From 361acf054c8ad27292526ebce7564555c3935f0d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 2 Nov 2023 20:32:32 -0500 Subject: [PATCH 1/3] Build with spdlog 1.12.0 and fmt 10.1.1. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/environments/all_cuda-120_arch-x86_64.yaml | 4 ++-- conda/recipes/librmm/conda_build_config.yaml | 4 ++-- dependencies.yaml | 4 ++-- fetch_rapids.cmake | 2 ++ 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 3a5cb90af..09f3ebeed 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -16,7 +16,7 @@ dependencies: - cxx-compiler - cython>=3.0.0 - doxygen=1.9.1 -- fmt>=9.1.0,<10 +- fmt>=10.1.1,<11 - gcc_linux-64=11.* - gcovr>=5.0 - graphviz @@ -34,7 +34,7 @@ dependencies: - pytest-cov - python>=3.9,<3.11 - scikit-build>=0.13.1 -- spdlog>=1.11.0,<1.12 +- spdlog>=1.12.0,<1.13 - sphinx - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index f87564b74..40f1871c2 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -15,7 +15,7 @@ dependencies: - cxx-compiler - cython>=3.0.0 - doxygen=1.9.1 -- fmt>=9.1.0,<10 +- fmt>=10.1.1,<11 - gcc_linux-64=11.* - gcovr>=5.0 - graphviz @@ -32,7 +32,7 @@ dependencies: - pytest-cov - python>=3.9,<3.11 - scikit-build>=0.13.1 -- spdlog>=1.11.0,<1.12 +- spdlog>=1.12.0,<1.13 - sphinx - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index 59c0a210e..ed58ac507 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -14,13 +14,13 @@ cmake_version: - ">=3.26.4" fmt_version: - - ">=9.1.0,<10" + - ">=10.1.1,<11" gtest_version: - ">=1.13.0" spdlog_version: - - ">=1.11.0,<1.12" + - ">=1.12.0,<1.13" sysroot_version: - "2.17" diff --git a/dependencies.yaml b/dependencies.yaml index af3f49ef0..805159e62 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -71,8 +71,8 @@ dependencies: packages: - c-compiler - cxx-compiler - - fmt>=9.1.0,<10 - - spdlog>=1.11.0,<1.12 + - fmt>=10.1.1,<11 + - spdlog>=1.12.0,<1.13 - python>=3.9,<3.11 - output_types: pyproject packages: diff --git a/fetch_rapids.cmake b/fetch_rapids.cmake index 899db0467..3fe155dfd 100644 --- a/fetch_rapids.cmake +++ b/fetch_rapids.cmake @@ -11,6 +11,8 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. # ============================================================================= +set(rapids-cmake-repo kkraus14/rapids-cmake) +set(rapids-cmake-branch spdlog_1.12_fmt_10) if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.12/RAPIDS.cmake ${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS.cmake) From a1b6ca403591cb8367817e60bfa2ad3bc3e9c199 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 28 Nov 2023 14:45:05 -0800 Subject: [PATCH 2/3] Rerun CI. From 10b9579130de0703d13299b4b739a9b0bd1bdbc2 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 30 Nov 2023 10:22:35 -0600 Subject: [PATCH 3/3] Remove rapids-cmake branch. --- fetch_rapids.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/fetch_rapids.cmake b/fetch_rapids.cmake index 0830b7639..86d447acb 100644 --- a/fetch_rapids.cmake +++ b/fetch_rapids.cmake @@ -11,8 +11,6 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. # ============================================================================= -set(rapids-cmake-repo kkraus14/rapids-cmake) -set(rapids-cmake-branch spdlog_1.12_fmt_10) if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.02/RAPIDS.cmake ${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS.cmake)