Skip to content

Commit 271e6c6

Browse files
jiridanekjiridanek
authored
Issue #385: refactor(Dockerfile.cuda): clean up commented-out CUDA and cudnn9 installation (#1599)
1 parent c703577 commit 271e6c6

File tree

2 files changed

+44
-100
lines changed

2 files changed

+44
-100
lines changed

‎jupyter/pytorch+llmcompressor/ubi9-python-3.11/Dockerfile.cuda‎

Lines changed: 22 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -103,56 +103,28 @@ RUN yum install -y \
103103
&& yum clean all \
104104
&& rm -rf /var/cache/yum/*
105105

106-
# # Install CUDA devel from:
107-
# # https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.6.3/ubi9/devel/Dockerfile
108-
# ENV NV_NVPROF_VERSION=12.6.80-1
109-
# ENV NV_NVPROF_DEV_PACKAGE=cuda-nvprof-12-6-${NV_NVPROF_VERSION}
110-
# ENV NV_CUDA_CUDART_DEV_VERSION=12.6.77-1
111-
# ENV NV_NVML_DEV_VERSION=12.6.77-1
112-
# ENV NV_LIBCUBLAS_DEV_VERSION=12.6.4.1-1
113-
# ENV NV_LIBNPP_DEV_VERSION=12.3.1.54-1
114-
# ENV NV_LIBNPP_DEV_PACKAGE=libnpp-devel-12-6-${NV_LIBNPP_DEV_VERSION}
115-
# ENV NV_LIBNCCL_DEV_PACKAGE_NAME=libnccl-devel
116-
# ENV NV_LIBNCCL_DEV_PACKAGE_VERSION=2.23.4-1
117-
# ENV NCCL_VERSION=2.23.4
118-
# ENV NV_LIBNCCL_DEV_PACKAGE=${NV_LIBNCCL_DEV_PACKAGE_NAME}-${NV_LIBNCCL_DEV_PACKAGE_VERSION}+cuda12.6
119-
# ENV NV_CUDA_NSIGHT_COMPUTE_VERSION=12.6.3-1
120-
# ENV NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE=cuda-nsight-compute-12-6-${NV_CUDA_NSIGHT_COMPUTE_VERSION}
121-
122-
# RUN yum install -y \
123-
# make \
124-
# findutils \
125-
# cuda-command-line-tools-12-6-${NV_CUDA_LIB_VERSION} \
126-
# cuda-libraries-devel-12-6-${NV_CUDA_LIB_VERSION} \
127-
# cuda-minimal-build-12-6-${NV_CUDA_LIB_VERSION} \
128-
# cuda-cudart-devel-12-6-${NV_CUDA_CUDART_DEV_VERSION} \
129-
# ${NV_NVPROF_DEV_PACKAGE} \
130-
# cuda-nvml-devel-12-6-${NV_NVML_DEV_VERSION} \
131-
# libcublas-devel-12-6-${NV_LIBCUBLAS_DEV_VERSION} \
132-
# ${NV_LIBNPP_DEV_PACKAGE} \
133-
# ${NV_LIBNCCL_DEV_PACKAGE} \
134-
# ${NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE} \
135-
# && yum clean all \
136-
# && rm -rf /var/cache/yum/*
137-
138-
# ENV LIBRARY_PATH=/usr/local/cuda/lib64/stubs
139-
140-
# # Install CUDA devel cudnn9 from:
141-
# # https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.6.3/ubi9/devel/cudnn/Dockerfile
142-
# ENV NV_CUDNN_VERSION=9.5.1.17-1
143-
# ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
144-
# ENV NV_CUDNN_PACKAGE_DEV=libcudnn9-devel-cuda-12-${NV_CUDNN_VERSION}
145-
146-
# LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
147-
148-
# RUN yum install -y \
149-
# ${NV_CUDNN_PACKAGE} \
150-
# ${NV_CUDNN_PACKAGE_DEV} \
151-
# && yum clean all \
152-
# && rm -rf /var/cache/yum/*
153-
154-
# # Set this flag so that libraries can find the location of CUDA
155-
# ENV XLA_FLAGS=--xla_gpu_cuda_data_dir=/usr/local/cuda
106+
# Install devel tools
107+
108+
RUN yum install -y \
109+
make \
110+
findutils \
111+
&& yum clean all \
112+
&& rm -rf /var/cache/yum/*
113+
114+
# Install CUDA cudnn9 from:
115+
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.6.3/ubi9/runtime/cudnn/Dockerfile
116+
ENV NV_CUDNN_VERSION=9.5.1.17-1
117+
ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
118+
119+
LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
120+
121+
RUN yum install -y \
122+
${NV_CUDNN_PACKAGE} \
123+
&& yum clean all \
124+
&& rm -rf /var/cache/yum/*
125+
126+
# Set this flag so that libraries can find the location of CUDA
127+
ENV XLA_FLAGS=--xla_gpu_cuda_data_dir=/usr/local/cuda
156128

157129
# Restore notebook user workspace
158130
USER 1001

‎runtimes/pytorch+llmcompressor/ubi9-python-3.11/Dockerfile.cuda‎

Lines changed: 22 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -90,56 +90,28 @@ RUN yum install -y \
9090
&& yum clean all \
9191
&& rm -rf /var/cache/yum/*
9292

93-
# # Install CUDA devel from:
94-
# # https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.6.3/ubi9/devel/Dockerfile
95-
# ENV NV_NVPROF_VERSION=12.6.80-1
96-
# ENV NV_NVPROF_DEV_PACKAGE=cuda-nvprof-12-6-${NV_NVPROF_VERSION}
97-
# ENV NV_CUDA_CUDART_DEV_VERSION=12.6.77-1
98-
# ENV NV_NVML_DEV_VERSION=12.6.77-1
99-
# ENV NV_LIBCUBLAS_DEV_VERSION=12.6.4.1-1
100-
# ENV NV_LIBNPP_DEV_VERSION=12.3.1.54-1
101-
# ENV NV_LIBNPP_DEV_PACKAGE=libnpp-devel-12-6-${NV_LIBNPP_DEV_VERSION}
102-
# ENV NV_LIBNCCL_DEV_PACKAGE_NAME=libnccl-devel
103-
# ENV NV_LIBNCCL_DEV_PACKAGE_VERSION=2.23.4-1
104-
# ENV NCCL_VERSION=2.23.4
105-
# ENV NV_LIBNCCL_DEV_PACKAGE=${NV_LIBNCCL_DEV_PACKAGE_NAME}-${NV_LIBNCCL_DEV_PACKAGE_VERSION}+cuda12.6
106-
# ENV NV_CUDA_NSIGHT_COMPUTE_VERSION=12.6.3-1
107-
# ENV NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE=cuda-nsight-compute-12-6-${NV_CUDA_NSIGHT_COMPUTE_VERSION}
108-
109-
# RUN yum install -y \
110-
# make \
111-
# findutils \
112-
# cuda-command-line-tools-12-6-${NV_CUDA_LIB_VERSION} \
113-
# cuda-libraries-devel-12-6-${NV_CUDA_LIB_VERSION} \
114-
# cuda-minimal-build-12-6-${NV_CUDA_LIB_VERSION} \
115-
# cuda-cudart-devel-12-6-${NV_CUDA_CUDART_DEV_VERSION} \
116-
# ${NV_NVPROF_DEV_PACKAGE} \
117-
# cuda-nvml-devel-12-6-${NV_NVML_DEV_VERSION} \
118-
# libcublas-devel-12-6-${NV_LIBCUBLAS_DEV_VERSION} \
119-
# ${NV_LIBNPP_DEV_PACKAGE} \
120-
# ${NV_LIBNCCL_DEV_PACKAGE} \
121-
# ${NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE} \
122-
# && yum clean all \
123-
# && rm -rf /var/cache/yum/*
124-
125-
# ENV LIBRARY_PATH=/usr/local/cuda/lib64/stubs
126-
127-
# # Install CUDA devel cudnn9 from:
128-
# # https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.6.3/ubi9/devel/cudnn/Dockerfile
129-
# ENV NV_CUDNN_VERSION=9.5.1.17-1
130-
# ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
131-
# ENV NV_CUDNN_PACKAGE_DEV=libcudnn9-devel-cuda-12-${NV_CUDNN_VERSION}
132-
133-
# LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
134-
135-
# RUN yum install -y \
136-
# ${NV_CUDNN_PACKAGE} \
137-
# ${NV_CUDNN_PACKAGE_DEV} \
138-
# && yum clean all \
139-
# && rm -rf /var/cache/yum/*
140-
141-
# # Set this flag so that libraries can find the location of CUDA
142-
# ENV XLA_FLAGS=--xla_gpu_cuda_data_dir=/usr/local/cuda
93+
# Install devel tools
94+
95+
RUN yum install -y \
96+
make \
97+
findutils \
98+
&& yum clean all \
99+
&& rm -rf /var/cache/yum/*
100+
101+
# Install CUDA cudnn9 from:
102+
# https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/12.6.3/ubi9/runtime/cudnn/Dockerfile
103+
ENV NV_CUDNN_VERSION=9.5.1.17-1
104+
ENV NV_CUDNN_PACKAGE=libcudnn9-cuda-12-${NV_CUDNN_VERSION}
105+
106+
LABEL com.nvidia.cudnn.version="${NV_CUDNN_VERSION}"
107+
108+
RUN yum install -y \
109+
${NV_CUDNN_PACKAGE} \
110+
&& yum clean all \
111+
&& rm -rf /var/cache/yum/*
112+
113+
# Set this flag so that libraries can find the location of CUDA
114+
ENV XLA_FLAGS=--xla_gpu_cuda_data_dir=/usr/local/cuda
143115

144116
# Restore notebook user workspace
145117
USER 1001

0 commit comments

Comments
 (0)