From 4368d95f9fda9805abc70f66029ecdd1b415fe1a Mon Sep 17 00:00:00 2001 From: Marty Kandes <mkandes@sdsc.edu> Date: Thu, 26 Jul 2018 16:35:53 -0700 Subject: [PATCH] naked-singularity-v0.3.6 :: added Singularity run section to ubuntu.def for comet that prints the ascii 'COMET' logo; modified LD_LIBRARY_PATH in ubuntu-cuda.def for comet to include NVIDIA CUDA Profiling Tools Interface library (libcupti); added fix in naked-singularity.sh to support naked_install into centos-based systems --- README | 4 ++-- .../us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def | 9 +++------ definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def | 10 +++++++++- naked-singularity.sh | 4 ++-- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/README b/README index 617fd1a..7c279dc 100644 --- a/README +++ b/README @@ -46,8 +46,8 @@ AUTHOR VERSION - 0.3.4 + 0.3.6 LAST UPDATED - Friday, July 6th, 2018 + Thursday, July 26th, 2018 diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def index 1123f19..6f4544b 100644 --- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def +++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def @@ -17,7 +17,7 @@ OSVersion: xenial AUTHOR_NAME Marty Kandes AUTHOR_EMAIL mkandes@sdsc.edu - LAST_UPDATED 20180619 + LAST_UPDATED 20180712 %setup @@ -229,11 +229,13 @@ OSVersion: xenial # Set paths to CUDA binaries and libraries export PATH="/usr/local/cuda-8.0/bin${PATH:+:${PATH}}" export LD_LIBRARY_PATH="/usr/local/cuda-8.0/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/extras/CUPTI/lib64" # Set container environment variables cd /.singularity.d/env echo 'export PATH="/usr/local/cuda-8.0/bin${PATH:+:${PATH}}"' >> 90-environment.sh echo 'export LD_LIBRARY_PATH="/usr/local/cuda-8.0/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"' >> 90-environment.sh + echo 'export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/extras/CUPTI/lib64"' >> 90-environment.sh # Update database for mlocate updatedb @@ -243,8 +245,3 @@ OSVersion: xenial %runscript %test - - export PATH="/usr/local/cuda-8.0/bin${PATH:+:${PATH}}" - export LD_LIBRARY_PATH="/usr/local/cuda-8.0/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" - nvcc --version - diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def index b1bbe7f..376ef18 100644 --- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def +++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def @@ -17,7 +17,7 @@ OSVersion: xenial AUTHOR_NAME Marty Kandes AUTHOR_EMAIL mkandes@sdsc.edu - LAST_UPDATED 20180523 + LAST_UPDATED 20180718 %setup @@ -99,4 +99,12 @@ OSVersion: xenial %runscript + echo " " + echo " __________________ __ _______________ " + echo " -----/ ____/ __ \/ |/ / ____/_ __/ " + echo " --/ / / / / / /|_/ / __/ / / " + echo " / /___/ /_/ / / / / /___ / / " + echo " \____/\____/_/ /_/_____/ /_/ " + echo " " + %test diff --git a/naked-singularity.sh b/naked-singularity.sh index 9f25504..d09a239 100755 --- a/naked-singularity.sh +++ b/naked-singularity.sh @@ -373,8 +373,8 @@ naked_install() { naked_out 'Installing Singularity dependencies ...' echo "sudo yum groupinstall -y 'Development Tools'" sudo yum groupinstall -y 'Development Tools' - echo 'yum install -y libarchive-devel' - yum install -y libarchive-devel + echo 'sudo yum install -y libarchive-devel' + sudo yum install -y libarchive-devel elif [[ "${operating_system}" = 'ubuntu' ]]; then -- GitLab