From a1e0cc06d666be60663e15780fc66939606fd67d Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Fri, 21 Feb 2025 15:36:41 -0500 Subject: [PATCH] Require CMake 3.30.4 (#691) Update CMake minimum required to 3.30.4 across all of RAPIDS Authors: - Robert Maynard (https://github.com/robertmaynard) Approvers: - James Lamb (https://github.com/jameslamb) - Corey J. Nolet (https://github.com/cjnolet) - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/cuvs/pull/691 --- conda/environments/all_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-128_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-128_arch-x86_64.yaml | 2 +- conda/environments/bench_ann_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/bench_ann_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/bench_ann_cuda-128_arch-aarch64.yaml | 2 +- conda/environments/bench_ann_cuda-128_arch-x86_64.yaml | 2 +- conda/recipes/cuvs-bench-cpu/conda_build_config.yaml | 2 +- conda/recipes/cuvs-bench/conda_build_config.yaml | 2 +- conda/recipes/cuvs/conda_build_config.yaml | 2 +- conda/recipes/libcuvs/conda_build_config.yaml | 2 +- cpp/CMakeLists.txt | 2 +- dependencies.yaml | 2 +- examples/c/CMakeLists.txt | 2 +- examples/cpp/CMakeLists.txt | 2 +- java/internal/CMakeLists.txt | 2 +- python/cuvs/CMakeLists.txt | 2 +- python/cuvs/pyproject.toml | 2 +- python/libcuvs/CMakeLists.txt | 2 +- python/libcuvs/pyproject.toml | 2 +- rust/cuvs-sys/CMakeLists.txt | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index 638c0ee36..5e99876a1 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -11,7 +11,7 @@ dependencies: - c-compiler - clang-tools==16.0.6 - clang==16.0.6 -- cmake>=3.26.4,!=3.30.0 +- cmake>=3.30.4 - cuda-nvtx=11.8 - cuda-profiler-api=11.8.86 - cuda-python>=11.8.5,<12.0a0 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index bb50937b3..9038901c2 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -11,7 +11,7 @@ dependencies: - c-compiler - clang-tools==16.0.6 - clang==16.0.6 -- cmake>=3.26.4,!=3.30.0 +- cmake>=3.30.4 - cuda-nvtx=11.8 - cuda-profiler-api=11.8.86 - cuda-python>=11.8.5,<12.0a0 diff --git a/conda/environments/all_cuda-128_arch-aarch64.yaml b/conda/environments/all_cuda-128_arch-aarch64.yaml index 5c12fbe77..0cbf9abc1 100644 --- a/conda/environments/all_cuda-128_arch-aarch64.yaml +++ b/conda/environments/all_cuda-128_arch-aarch64.yaml @@ -11,7 +11,7 @@ dependencies: - c-compiler - clang-tools==16.0.6 - clang==16.0.6 -- cmake>=3.26.4,!=3.30.0 +- cmake>=3.30.4 - cuda-cudart-dev - cuda-nvcc - cuda-nvtx-dev diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml index b2835312c..17bdcd8c5 100644 --- a/conda/environments/all_cuda-128_arch-x86_64.yaml +++ b/conda/environments/all_cuda-128_arch-x86_64.yaml @@ -11,7 +11,7 @@ dependencies: - c-compiler - clang-tools==16.0.6 - clang==16.0.6 -- cmake>=3.26.4,!=3.30.0 +- cmake>=3.30.4 - cuda-cudart-dev - cuda-nvcc - cuda-nvtx-dev diff --git a/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml index 88aa21235..a471423d9 100644 --- a/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml @@ -12,7 +12,7 @@ dependencies: - clang-tools==16.0.6 - clang==16.0.6 - click -- cmake>=3.26.4,!=3.30.0 +- cmake>=3.30.4 - cuda-nvtx=11.8 - cuda-profiler-api=11.8.86 - cuda-python>=11.8.5,<12.0a0 diff --git a/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml index a1d3a5d11..5b1309a66 100644 --- a/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml @@ -12,7 +12,7 @@ dependencies: - clang-tools==16.0.6 - clang==16.0.6 - click -- cmake>=3.26.4,!=3.30.0 +- cmake>=3.30.4 - cuda-nvtx=11.8 - cuda-profiler-api=11.8.86 - cuda-python>=11.8.5,<12.0a0 diff --git a/conda/environments/bench_ann_cuda-128_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-128_arch-aarch64.yaml index cba83da04..ce32927d4 100644 --- a/conda/environments/bench_ann_cuda-128_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-128_arch-aarch64.yaml @@ -12,7 +12,7 @@ dependencies: - clang-tools==16.0.6 - clang==16.0.6 - click -- cmake>=3.26.4,!=3.30.0 +- cmake>=3.30.4 - cuda-cudart-dev - cuda-nvcc - cuda-nvtx-dev diff --git a/conda/environments/bench_ann_cuda-128_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-128_arch-x86_64.yaml index d8f050f32..f9b2b8aa6 100644 --- a/conda/environments/bench_ann_cuda-128_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-128_arch-x86_64.yaml @@ -12,7 +12,7 @@ dependencies: - clang-tools==16.0.6 - clang==16.0.6 - click -- cmake>=3.26.4,!=3.30.0 +- cmake>=3.30.4 - cuda-cudart-dev - cuda-nvcc - cuda-nvtx-dev diff --git a/conda/recipes/cuvs-bench-cpu/conda_build_config.yaml b/conda/recipes/cuvs-bench-cpu/conda_build_config.yaml index 74f45d911..736028df6 100644 --- a/conda/recipes/cuvs-bench-cpu/conda_build_config.yaml +++ b/conda/recipes/cuvs-bench-cpu/conda_build_config.yaml @@ -13,7 +13,7 @@ c_stdlib_version: - "2.28" cmake_version: - - ">=3.26.4,!=3.30.0" + - ">=3.30.4" glog_version: - ">=0.6.0" diff --git a/conda/recipes/cuvs-bench/conda_build_config.yaml b/conda/recipes/cuvs-bench/conda_build_config.yaml index ccd7341d1..6154e9007 100644 --- a/conda/recipes/cuvs-bench/conda_build_config.yaml +++ b/conda/recipes/cuvs-bench/conda_build_config.yaml @@ -17,7 +17,7 @@ c_stdlib_version: - "2.28" cmake_version: - - ">=3.26.4,!=3.30.0" + - ">=3.30.4" nccl_version: - ">=2.19" diff --git a/conda/recipes/cuvs/conda_build_config.yaml b/conda/recipes/cuvs/conda_build_config.yaml index 83f5ebcb1..0a1108eb5 100644 --- a/conda/recipes/cuvs/conda_build_config.yaml +++ b/conda/recipes/cuvs/conda_build_config.yaml @@ -17,4 +17,4 @@ c_stdlib_version: - "2.28" cmake_version: - - ">=3.26.4,!=3.30.0" + - ">=3.30.4" diff --git a/conda/recipes/libcuvs/conda_build_config.yaml b/conda/recipes/libcuvs/conda_build_config.yaml index 72cc4415d..3a54a5f34 100644 --- a/conda/recipes/libcuvs/conda_build_config.yaml +++ b/conda/recipes/libcuvs/conda_build_config.yaml @@ -17,7 +17,7 @@ c_stdlib_version: - "2.28" cmake_version: - - ">=3.26.4,!=3.30.0" + - ">=3.30.4" h5py_version: - ">=3.8.0" diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 945a18157..9d505f862 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -10,7 +10,7 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under # the License. -cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR) +cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR) include(../rapids_config.cmake) include(rapids-cmake) include(rapids-cpm) diff --git a/dependencies.yaml b/dependencies.yaml index 4b3ba55d0..97e6099f5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -212,7 +212,7 @@ dependencies: common: - output_types: [conda, requirements, pyproject] packages: - - &cmake_ver cmake>=3.26.4,!=3.30.0 + - &cmake_ver cmake>=3.30.4 - ninja - output_types: [conda] packages: diff --git a/examples/c/CMakeLists.txt b/examples/c/CMakeLists.txt index 2a7e70522..52f3b34d1 100644 --- a/examples/c/CMakeLists.txt +++ b/examples/c/CMakeLists.txt @@ -11,7 +11,7 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. -cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR) +cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR) # ------------- configure rapids-cmake --------------# diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt index 96414534c..311be31f7 100644 --- a/examples/cpp/CMakeLists.txt +++ b/examples/cpp/CMakeLists.txt @@ -11,7 +11,7 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. -cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR) +cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR) # ------------- configure rapids-cmake --------------# diff --git a/java/internal/CMakeLists.txt b/java/internal/CMakeLists.txt index 3bd316e2d..c764745b1 100644 --- a/java/internal/CMakeLists.txt +++ b/java/internal/CMakeLists.txt @@ -12,7 +12,7 @@ # the License. # ============================================================================= -cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR) +cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR) include(rapids_config.cmake) include(rapids-cmake) diff --git a/python/cuvs/CMakeLists.txt b/python/cuvs/CMakeLists.txt index 93946cfdb..97eb53cc4 100644 --- a/python/cuvs/CMakeLists.txt +++ b/python/cuvs/CMakeLists.txt @@ -12,7 +12,7 @@ # the License. # ============================================================================= -cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR) +cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR) include(../../rapids_config.cmake) diff --git a/python/cuvs/pyproject.toml b/python/cuvs/pyproject.toml index d6847b381..f4752d520 100644 --- a/python/cuvs/pyproject.toml +++ b/python/cuvs/pyproject.toml @@ -115,7 +115,7 @@ regex = "(?P.*)" [tool.rapids-build-backend] requires = [ - "cmake>=3.26.4,!=3.30.0", + "cmake>=3.30.4", "cuda-python", "cython>=3.0.0", "libcuvs==25.4.*,>=0.0.0a0", diff --git a/python/libcuvs/CMakeLists.txt b/python/libcuvs/CMakeLists.txt index 569652b71..a5a1c66b7 100644 --- a/python/libcuvs/CMakeLists.txt +++ b/python/libcuvs/CMakeLists.txt @@ -12,7 +12,7 @@ # the License. # ============================================================================= -cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR) +cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR) include(../../rapids_config.cmake) diff --git a/python/libcuvs/pyproject.toml b/python/libcuvs/pyproject.toml index 33958c823..24596e0ab 100644 --- a/python/libcuvs/pyproject.toml +++ b/python/libcuvs/pyproject.toml @@ -92,7 +92,7 @@ regex = "(?P.*)" [tool.rapids-build-backend] build-backend = "scikit_build_core.build" requires = [ - "cmake>=3.26.4,!=3.30.0", + "cmake>=3.30.4", "libraft==25.4.*,>=0.0.0a0", "librmm==25.4.*,>=0.0.0a0", "ninja", diff --git a/rust/cuvs-sys/CMakeLists.txt b/rust/cuvs-sys/CMakeLists.txt index 759152d90..0fcb0348a 100644 --- a/rust/cuvs-sys/CMakeLists.txt +++ b/rust/cuvs-sys/CMakeLists.txt @@ -12,7 +12,7 @@ # the License. # ============================================================================= -cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR) +cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR) include(rapids_config.cmake) include(rapids-cmake)