diff --git a/README b/README index 617fd1ad01b9c444b7e495032c73d14162890d58..7c279dcac44c79ee958e06ff1e0e0e51abd5383e 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 1123f192640a3ca35920366e95ae9004d9ae7382..6f4544bfa40266e36c4ee7729a98df1b3879f4af 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 b1bbe7f55a8159c92a54d49b4917c325a2a778cb..376ef1867cb597061a18bebbf517b5228897b85f 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 9f25504568eaae2063db39ed8f077bfacef5a3d2..d09a239f2ab6f8515ef9ef8e04352f9ad8e78834 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