From 20cb0ae6269dcd770ac534bbfe19342217632b4e Mon Sep 17 00:00:00 2001 From: Janusz Lisiecki Date: Tue, 23 Apr 2024 11:32:10 +0200 Subject: [PATCH] Pin all nvJPEG2k subpackages - libnvjpeg2k0, even when pinned, pulls the latest subpackages so these subpackages need to be pinned explicitly. - removes usage of the deprecated, meta pacakges for nvjpeg2k0 Signed-off-by: Janusz Lisiecki --- docker/Dockerfile.cuda118.aarch64.deps | 5 ++++- docker/Dockerfile.cuda118.x86_64.deps | 7 +++++-- docker/Dockerfile.cuda124.aarch64.deps | 5 ++++- docker/Dockerfile.cuda124.x86_64.deps | 5 ++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile.cuda118.aarch64.deps b/docker/Dockerfile.cuda118.aarch64.deps index 090890a5c3..748cf83344 100644 --- a/docker/Dockerfile.cuda118.aarch64.deps +++ b/docker/Dockerfile.cuda118.aarch64.deps @@ -13,12 +13,15 @@ RUN curl -LO https://developer.download.nvidia.com/compute/cuda/11.8.0/local_ins RUN NVJPEG2K_VERSION=0.7.5.32-1 && \ CUDA_VERSION_MAJOR=11 && \ + CUDA_VERSION_MINOR=8 && \ apt-get update && \ apt-get install wget software-properties-common -y && \ apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/sbsa/3bf863cc.pub && \ add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/sbsa/ /" && \ apt-get update && \ - apt-get install libnvjpeg2k0=${NVJPEG2K_VERSION} libnvjpeg2k-dev=${NVJPEG2K_VERSION} -y && \ + apt-get install libnvjpeg2k0-dev-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \ + libnvjpeg2k0-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \ + libnvjpeg2k0-static-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} -y && \ cp /usr/include/libnvjpeg2k/${CUDA_VERSION_MAJOR}/* /usr/local/cuda/include/ && \ cp /usr/lib/sbsa-linux-gnu/libnvjpeg2k/${CUDA_VERSION_MAJOR}/* /usr/local/cuda/lib64/ && \ rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile.cuda118.x86_64.deps b/docker/Dockerfile.cuda118.x86_64.deps index 17053bc12c..8d0b41d18f 100644 --- a/docker/Dockerfile.cuda118.x86_64.deps +++ b/docker/Dockerfile.cuda118.x86_64.deps @@ -15,14 +15,17 @@ RUN NVJPEG2K_VERSION=0.7.5.32-1 && \ CUFILE_VERSION=1.4.0.31-1 && \ NVCOMP_VERSION=2.6.1 && \ CUDA_VERSION_MAJOR=11 && \ + CUDA_VERSION_MINOR=8 && \ apt-get update && \ apt-get install wget software-properties-common -y && \ apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub && \ apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub && \ add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" && \ apt-get update && \ - apt-get install libnvjpeg2k0=${NVJPEG2K_VERSION} libnvjpeg2k-dev=${NVJPEG2K_VERSION} -y && \ - apt-get install libcufile-dev-11-8=${CUFILE_VERSION} -y && \ + apt-get install libnvjpeg2k0-dev-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \ + libnvjpeg2k0-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \ + libnvjpeg2k0-static-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \ + libcufile-dev-${CUDA_VERSION_MAJOR}-${CUDA_VERSION_MINOR}=${CUFILE_VERSION} -y && \ cp /usr/include/libnvjpeg2k/${CUDA_VERSION_MAJOR}/* /usr/local/cuda/include/ && \ cp /usr/lib/x86_64-linux-gnu/libnvjpeg2k/${CUDA_VERSION_MAJOR}/* /usr/local/cuda/lib64/ && \ rm -rf /var/lib/apt/lists/* && \ diff --git a/docker/Dockerfile.cuda124.aarch64.deps b/docker/Dockerfile.cuda124.aarch64.deps index 7d8112d279..4766e70065 100644 --- a/docker/Dockerfile.cuda124.aarch64.deps +++ b/docker/Dockerfile.cuda124.aarch64.deps @@ -20,7 +20,10 @@ RUN NVJPEG2K_VERSION=0.7.5.32-1 && \ apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/sbsa/3bf863cc.pub && \ add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/sbsa/ /" && \ apt-get update && \ - apt-get install libnvjpeg2k0=${NVJPEG2K_VERSION} libnvjpeg2k-dev=${NVJPEG2K_VERSION} libcufile-dev-${CUDA_VERSION_MAJOR}-${CUDA_VERSION_MINOR}=${CUFILE_VERSION} -y && \ + apt-get install libnvjpeg2k0-dev-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \ + libnvjpeg2k0-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \ + libnvjpeg2k0-static-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \ + libcufile-dev-${CUDA_VERSION_MAJOR}-${CUDA_VERSION_MINOR}=${CUFILE_VERSION} -y && \ cp /usr/include/libnvjpeg2k/${CUDA_VERSION_MAJOR}/* /usr/local/cuda/include/ && \ cp /usr/lib/sbsa-linux-gnu/libnvjpeg2k/${CUDA_VERSION_MAJOR}/* /usr/local/cuda/lib64/ && \ rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile.cuda124.x86_64.deps b/docker/Dockerfile.cuda124.x86_64.deps index 6dbca35df0..0edc6f4f9c 100644 --- a/docker/Dockerfile.cuda124.x86_64.deps +++ b/docker/Dockerfile.cuda124.x86_64.deps @@ -21,7 +21,10 @@ RUN NVJPEG2K_VERSION=0.7.5.32-1 && \ apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub && \ add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" && \ apt-get update && \ - apt-get install libnvjpeg2k0=${NVJPEG2K_VERSION} libnvjpeg2k-dev=${NVJPEG2K_VERSION} libcufile-dev-${CUDA_VERSION_MAJOR}-${CUDA_VERSION_MINOR}=${CUFILE_VERSION} -y && \ + apt-get install libnvjpeg2k0-dev-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \ + libnvjpeg2k0-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \ + libnvjpeg2k0-static-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \ + libcufile-dev-${CUDA_VERSION_MAJOR}-${CUDA_VERSION_MINOR}=${CUFILE_VERSION} -y && \ cp /usr/include/libnvjpeg2k/${CUDA_VERSION_MAJOR}/* /usr/local/cuda/include/ && \ cp /usr/lib/x86_64-linux-gnu/libnvjpeg2k/${CUDA_VERSION_MAJOR}/* /usr/local/cuda/lib64/ && \ rm -rf /var/lib/apt/lists/* && \