From 8b9ec6f9ec46c6e046088d7eab4e7f1de716e308 Mon Sep 17 00:00:00 2001
From: Marty Kandes <mkandes@sdsc.edu>
Date: Fri, 3 Sep 2021 20:48:43 +0000
Subject: [PATCH] Also update CUDNN_REVISION in
Singularity.ubuntu-18.04-cuda-10.2
---
.../ubuntu/Singularity.ubuntu-18.04-cuda-10.2 | 22 +++++--------------
.../ubuntu/Singularity.ubuntu-18.04-cuda-11.2 | 2 +-
2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2 b/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2
index 1483e02..ecb907a 100644
--- a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2
+++ b/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2
@@ -1,5 +1,5 @@
-Bootstrap: shub
-From: mkandes/naked-singularity:ubuntu-18.04
+Bootstrap: oras
+From: ghcr.io/mkandes/naked-singularity:ubuntu-18.04
%labels
@@ -10,19 +10,12 @@ From: mkandes/naked-singularity:ubuntu-18.04
AUTHOR_NAME Marty Kandes
AUTHOR_EMAIL mkandes@sdsc.edu
- LAST_UPDATED 20210427
+ LAST_UPDATED 20210903
%setup
%environment
- # Location of NVIDIA/CUDA repositories
- export CUDA_ROOT_URL='http://developer.download.nvidia.com/compute'
- export CUDA_DISTRO='ubuntu1804'
- export CUDA_ARCH='x86_64'
- export CUDA_REPO_URL="${CUDA_ROOT_URL}/cuda/repos/${CUDA_DISTRO}/${CUDA_ARCH}"
- export CUDA_GPG_PUBKEY='7fa2af80.pub'
-
# Set NVIDIA driver and CUDA versions
export CUDA_DRIVER_VERSION='460'
export CUDA_MAJOR='10'
@@ -30,7 +23,7 @@ From: mkandes/naked-singularity:ubuntu-18.04
export CUDA_VERSION="${CUDA_MAJOR}.${CUDA_MINOR}"
export CUDNN_MAJOR='8'
export CUDNN_MINOR='1'
- export CUDNN_REVISION='0.77'
+ export CUDNN_REVISION='1.33'
export CUDNN_VERSION="${CUDNN_MAJOR}.${CUDNN_MINOR}.${CUDNN_REVISION}"
export NCCL_MAJOR='2'
export NCCL_MINOR='8'
@@ -73,7 +66,7 @@ From: mkandes/naked-singularity:ubuntu-18.04
export CUDA_VERSION="${CUDA_MAJOR}.${CUDA_MINOR}"
export CUDNN_MAJOR='8'
export CUDNN_MINOR='1'
- export CUDNN_REVISION='0.77'
+ export CUDNN_REVISION='1.33'
export CUDNN_VERSION="${CUDNN_MAJOR}.${CUDNN_MINOR}.${CUDNN_REVISION}"
export NCCL_MAJOR='2'
export NCCL_MINOR='8'
@@ -126,11 +119,6 @@ From: mkandes/naked-singularity:ubuntu-18.04
apt-get -y libglu1-mesa
apt-get -y libglu1-mesa-dev
- # Set paths to CUDA binaries and libraries
- export CUDA_HOME="/usr/local/cuda-${CUDA_VERSION}"
- export PATH="${CUDA_HOME}/bin${PATH:+:${PATH}}"
- export LD_LIBRARY_PATH="${CUDA_HOME}/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
-
# Cleanup
apt-get -y autoremove --purge
apt-get -y clean
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2 b/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2
index 8dac398..521d581 100644
--- a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2
+++ b/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2
@@ -23,7 +23,7 @@ From: ghcr.io/mkandes/naked-singularity:ubuntu-18.04
export CUDA_VERSION="${CUDA_MAJOR}.${CUDA_MINOR}"
export CUDNN_MAJOR='8'
export CUDNN_MINOR='1'
- export CUDNN_REVISION='0.77'
+ export CUDNN_REVISION='1.33'
export CUDNN_VERSION="${CUDNN_MAJOR}.${CUDNN_MINOR}.${CUDNN_REVISION}"
export NCCL_MAJOR='2'
export NCCL_MINOR='8'
--
GitLab