Skip to content

Commit cd83fe6

Browse files
authored
[breaking][CI] Use CTK 12.4 (dmlc#10697)
1 parent 142bdc7 commit cd83fe6

File tree

6 files changed

+40
-20
lines changed

6 files changed

+40
-20
lines changed

tests/buildkite/conftest.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ function set_buildkite_env_vars_in_container {
2222

2323
set -x
2424

25-
CUDA_VERSION=11.8.0
26-
NCCL_VERSION=2.16.5-1
27-
RAPIDS_VERSION=24.06
28-
DEV_RAPIDS_VERSION=24.08
25+
CUDA_VERSION=12.4.1
26+
NCCL_VERSION=2.22.3-1
27+
RAPIDS_VERSION=24.08
28+
DEV_RAPIDS_VERSION=24.10
2929
SPARK_VERSION=3.5.1
3030
JDK_VERSION=8
3131
R_VERSION=4.3.2

tests/ci_build/Dockerfile.cpu

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM ubuntu:22.04
22

33
# Environment
44
ENV DEBIAN_FRONTEND=noninteractive
5-
SHELL ["/bin/bash", "-c"] # Use Bash as shell
5+
SHELL ["/bin/bash", "-c"]
66

77
# Install all basic requirements
88
RUN \
@@ -24,9 +24,14 @@ ENV GOSU_VERSION=1.10
2424
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
2525

2626
# Install gRPC
27-
RUN git clone -b v1.49.1 https://github.com/grpc/grpc.git \
28-
--recurse-submodules --depth 1 --shallow-submodules && \
27+
# Patch Abseil to apply https://github.com/abseil/abseil-cpp/issues/1629
28+
RUN git clone -b v1.65.4 https://github.com/grpc/grpc.git \
29+
--recurse-submodules --depth 1 && \
2930
pushd grpc && \
31+
pushd third_party/abseil-cpp && \
32+
git fetch origin master && \
33+
git cherry-pick -n cfde5f74e276049727f9556f13473a59fe77d9eb && \
34+
popd && \
3035
cmake -S . -B build -GNinja -DCMAKE_INSTALL_PREFIX=/opt/grpc -DCMAKE_CXX_VISIBILITY_PRESET=hidden && \
3136
cmake --build build --target install && \
3237
popd && \

tests/ci_build/Dockerfile.gpu

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG NCCL_VERSION_ARG
66

77
# Environment
88
ENV DEBIAN_FRONTEND=noninteractive
9-
SHELL ["/bin/bash", "-c"] # Use Bash as shell
9+
SHELL ["/bin/bash", "-c"]
1010

1111
# Install all basic requirements
1212
RUN \
@@ -22,8 +22,9 @@ ENV PATH=/opt/miniforge/bin:$PATH
2222
# Create new Conda environment with cuDF, Dask, and cuPy
2323
RUN \
2424
export NCCL_SHORT_VER=$(echo "$NCCL_VERSION_ARG" | cut -d "-" -f 1) && \
25+
export CUDA_SHORT_VER=$(echo "$CUDA_VERSION_ARG" | grep -o -E '[0-9]+\.[0-9]') && \
2526
mamba create -y -n gpu_test -c rapidsai -c conda-forge -c nvidia \
26-
python=3.10 cudf=$RAPIDS_VERSION_ARG* rmm=$RAPIDS_VERSION_ARG* cudatoolkit=$CUDA_VERSION_ARG \
27+
python=3.10 cudf=$RAPIDS_VERSION_ARG* rmm=$RAPIDS_VERSION_ARG* cuda-version=$CUDA_SHORT_VER \
2728
"nccl>=${NCCL_SHORT_VER}" \
2829
dask \
2930
dask-cuda=$RAPIDS_VERSION_ARG* dask-cudf=$RAPIDS_VERSION_ARG* cupy \

tests/ci_build/Dockerfile.gpu_build_rockylinux8

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,38 @@ ENV CUDAHOSTCXX=/opt/rh/gcc-toolset-10/root/usr/bin/c++
3636

3737
ENV GOSU_VERSION=1.10
3838

39-
# Install RMM (Patch out -Werror)
39+
# Install gRPC
40+
# Patch Abseil to apply https://github.com/abseil/abseil-cpp/issues/1629
41+
RUN git clone -b v1.65.4 https://github.com/grpc/grpc.git \
42+
--recurse-submodules --depth 1 && \
43+
pushd grpc && \
44+
pushd third_party/abseil-cpp && \
45+
git fetch origin master && \
46+
git cherry-pick -n cfde5f74e276049727f9556f13473a59fe77d9eb && \
47+
popd && \
48+
cmake -S . -B build -GNinja -DCMAKE_INSTALL_PREFIX=/opt/grpc -DCMAKE_CXX_VISIBILITY_PRESET=hidden && \
49+
cmake --build build --target install && \
50+
popd && \
51+
rm -rf grpc
52+
53+
# Install RMM
54+
# Patch out -Werror
55+
# Patch CCCL 2.5.0 to apply https://github.com/NVIDIA/cccl/pull/1957
4056
RUN git clone -b v${RAPIDS_VERSION_ARG}.00 https://github.com/rapidsai/rmm.git --recurse-submodules --depth 1 && \
4157
pushd rmm && \
4258
find . -name CMakeLists.txt -print0 | xargs -0 sed -i 's/-Werror//g' && \
4359
mkdir build && \
4460
pushd build && \
4561
cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=/opt/rmm -DCUDA_STATIC_RUNTIME=ON && \
62+
pushd _deps/cccl-src/ && \
63+
git fetch origin main && \
64+
git cherry-pick -n 9fcb32c228865f21f2b002b29d38a06b4c6fbd73 && \
65+
popd && \
4666
cmake --build . --target install && \
4767
popd && \
4868
popd && \
4969
rm -rf rmm
5070

51-
# Install gRPC
52-
RUN git clone -b v1.49.1 https://github.com/grpc/grpc.git \
53-
--recurse-submodules --depth 1 && \
54-
pushd grpc && \
55-
cmake -S . -B build -GNinja -DCMAKE_INSTALL_PREFIX=/opt/grpc -DCMAKE_CXX_VISIBILITY_PRESET=hidden && \
56-
cmake --build build --target install && \
57-
popd && \
58-
rm -rf grpc
59-
6071
# Install lightweight sudo (not bound to TTY)
6172
RUN set -ex; \
6273
wget -nv -nc -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64" && \

tests/ci_build/Dockerfile.gpu_dev_ver

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ ENV PATH=/opt/miniforge/bin:$PATH
2525
# Create new Conda environment with dev versions of cuDF, Dask, and cuPy
2626
RUN \
2727
export NCCL_SHORT_VER=$(echo "$NCCL_VERSION_ARG" | cut -d "-" -f 1) && \
28+
export CUDA_SHORT_VER=$(echo "$CUDA_VERSION_ARG" | grep -o -E '[0-9]+\.[0-9]') && \
2829
mamba create -y -n gpu_test -c rapidsai-nightly -c conda-forge -c nvidia \
29-
python=3.10 "cudf=$RAPIDS_VERSION_ARG.*" "rmm=$RAPIDS_VERSION_ARG.*" cudatoolkit=$CUDA_VERSION_ARG \
30+
python=3.10 "cudf=$RAPIDS_VERSION_ARG.*" "rmm=$RAPIDS_VERSION_ARG.*" cuda-version=$CUDA_SHORT_VER \
3031
"nccl>=${NCCL_SHORT_VER}" \
3132
dask \
3233
"dask-cuda=$RAPIDS_VERSION_ARG.*" "dask-cudf=$RAPIDS_VERSION_ARG.*" cupy \

tests/ci_build/test_python.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ case "$suite" in
5656
set -x
5757
install_xgboost
5858
setup_pyspark_envs
59+
python -c 'from cupy.cuda import jitify; jitify._init_module()'
5960
pytest -v -s -rxXs --fulltrace --durations=0 -m "not mgpu" ${args} tests/python-gpu
6061
unset_pyspark_envs
6162
uninstall_xgboost
@@ -67,6 +68,7 @@ case "$suite" in
6768
set -x
6869
install_xgboost
6970
setup_pyspark_envs
71+
python -c 'from cupy.cuda import jitify; jitify._init_module()'
7072
pytest -v -s -rxXs --fulltrace --durations=0 -m "mgpu" ${args} tests/python-gpu
7173
pytest -v -s -rxXs --fulltrace --durations=0 -m "mgpu" ${args} tests/test_distributed/test_gpu_with_dask
7274
pytest -v -s -rxXs --fulltrace --durations=0 -m "mgpu" ${args} tests/test_distributed/test_gpu_with_spark

0 commit comments

Comments
 (0)