diff --git a/containers/ci_container.yml b/containers/ci_container.yml index 866d724..1c7182a 100644 --- a/containers/ci_container.yml +++ b/containers/ci_container.yml @@ -4,7 +4,7 @@ # containers/dockerfile/Dockerfile.CONTAINER_DEF x-rapids_versions: - stable: &rapids_version "25.10" + stable: &rapids_version "25.12" x-cuda_versions: cuda: &cuda_version "12.8.0" diff --git a/containers/dockerfile/Dockerfile.gpu_build_rockylinux8 b/containers/dockerfile/Dockerfile.gpu_build_rockylinux8 index 59c8974..75f7cbd 100644 --- a/containers/dockerfile/Dockerfile.gpu_build_rockylinux8 +++ b/containers/dockerfile/Dockerfile.gpu_build_rockylinux8 @@ -57,18 +57,13 @@ RUN git clone -b v1.65.4 https://github.com/grpc/grpc.git \ # Install RMM # Patch out -Werror -# Patch CCCL 2.5.0 to apply https://github.com/NVIDIA/cccl/pull/1957 -RUN git clone -b branch-${RAPIDS_VERSION} https://github.com/rapidsai/rmm.git --recurse-submodules --depth 1 && \ +RUN git clone -b v${RAPIDS_VERSION}.00 https://github.com/rapidsai/rmm.git --recurse-submodules --depth 1 && \ pushd rmm && \ find . -name CMakeLists.txt -print0 | xargs -0 sed -i 's/-Werror//g' && \ pushd cpp && \ mkdir build && \ pushd build && \ - cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=/opt/rmm -DCUDA_STATIC_RUNTIME=ON -DBUILD_SHARED_LIBS=OFF && \ - pushd _deps/cccl-src/ && \ - git fetch origin main && \ - git cherry-pick -n 9fcb32c228865f21f2b002b29d38a06b4c6fbd73 && \ - popd && \ + cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=/opt/rmm -DCUDA_STATIC_RUNTIME=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF && \ cmake --build . --target install && \ popd && popd && popd && \ rm -rf rmm