Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CMake FindPackage rmm, pin dev envs' dlpack to v0.3 #8271

Merged
merged 6 commits into from
May 18, 2021
Merged

Fix CMake FindPackage rmm, pin dev envs' dlpack to v0.3 #8271

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53a3f1e
specify patch version for FindPackage RMM
trxcllnt May 18, 2021
e9cedf0
pin dev conda envs to dlpack 0.3
trxcllnt May 18, 2021
a3e6eb4
use the major.minor versions in the branch name
trxcllnt May 18, 2021
de4611c
handle the case where patch component is omitted
trxcllnt May 18, 2021
8c4a1ee
update dev environments' RMM version
trxcllnt May 18, 2021
9527c6e
pin dlpack to v0.3 in meta.yml
trxcllnt May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependencies:
- dask==2021.4.0
- distributed>=2.22.0,<=2021.4.0
- streamz
- dlpack
- dlpack==0.3
- arrow-cpp=1.0.1
- arrow-cpp-proc * cuda
- double-conversion
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda11.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependencies:
- dask==2021.4.0
- distributed>=2.22.0,<=2021.4.0
- streamz
- dlpack
- dlpack==0.3
- arrow-cpp=1.0.1
- arrow-cpp-proc * cuda
- double-conversion
Expand Down
10 changes: 8 additions & 2 deletions cpp/cmake/thirdparty/CUDF_GetRMM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,20 @@ function(find_and_configure_rmm VERSION)
return()
endif()

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()
trxcllnt marked this conversation as resolved.
Show resolved Hide resolved

# Consumers have two options for local source builds:
# 1. Pass `-D CPM_rmm_SOURCE=/path/to/rmm` to build a local RMM source tree
# 2. Pass `-D CMAKE_PREFIX_PATH=/path/to/rmm/build` to use an existing local
# RMM build directory as the install location for find_package(rmm)
CPMFindPackage(NAME rmm
VERSION ${VERSION}
GIT_REPOSITORY https://github.com/rapidsai/rmm.git
GIT_TAG branch-${VERSION}
GIT_TAG branch-${MAJOR_AND_MINOR}
GIT_SHALLOW TRUE
OPTIONS "BUILD_TESTS OFF"
"BUILD_BENCHMARKS OFF"
Expand All @@ -39,6 +45,6 @@ function(find_and_configure_rmm VERSION)
fix_cmake_global_defaults(rmm::rmm)
endfunction()

set(CUDF_MIN_VERSION_rmm "${CUDF_VERSION_MAJOR}.${CUDF_VERSION_MINOR}")
set(CUDF_MIN_VERSION_rmm "${CUDF_VERSION_MAJOR}.${CUDF_VERSION_MINOR}.00")

find_and_configure_rmm(${CUDF_MIN_VERSION_rmm})