Skip to content

Commit 7caf341

Browse files
committed
Merge branch 'branch-21.10' of https://github.com/rapidsai/cugraph into enh_mem_req_part2
2 parents 7f79338 + 7565dc3 commit 7caf341

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

ci/gpu/build.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,13 @@ gpuci_logger "Activate conda env"
5353
. /opt/conda/etc/profile.d/conda.sh
5454
conda activate rapids
5555

56+
# FIXME: return librmm and RMM to ${MINOR_VERSION}
5657
gpuci_logger "Install dependencies"
5758
gpuci_mamba_retry install -y \
5859
"libcudf=${MINOR_VERSION}" \
5960
"cudf=${MINOR_VERSION}" \
60-
"librmm=${MINOR_VERSION}" \
61-
"rmm=${MINOR_VERSION}" \
61+
"librmm=21.10.00a210812" \
62+
"rmm=21.10.00a210813" \
6263
"cudatoolkit=$CUDA_REL" \
6364
"dask-cudf=${MINOR_VERSION}" \
6465
"dask-cuda=${MINOR_VERSION}" \

conda/environments/cugraph_dev_cuda11.0.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ dependencies:
88
- cudatoolkit=11.0
99
- cudf=21.10.*
1010
- libcudf=21.10.*
11-
- rmm=21.10.*
12-
- librmm=21.10.*
11+
- rmm=21.10.00a210813
12+
- librmm=21.10.00a210812
1313
- dask>=2021.6.0
1414
- distributed>=2021.6.0
1515
- dask-cuda=21.10.*

conda/environments/cugraph_dev_cuda11.2.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ dependencies:
88
- cudatoolkit=11.2
99
- cudf=21.10.*
1010
- libcudf=21.10.*
11-
- rmm=21.10.*
12-
- librmm=21.10.*
11+
- rmm=21.10.00a210813
12+
- librmm=21.10.00a210812
1313
- dask>=2021.6.0
1414
- distributed>=2021.6.0
1515
- dask-cuda=21.10.*

conda/recipes/libcugraph/meta.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ build:
2929
- CMAKE_CXX_COMPILER_LAUNCHER
3030
- CMAKE_CUDA_COMPILER_LAUNCHER
3131

32+
# FIXME: return librmm to {{ minor_version }}.*
3233
requirements:
3334
build:
3435
- cmake>=3.20.1
3536
- cudatoolkit {{ cuda_version }}.*
36-
- librmm {{ minor_version }}.*
37+
- librmm=21.10.00a210812
3738
- boost-cpp>=1.66
3839
- nccl>=2.9.9
3940
- ucx-proc=*=gpu

cpp/cmake/thirdparty/get_rmm.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,16 @@ function(find_and_configure_rmm VERSION)
2626
return()
2727
endif()
2828

29+
# FIXME: turn GIT_SHALLOW back to TRUE when changing GIT_TAG back
30+
# to branch-${MAJOR_AND_MINOR}
2931
rapids_cpm_find(rmm ${VERSION}
3032
GLOBAL_TARGETS rmm::rmm
3133
BUILD_EXPORT_SET cugraph-exports
3234
INSTALL_EXPORT_SET cugraph-exports
3335
CPM_ARGS
3436
GIT_REPOSITORY https://github.com/rapidsai/rmm.git
35-
GIT_TAG branch-${MAJOR_AND_MINOR}
36-
GIT_SHALLOW TRUE
37+
GIT_TAG 23bbe745af1d988224b5498f7b8e3fe3720532d4
38+
GIT_SHALLOW FALSE
3739
OPTIONS "BUILD_TESTS OFF"
3840
"BUILD_BENCHMARKS OFF"
3941
"CUDA_STATIC_RUNTIME ${CUDA_STATIC_RUNTIME}"

0 commit comments

Comments
 (0)