diff --git a/README b/README
index b3f9da56984dfdb879d3e6a7723b4261877c846c..26add51472c532e41eb784ff6a0a1976b8430d65 100644
--- a/README
+++ b/README
@@ -5,8 +5,8 @@ README
DESCRIPTION
A repository of definition files for bootstrapping Singularity
- containers around target applications that you would like to run on
- a target high-performance computing system.
+ containers around applications that you would like to run on a
+ high-performance computing system.
USAGE
@@ -30,4 +30,4 @@ AUTHOR
LAST UPDATED
- Friday, July 7th, 2017
+ Friday, July 21st, 2017
diff --git a/definition-files/us/ucsd/sdsc/comet/deepbench/deepbench-nvidia.def b/definition-files/us/ucsd/sdsc/comet/deepbench/deepbench-nvidia.def
new file mode 100644
index 0000000000000000000000000000000000000000..a6eca37e5acdee7993f06a512efa5c4f82d0f99e
--- /dev/null
+++ b/definition-files/us/ucsd/sdsc/comet/deepbench/deepbench-nvidia.def
@@ -0,0 +1,195 @@
+Bootstrap: debootstrap
+MirrorURL: http://us.archive.ubuntu.com/ubuntu
+OSVersion: xenial
+
+%labels
+
+ AUTHOR_NAME Marty Kandes
+ AUTHOR_EMAIL mkandes@sdsc.edu
+ APPLICATION_NAME deepbench
+ APPLICATION_VERSION unknown
+ APPLICATION_URL https://github.com/baidu-research/DeepBench
+ SYSTEM_NAME comet
+ SYSTEM_SINGULARITY_VERSION 2.2
+ SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
+ VERSION 0.0.1
+ LAST_UPDATED 20170721
+
+%setup
+
+%environment
+
+%post -c /bin/bash
+
+ declare -r MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+ declare -r OSVERSION='xenial'
+
+ apt-get -y install ubuntu-minimal
+ apt-get -y install ubuntu-standard
+ apt-get -y install ubuntu-server
+
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} restricted"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} universe"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} multiverse"
+
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates main"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates restricted"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates universe"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates multiverse"
+
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports main"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports restricted"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports universe"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports multiverse"
+
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security main"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security restricted"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security universe"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security multiverse"
+
+ apt-get -y update && apt-get -y upgrade
+
+ mkdir /cvmfs /oasis /projects /scratch
+
+ cd /opt
+
+ declare -r NVIDIA_ROOT_URL='http://developer.download.nvidia.com/compute'
+ declare -r CUDA_REPO_URL="${NVIDIA_ROOT_URL}/cuda/repos/ubuntu1604/x86_64"
+ declare -r ML_REPO_URL="${NVIDIA_ROOT_URL}/machine-learning/repos/ubuntu1604/x86_64/"
+
+ apt-get -y install x11-common xserver-xorg-core cmake make dkms \
+ linux-libc-dev libc6-dev lib32gcc1 libc6-i386 libgl1 \
+ libwayland-client0 libwayland-server0 pkg-config \
+ screen-resolution-extra libvdpau1 libatk1.0-0 \
+ libcairo-gobject2 libcairo2 libfontconfig1 \
+ libgdk-pixbuf2.0-0 libgtk-3-0 libgtk2.0-0 libjansson4 \
+ freeglut3-dev libx11-dev libxmu-dev libxi-dev \
+ libglu1-mesa libglu1-mesa-dev default-jre
+
+ wget --wait=10 "${CUDA_REPO_URL}/nvidia-367_367.48-0ubuntu1_amd64.deb"
+ wget --wait=10 "${CUDA_REPO_URL}/nvidia-367-dev_367.48-0ubuntu1_amd64.deb"
+ wget --wait=10 "${CUDA_REPO_URL}/nvidia-modprobe_367.48-0ubuntu1_amd64.deb"
+ wget --wait=10 "${CUDA_REPO_URL}/libcuda1-367_367.48-0ubuntu1_amd64.deb"
+ wget --wait=10 "${CUDA_REPO_URL}/nvidia-libopencl1-367_367.48-0ubuntu1_amd64.deb"
+ wget --wait=10 "${CUDA_REPO_URL}/nvidia-opencl-icd-367_367.48-0ubuntu1_amd64.deb"
+ wget --wait=10 "${CUDA_REPO_URL}/libxnvctrl0_367.48-0ubuntu1_amd64.deb"
+ wget --wait=10 "${CUDA_REPO_URL}/nvidia-settings_367.48-0ubuntu1_amd64.deb"
+ wget --wait=10 "${CUDA_REPO_URL}/cuda-drivers_367.48-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}/libcudnn5_5.1.10-1+cuda8.0_amd64.deb"
+ wget --wait=10 "${ML_REPO_URL}/libcudnn5-dev_5.1.10-1+cuda8.0_amd64.deb"
+
+ wget --wait=10 "${ML_REPO_URL}/libnccl1_1.2.3-1+cuda8.0_amd64.deb"
+ wget --wait=10 "${ML_REPO_URL}/libnccl-dev_1.2.3-1+cuda8.0_amd64.deb"
+
+ dpkg -i nvidia-367_367.48-0ubuntu1_amd64.deb
+ dpkg -i nvidia-367-dev_367.48-0ubuntu1_amd64.deb
+ dpkg -i nvidia-modprobe_367.48-0ubuntu1_amd64.deb
+ dpkg -i libcuda1-367_367.48-0ubuntu1_amd64.deb
+ dpkg -i nvidia-libopencl1-367_367.48-0ubuntu1_amd64.deb
+ dpkg -i nvidia-opencl-icd-367_367.48-0ubuntu1_amd64.deb
+ dpkg -i libxnvctrl0_367.48-0ubuntu1_amd64.deb
+ dpkg -i nvidia-settings_367.48-0ubuntu1_amd64.deb
+ dpkg -i cuda-drivers_367.48-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 libcudnn5_5.1.10-1+cuda8.0_amd64.deb
+ dpkg -i libcudnn5-dev_5.1.10-1+cuda8.0_amd64.deb
+
+ dpkg -i libnccl1_1.2.3-1+cuda8.0_amd64.deb
+ dpkg -i libnccl-dev_1.2.3-1+cuda8.0_amd64.deb
+
+ apt-get -y install bison
+ apt-get -y install libibverbs-dev
+ apt-get -y install libibmad-dev
+ apt-get -y install libibumad-dev
+ apt-get -y install librdmacm-dev
+ apt-get -y install libmlx5-dev
+ apt-get -y install libmlx4-dev
+ apt-get -y install gfortran
+
+ wget http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.1.tar.gz
+ tar -xzf mvapich2-2.1.tar.gz
+ cd mvapich2-2.1
+ ./configure --prefix=/usr/local
+ make -j4
+ make install
+
+ cd /opt
+
+ git clone https://github.com/baidu-research/DeepBench.git
+ cd DeepBench/code
+ sed -i 's/-lmpi_cxx//' osu_allreduce/Makefile
+ make CUDA_PATH='/usr/local/cuda-8.0' CUDNN_PATH='/usr/lib/x86_64-linux-gnu/' NCCL_PATH='/usr/lib/x86_64-linux-gnu/' MPI_PATH='/usr/local/bin/' ARCH='sm_60'
+
+%files
+
+%runscript
+
+%test
+
+ export PATH="/usr/local/cuda-8.0/bin${PATH:+:${PATH}}"
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda-8.0/lib64:/usr/lib/x86_64-linux-gnu/:/usr/local/lib/"
+
+ time -p /opt/DeepBench/code/bin/gemm_bench train float
diff --git a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-cpu.def b/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-cpu.def
index 264d7d01a43ae52ad00816e964ddd6b5f5ef4a2f..41ab152709e8ab441fc8adb7017db3f05c3471af 100644
--- a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-cpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-cpu.def
@@ -6,14 +6,14 @@ OSVersion: xenial
AUTHOR_NAME Marty Kandes
AUTHOR_EMAIL mkandes@sdsc.edu
- OPERATING_SYSTEM_NAME ubuntu
- OPERATING_SYSTEM_VERSION 16.04
APPLICATION_NAME tensorflow
APPLICATION_VERSION 1.2
+ APPLICATION_URL https://www.tensorflow.org/
SYSTEM_NAME comet
SYSTEM_SINGULARITY_VERSION 2.2
- VERSION 0.0.1
- LAST_UPDATED 20170710
+ SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
+ VERSION 0.0.2
+ LAST_UPDATED 20170714
%setup
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def
index 4880367bff3e4fe70558fba1b3c7addb61decc3e..acf342a68a7db3ebbc4c5e70385908cadc67e2d7 100644
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def
@@ -6,14 +6,14 @@ OSVersion: xenial
AUTHOR_NAME Marty Kandes
AUTHOR_EMAIL mkandes@sdsc.edu
- OPERATING_SYSTEM_NAME ubuntu
- OPERATING_SYSTEM_VERSION 16.04
APPLICATION_NAME none
APPLICATION_VERSION none
+ APPLICATION_URL none
SYSTEM_NAME comet
SYSTEM_SINGULARITY_VERSION 2.2
- VERSION 0.0.2
- LAST_UPDATED 20170710
+ SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
+ VERSION 0.0.3
+ LAST_UPDATED 20170714
%setup