Skip to content

Commit 2a13103

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents d5252ae + 252dce3 commit 2a13103

File tree

4 files changed

+1811
-1896
lines changed

4 files changed

+1811
-1896
lines changed

images/runtime/ray/cuda/Dockerfile

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
ARG PYTHON_VERSION=311
2-
ARG IMAGE_TAG=1-1743079393
2+
ARG IMAGE_TAG=1-77.1726664316
33

44
FROM registry.access.redhat.com/ubi9/python-${PYTHON_VERSION}:${IMAGE_TAG}
55

6-
LABEL name="ray-ubi9-py311-cu122" \
7-
summary="CUDA 12.2 Python 3.11 image based on UBI9 for Ray" \
8-
description="CUDA 12.2 Python 3.11 image based on UBI9 for Ray" \
9-
io.k8s.display-name="CUDA 12.2 Python 3.11 base image for Ray" \
10-
io.k8s.description="CUDA 12.2 Python 3.11 image based on UBI9 for Ray" \
6+
LABEL name="ray-ubi9-py311-cu121" \
7+
summary="CUDA 12.1 Python 3.11 image based on UBI9 for Ray" \
8+
description="CUDA 12.1 Python 3.11 image based on UBI9 for Ray" \
9+
io.k8s.display-name="CUDA 12.1 Python 3.11 base image for Ray" \
10+
io.k8s.description="CUDA 12.1 Python 3.11 image based on UBI9 for Ray" \
1111
authoritative-source-url="https://github.com/opendatahub-io/distributed-workloads"
1212

1313
# Install CUDA base from:
14-
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.2.2/ubi9/base/Dockerfile
14+
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.1.1/ubi9/base/Dockerfile
1515
USER 0
1616
WORKDIR /opt/app-root/bin
1717

18-
ENV NVARCH x86_64
19-
ENV NVIDIA_REQUIRE_CUDA "cuda>=12.2 brand=tesla,driver>=470,driver<471 brand=unknown,driver>=470,driver<471 brand=nvidia,driver>=470,driver<471 brand=nvidiartx,driver>=470,driver<471 brand=geforce,driver>=470,driver<471 brand=geforcertx,driver>=470,driver<471 brand=quadro,driver>=470,driver<471 brand=quadrortx,driver>=470,driver<471 brand=titan,driver>=470,driver<471 brand=titanrtx,driver>=470,driver<471 brand=tesla,driver>=525,driver<526 brand=unknown,driver>=525,driver<526 brand=nvidia,driver>=525,driver<526 brand=nvidiartx,driver>=525,driver<526 brand=geforce,driver>=525,driver<526 brand=geforcertx,driver>=525,driver<526 brand=quadro,driver>=525,driver<526 brand=quadrortx,driver>=525,driver<526 brand=titan,driver>=525,driver<526 brand=titanrtx,driver>=525,driver<526"
20-
ENV NV_CUDA_CUDART_VERSION 12.2.140-1
18+
ENV NVARCH=x86_64
19+
ENV NVIDIA_REQUIRE_CUDA="cuda>=12.1 brand=tesla,driver>=470,driver<471 brand=unknown,driver>=470,driver<471 brand=nvidia,driver>=470,driver<471 brand=nvidiartx,driver>=470,driver<471 brand=geforce,driver>=470,driver<471 brand=geforcertx,driver>=470,driver<471 brand=quadro,driver>=470,driver<471 brand=quadrortx,driver>=470,driver<471 brand=titan,driver>=470,driver<471 brand=titanrtx,driver>=470,driver<471 brand=tesla,driver>=525,driver<526 brand=unknown,driver>=525,driver<526 brand=nvidia,driver>=525,driver<526 brand=nvidiartx,driver>=525,driver<526 brand=geforce,driver>=525,driver<526 brand=geforcertx,driver>=525,driver<526 brand=quadro,driver>=525,driver<526 brand=quadrortx,driver>=525,driver<526 brand=titan,driver>=525,driver<526 brand=titanrtx,driver>=525,driver<526"
20+
ENV NV_CUDA_CUDART_VERSION=12.1.105-1
2121

2222
COPY cuda.repo-x86_64 /etc/yum.repos.d/cuda.repo
2323

2424
RUN NVIDIA_GPGKEY_SUM=d0664fbbdb8c32356d45de36c5984617217b2d0bef41b93ccecd326ba3b80c87 && \
2525
curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/rhel9/${NVARCH}/D42D0685.pub | sed '/^Version/d' > /etc/pki/rpm-gpg/RPM-GPG-KEY-NVIDIA && \
2626
echo "$NVIDIA_GPGKEY_SUM /etc/pki/rpm-gpg/RPM-GPG-KEY-NVIDIA" | sha256sum -c --strict -
2727

28-
ENV CUDA_VERSION=12.2.2
28+
ENV CUDA_VERSION=12.1.1
2929

3030
# For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
3131
RUN yum upgrade -y && yum install -y \
32-
cuda-cudart-12-2-${NV_CUDA_CUDART_VERSION} \
33-
cuda-compat-12-2 \
32+
cuda-cudart-12-1-${NV_CUDA_CUDART_VERSION} \
33+
cuda-compat-12-1 \
3434
&& yum clean all \
3535
&& rm -rf /var/cache/yum/*
3636

@@ -48,23 +48,23 @@ ENV NVIDIA_VISIBLE_DEVICES=all
4848
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
4949

5050
# Install CUDA runtime from:
51-
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.2.2/ubi9/runtime/Dockerfile
52-
ENV NV_CUDA_LIB_VERSION 12.2.2-1
53-
ENV NV_NVTX_VERSION 12.2.140-1
54-
ENV NV_LIBNPP_VERSION 12.2.1.4-1
55-
ENV NV_LIBNPP_PACKAGE libnpp-12-2-${NV_LIBNPP_VERSION}
56-
ENV NV_LIBCUBLAS_VERSION 12.2.5.6-1
57-
ENV NV_LIBNCCL_PACKAGE_NAME libnccl
58-
ENV NV_LIBNCCL_PACKAGE_VERSION 2.19.3-1
59-
ENV NV_LIBNCCL_VERSION 2.19.3
60-
ENV NCCL_VERSION 2.19.3
61-
ENV NV_LIBNCCL_PACKAGE ${NV_LIBNCCL_PACKAGE_NAME}-${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.2
51+
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.1.1/ubi9/runtime/Dockerfile
52+
ENV NV_CUDA_LIB_VERSION=12.1.1-1
53+
ENV NV_NVTX_VERSION=12.1.105-1
54+
ENV NV_LIBNPP_VERSION=12.1.0.40-1
55+
ENV NV_LIBNPP_PACKAGE=libnpp-12-1-${NV_LIBNPP_VERSION}
56+
ENV NV_LIBCUBLAS_VERSION=12.1.3.1-1
57+
ENV NV_LIBNCCL_PACKAGE_NAME=libnccl
58+
ENV NV_LIBNCCL_PACKAGE_VERSION=2.17.1-1
59+
ENV NV_LIBNCCL_VERSION=2.17.1
60+
ENV NCCL_VERSION=2.17.1
61+
ENV NV_LIBNCCL_PACKAGE=${NV_LIBNCCL_PACKAGE_NAME}-${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.1
6262

6363
RUN yum install -y \
64-
cuda-libraries-12-2-${NV_CUDA_LIB_VERSION} \
65-
cuda-nvtx-12-2-${NV_NVTX_VERSION} \
64+
cuda-libraries-12-1-${NV_CUDA_LIB_VERSION} \
65+
cuda-nvtx-12-1-${NV_NVTX_VERSION} \
6666
${NV_LIBNPP_PACKAGE} \
67-
libcublas-12-2-${NV_LIBCUBLAS_VERSION} \
67+
libcublas-12-1-${NV_LIBCUBLAS_VERSION} \
6868
${NV_LIBNCCL_PACKAGE} \
6969
&& yum clean all \
7070
&& rm -rf /var/cache/yum/*
@@ -73,31 +73,32 @@ RUN yum install -y \
7373
ENV XLA_FLAGS=--xla_gpu_cuda_data_dir=/usr/local/cuda
7474

7575
# Install CUDA devel from:
76-
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.2.2/ubi9/devel/Dockerfile
77-
ENV NV_CUDA_LIB_VERSION 12.2.2-1
78-
ENV NV_NVPROF_VERSION 12.2.142-1
79-
ENV NV_NVPROF_DEV_PACKAGE cuda-nvprof-12-2-${NV_NVPROF_VERSION}
80-
ENV NV_CUDA_CUDART_DEV_VERSION 12.2.140-1
81-
ENV NV_NVML_DEV_VERSION 12.2.140-1
82-
ENV NV_LIBCUBLAS_DEV_VERSION 12.2.5.6-1
83-
ENV NV_LIBNPP_DEV_VERSION 12.2.1.4-1
84-
ENV NV_LIBNPP_DEV_PACKAGE libnpp-devel-12-2-${NV_LIBNPP_DEV_VERSION}
85-
ENV NV_LIBNCCL_DEV_PACKAGE_NAME libnccl-devel
86-
ENV NV_LIBNCCL_DEV_PACKAGE_VERSION 2.19.3-1
87-
ENV NCCL_VERSION 2.19.3
88-
ENV NV_LIBNCCL_DEV_PACKAGE ${NV_LIBNCCL_DEV_PACKAGE_NAME}-${NV_LIBNCCL_DEV_PACKAGE_VERSION}+cuda12.2
89-
ENV NV_CUDA_NSIGHT_COMPUTE_VERSION 12.2.2-1
90-
ENV NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE cuda-nsight-compute-12-2-${NV_CUDA_NSIGHT_COMPUTE_VERSION}
76+
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.1.1/ubi9/devel/Dockerfile
77+
ENV NV_CUDA_LIB_VERSION=12.1.1-1
78+
ENV NV_NVPROF_VERSION=12.1.105-1
79+
ENV NV_NVPROF_DEV_PACKAGE=cuda-nvprof-12-1-${NV_NVPROF_VERSION}
80+
ENV NV_CUDA_CUDART_DEV_VERSION=12.1.105-1
81+
ENV NV_NVML_DEV_VERSION=12.1.105-1
82+
ENV NV_LIBCUBLAS_DEV_VERSION=12.1.3.1-1
83+
ENV NV_LIBNPP_DEV_VERSION=12.1.0.40-1
84+
ENV NV_LIBNPP_DEV_PACKAGE=libnpp-devel-12-1-${NV_LIBNPP_DEV_VERSION}
85+
ENV NV_LIBNCCL_DEV_PACKAGE_NAME=libnccl-devel
86+
ENV NV_LIBNCCL_DEV_PACKAGE_VERSION=2.17.1-1
87+
ENV NCCL_VERSION=2.17.1
88+
ENV NV_LIBNCCL_DEV_PACKAGE=${NV_LIBNCCL_DEV_PACKAGE_NAME}-${NV_LIBNCCL_DEV_PACKAGE_VERSION}+cuda12.1
89+
ENV NV_CUDA_NSIGHT_COMPUTE_VERSION=12.1.1-1
90+
ENV NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE=cuda-nsight-compute-12-1-${NV_CUDA_NSIGHT_COMPUTE_VERSION}
9191

9292
RUN yum install -y \
9393
make \
9494
findutils \
95-
cuda-libraries-devel-12-2-${NV_CUDA_LIB_VERSION} \
96-
cuda-minimal-build-12-2-${NV_CUDA_LIB_VERSION} \
97-
cuda-cudart-devel-12-2-${NV_CUDA_CUDART_DEV_VERSION} \
95+
cuda-command-line-tools-12-1-${NV_CUDA_LIB_VERSION} \
96+
cuda-libraries-devel-12-1-${NV_CUDA_LIB_VERSION} \
97+
cuda-minimal-build-12-1-${NV_CUDA_LIB_VERSION} \
98+
cuda-cudart-devel-12-1-${NV_CUDA_CUDART_DEV_VERSION} \
9899
${NV_NVPROF_DEV_PACKAGE} \
99-
cuda-nvml-devel-12-2-${NV_NVML_DEV_VERSION} \
100-
libcublas-devel-12-2-${NV_LIBCUBLAS_DEV_VERSION} \
100+
cuda-nvml-devel-12-1-${NV_NVML_DEV_VERSION} \
101+
libcublas-devel-12-1-${NV_LIBCUBLAS_DEV_VERSION} \
101102
${NV_LIBNPP_DEV_PACKAGE} \
102103
${NV_LIBNCCL_DEV_PACKAGE} \
103104
${NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE} \
@@ -107,10 +108,10 @@ RUN yum install -y \
107108
ENV LIBRARY_PATH=/usr/local/cuda/lib64/stubs
108109

109110
# Install CUDA devel cudnn8 from:
110-
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.2.2/ubi9/devel/cudnn8/Dockerfile
111-
ENV NV_CUDNN_VERSION 8.9.6.50-1
112-
ENV NV_CUDNN_PACKAGE libcudnn8-${NV_CUDNN_VERSION}.cuda12.2
113-
ENV NV_CUDNN_PACKAGE_DEV libcudnn8-devel-${NV_CUDNN_VERSION}.cuda12.2
111+
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.1.1/ubi9/devel/cudnn8/Dockerfile
112+
ENV NV_CUDNN_VERSION=8.9.0.131-1
113+
ENV NV_CUDNN_PACKAGE=libcudnn8-${NV_CUDNN_VERSION}.cuda12.1
114+
ENV NV_CUDNN_PACKAGE_DEV=libcudnn8-devel-${NV_CUDNN_VERSION}.cuda12.1
114115

115116
LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
116117

images/runtime/ray/cuda/Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name = "pypi"
55

66
[packages]
77
numpy = {version = "<2.0.0" }
8-
"ray[all]" = {version = "~=2.44.0" }
8+
"ray[all]" = {version = "~=2.35.0" }
99

1010
[requires]
1111
python_version = "3.9"

0 commit comments

Comments
 (0)