diff --git a/README b/README index 5333cb7cdb83e2535d70b3001b87d10d908161d8..51ba99223ec2e55a3a1adbe2581e6a0b48da79c8 100644 --- a/README +++ b/README @@ -46,8 +46,8 @@ AUTHOR VERSION - 0.4.2 + 0.4.3 LAST UPDATED - Tuesday, October 2nd, 2018 + Thursday, October 4th, 2018 diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-opencl-openmpi.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-opencl-openmpi.def index f3eafbb12e55ab2081be867844914d133713771b..3042f5b487dd4120017ff56dac2ffc658c7a6dfb 100644 --- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-opencl-openmpi.def +++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-opencl-openmpi.def @@ -5,11 +5,11 @@ OSVersion: xenial %labels APPLICATION_NAME ubuntu + cuda + opencl + openmpi - APPLICATION_VERSION 16.04 + 8.0.44 + 16.1.2 + 1.8.4 + APPLICATION_VERSION 16.04 + 9.2.88 + 16.1.2 + 1.8.4 APPLICATION_URL https://software.intel.com/en-us/articles/opencl-drivers#latest_CPU_runtime SYSTEM_NAME comet - SYSTEM_SINGULARITY_VERSION 2.5.1 + SYSTEM_SINGULARITY_VERSION 2.5.2 SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html SINGULARITY_IMAGE_SIZE 8192 @@ -17,7 +17,7 @@ OSVersion: xenial AUTHOR_NAME Marty Kandes AUTHOR_EMAIL mkandes@sdsc.edu - LAST_UPDATED 20180706 + LAST_UPDATED 20181003 %setup @@ -25,6 +25,11 @@ OSVersion: xenial # Set system locale export LC_ALL=C + export PATH="/usr/local/cuda-9.2/bin${PATH:+:${PATH}}" + export LD_LIBRARY_PATH="/usr/local/cuda-9.2/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/extras/CUPTI/lib64" + export PATH="/opt/openmpi-1.8.4/bin:${PATH}" + export LD_LIBRARY_PATH="/opt/openmpi-1.8.4/lib:${LD_LIBRARY_PATH}" %post -c /bin/bash @@ -128,7 +133,7 @@ OSVersion: xenial apt-get -y install default-jre # Download NVIDIA drivers, libraries, and packages - wget --wait=10 "${CUDA_REPO_URL}/nvidia-396_396.26-0ubuntu1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/nvidia-396_396.26-0ubuntu1_amd64.deb" wget --wait=10 "${CUDA_REPO_URL}/nvidia-396-dev_396.26-0ubuntu1_amd64.deb" wget --wait=10 "${CUDA_REPO_URL}/nvidia-modprobe_396.26-0ubuntu1_amd64.deb" wget --wait=10 "${CUDA_REPO_URL}/libcuda1-396_396.26-0ubuntu1_amd64.deb" @@ -138,42 +143,58 @@ OSVersion: xenial wget --wait=10 "${CUDA_REPO_URL}/nvidia-settings_396.26-0ubuntu1_amd64.deb" wget --wait=10 "${CUDA_REPO_URL}/cuda-drivers_396.26-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-license-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-misc-headers-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-core-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cudart-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-driver-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cudart-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-command-line-tools-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvrtc-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvrtc-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvml-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvgraph-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvgraph-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cusolver-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cusolver-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cublas-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cublas-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cufft-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cufft-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-curand-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-curand-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cusparse-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cusparse-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-npp-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-npp-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-samples-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-documentation-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-visual-tools-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-toolkit-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-runtime-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-demo-suite-8-0_8.0.44-1_amd64.deb" - - wget --wait=10 "${ML_REPO_URL}/libcudnn7_7.1.4.18-1+cuda8.0_amd64.deb" - wget --wait=10 "${ML_REPO_URL}/libcudnn7-dev_7.1.4.18-1+cuda8.0_amd64.deb" - - wget --wait=10 "${ML_REPO_URL}/libnccl2_2.2.12-1+cuda8.0_amd64.deb" - wget --wait=10 "${ML_REPO_URL}/libnccl-dev_2.2.12-1+cuda8.0_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-license-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-misc-headers-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvcc-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cuobjdump-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvprune-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-compiler-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-core-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cudart-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-driver-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cudart-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvdisasm-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-gdb-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvprof-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-memcheck-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cupti-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-gpu-library-advisor-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvtx-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-command-line-tools-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvrtc-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvrtc-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvml-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvgraph-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvgraph-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cusolver-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cusolver-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cublas-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cublas-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cufft-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cufft-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-curand-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-curand-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cusparse-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cusparse-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-npp-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-npp-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-samples-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-documentation-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nsight-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvvp-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-visual-tools-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-tools-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-libraries-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-toolkit-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-libraries-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-runtime-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-demo-suite-9-2_9.2.88-1_amd64.deb" + + wget --wait=10 "${ML_REPO_URL}/libcudnn7_7.2.1.38-1+cuda9.2_amd64.deb" + wget --wait=10 "${ML_REPO_URL}/libcudnn7-dev_7.2.1.38-1+cuda9.2_amd64.deb" + + wget --wait=10 "${ML_REPO_URL}/libnccl2_2.3.4-1+cuda9.2_amd64.deb" + wget --wait=10 "${ML_REPO_URL}/libnccl-dev_2.3.4-1+cuda9.2_amd64.deb" # Fix for "update-alternatives: error: error creating symbolic link '/usr/lib/nvidia/alternate-install-present.dpkg-tmp': No such file or directory" mkdir -p /usr/lib/nvidia @@ -189,46 +210,63 @@ OSVersion: xenial dpkg -i nvidia-settings_396.26-0ubuntu1_amd64.deb dpkg -i cuda-drivers_396.26-1_amd64.deb - dpkg -i cuda-license-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-misc-headers-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-core-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cudart-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-driver-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cudart-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-command-line-tools-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvrtc-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvrtc-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvml-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvgraph-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvgraph-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cusolver-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cusolver-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cublas-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cublas-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cufft-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cufft-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-curand-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-curand-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cusparse-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cusparse-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-npp-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-npp-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-samples-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-documentation-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-visual-tools-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-toolkit-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-runtime-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-demo-suite-8-0_8.0.44-1_amd64.deb - - dpkg -i libcudnn7_7.1.4.18-1+cuda8.0_amd64.deb - dpkg -i libcudnn7-dev_7.1.4.18-1+cuda8.0_amd64.deb - - dpkg -i libnccl2_2.2.12-1+cuda8.0_amd64.deb - dpkg -i libnccl-dev_2.2.12-1+cuda8.0_amd64.deb + dpkg -i cuda-license-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-misc-headers-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvcc-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cuobjdump-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvprune-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-compiler-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-core-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cudart-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-driver-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cudart-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvdisasm-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-gdb-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvprof-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-memcheck-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cupti-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-gpu-library-advisor-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvtx-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-command-line-tools-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvrtc-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvrtc-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvml-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvgraph-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvgraph-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cusolver-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cusolver-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cublas-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cublas-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cufft-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cufft-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-curand-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-curand-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cusparse-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cusparse-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-npp-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-npp-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-samples-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-documentation-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nsight-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvvp-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-visual-tools-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-tools-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-libraries-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-toolkit-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-libraries-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-runtime-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-demo-suite-9-2_9.2.88-1_amd64.deb + + dpkg -i libcudnn7_7.2.1.38-1+cuda9.2_amd64.deb + dpkg -i libcudnn7-dev_7.2.1.38-1+cuda9.2_amd64.deb + + dpkg -i libnccl2_2.3.4-1+cuda9.2_amd64.deb + dpkg -i libnccl-dev_2.3.4-1+cuda9.2_amd64.deb # 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 PATH="/usr/local/cuda-9.2/bin${PATH:+:${PATH}}" + export LD_LIBRARY_PATH="/usr/local/cuda-9.2/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/extras/CUPTI/lib64" # Location of Intel repository declare -r INTEL_ROOT_URL='http://registrationcenter-download.intel.com' @@ -264,6 +302,9 @@ OSVersion: xenial ln /opt/intel/opencl-1.2-6.4.0.37/etc/intel64.icd /etc/OpenCL/vendors/intel64.icd ldconfig + # Test OpenCL installation + clinfo + # Install basic drivers for user space access to Ethernet, RDMA, # and Infiniband. See https://community.mellanox.com/docs/DOC-2431 apt-get -y install dkms @@ -302,19 +343,12 @@ OSVersion: xenial tar -xzvf openmpi-1.8.4.tar.gz cd openmpi-1.8.4 ./configure --prefix=/opt/openmpi-1.8.4 --with-cuda - make all install + make all install # Set paths to OpenMPI binaries and libraries export PATH="/opt/openmpi-1.8.4/bin:${PATH}" export LD_LIBRARY_PATH="/opt/openmpi-1.8.4/lib:${LD_LIBRARY_PATH}" - # 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 PATH="/opt/openmpi-1.8.4/bin:${PATH}"' >> 90-environment.sh - echo 'export LD_LIBRARY_PATH="/opt/openmpi-1.8.4/lib:${LD_LIBRARY_PATH}"' >> 90-environment.sh - # Update database for mlocate updatedb @@ -322,15 +356,12 @@ 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 - - # Test OpenCL installation - clinfo + echo " " + echo " __________________ __ _______________ " + echo " -----/ ____/ __ \/ |/ / ____/_ __/ " + echo " --/ / / / / / /|_/ / __/ / / " + echo " / /___/ /_/ / / / / /___ / / " + echo " \____/\____/_/ /_/_____/ /_/ " + echo " " - #export PATH="/opt/openmpi-1.8.4/bin:${PATH}" - #export LD_LIBRARY_PATH="/opt/openmpi-1.8.4/lib:${LD_LIBRARY_PATH}" - #mpirun --version +%test diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-opencl.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-opencl.def index 73fe5de5aac38ea2af79bfeb6d659f3d809ec254..23bafbf65af66e6cb80a917b64bb067e895aa9b3 100644 --- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-opencl.def +++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-opencl.def @@ -5,11 +5,11 @@ OSVersion: xenial %labels APPLICATION_NAME ubuntu + cuda + opencl - APPLICATION_VERSION 16.04 + 8.0.44 + 16.1.2 + APPLICATION_VERSION 16.04 + 9.2.88 + 16.1.2 APPLICATION_URL https://software.intel.com/en-us/articles/opencl-drivers#latest_CPU_runtime SYSTEM_NAME comet - SYSTEM_SINGULARITY_VERSION 2.5.1 + SYSTEM_SINGULARITY_VERSION 2.5.2 SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html SINGULARITY_IMAGE_SIZE 8192 @@ -17,7 +17,7 @@ OSVersion: xenial AUTHOR_NAME Marty Kandes AUTHOR_EMAIL mkandes@sdsc.edu - LAST_UPDATED 20180706 + LAST_UPDATED 20181003 %setup @@ -25,6 +25,9 @@ OSVersion: xenial # Set system locale export LC_ALL=C + export PATH="/usr/local/cuda-9.2/bin${PATH:+:${PATH}}" + export LD_LIBRARY_PATH="/usr/local/cuda-9.2/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/extras/CUPTI/lib64" %post -c /bin/bash @@ -128,7 +131,7 @@ OSVersion: xenial apt-get -y install default-jre # Download NVIDIA drivers, libraries, and packages - wget --wait=10 "${CUDA_REPO_URL}/nvidia-396_396.26-0ubuntu1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/nvidia-396_396.26-0ubuntu1_amd64.deb" wget --wait=10 "${CUDA_REPO_URL}/nvidia-396-dev_396.26-0ubuntu1_amd64.deb" wget --wait=10 "${CUDA_REPO_URL}/nvidia-modprobe_396.26-0ubuntu1_amd64.deb" wget --wait=10 "${CUDA_REPO_URL}/libcuda1-396_396.26-0ubuntu1_amd64.deb" @@ -138,42 +141,58 @@ OSVersion: xenial wget --wait=10 "${CUDA_REPO_URL}/nvidia-settings_396.26-0ubuntu1_amd64.deb" wget --wait=10 "${CUDA_REPO_URL}/cuda-drivers_396.26-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-license-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-misc-headers-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-core-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cudart-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-driver-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cudart-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-command-line-tools-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvrtc-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvrtc-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvml-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvgraph-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvgraph-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cusolver-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cusolver-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cublas-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cublas-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cufft-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cufft-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-curand-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-curand-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cusparse-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cusparse-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-npp-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-npp-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-samples-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-documentation-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-visual-tools-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-toolkit-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-runtime-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-demo-suite-8-0_8.0.44-1_amd64.deb" - - wget --wait=10 "${ML_REPO_URL}/libcudnn7_7.1.4.18-1+cuda8.0_amd64.deb" - wget --wait=10 "${ML_REPO_URL}/libcudnn7-dev_7.1.4.18-1+cuda8.0_amd64.deb" - - wget --wait=10 "${ML_REPO_URL}/libnccl2_2.2.12-1+cuda8.0_amd64.deb" - wget --wait=10 "${ML_REPO_URL}/libnccl-dev_2.2.12-1+cuda8.0_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-license-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-misc-headers-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvcc-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cuobjdump-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvprune-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-compiler-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-core-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cudart-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-driver-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cudart-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvdisasm-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-gdb-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvprof-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-memcheck-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cupti-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-gpu-library-advisor-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvtx-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-command-line-tools-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvrtc-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvrtc-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvml-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvgraph-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvgraph-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cusolver-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cusolver-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cublas-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cublas-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cufft-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cufft-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-curand-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-curand-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cusparse-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cusparse-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-npp-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-npp-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-samples-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-documentation-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nsight-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvvp-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-visual-tools-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-tools-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-libraries-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-toolkit-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-libraries-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-runtime-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-demo-suite-9-2_9.2.88-1_amd64.deb" + + wget --wait=10 "${ML_REPO_URL}/libcudnn7_7.2.1.38-1+cuda9.2_amd64.deb" + wget --wait=10 "${ML_REPO_URL}/libcudnn7-dev_7.2.1.38-1+cuda9.2_amd64.deb" + + wget --wait=10 "${ML_REPO_URL}/libnccl2_2.3.4-1+cuda9.2_amd64.deb" + wget --wait=10 "${ML_REPO_URL}/libnccl-dev_2.3.4-1+cuda9.2_amd64.deb" # Fix for "update-alternatives: error: error creating symbolic link '/usr/lib/nvidia/alternate-install-present.dpkg-tmp': No such file or directory" mkdir -p /usr/lib/nvidia @@ -189,46 +208,63 @@ OSVersion: xenial dpkg -i nvidia-settings_396.26-0ubuntu1_amd64.deb dpkg -i cuda-drivers_396.26-1_amd64.deb - dpkg -i cuda-license-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-misc-headers-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-core-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cudart-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-driver-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cudart-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-command-line-tools-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvrtc-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvrtc-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvml-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvgraph-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvgraph-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cusolver-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cusolver-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cublas-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cublas-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cufft-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cufft-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-curand-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-curand-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cusparse-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cusparse-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-npp-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-npp-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-samples-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-documentation-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-visual-tools-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-toolkit-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-runtime-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-demo-suite-8-0_8.0.44-1_amd64.deb - - dpkg -i libcudnn7_7.1.4.18-1+cuda8.0_amd64.deb - dpkg -i libcudnn7-dev_7.1.4.18-1+cuda8.0_amd64.deb - - dpkg -i libnccl2_2.2.12-1+cuda8.0_amd64.deb - dpkg -i libnccl-dev_2.2.12-1+cuda8.0_amd64.deb + dpkg -i cuda-license-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-misc-headers-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvcc-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cuobjdump-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvprune-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-compiler-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-core-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cudart-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-driver-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cudart-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvdisasm-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-gdb-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvprof-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-memcheck-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cupti-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-gpu-library-advisor-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvtx-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-command-line-tools-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvrtc-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvrtc-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvml-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvgraph-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvgraph-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cusolver-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cusolver-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cublas-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cublas-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cufft-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cufft-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-curand-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-curand-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cusparse-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cusparse-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-npp-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-npp-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-samples-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-documentation-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nsight-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvvp-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-visual-tools-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-tools-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-libraries-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-toolkit-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-libraries-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-runtime-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-demo-suite-9-2_9.2.88-1_amd64.deb + + dpkg -i libcudnn7_7.2.1.38-1+cuda9.2_amd64.deb + dpkg -i libcudnn7-dev_7.2.1.38-1+cuda9.2_amd64.deb + + dpkg -i libnccl2_2.3.4-1+cuda9.2_amd64.deb + dpkg -i libnccl-dev_2.3.4-1+cuda9.2_amd64.deb # 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 PATH="/usr/local/cuda-9.2/bin${PATH:+:${PATH}}" + export LD_LIBRARY_PATH="/usr/local/cuda-9.2/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/extras/CUPTI/lib64" # Location of Intel repository declare -r INTEL_ROOT_URL='http://registrationcenter-download.intel.com' @@ -267,11 +303,6 @@ OSVersion: xenial # Test OpenCL installation clinfo - # 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 - # Update database for mlocate updatedb @@ -279,4 +310,12 @@ OSVersion: xenial %runscript + echo " " + echo " __________________ __ _______________ " + echo " -----/ ____/ __ \/ |/ / ____/_ __/ " + echo " --/ / / / / / /|_/ / __/ / / " + echo " / /___/ /_/ / / / / /___ / / " + echo " \____/\____/_/ /_/_____/ /_/ " + echo " " + %test diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def index 4698c38d3eade213b138614c8098ed466c38979e..bcbb955cb4f4e1c5daaf0f85dd1f7bb48420443c 100644 --- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def +++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def @@ -5,11 +5,11 @@ OSVersion: xenial %labels APPLICATION_NAME ubuntu + cuda + openmpi - APPLICATION_VERSION 16.04 + 8.0.44 + 1.8.4 + APPLICATION_VERSION 16.04 + 9.2.88 + 1.8.4 APPLICATION_URL https://www.open-mpi.org/faq/?category=runcuda SYSTEM_NAME comet - SYSTEM_SINGULARITY_VERSION 2.5.1 + SYSTEM_SINGULARITY_VERSION 2.5.2 SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html SINGULARITY_IMAGE_SIZE 8192 @@ -17,7 +17,7 @@ OSVersion: xenial AUTHOR_NAME Marty Kandes AUTHOR_EMAIL mkandes@sdsc.edu - LAST_UPDATED 20180619 + LAST_UPDATED 20181003 %setup @@ -25,6 +25,11 @@ OSVersion: xenial # Set system locale export LC_ALL=C + export PATH="/usr/local/cuda-9.2/bin${PATH:+:${PATH}}" + export LD_LIBRARY_PATH="/usr/local/cuda-9.2/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/extras/CUPTI/lib64" + export PATH="/opt/openmpi-1.8.4/bin:${PATH}" + export LD_LIBRARY_PATH="/opt/openmpi-1.8.4/lib:${LD_LIBRARY_PATH}" %post -c /bin/bash @@ -128,7 +133,7 @@ OSVersion: xenial apt-get -y install default-jre # Download NVIDIA drivers, libraries, and packages - wget --wait=10 "${CUDA_REPO_URL}/nvidia-396_396.26-0ubuntu1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/nvidia-396_396.26-0ubuntu1_amd64.deb" wget --wait=10 "${CUDA_REPO_URL}/nvidia-396-dev_396.26-0ubuntu1_amd64.deb" wget --wait=10 "${CUDA_REPO_URL}/nvidia-modprobe_396.26-0ubuntu1_amd64.deb" wget --wait=10 "${CUDA_REPO_URL}/libcuda1-396_396.26-0ubuntu1_amd64.deb" @@ -138,42 +143,58 @@ OSVersion: xenial wget --wait=10 "${CUDA_REPO_URL}/nvidia-settings_396.26-0ubuntu1_amd64.deb" wget --wait=10 "${CUDA_REPO_URL}/cuda-drivers_396.26-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-license-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-misc-headers-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-core-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cudart-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-driver-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cudart-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-command-line-tools-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvrtc-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvrtc-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvml-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvgraph-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-nvgraph-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cusolver-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cusolver-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cublas-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cublas-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cufft-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cufft-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-curand-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-curand-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cusparse-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-cusparse-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-npp-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-npp-dev-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-samples-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-documentation-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-visual-tools-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-toolkit-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-runtime-8-0_8.0.44-1_amd64.deb" - wget --wait=10 "${CUDA_REPO_URL}/cuda-demo-suite-8-0_8.0.44-1_amd64.deb" - - wget --wait=10 "${ML_REPO_URL}/libcudnn7_7.1.4.18-1+cuda8.0_amd64.deb" - wget --wait=10 "${ML_REPO_URL}/libcudnn7-dev_7.1.4.18-1+cuda8.0_amd64.deb" - - wget --wait=10 "${ML_REPO_URL}/libnccl2_2.2.12-1+cuda8.0_amd64.deb" - wget --wait=10 "${ML_REPO_URL}/libnccl-dev_2.2.12-1+cuda8.0_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-license-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-misc-headers-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvcc-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cuobjdump-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvprune-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-compiler-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-core-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cudart-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-driver-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cudart-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvdisasm-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-gdb-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvprof-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-memcheck-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cupti-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-gpu-library-advisor-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvtx-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-command-line-tools-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvrtc-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvrtc-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvml-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvgraph-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvgraph-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cusolver-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cusolver-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cublas-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cublas-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cufft-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cufft-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-curand-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-curand-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cusparse-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-cusparse-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-npp-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-npp-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-samples-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-documentation-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nsight-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-nvvp-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-visual-tools-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-tools-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-libraries-dev-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-toolkit-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-libraries-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-runtime-9-2_9.2.88-1_amd64.deb" + wget --wait=10 "${CUDA_REPO_URL}/cuda-demo-suite-9-2_9.2.88-1_amd64.deb" + + wget --wait=10 "${ML_REPO_URL}/libcudnn7_7.2.1.38-1+cuda9.2_amd64.deb" + wget --wait=10 "${ML_REPO_URL}/libcudnn7-dev_7.2.1.38-1+cuda9.2_amd64.deb" + + wget --wait=10 "${ML_REPO_URL}/libnccl2_2.3.4-1+cuda9.2_amd64.deb" + wget --wait=10 "${ML_REPO_URL}/libnccl-dev_2.3.4-1+cuda9.2_amd64.deb" # Fix for "update-alternatives: error: error creating symbolic link '/usr/lib/nvidia/alternate-install-present.dpkg-tmp': No such file or directory" mkdir -p /usr/lib/nvidia @@ -189,46 +210,63 @@ OSVersion: xenial dpkg -i nvidia-settings_396.26-0ubuntu1_amd64.deb dpkg -i cuda-drivers_396.26-1_amd64.deb - dpkg -i cuda-license-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-misc-headers-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-core-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cudart-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-driver-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cudart-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-command-line-tools-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvrtc-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvrtc-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvml-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvgraph-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-nvgraph-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cusolver-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cusolver-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cublas-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cublas-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cufft-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cufft-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-curand-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-curand-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cusparse-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-cusparse-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-npp-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-npp-dev-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-samples-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-documentation-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-visual-tools-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-toolkit-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-runtime-8-0_8.0.44-1_amd64.deb - dpkg -i cuda-demo-suite-8-0_8.0.44-1_amd64.deb - - dpkg -i libcudnn7_7.1.4.18-1+cuda8.0_amd64.deb - dpkg -i libcudnn7-dev_7.1.4.18-1+cuda8.0_amd64.deb - - dpkg -i libnccl2_2.2.12-1+cuda8.0_amd64.deb - dpkg -i libnccl-dev_2.2.12-1+cuda8.0_amd64.deb + dpkg -i cuda-license-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-misc-headers-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvcc-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cuobjdump-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvprune-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-compiler-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-core-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cudart-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-driver-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cudart-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvdisasm-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-gdb-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvprof-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-memcheck-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cupti-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-gpu-library-advisor-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvtx-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-command-line-tools-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvrtc-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvrtc-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvml-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvgraph-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvgraph-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cusolver-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cusolver-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cublas-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cublas-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cufft-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cufft-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-curand-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-curand-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cusparse-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-cusparse-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-npp-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-npp-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-samples-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-documentation-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nsight-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-nvvp-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-visual-tools-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-tools-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-libraries-dev-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-toolkit-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-libraries-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-runtime-9-2_9.2.88-1_amd64.deb + dpkg -i cuda-demo-suite-9-2_9.2.88-1_amd64.deb + + dpkg -i libcudnn7_7.2.1.38-1+cuda9.2_amd64.deb + dpkg -i libcudnn7-dev_7.2.1.38-1+cuda9.2_amd64.deb + + dpkg -i libnccl2_2.3.4-1+cuda9.2_amd64.deb + dpkg -i libnccl-dev_2.3.4-1+cuda9.2_amd64.deb # 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 PATH="/usr/local/cuda-9.2/bin${PATH:+:${PATH}}" + export LD_LIBRARY_PATH="/usr/local/cuda-9.2/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/extras/CUPTI/lib64" # Install basic drivers for user space access to Ethernet, RDMA, # and Infiniband. See https://community.mellanox.com/docs/DOC-2431 @@ -268,19 +306,12 @@ OSVersion: xenial tar -xzvf openmpi-1.8.4.tar.gz cd openmpi-1.8.4 ./configure --prefix=/opt/openmpi-1.8.4 --with-cuda - make all install + make all install # Set paths to OpenMPI binaries and libraries export PATH="/opt/openmpi-1.8.4/bin:${PATH}" export LD_LIBRARY_PATH="/opt/openmpi-1.8.4/lib:${LD_LIBRARY_PATH}" - # 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 PATH="/opt/openmpi-1.8.4/bin:${PATH}"' >> 90-environment.sh - echo 'export LD_LIBRARY_PATH="/opt/openmpi-1.8.4/lib:${LD_LIBRARY_PATH}"' >> 90-environment.sh - # Update database for mlocate updatedb @@ -288,12 +319,12 @@ 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 + echo " " + echo " __________________ __ _______________ " + echo " -----/ ____/ __ \/ |/ / ____/_ __/ " + echo " --/ / / / / / /|_/ / __/ / / " + echo " / /___/ /_/ / / / / /___ / / " + echo " \____/\____/_/ /_/_____/ /_/ " + echo " " - #export PATH="/opt/openmpi-1.8.4/bin:${PATH}" - #export LD_LIBRARY_PATH="/opt/openmpi-1.8.4/lib:${LD_LIBRARY_PATH}" - #mpirun --version +%test 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 d37b79474a6478b6f74acc21ca940028d081c1fe..cc2ff935cab84bacb5ac85e2ab02f81e407f9e86 100644 --- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def +++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def @@ -5,7 +5,7 @@ OSVersion: xenial %labels APPLICATION_NAME ubuntu + cuda - APPLICATION_VERSION 16.04 + 9.2.8 + APPLICATION_VERSION 16.04 + 9.2.88 APPLICATION_URL https://developer.nvidia.com/cuda-zone SYSTEM_NAME comet @@ -17,7 +17,7 @@ OSVersion: xenial AUTHOR_NAME Marty Kandes AUTHOR_EMAIL mkandes@sdsc.edu - LAST_UPDATED 20180927 + LAST_UPDATED 20181003 %setup @@ -273,4 +273,12 @@ OSVersion: xenial %runscript + echo " " + echo " __________________ __ _______________ " + echo " -----/ ____/ __ \/ |/ / ____/_ __/ " + echo " --/ / / / / / /|_/ / __/ / / " + echo " / /___/ /_/ / / / / /___ / / " + echo " \____/\____/_/ /_/_____/ /_/ " + echo " " + %test diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def index 376ef1867cb597061a18bebbf517b5228897b85f..254df0fc8e38f9cbd4a0f920923b175f3982a18e 100644 --- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def +++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def @@ -9,7 +9,7 @@ OSVersion: xenial APPLICATION_URL https://www.ubuntu.com/ SYSTEM_NAME comet - SYSTEM_SINGULARITY_VERSION 2.5.1 + SYSTEM_SINGULARITY_VERSION 2.5.2 SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html SINGULARITY_IMAGE_SIZE 2048 @@ -17,7 +17,7 @@ OSVersion: xenial AUTHOR_NAME Marty Kandes AUTHOR_EMAIL mkandes@sdsc.edu - LAST_UPDATED 20180718 + LAST_UPDATED 20181003 %setup @@ -89,9 +89,6 @@ OSVersion: xenial chmod +x Miniconda3-latest-Linux-x86_64.sh ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3 - # Set container environment variables - cd /.singularity.d/env - # Update database for mlocate updatedb diff --git a/naked-singularity.sh b/naked-singularity.sh index d09a239f2ab6f8515ef9ef8e04352f9ad8e78834..b971713db2a1d45b64c8d700d7b2f85bb70ba079 100755 --- a/naked-singularity.sh +++ b/naked-singularity.sh @@ -326,7 +326,7 @@ naked_install() { local operating_system='ubuntu' local prefix='/usr/local' - local version='2.5.1' + local version='2.5.2' naked_out "Read in all command-line options of the 'install' command ..."