Skip to content
Snippets Groups Projects
Commit 4368d95f authored by Marty Kandes's avatar Marty Kandes
Browse files

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
parent e6c178ce
No related branches found
No related tags found
No related merge requests found
...@@ -46,8 +46,8 @@ AUTHOR ...@@ -46,8 +46,8 @@ AUTHOR
VERSION VERSION
0.3.4 0.3.6
LAST UPDATED LAST UPDATED
Friday, July 6th, 2018 Thursday, July 26th, 2018
...@@ -17,7 +17,7 @@ OSVersion: xenial ...@@ -17,7 +17,7 @@ OSVersion: xenial
AUTHOR_NAME Marty Kandes AUTHOR_NAME Marty Kandes
AUTHOR_EMAIL mkandes@sdsc.edu AUTHOR_EMAIL mkandes@sdsc.edu
LAST_UPDATED 20180619 LAST_UPDATED 20180712
%setup %setup
...@@ -229,11 +229,13 @@ OSVersion: xenial ...@@ -229,11 +229,13 @@ OSVersion: xenial
# Set paths to CUDA binaries and libraries # Set paths to CUDA binaries and libraries
export PATH="/usr/local/cuda-8.0/bin${PATH:+:${PATH}}" 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="/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 # Set container environment variables
cd /.singularity.d/env cd /.singularity.d/env
echo 'export PATH="/usr/local/cuda-8.0/bin${PATH:+:${PATH}}"' >> 90-environment.sh 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="/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 # Update database for mlocate
updatedb updatedb
...@@ -243,8 +245,3 @@ OSVersion: xenial ...@@ -243,8 +245,3 @@ OSVersion: xenial
%runscript %runscript
%test %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
...@@ -17,7 +17,7 @@ OSVersion: xenial ...@@ -17,7 +17,7 @@ OSVersion: xenial
AUTHOR_NAME Marty Kandes AUTHOR_NAME Marty Kandes
AUTHOR_EMAIL mkandes@sdsc.edu AUTHOR_EMAIL mkandes@sdsc.edu
LAST_UPDATED 20180523 LAST_UPDATED 20180718
%setup %setup
...@@ -99,4 +99,12 @@ OSVersion: xenial ...@@ -99,4 +99,12 @@ OSVersion: xenial
%runscript %runscript
echo " "
echo " __________________ __ _______________ "
echo " -----/ ____/ __ \/ |/ / ____/_ __/ "
echo " --/ / / / / / /|_/ / __/ / / "
echo " / /___/ /_/ / / / / /___ / / "
echo " \____/\____/_/ /_/_____/ /_/ "
echo " "
%test %test
...@@ -373,8 +373,8 @@ naked_install() { ...@@ -373,8 +373,8 @@ naked_install() {
naked_out 'Installing Singularity dependencies ...' naked_out 'Installing Singularity dependencies ...'
echo "sudo yum groupinstall -y 'Development Tools'" echo "sudo yum groupinstall -y 'Development Tools'"
sudo yum groupinstall -y 'Development Tools' sudo yum groupinstall -y 'Development Tools'
echo 'yum install -y libarchive-devel' echo 'sudo yum install -y libarchive-devel'
yum install -y libarchive-devel sudo yum install -y libarchive-devel
elif [[ "${operating_system}" = 'ubuntu' ]]; then elif [[ "${operating_system}" = 'ubuntu' ]]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment