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

Temporarily pin RMM while refactor removes deprecated calls #1775

Merged
merged 4 commits into from
Aug 17, 2021
+13 −9
Merged

Temporarily pin RMM while refactor removes deprecated calls #1775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afa7911
FIX Temporarily pin RMM while deprecated calls are removed
dantegd Aug 14, 2021
a375f5e
DOC Add fixme comment
dantegd Aug 16, 2021
2b03196
FIX Pin RMM temporarily in conda recipes and build.sh
dantegd Aug 17, 2021
6627e4d
FIX Wrong nightly date
dantegd Aug 17, 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
5 changes: 3 additions & 2 deletions ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,13 @@ gpuci_logger "Activate conda env"
. /opt/conda/etc/profile.d/conda.sh
conda activate rapids

# FIXME: return librmm and RMM to ${MINOR_VERSION}
gpuci_logger "Install dependencies"
gpuci_mamba_retry install -y \
"libcudf=${MINOR_VERSION}" \
"cudf=${MINOR_VERSION}" \
"librmm=${MINOR_VERSION}" \
"rmm=${MINOR_VERSION}" \
"librmm=21.10.00a210812" \
"rmm=21.10.00a210813" \
"cudatoolkit=$CUDA_REL" \
"dask-cudf=${MINOR_VERSION}" \
"dask-cuda=${MINOR_VERSION}" \
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cugraph_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ dependencies:
- cudatoolkit=11.0
- cudf=21.10.*
- libcudf=21.10.*
- rmm=21.10.*
- librmm=21.10.*
- rmm=21.10.00a210813
- librmm=21.10.00a210812
- dask>=2021.6.0
- distributed>=2021.6.0
- dask-cuda=21.10.*
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cugraph_dev_cuda11.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ dependencies:
- cudatoolkit=11.2
- cudf=21.10.*
- libcudf=21.10.*
- rmm=21.10.*
- librmm=21.10.*
- rmm=21.10.00a210813
- librmm=21.10.00a210812
- dask>=2021.6.0
- distributed>=2021.6.0
- dask-cuda=21.10.*
Expand Down
3 changes: 2 additions & 1 deletion conda/recipes/libcugraph/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ build:
- CMAKE_CXX_COMPILER_LAUNCHER
- CMAKE_CUDA_COMPILER_LAUNCHER

# FIXME: return librmm to {{ minor_version }}.*
requirements:
build:
- cmake>=3.20.1
- cudatoolkit {{ cuda_version }}.*
- librmm {{ minor_version }}.*
- librmm=21.10.00a210812
- boost-cpp>=1.66
- nccl>=2.9.9
- ucx-proc=*=gpu
Expand Down
6 changes: 4 additions & 2 deletions cpp/cmake/thirdparty/get_rmm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,16 @@ function(find_and_configure_rmm VERSION)
return()
endif()

# FIXME: turn GIT_SHALLOW back to TRUE when changing GIT_TAG back
# to branch-${MAJOR_AND_MINOR}
rapids_cpm_find(rmm ${VERSION}
GLOBAL_TARGETS rmm::rmm
BUILD_EXPORT_SET cugraph-exports
INSTALL_EXPORT_SET cugraph-exports
CPM_ARGS
GIT_REPOSITORY https://github.com/rapidsai/rmm.git
GIT_TAG branch-${MAJOR_AND_MINOR}
GIT_SHALLOW TRUE
GIT_TAG 23bbe745af1d988224b5498f7b8e3fe3720532d4
GIT_SHALLOW FALSE
dantegd marked this conversation as resolved.
Show resolved Hide resolved
OPTIONS "BUILD_TESTS OFF"
"BUILD_BENCHMARKS OFF"
"CUDA_STATIC_RUNTIME ${CUDA_STATIC_RUNTIME}"
Expand Down