naked-singularity-v0.0.5 :: updated deepbench-nvidia.def,

tensorflow-cpu.def, and ubuntu.def for comet, which is now running singularity v2.3.1; also added mxnet-cpu.def, tensorflow-gpu.def, and ubuntu-cuda.def for comet

naked-singularity-v0.0.5 :: updated deepbench-nvidia.def,

tensorflow-cpu.def, and ubuntu.def for comet, which is now running singularity v2.3.1; also added mxnet-cpu.def, tensorflow-gpu.def, and ubuntu-cuda.def for comet
naked-singularity-v0.0.5 :: updated deepbench-nvidia.def,
118ffcc1 · Marty Kandes · 4509e516 · 118ffcc1 · 118ffcc1 · 118ffcc1
Commit 118ffcc1 authored 7 years ago by Marty Kandes
--- a/README
+++ b/README
@@ -5,8 +5,8 @@ README
 DESCRIPTION
    A repository of definition files for bootstrapping Singularity
-    containers around applications that you would like to run on a 
+    containers around applications that you would like to run on 
-    high-performance computing system.
+    high-performance computing systems.
 USAGE
@@ -30,4 +30,4 @@ AUTHOR
 LAST UPDATED
-    Friday, July 21st, 2017
+    Monday, August 14th, 2017
--- a/definition-files/us/ucsd/sdsc/comet/deepbench/deepbench-nvidia.def
+++ b/definition-files/us/ucsd/sdsc/comet/deepbench/deepbench-nvidia.def
@@ -10,10 +10,10 @@ OSVersion: xenial
    APPLICATION_VERSION unknown
    APPLICATION_URL https://github.com/baidu-research/DeepBench
    SYSTEM_NAME comet
-    SYSTEM_SINGULARITY_VERSION 2.2
+    SYSTEM_SINGULARITY_VERSION 2.3.1
    SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html 
-    VERSION 0.0.1
+    VERSION 0.0.2
-    LAST_UPDATED 20170721
+    LAST_UPDATED 20170811
 %setup
@@ -21,50 +21,71 @@ OSVersion: xenial
 %post -c /bin/bash
-    declare -r MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+    export LC_ALL=C
-    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} main"
    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} universe"
    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} multiverse"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} restricted"
    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}-updates restricted"
    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}-backports restricted"
    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"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security restricted"
    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 \
+    apt-get -y install x11-common 
-                       linux-libc-dev libc6-dev lib32gcc1 libc6-i386 libgl1 \
+    apt-get -y install xserver-xorg-core 
-                       libwayland-client0 libwayland-server0 pkg-config \
+    apt-get -y install cmake 
-                       screen-resolution-extra libvdpau1 libatk1.0-0 \
+    apt-get -y install make 
-                       libcairo-gobject2 libcairo2 libfontconfig1 \
+    apt-get -y install dkms
-                       libgdk-pixbuf2.0-0 libgtk-3-0 libgtk2.0-0 libjansson4 \
+    apt-get -y install linux-libc-dev 
-                       freeglut3-dev libx11-dev libxmu-dev libxi-dev \
+    apt-get -y install libc6-dev 
-                       libglu1-mesa libglu1-mesa-dev default-jre
+    apt-get -y install lib32gcc1 
+    apt-get -y install libc6-i386 
+    apt-get -y install libgl1
+    apt-get -y install libwayland-client0 
+    apt-get -y install libwayland-server0 
+    apt-get -y install pkg-config
+    apt-get -y install screen-resolution-extra 
+    apt-get -y install libvdpau1 
+    apt-get -y install libatk1.0-0
+    apt-get -y install libcairo-gobject2 
+    apt-get -y install libcairo2 
+    apt-get -y install libfontconfig1
+    apt-get -y install libgdk-pixbuf2.0-0 
+    apt-get -y install libgtk-3-0 
+    apt-get -y install libgtk2.0-0 
+    apt-get -y install libjansson4
+    apt-get -y install freeglut3-dev
+    apt-get -y install libx11-dev 
+    apt-get -y install libxmu-dev
+    apt-get -y install libxi-dev
+    apt-get -y install libglu1-mesa
+    apt-get -y install libglu1-mesa-dev
+    apt-get -y install default-jre
+    cd /opt
    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"

--- a/definition-files/us/ucsd/sdsc/comet/mxnet/mxnet-cpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/mxnet/mxnet-cpu.def
+Bootstrap: debootstrap
+MirrorURL: http://us.archive.ubuntu.com/ubuntu
+OSVersion: xenial
+%labels
+    AUTHOR_NAME Marty Kandes
+    AUTHOR_EMAIL mkandes@sdsc.edu
+    APPLICATION_NAME mxnet-cpu
+    APPLICATION_VERSION unknown
+    APPLICATION_URL http://mxnet.io/
+    SYSTEM_NAME comet
+    SYSTEM_SINGULARITY_VERSION 2.3.1
+    SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html 
+    VERSION 0.0.1
+    LAST_UPDATED 20170814
+%setup
+%environment
+%post -c /bin/bash
+    export LC_ALL=C
+    apt-get -y install ubuntu-standard
+    apt-get -y install ubuntu-server
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} main"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} universe"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} multiverse"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} restricted"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates main"
+    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}-updates restricted"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports main"
+    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}-backports restricted"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security main"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security universe"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security multiverse"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security restricted"
+    apt-get -y update && apt-get -y upgrade
+    mkdir /cvmfs /oasis /projects /scratch
+    cd /opt
+    apt-get install -y build-essential
+    apt-get install -y libopenblas-dev
+    apt-get install -y liblapack-dev
+    apt-get install -y libopencv-dev
+    git clone --recursive https://github.com/dmlc/mxnet
+    cd mxnet
+    make -j $(nproc) USE_OPENCV=1 USE_BLAS=openblas
+    apt-get install -y python-dev
+    apt-get install -y python-setuptools
+    apt-get install -y python-numpy
+    apt-get install -y python-pip
+    cd python
+    pip install --upgrade pip
+    pip install -e ./
+    apt-get install graphviz
+%files
+%runscript
+%test
--- a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-cpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-cpu.def
@@ -10,10 +10,10 @@ OSVersion: xenial
    APPLICATION_VERSION 1.2
    APPLICATION_URL https://www.tensorflow.org/
    SYSTEM_NAME comet
-    SYSTEM_SINGULARITY_VERSION 2.2
+    SYSTEM_SINGULARITY_VERSION 2.3.1
    SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    VERSION 0.0.3
+    VERSION 0.0.4
-    LAST_UPDATED 20170721
+    LAST_UPDATED 20170811
 %setup
@@ -21,40 +21,40 @@ OSVersion: xenial
 %post -c /bin/bash
-    declare -r MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+    export LC_ALL=C
-    declare -r OSVERSION='xenial'
-    apt-get -y install ubuntu-minimal
+    apt-get -y install ubuntu-standard
-    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} main"
    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} universe"
    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} multiverse"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} restricted"
    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}-updates restricted"
    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}-backports restricted"
    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"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security restricted"
    apt-get -y update && apt-get -y upgrade
    mkdir /cvmfs /oasis /projects /scratch
-    echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
+    echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
-    curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
+    curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
    apt-get -y update
+    apt-get -y install openjdk-8-jdk
    apt-get -y install bazel
    apt-get -y install expect
    apt-get -y install python-numpy 
@@ -99,8 +99,6 @@ OSVersion: xenial
    bazel build --config=opt //tensorflow/tools/pip_package:build_pip_package
    bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pkg
-    export LC_ALL=C
    pip install /tmp/tensorflow_pkg/tensorflow-1.2.1-cp27-cp27mu-linux_x86_64.whl
 %files

--- a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def
+Bootstrap: debootstrap
+MirrorURL: http://us.archive.ubuntu.com/ubuntu
+OSVersion: xenial
+%labels
+    AUTHOR_NAME Marty Kandes
+    AUTHOR_EMAIL mkandes@sdsc.edu
+    APPLICATION_NAME tensorflow
+    APPLICATION_VERSION 1.2
+    APPLICATION_URL https://www.tensorflow.org/
+    SYSTEM_NAME comet
+    SYSTEM_SINGULARITY_VERSION 2.3.1
+    SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
+    VERSION 0.0.1
+    LAST_UPDATED 20170814
+%setup
+%environment
+%post -c /bin/bash
+    export LC_ALL=C
+    apt-get -y install ubuntu-standard
+    apt-get -y install ubuntu-server
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} main"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} universe"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} multiverse"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} restricted"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates main"
+    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}-updates restricted"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports main"
+    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}-backports restricted"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security main"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security universe"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security multiverse"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security restricted"
+    apt-get -y update && apt-get -y upgrade
+    mkdir /cvmfs /oasis /projects /scratch
+    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
+    apt-get -y install xserver-xorg-core
+    apt-get -y install cmake
+    apt-get -y install make
+    apt-get -y install dkms
+    apt-get -y install linux-libc-dev
+    apt-get -y install libc6-dev
+    apt-get -y install lib32gcc1
+    apt-get -y install libc6-i386
+    apt-get -y install libgl1
+    apt-get -y install libwayland-client0
+    apt-get -y install libwayland-server0
+    apt-get -y install pkg-config
+    apt-get -y install screen-resolution-extra
+    apt-get -y install libvdpau1
+    apt-get -y install libatk1.0-0
+    apt-get -y install libcairo-gobject2
+    apt-get -y install libcairo2
+    apt-get -y install libfontconfig1
+    apt-get -y install libgdk-pixbuf2.0-0
+    apt-get -y install libgtk-3-0
+    apt-get -y install libgtk2.0-0
+    apt-get -y install libjansson4
+    apt-get -y install freeglut3-dev
+    apt-get -y install libx11-dev
+    apt-get -y install libxmu-dev
+    apt-get -y install libxi-dev
+    apt-get -y install libglu1-mesa
+    apt-get -y install libglu1-mesa-dev
+    apt-get -y install default-jre
+    cd /opt
+    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
+    #echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
+    #curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
+    apt-get -y update
+    apt-get -y install openjdk-8-jdk
+    #apt-get -y install bazel
+    apt-get -y install expect
+    apt-get -y install python-numpy 
+    apt-get -y install python-dev 
+    apt-get -y install python-pip 
+    apt-get -y install python-wheel
+    apt-get -y install libcupti-dev
+    apt-get -y install zlib1g-dev
+    wget https://github.com/bazelbuild/bazel/releases/download/0.5.2/bazel_0.5.2-linux-x86_64.deb
+    dpkg -i bazel_0.5.2-linux-x86_64.deb
+    git clone https://github.com/tensorflow/tensorflow 
+    cd tensorflow
+    git checkout r1.2
+    echo '#!/usr/bin/expect -f' > configure.exp
+    echo 'spawn ./configure' >> configure.exp
+    echo 'expect "Please specify the location of python. \[Default is /usr/bin/python\]: "' >> configure.exp
+    echo 'send "/usr/bin/python\r"' >> configure.exp
+    echo 'expect "Please input the desired Python library path to use.  Default is \[/usr/local/lib/python2.7/dist-packages\]\r"' >> configure.exp
+    echo 'send "/usr/local/lib/python2.7/dist-packages\r"' >> configure.exp
+    echo 'expect "Do you wish to build TensorFlow with MKL support? \[y/N\] "' >> configure.exp
+    echo 'send "N\r"' >> configure.exp
+    echo 'expect "Please specify optimization flags to use during compilation when bazel option \"--config=opt\" is specified \[Default is -march=native\]: "' >> configure.exp
+    echo 'send " -march=native\r"' >> configure.exp
+    echo 'expect "Do you wish to use jemalloc as the malloc implementation? \[Y/n\] "' >> configure.exp
+    echo 'send "Y\r"' >> configure.exp
+    echo 'expect "Do you wish to build TensorFlow with Google Cloud Platform support? \[y/N\] "' >> configure.exp
+    echo 'send "N\r"' >> configure.exp
+    echo 'expect "Do you wish to build TensorFlow with Hadoop File System support? \[y/N\] "' >> configure.exp
+    echo 'send "N\r"' >> configure.exp
+    echo 'expect "Do you wish to build TensorFlow with the XLA just-in-time compiler (experimental)? \[y/N\] "' >> configure.exp
+    echo 'send "N\r"' >> configure.exp
+    echo 'expect "Do you wish to build TensorFlow with VERBS support? \[y/N\] "' >> configure.exp
+    echo 'send "N\r"' >> configure.exp
+    echo 'expect "Do you wish to build TensorFlow with OpenCL support? \[y/N\] "' >> configure.exp
+    echo 'send "N\r"' >> configure.exp
+    echo 'expect "Do you wish to build TensorFlow with CUDA support? \[y/N\] "' >> configure.exp
+    echo 'send "Y\r"' >> configure.exp
+    echo 'expect "Do you want to use clang as CUDA compiler? \[y/N\] "' >> configure.exp
+    echo 'send "N\r"' >> configure.exp
+    echo 'expect "Please specify the CUDA SDK version you want to use, e.g. 7.0. \[Leave empty to use system default\]: "' >> configure.exp
+    echo 'send "8.0\r"' >> configure.exp
+    echo 'expect "Please specify the location where CUDA 8.0 toolkit is installed. Refer to README.md for more details. \[Default is /usr/local/cuda\]: "' >> configure.exp
+    echo 'send "/usr/local/cuda\r"' >> configure.exp
+    echo 'expect "Please specify which gcc should be used by nvcc as the host compiler. \[Default is /usr/bin/gcc\]: "' >> configure.exp
+    echo 'send "/usr/bin/gcc\r"' >> configure.exp
+    echo 'expect "Please specify the cuDNN version you want to use. \[Leave empty to use system default\]: "' >> configure.exp
+    echo 'send "5.1.10\r"' >> configure.exp
+    echo 'expect "Please specify the location where cuDNN 5.1.10 library is installed. Refer to README.md for more details. \[Default is /usr/local/cuda\]: "' >> configure.exp
+    echo 'send "/usr/lib/x86_64-linux-gnu\r"' >> configure.exp
+    echo 'expect "Please specify a list of comma-separated Cuda compute capabilities you want to build with.\r"' >> configure.exp
+    echo 'expect "You can find the compute capability of your device at: https://developer.nvidia.com/cuda-gpus.\r"' >> configure.exp
+    echo 'expect "Please note that each additional compute capability significantly increases your build time and binary size.\r"' >> configure.exp
+    echo 'expect "\[Default is: \"3.5,5.2\"\]: "' >> configure.exp
+    echo 'send "3.7,6.0\r"' >> configure.exp
+    echo 'expect "> "' >> configure.exp
+    chmod +x configure.exp
+    ./configure.exp
+    bazel build --config=opt --config=cuda //tensorflow/tools/pip_package:build_pip_package
+    bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pkg
+    pip install /tmp/tensorflow_pkg/tensorflow-1.2.1-cp27-cp27mu-linux_x86_64.whl
+%files
+%runscript
+%test
+    time -p python /opt/tensorflow/tensorflow/examples/tutorials/mnist/mnist_deep.py
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def
+Bootstrap: debootstrap
+MirrorURL: http://us.archive.ubuntu.com/ubuntu
+OSVersion: xenial
+%labels
+    AUTHOR_NAME Marty Kandes
+    AUTHOR_EMAIL mkandes@sdsc.edu
+    APPLICATION_NAME cuda
+    APPLICATION_VERSION 8.0.44
+    APPLICATION_URL https://developer.nvidia.com/cuda-zone
+    DEVICE_DRIVER_VERSION 367.48
+    SYSTEM_NAME comet
+    SYSTEM_SINGULARITY_VERSION 2.3.1
+    SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html 
+    VERSION 0.0.1
+    LAST_UPDATED 20170811
+%setup
+%environment
+%post -c /bin/bash
+    export LC_ALL=C
+    apt-get -y install ubuntu-standard
+    apt-get -y install ubuntu-server
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} main"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} universe"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} multiverse"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} restricted"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates main"
+    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}-updates restricted"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports main"
+    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}-backports restricted"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security main"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security universe"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security multiverse"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security restricted"
+    apt-get -y update && apt-get -y upgrade
+    mkdir /cvmfs /oasis /projects /scratch
+    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
+    apt-get -y install xserver-xorg-core
+    apt-get -y install cmake
+    apt-get -y install make
+    apt-get -y install dkms
+    apt-get -y install linux-libc-dev
+    apt-get -y install libc6-dev
+    apt-get -y install lib32gcc1
+    apt-get -y install libc6-i386
+    apt-get -y install libgl1
+    apt-get -y install libwayland-client0
+    apt-get -y install libwayland-server0
+    apt-get -y install pkg-config
+    apt-get -y install screen-resolution-extra
+    apt-get -y install libvdpau1
+    apt-get -y install libatk1.0-0
+    apt-get -y install libcairo-gobject2
+    apt-get -y install libcairo2
+    apt-get -y install libfontconfig1
+    apt-get -y install libgdk-pixbuf2.0-0
+    apt-get -y install libgtk-3-0
+    apt-get -y install libgtk2.0-0
+    apt-get -y install libjansson4
+    apt-get -y install freeglut3-dev
+    apt-get -y install libx11-dev
+    apt-get -y install libxmu-dev
+    apt-get -y install libxi-dev
+    apt-get -y install libglu1-mesa
+    apt-get -y install libglu1-mesa-dev
+    apt-get -y install default-jre
+    cd /opt
+    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 
+%files
+%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
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def
@@ -10,10 +10,10 @@ OSVersion: xenial
    APPLICATION_VERSION none
    APPLICATION_URL none
    SYSTEM_NAME comet
-    SYSTEM_SINGULARITY_VERSION 2.2
+    SYSTEM_SINGULARITY_VERSION 2.3.1
    SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    VERSION 0.0.4
+    VERSION 0.0.5
-    LAST_UPDATED 20170721
+    LAST_UPDATED 20170811
 %setup
@@ -21,31 +21,30 @@ OSVersion: xenial
 %post -c /bin/bash
-    declare -r MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+    export LC_ALL=C
-    declare -r OSVERSION='xenial'
-    apt-get -y install ubuntu-minimal
+    apt-get -y install ubuntu-standard
-    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} main"
    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} universe"
    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} multiverse"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} restricted"
    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}-updates restricted"
    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}-backports restricted"
    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"
+    add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security restricted"
    apt-get -y update && apt-get -y upgrade