From bf6cfe3b99884ff4ba1cd2c5d5451fe634426405 Mon Sep 17 00:00:00 2001 From: Philip Hyunsu Cho Date: Wed, 16 Dec 2020 10:07:52 -0800 Subject: [PATCH] [Breaking] Upgrade cuDF and RMM to 0.18 nightlies; require RMM 0.18+ for RMM plugin (#6510) * [CI] Upgrade cuDF and RMM to 0.18 nightlies * Modify RMM plugin to be compatible with RMM 0.18 * Update src/common/device_helpers.cuh Co-authored-by: Mark Harris Co-authored-by: Mark Harris --- src/common/device_helpers.cuh | 2 +- tests/ci_build/Dockerfile.gpu | 2 +- tests/ci_build/Dockerfile.rmm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/device_helpers.cuh b/src/common/device_helpers.cuh index 0112d299a..62af08b42 100644 --- a/src/common/device_helpers.cuh +++ b/src/common/device_helpers.cuh @@ -429,7 +429,7 @@ struct XGBDefaultDeviceAllocatorImpl : XGBBaseDeviceAllocator { } #if defined(XGBOOST_USE_RMM) && XGBOOST_USE_RMM == 1 XGBDefaultDeviceAllocatorImpl() - : SuperT(rmm::mr::get_current_device_resource(), cudaStream_t{nullptr}) {} + : SuperT(rmm::cuda_stream_default, rmm::mr::get_current_device_resource()) {} #endif // defined(XGBOOST_USE_RMM) && XGBOOST_USE_RMM == 1 }; diff --git a/tests/ci_build/Dockerfile.gpu b/tests/ci_build/Dockerfile.gpu index 79a379b70..364ec668e 100644 --- a/tests/ci_build/Dockerfile.gpu +++ b/tests/ci_build/Dockerfile.gpu @@ -19,7 +19,7 @@ ENV PATH=/opt/python/bin:$PATH # Create new Conda environment with cuDF, Dask, and cuPy RUN \ conda create -n gpu_test -c rapidsai-nightly -c rapidsai -c nvidia -c conda-forge -c defaults \ - python=3.7 cudf=0.17* rmm=0.17* cudatoolkit=$CUDA_VERSION_ARG dask dask-cuda dask-cudf cupy \ + python=3.7 cudf=0.18* rmm=0.18* cudatoolkit=$CUDA_VERSION_ARG dask dask-cuda dask-cudf cupy \ numpy pytest scipy scikit-learn pandas matplotlib wheel python-kubernetes urllib3 graphviz hypothesis ENV GOSU_VERSION 1.10 diff --git a/tests/ci_build/Dockerfile.rmm b/tests/ci_build/Dockerfile.rmm index 961a55ad2..042fc425f 100644 --- a/tests/ci_build/Dockerfile.rmm +++ b/tests/ci_build/Dockerfile.rmm @@ -29,7 +29,7 @@ ENV PATH=/opt/python/bin:$PATH # Create new Conda environment with RMM RUN \ conda create -n gpu_test -c nvidia -c rapidsai-nightly -c rapidsai -c conda-forge -c defaults \ - python=3.7 rmm=0.17* cudatoolkit=$CUDA_VERSION_ARG + python=3.7 rmm=0.18* cudatoolkit=$CUDA_VERSION_ARG ENV GOSU_VERSION 1.10