Merge branch 'branch-25.04' into tom/retry-http

rapidsai · Feb 22, 2025 · 0ea0918 · 0ea0918
2 parents ae2ea11 + 637cac5
commit 0ea0918
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 20 deletions.
diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml
@@ -8,7 +8,7 @@ channels:
 dependencies:
 - boto3>=1.21.21
 - c-compiler
-- cmake>=3.26.4,!=3.30.0
+- cmake>=3.30.4
 - cuda-python>=11.8.5,<12.0a0
 - cuda-version=11.8
 - cudatoolkit

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -8,7 +8,7 @@ channels:
 dependencies:
 - boto3>=1.21.21
 - c-compiler
-- cmake>=3.26.4,!=3.30.0
+- cmake>=3.30.4
 - cuda-python>=11.8.5,<12.0a0
 - cuda-version=11.8
 - cudatoolkit

diff --git a/conda/environments/all_cuda-128_arch-aarch64.yaml b/conda/environments/all_cuda-128_arch-aarch64.yaml
@@ -8,7 +8,7 @@ channels:
 dependencies:
 - boto3>=1.21.21
 - c-compiler
-- cmake>=3.26.4,!=3.30.0
+- cmake>=3.30.4
 - cuda-nvcc
 - cuda-python>=12.6.2,<13.0a0
 - cuda-version=12.8

diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml
@@ -8,7 +8,7 @@ channels:
 dependencies:
 - boto3>=1.21.21
 - c-compiler
-- cmake>=3.26.4,!=3.30.0
+- cmake>=3.30.4
 - cuda-nvcc
 - cuda-python>=12.6.2,<13.0a0
 - cuda-version=12.8

diff --git a/conda/recipes/kvikio/conda_build_config.yaml b/conda/recipes/kvikio/conda_build_config.yaml
@@ -7,7 +7,7 @@ cxx_compiler_version:
   - 11  # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
 
 cmake_version:
-  - ">=3.26.4,!=3.30.0"
+  - ">=3.30.4"
 
 cuda_compiler:
   - cuda-nvcc  # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]

diff --git a/conda/recipes/libkvikio/conda_build_config.yaml b/conda/recipes/libkvikio/conda_build_config.yaml
@@ -7,7 +7,7 @@ cxx_compiler_version:
   - 11  # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
 
 cmake_version:
-  - ">=3.26.4,!=3.30.0"
+  - ">=3.30.4"
 
 cuda_compiler:
   - cuda-nvcc  # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]

diff --git a/cpp/CMakeLists.txt b/cpp/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(cmake/rapids_config.cmake)
 include(rapids-cmake)

diff --git a/cpp/examples/downstream/CMakeLists.txt b/cpp/examples/downstream/CMakeLists.txt
@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2021-2024, NVIDIA CORPORATION.
+# Copyright (c) 2021-2025, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
 # the License.
 # =============================================================================
 
-cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
 
 project(
   KvikIODownstreamExample

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -115,7 +115,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
   build-cpp:
     common:

diff --git a/java/pom.xml b/java/pom.xml
@@ -22,7 +22,8 @@
     <maven.compiler.target>11</maven.compiler.target>
     <junit.version>5.4.2</junit.version>
     <jcuda.version>12.0.0</jcuda.version>
-    <cmake.version>3.23.2-b1</cmake.version>
+    <cmake.version>3.30.2-b1</cmake.version>
+    <cmake.download>false</cmake.download>
   </properties>
 
   <dependencies>

diff --git a/java/src/main/native/CMakeLists.txt b/java/src/main/native/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, NVIDIA CORPORATION.
+# Copyright (c) 2024-2025, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -12,11 +12,11 @@
 # the License.
 #
 
-cmake_minimum_required(VERSION 3.23)
+cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
 
 project(CuFileJNI LANGUAGES CXX CUDA)
 
-find_package(CUDA REQUIRED)
+find_package(CUDAToolkit REQUIRED)
 
 find_package(JNI REQUIRED)
 

diff --git a/python/kvikio/CMakeLists.txt b/python/kvikio/CMakeLists.txt
@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2022-2024, NVIDIA CORPORATION.
+# Copyright (c) 2022-2025, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -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(../../cpp/cmake/rapids_config.cmake)
 include(rapids-cpm)

diff --git a/python/kvikio/pyproject.toml b/python/kvikio/pyproject.toml
@@ -118,7 +118,7 @@ build-backend = "scikit_build_core.build"
 dependencies-file = "../../dependencies.yaml"
 matrix-entry = "cuda_suffixed=true;use_cuda_wheels=true"
 requires = [
-    "cmake>=3.26.4,!=3.30.0",
+    "cmake>=3.30.4",
     "cython>=3.0.0",
     "libkvikio==25.4.*,>=0.0.0a0",
     "ninja",

diff --git a/python/libkvikio/CMakeLists.txt b/python/libkvikio/CMakeLists.txt
@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2024, NVIDIA CORPORATION.
+# Copyright (c) 2024-2025, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -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(../../cpp/cmake/rapids_config.cmake)
 include(rapids-cpm)

diff --git a/python/libkvikio/pyproject.toml b/python/libkvikio/pyproject.toml
@@ -53,7 +53,7 @@ build-backend = "scikit_build_core.build"
 dependencies-file = "../../dependencies.yaml"
 matrix-entry = "cuda_suffixed=true"
 requires = [
-    "cmake>=3.26.4,!=3.30.0",
+    "cmake>=3.30.4",
     "ninja",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.