From d1aca2ef1782e0eb472c92be67610e420a509233 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 18 May 2021 07:59:51 -0500 Subject: [PATCH 1/4] update cuspatial version for calver, specify patch version for FindPackage cudf --- cpp/CMakeLists.txt | 2 +- cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 9530dc472..1c5cd5969 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -28,7 +28,7 @@ elseif(CMAKE_CUDA_ARCHITECTURES STREQUAL "") set(CUSPATIAL_BUILD_FOR_DETECTED_ARCHS TRUE) endif() -project(CUSPATIAL VERSION 0.20.0 LANGUAGES C CXX) +project(CUSPATIAL VERSION 21.06.00 LANGUAGES C CXX) # Needed because GoogleBenchmark changes the state of FindThreads.cmake, # causing subsequent runs to have different values for the `Threads::Threads` target. diff --git a/cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake b/cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake index 20862bf48..0f95b267b 100644 --- a/cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake +++ b/cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake @@ -36,6 +36,6 @@ function(find_and_configure_cudf VERSION) fix_cmake_global_defaults(cudf::cudftestutil) endfunction() -set(CUSPATIAL_MIN_VERSION_cudf "${CUSPATIAL_VERSION_MAJOR}.${CUSPATIAL_VERSION_MINOR}") +set(CUSPATIAL_MIN_VERSION_cudf "${CUSPATIAL_VERSION_MAJOR}.${CUSPATIAL_VERSION_MINOR}.00") find_and_configure_cudf(${CUSPATIAL_MIN_VERSION_cudf}) From 0cf06131accee039c81c2c3fc67c64482eb4b893 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 18 May 2021 08:24:53 -0500 Subject: [PATCH 2/4] use the major.minor versions in the branch name --- cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake b/cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake index 0f95b267b..b2d0f098c 100644 --- a/cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake +++ b/cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake @@ -20,10 +20,14 @@ function(find_and_configure_cudf VERSION) return() endif() + if(${VERSION} MATCHES [=[([0-9]+)\.([0-9]+)\.([0-9]+)]=]) + set(MAJOR_AND_MINOR "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}") + endif() + CPMFindPackage(NAME cudf VERSION ${VERSION} GIT_REPOSITORY https://github.com/rapidsai/cudf.git - GIT_TAG branch-${VERSION} + GIT_TAG branch-${MAJOR_AND_MINOR} GIT_SHALLOW TRUE SOURCE_SUBDIR cpp OPTIONS "BUILD_TESTS OFF" From 5e9c4723b2087346cfcc875064d3904058b2cd85 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 18 May 2021 08:35:38 -0500 Subject: [PATCH 3/4] handle the case where patch component is omitted --- cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake b/cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake index b2d0f098c..8a84bb7c6 100644 --- a/cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake +++ b/cpp/cmake/thirdparty/CUSPATIAL_GetCUDF.cmake @@ -22,6 +22,8 @@ function(find_and_configure_cudf VERSION) if(${VERSION} MATCHES [=[([0-9]+)\.([0-9]+)\.([0-9]+)]=]) set(MAJOR_AND_MINOR "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}") + else() + set(MAJOR_AND_MINOR "${VERSION}") endif() CPMFindPackage(NAME cudf From 26484c496ee62692d16595a45f72bc222f25d229 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 18 May 2021 08:43:25 -0500 Subject: [PATCH 4/4] update dev environments' cuDF version --- conda/environments/cuspatial_dev_cuda11.0.yml | 2 +- conda/environments/cuspatial_dev_cuda11.1.yml | 4 ++-- conda/environments/cuspatial_dev_cuda11.2.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/environments/cuspatial_dev_cuda11.0.yml b/conda/environments/cuspatial_dev_cuda11.0.yml index 8d371c241..4f1ad7553 100644 --- a/conda/environments/cuspatial_dev_cuda11.0.yml +++ b/conda/environments/cuspatial_dev_cuda11.0.yml @@ -7,7 +7,7 @@ channels: dependencies: - clang=8.0.1 - clang-tools=8.0.1 - - cudf=0.20.* + - cudf=21.06.* - cudatoolkit=11.0 - gdal>=3.0.2 - geopandas=0.7.0 diff --git a/conda/environments/cuspatial_dev_cuda11.1.yml b/conda/environments/cuspatial_dev_cuda11.1.yml index ebf912ad5..b87c1dce7 100644 --- a/conda/environments/cuspatial_dev_cuda11.1.yml +++ b/conda/environments/cuspatial_dev_cuda11.1.yml @@ -7,11 +7,11 @@ channels: dependencies: - clang=8.0.1 - clang-tools=8.0.1 - - cudf=0.20.* + - cudf=21.06.* - cudatoolkit=11.1 - gdal>=3.0.2 - geopandas=0.7.0 - - cmake>=3.14 + - cmake>=3.18 - cython>=0.29,<0.30 - gtest - gmock diff --git a/conda/environments/cuspatial_dev_cuda11.2.yml b/conda/environments/cuspatial_dev_cuda11.2.yml index d370e1f85..6fec8297f 100644 --- a/conda/environments/cuspatial_dev_cuda11.2.yml +++ b/conda/environments/cuspatial_dev_cuda11.2.yml @@ -7,11 +7,11 @@ channels: dependencies: - clang=8.0.1 - clang-tools=8.0.1 - - cudf=0.20.* + - cudf=21.06.* - cudatoolkit=11.2 - gdal>=3.0.2 - geopandas=0.7.0 - - cmake>=3.14 + - cmake>=3.18 - cython>=0.29,<0.30 - gtest - gmock