From 6c9e0748d121efef4c59fbfa948d24881f31a200 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 8 Jun 2023 15:03:33 -0700 Subject: [PATCH 1/2] Update to CMake 3.26.4 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/recipes/libcuspatial/conda_build_config.yaml | 2 +- cpp/CMakeLists.txt | 2 +- dependencies.yaml | 2 +- java/src/main/native/CMakeLists.txt | 2 +- python/cuspatial/CMakeLists.txt | 2 +- python/cuspatial/pyproject.toml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 18c0b1af9..cc9482d78 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -7,7 +7,7 @@ channels: - nvidia dependencies: - c-compiler -- cmake>=3.23.1,!=3.25.0 +- cmake>=3.26.4 - cudatoolkit=11.8 - cudf==23.8.* - cuml==23.8.* diff --git a/conda/recipes/libcuspatial/conda_build_config.yaml b/conda/recipes/libcuspatial/conda_build_config.yaml index 6056ed6b2..f3da4ec36 100644 --- a/conda/recipes/libcuspatial/conda_build_config.yaml +++ b/conda/recipes/libcuspatial/conda_build_config.yaml @@ -8,7 +8,7 @@ cuda_compiler: - nvcc cmake_version: - - ">=3.23.1,!=3.25.0" + - ">=3.26.4" gtest_version: - ">=1.13.0" diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index c3477d10d..ad47f587a 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -14,7 +14,7 @@ # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR) include(../fetch_rapids.cmake) include(rapids-cmake) diff --git a/dependencies.yaml b/dependencies.yaml index 8d28e9730..10eafbc10 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -76,7 +76,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - ninja - - cmake>=3.23.1,!=3.25.0 + - cmake>=3.26.4 - output_types: conda packages: - c-compiler diff --git a/java/src/main/native/CMakeLists.txt b/java/src/main/native/CMakeLists.txt index c7b649be1..071f0ca37 100755 --- a/java/src/main/native/CMakeLists.txt +++ b/java/src/main/native/CMakeLists.txt @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR) include(../../../../fetch_rapids.cmake) diff --git a/python/cuspatial/CMakeLists.txt b/python/cuspatial/CMakeLists.txt index 14d57f1cd..bf9f575a8 100644 --- a/python/cuspatial/CMakeLists.txt +++ b/python/cuspatial/CMakeLists.txt @@ -12,7 +12,7 @@ # the License. # ============================================================================= -cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR) set(cuspatial_version 23.08.00) diff --git a/python/cuspatial/pyproject.toml b/python/cuspatial/pyproject.toml index 10b2555ae..8db1ffa61 100644 --- a/python/cuspatial/pyproject.toml +++ b/python/cuspatial/pyproject.toml @@ -15,7 +15,7 @@ [build-system] build-backend = "setuptools.build_meta" requires = [ - "cmake>=3.23.1,!=3.25.0", + "cmake>=3.26.4", "cudf==23.8.*", "cython>=0.29,<0.30", "ninja", From c0beefcab5c2cfac4133c8edfa8169b53700b315 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 8 Jun 2023 15:12:46 -0700 Subject: [PATCH 2/2] Fix remaining cases --- conda/recipes/cuspatial/conda_build_config.yaml | 3 +++ conda/recipes/cuspatial/meta.yaml | 2 +- docs/source/developer_guide/build.md | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/conda/recipes/cuspatial/conda_build_config.yaml b/conda/recipes/cuspatial/conda_build_config.yaml index ad733ac69..b4b06a9b6 100644 --- a/conda/recipes/cuspatial/conda_build_config.yaml +++ b/conda/recipes/cuspatial/conda_build_config.yaml @@ -9,3 +9,6 @@ cuda_compiler: sysroot_version: - "2.17" + +cmake_version: + - ">=3.26.4" diff --git a/conda/recipes/cuspatial/meta.yaml b/conda/recipes/cuspatial/meta.yaml index d39ace7f7..88b82e665 100644 --- a/conda/recipes/cuspatial/meta.yaml +++ b/conda/recipes/cuspatial/meta.yaml @@ -43,7 +43,7 @@ requirements: - ninja - sysroot_{{ target_platform }} {{ sysroot_version }} host: - - cmake >=3.23.1,!=3.25.0 + - cmake {{ cmake_version }} - cudf ={{ minor_version }} - cython >=0.29,<0.30 - libcuspatial ={{ version }} diff --git a/docs/source/developer_guide/build.md b/docs/source/developer_guide/build.md index 26f21cb68..ea6da6bc3 100644 --- a/docs/source/developer_guide/build.md +++ b/docs/source/developer_guide/build.md @@ -3,7 +3,7 @@ ## Pre-requisites - gcc >= 7.5 -- cmake >= 3.23 +- cmake >= 3.26.4 - miniconda ## Fetch cuSpatial repository