Skip to content

Commit

Permalink
cleanup and potential fix for deepl deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@DeepCowProductions
DeepCowProductions committed Aug 30, 2024
1 parent 75e9e53 commit f7a5a4b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 93 deletions.
87 changes: 1 addition & 86 deletions base-images/vscode/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,10 @@ FROM nocuda as cuda
USER root

ENV NVARCH x86_64
ENV CUDA_VERSION 11.7.1
ENV CUDA_VERSION 12.5

ENV NVIDIA_REQUIRE_CUDA "cuda>=12.5 brand=unknown,driver>=470,driver<471 brand=grid,driver>=470,driver<471 brand=tesla,driver>=470,driver<471 brand=nvidia,driver>=470,driver<471 brand=quadro,driver>=470,driver<471 brand=quadrortx,driver>=470,driver<471 brand=nvidiartx,driver>=470,driver<471 brand=vapps,driver>=470,driver<471 brand=vpc,driver>=470,driver<471 brand=vcs,driver>=470,driver<471 brand=vws,driver>=470,driver<471 brand=cloudgaming,driver>=470,driver<471 brand=unknown,driver>=535,driver<536 brand=grid,driver>=535,driver<536 brand=tesla,driver>=535,driver<536 brand=nvidia,driver>=535,driver<536 brand=quadro,driver>=535,driver<536 brand=quadrortx,driver>=535,driver<536 brand=nvidiartx,driver>=535,driver<536 brand=vapps,driver>=535,driver<536 brand=vpc,driver>=535,driver<536 brand=vcs,driver>=535,driver<536 brand=vws,driver>=535,driver<536 brand=cloudgaming,driver>=535,driver<536 brand=unknown,driver>=550,driver<551 brand=grid,driver>=550,driver<551 brand=tesla,driver>=550,driver<551 brand=nvidia,driver>=550,driver<551 brand=quadro,driver>=550,driver<551 brand=quadrortx,driver>=550,driver<551 brand=nvidiartx,driver>=550,driver<551 brand=vapps,driver>=550,driver<551 brand=vpc,driver>=550,driver<551 brand=vcs,driver>=550,driver<551 brand=vws,driver>=550,driver<551 brand=cloudgaming,driver>=550,driver<551"
ENV NV_CUDA_CUDART_VERSION 12.5.82-1
#ENV NVIDIA_REQUIRE_CUDA "cuda>=12.1 brand=tesla,driver>=450,driver<451 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>=510,driver<511 brand=unknown,driver>=510,driver<511 brand=nvidia,driver>=510,driver<511 brand=nvidiartx,driver>=510,driver<511 brand=geforce,driver>=510,driver<511 brand=geforcertx,driver>=510,driver<511 brand=quadro,driver>=510,driver<511 brand=quadrortx,driver>=510,driver<511 brand=titan,driver>=510,driver<511 brand=titanrtx,driver>=510,driver<511 brand=tesla,driver>=515,driver<516 brand=unknown,driver>=515,driver<516 brand=nvidia,driver>=515,driver<516 brand=nvidiartx,driver>=515,driver<516 brand=geforce,driver>=515,driver<516 brand=geforcertx,driver>=515,driver<516 brand=quadro,driver>=515,driver<516 brand=quadrortx,driver>=515,driver<516 brand=titan,driver>=515,driver<516 brand=titanrtx,driver>=515,driver<516 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"
#ENV NV_CUDA_COMPAT_PACKAGE cuda-compat-12-1

#RUN apt-get update && apt-get install -y --no-install-recommends \
# gnupg2 curl ca-certificates && \
# curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/${NVARCH}/3bf863cc.pub | apt-key add - && \
# echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/${NVARCH} /" > /etc/apt/sources.list.d/cuda.list && \
# apt-get purge --autoremove -y curl \
# && rm -rf /var/lib/apt/lists/*

RUN apt-get update && apt-get install -y --no-install-recommends \
gnupg2 curl ca-certificates && \
Expand All @@ -47,11 +38,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

## For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
#RUN apt-get update && apt-get install -y --no-install-recommends \
# cuda-cudart-11-7 \
# ${NV_CUDA_COMPAT_PACKAGE} \
# && rm -rf /var/lib/apt/lists/*
# For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
RUN apt-get update && apt-get install -y --no-install-recommends \
cuda-cudart-12-5=${NV_CUDA_CUDART_VERSION} \
cuda-compat-12-5 \
Expand Down Expand Up @@ -93,43 +79,22 @@ FROM cuda as cuda-runtime

USER root

#ENV NV_CUDA_LIB_VERSION 11.7.1-1
ENV NV_CUDA_LIB_VERSION 12.5.1-1

#ENV NV_NVTX_VERSION 11.7.91-1
#ENV NV_LIBNPP_VERSION 11.7.4.75-1
#ENV NV_LIBNPP_PACKAGE libnpp-11-7=${NV_LIBNPP_VERSION}
#ENV NV_LIBCUSPARSE_VERSION 11.7.4.91-1
ENV NV_NVTX_VERSION 12.5.82-1
ENV NV_LIBNPP_VERSION 12.3.0.159-1
ENV NV_LIBNPP_PACKAGE libnpp-12-5=${NV_LIBNPP_VERSION}
ENV NV_LIBCUSPARSE_VERSION 12.5.1.3-1

#ENV NV_LIBCUBLAS_PACKAGE_NAME libcublas-11-7
#ENV NV_LIBCUBLAS_VERSION 11.10.3.66-1
#ENV NV_LIBCUBLAS_PACKAGE ${NV_LIBCUBLAS_PACKAGE_NAME}=${NV_LIBCUBLAS_VERSION}
ENV NV_LIBCUBLAS_PACKAGE_NAME libcublas-12-5
ENV NV_LIBCUBLAS_VERSION 12.5.3.2-1
ENV NV_LIBCUBLAS_PACKAGE ${NV_LIBCUBLAS_PACKAGE_NAME}=${NV_LIBCUBLAS_VERSION}

#ENV NV_LIBNCCL_PACKAGE_NAME libnccl2
#ENV NV_LIBNCCL_PACKAGE_VERSION 2.13.4-1
#ENV NCCL_VERSION 2.13.4-1
#ENV NV_LIBNCCL_PACKAGE ${NV_LIBNCCL_PACKAGE_NAME}=${NV_LIBNCCL_PACKAGE_VERSION}+cuda11.7
ENV NV_LIBNCCL_PACKAGE_NAME libnccl2
ENV NV_LIBNCCL_PACKAGE_VERSION 2.22.3-1
ENV NCCL_VERSION 2.22.3-1
ENV NV_LIBNCCL_PACKAGE ${NV_LIBNCCL_PACKAGE_NAME}=${NV_LIBNCCL_PACKAGE_VERSION}+cuda12.5

#RUN apt-get update && apt-get install -y --no-install-recommends \
# cuda-libraries-11-7=${NV_CUDA_LIB_VERSION} \
# ${NV_LIBNPP_PACKAGE} \
# cuda-nvtx-11-7=${NV_NVTX_VERSION} \
# libcusparse-11-7=${NV_LIBCUSPARSE_VERSION} \
# ${NV_LIBCUBLAS_PACKAGE} \
# ${NV_LIBNCCL_PACKAGE} \
# && rm -rf /var/lib/apt/lists/*

RUN apt-get update && apt-get install -y --no-install-recommends \
cuda-libraries-12-5=${NV_CUDA_LIB_VERSION} \
${NV_LIBNPP_PACKAGE} \
Expand All @@ -140,7 +105,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

# Keep apt from auto upgrading the cublas and nccl packages. See https://gitlab.com/nvidia/container-images/cuda/-/issues/88
#RUN apt-mark hold ${NV_LIBCUBLAS_PACKAGE_NAME} ${NV_LIBNCCL_PACKAGE_NAME}
RUN apt-mark hold ${NV_LIBCUBLAS_PACKAGE_NAME} ${NV_LIBNCCL_PACKAGE_NAME}

LABEL ki.fh-swf.de.jupyterhub.namelabel="${BUILD_JUPYTER_VARIANT}-${BUILD_CUDA_VARIANT}"
Expand All @@ -157,20 +121,12 @@ FROM cuda-runtime as cuda-cudnn

USER root

#ENV NV_CUDNN_VERSION 8.5.0.96
#ENV NV_CUDNN_PACKAGE_NAME "libcudnn8"
#ENV NV_CUDNN_PACKAGE "libcudnn8=$NV_CUDNN_VERSION-1+cuda11.7"

ENV NV_CUDNN_VERSION 9.2.1.18-1
ENV NV_CUDNN_PACKAGE_NAME libcudnn9-cuda-12
ENV NV_CUDNN_PACKAGE libcudnn9-cuda-12=${NV_CUDNN_VERSION}

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

#RUN apt-get update && apt-get install -y --no-install-recommends \
# ${NV_CUDNN_PACKAGE} \
# && apt-mark hold ${NV_CUDNN_PACKAGE_NAME} \
# && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y --no-install-recommends \
${NV_CUDNN_PACKAGE} \
&& apt-mark hold ${NV_CUDNN_PACKAGE_NAME} \
Expand Down Expand Up @@ -207,54 +163,27 @@ USER root

ENV NV_CUDA_LIB_VERSION "12.5.1-1"

#ENV NV_CUDA_CUDART_DEV_VERSION 11.7.99-1
#ENV NV_NVML_DEV_VERSION 11.7.91-1
#ENV NV_LIBCUSPARSE_DEV_VERSION 11.7.4.91-1
#ENV NV_LIBNPP_DEV_VERSION 11.7.4.75-1
#ENV NV_LIBNPP_DEV_PACKAGE libnpp-dev-11-7=${NV_LIBNPP_DEV_VERSION}
ENV NV_CUDA_CUDART_DEV_VERSION 12.5.82-1
ENV NV_NVML_DEV_VERSION 12.5.82-1
ENV NV_LIBCUSPARSE_DEV_VERSION 12.5.1.3-1
ENV NV_LIBNPP_DEV_VERSION 12.3.0.159-1
ENV NV_LIBNPP_DEV_PACKAGE libnpp-dev-12-5=${NV_LIBNPP_DEV_VERSION}

#ENV NV_LIBCUBLAS_DEV_VERSION 11.10.3.66-1
#ENV NV_LIBCUBLAS_DEV_PACKAGE_NAME libcublas-dev-11-7
#ENV NV_LIBCUBLAS_DEV_PACKAGE ${NV_LIBCUBLAS_DEV_PACKAGE_NAME}=${NV_LIBCUBLAS_DEV_VERSION}
ENV NV_LIBCUBLAS_DEV_VERSION 12.5.3.2-1
ENV NV_LIBCUBLAS_DEV_PACKAGE_NAME libcublas-dev-12-5
ENV NV_LIBCUBLAS_DEV_PACKAGE ${NV_LIBCUBLAS_DEV_PACKAGE_NAME}=${NV_LIBCUBLAS_DEV_VERSION}

#ENV NV_NVPROF_VERSION 11.7.101-1
#ENV NV_NVPROF_DEV_PACKAGE cuda-nvprof-11-7=${NV_NVPROF_VERSION}
ENV NV_CUDA_NSIGHT_COMPUTE_VERSION 12.5.1-1
ENV NV_CUDA_NSIGHT_COMPUTE_DEV_PACKAGE cuda-nsight-compute-12-5=${NV_CUDA_NSIGHT_COMPUTE_VERSION}

ENV NV_NVPROF_VERSION 12.5.82-1
ENV NV_NVPROF_DEV_PACKAGE cuda-nvprof-12-5=${NV_NVPROF_VERSION}

#ENV NV_LIBNCCL_DEV_PACKAGE_NAME libnccl-dev
#ENV NV_LIBNCCL_DEV_PACKAGE_VERSION 2.13.4-1
#ENV NCCL_VERSION 2.13.4-1
#ENV NV_LIBNCCL_DEV_PACKAGE ${NV_LIBNCCL_DEV_PACKAGE_NAME}=${NV_LIBNCCL_DEV_PACKAGE_VERSION}+cuda11.7
ENV NV_LIBNCCL_DEV_PACKAGE_NAME libnccl-dev
ENV NV_LIBNCCL_DEV_PACKAGE_VERSION 2.22.3-1
ENV NCCL_VERSION 2.22.3-1
ENV NV_LIBNCCL_DEV_PACKAGE ${NV_LIBNCCL_DEV_PACKAGE_NAME}=${NV_LIBNCCL_DEV_PACKAGE_VERSION}+cuda12.5

#RUN apt-get update && apt-get install -y --no-install-recommends \
# libtinfo5 libncursesw5 \
# cuda-cudart-dev-11-7=${NV_CUDA_CUDART_DEV_VERSION} \
# cuda-command-line-tools-11-7=${NV_CUDA_LIB_VERSION} \
# cuda-minimal-build-11-7=${NV_CUDA_LIB_VERSION} \
# cuda-libraries-dev-11-7=${NV_CUDA_LIB_VERSION} \
# cuda-nvml-dev-11-7=${NV_NVML_DEV_VERSION} \
# ${NV_NVPROF_DEV_PACKAGE} \
# ${NV_LIBNPP_DEV_PACKAGE} \
# libcusparse-dev-11-7=${NV_LIBCUSPARSE_DEV_VERSION} \
# ${NV_LIBCUBLAS_DEV_PACKAGE} \
# ${NV_LIBNCCL_DEV_PACKAGE} \
# && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y --no-install-recommends \
cuda-cudart-dev-12-5=${NV_CUDA_CUDART_DEV_VERSION} \
cuda-command-line-tools-12-5=${NV_CUDA_LIB_VERSION} \
Expand Down Expand Up @@ -282,10 +211,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

# extra Install TensorRT
#ENV NV_TRT_VERSION 8.5.3
ENV NV_TRT_VERSION 10.3.0
# version="10.x.x.x-1+cudax.x"
#ENV NV_TENSOR_RT_TAG 8.5.3-1+cuda11.8
ENV NV_TENSOR_RT_TAG 10.3.0.26-1+cuda12.5
ENV OS_RELEASE ubuntu2204

Expand All @@ -304,18 +231,6 @@ RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/
RUN add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/ /"
RUN apt-get update

#RUN apt-get install -y libcudnn8-dev=8.5.0.96-1+cuda11.7
#RUN apt-get install -y libnvinfer8=${NV_TENSOR_RT_TAG} \
# libnvinfer-plugin8=${NV_TENSOR_RT_TAG} \
# libnvinfer-dev=${NV_TENSOR_RT_TAG} \
# libnvinfer-plugin-dev=${NV_TENSOR_RT_TAG} \
# libnvonnxparsers8=${NV_TENSOR_RT_TAG} \
# libnvonnxparsers-dev=${NV_TENSOR_RT_TAG} \
# libnvparsers8=${NV_TENSOR_RT_TAG} \
# libnvparsers-dev=${NV_TENSOR_RT_TAG} \
# && apt-get clean \
# && rm -rf /var/lib/apt/lists/*

RUN apt-get install -y \
libnvinfer-bin=${NV_TENSOR_RT_TAG} \
libnvinfer-dev=${NV_TENSOR_RT_TAG} \
Expand Down
14 changes: 7 additions & 7 deletions images/deepml/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,21 @@ USER $NB_UID
# prevent TF from allocating all VRAM
ENV TF_FORCE_GPU_ALLOW_GROWTH true

# Install PyTorch
RUN pip install \
torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu124
#torch==2.0.0+cu117 torchvision==0.15.1+cu117 torchaudio==2.0.1 --index-url https://download.pytorch.org/whl/cu117 \

RUN pip install flair --no-dependencies && rm -rf /tmp/* $HOME/.cache
#RUN pip install flair && rm -rf /tmp/* $HOME/.cache

# Install Huggingface tensorflow and other libraries
RUN pip install \
nvidia-cudnn-cu12==9.2.1.18 tensorflow==2.17.* mysql-connector-python keras-tuner pymysql \
librosa gradio wandb Cython==0.29.36 \
transformers datasets tokenizers evaluate adapter-transformers diffusers[torch] accelerate \
nltk gensim jiwer audiofile opencv-python tiktoken \
nltk gensim flair jiwer audiofile opencv-python tiktoken \
&& rm -rf /tmp/* $HOME/.cache

# Install PyTorch
RUN pip install \
torch==2.4.0+cu124 torchvision==0.19.0+cu124 torchaudio==2.4.0+cu124 --index-url https://download.pytorch.org/whl/cu124
#torch==2.0.0+cu117 torchvision==0.15.1+cu117 torchaudio==2.0.1 --index-url https://download.pytorch.org/whl/cu117 \

# spacy needs Cython==0.29.36 for now to compile
# see https://github.com/explosion/spaCy/discussions/12941
RUN pip install \
Expand Down

0 comments on commit f7a5a4b

Please sign in to comment.