diff --git a/definition-files/us/ucsd/sdsc/comet/deepbench/deepbench.def b/definition-files/comet/deepbench/deepbench.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/deepbench/deepbench.def
rename to definition-files/comet/deepbench/deepbench.def
diff --git a/definition-files/us/ucsd/sdsc/comet/keras/keras-tensorflow-cpu.def b/definition-files/comet/keras/keras-tensorflow-cpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/keras/keras-tensorflow-cpu.def
rename to definition-files/comet/keras/keras-tensorflow-cpu.def
diff --git a/definition-files/us/ucsd/sdsc/comet/keras/keras-tensorflow-gpu.def b/definition-files/comet/keras/keras-tensorflow-gpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/keras/keras-tensorflow-gpu.def
rename to definition-files/comet/keras/keras-tensorflow-gpu.def
diff --git a/definition-files/us/ucsd/sdsc/comet/meep/meep.def b/definition-files/comet/meep/meep.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/meep/meep.def
rename to definition-files/comet/meep/meep.def
diff --git a/definition-files/us/ucsd/sdsc/comet/mxnet/mxnet-cpu.def b/definition-files/comet/mxnet/mxnet-cpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/mxnet/mxnet-cpu.def
rename to definition-files/comet/mxnet/mxnet-cpu.def
diff --git a/definition-files/us/ucsd/sdsc/comet/mxnet/mxnet-gpu.def b/definition-files/comet/mxnet/mxnet-gpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/mxnet/mxnet-gpu.def
rename to definition-files/comet/mxnet/mxnet-gpu.def
diff --git a/definition-files/us/ucsd/sdsc/comet/neon/neon-cpu.def b/definition-files/comet/neon/neon-cpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/neon/neon-cpu.def
rename to definition-files/comet/neon/neon-cpu.def
diff --git a/definition-files/us/ucsd/sdsc/comet/pytorch/pytorch-cpu.def b/definition-files/comet/pytorch/pytorch-cpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/pytorch/pytorch-cpu.def
rename to definition-files/comet/pytorch/pytorch-cpu.def
diff --git a/definition-files/us/ucsd/sdsc/comet/pytorch/pytorch-gpu.def b/definition-files/comet/pytorch/pytorch-gpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/pytorch/pytorch-gpu.def
rename to definition-files/comet/pytorch/pytorch-gpu.def
diff --git a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-cpu.def b/definition-files/comet/tensorflow/tensorflow-cpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-cpu.def
rename to definition-files/comet/tensorflow/tensorflow-cpu.def
diff --git a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def b/definition-files/comet/tensorflow/tensorflow-gpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def
rename to definition-files/comet/tensorflow/tensorflow-gpu.def
diff --git a/definition-files/us/ucsd/sdsc/comet/theano/theano-cpu.def b/definition-files/comet/theano/theano-cpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/theano/theano-cpu.def
rename to definition-files/comet/theano/theano-cpu.def
diff --git a/definition-files/us/ucsd/sdsc/comet/theano/theano-gpu.def b/definition-files/comet/theano/theano-gpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/theano/theano-gpu.def
rename to definition-files/comet/theano/theano-gpu.def
diff --git a/definition-files/us/ucsd/sdsc/comet/torch/torch-gpu.def b/definition-files/comet/torch/torch-gpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/torch/torch-gpu.def
rename to definition-files/comet/torch/torch-gpu.def
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-opencl-openmpi.def b/definition-files/comet/ubuntu/ubuntu-cuda-opencl-openmpi.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-opencl-openmpi.def
rename to definition-files/comet/ubuntu/ubuntu-cuda-opencl-openmpi.def
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-opencl.def b/definition-files/comet/ubuntu/ubuntu-cuda-opencl.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-opencl.def
rename to definition-files/comet/ubuntu/ubuntu-cuda-opencl.def
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def b/definition-files/comet/ubuntu/ubuntu-cuda-openmpi.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def
rename to definition-files/comet/ubuntu/ubuntu-cuda-openmpi.def
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def b/definition-files/comet/ubuntu/ubuntu-cuda.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def
rename to definition-files/comet/ubuntu/ubuntu-cuda.def
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-mvapich2.def b/definition-files/comet/ubuntu/ubuntu-mvapich2.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-mvapich2.def
rename to definition-files/comet/ubuntu/ubuntu-mvapich2.def
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-openmpi.def b/definition-files/comet/ubuntu/ubuntu-openmpi.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-openmpi.def
rename to definition-files/comet/ubuntu/ubuntu-openmpi.def
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def b/definition-files/comet/ubuntu/ubuntu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def
rename to definition-files/comet/ubuntu/ubuntu.def
diff --git a/definition-files/us/ucsd/sdsc/tscc/keras/keras-tensorflow-cpu.def b/definition-files/tscc/keras/keras-tensorflow-cpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/tscc/keras/keras-tensorflow-cpu.def
rename to definition-files/tscc/keras/keras-tensorflow-cpu.def
diff --git a/definition-files/us/ucsd/sdsc/tscc/keras/keras-tensorflow-gpu.def b/definition-files/tscc/keras/keras-tensorflow-gpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/tscc/keras/keras-tensorflow-gpu.def
rename to definition-files/tscc/keras/keras-tensorflow-gpu.def
diff --git a/definition-files/us/ucsd/sdsc/tscc/tensorflow/tensorflow-cpu.def b/definition-files/tscc/tensorflow/tensorflow-cpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/tscc/tensorflow/tensorflow-cpu.def
rename to definition-files/tscc/tensorflow/tensorflow-cpu.def
diff --git a/definition-files/us/ucsd/sdsc/tscc/tensorflow/tensorflow-gpu.def b/definition-files/tscc/tensorflow/tensorflow-gpu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/tscc/tensorflow/tensorflow-gpu.def
rename to definition-files/tscc/tensorflow/tensorflow-gpu.def
diff --git a/definition-files/us/ucsd/sdsc/tscc/ubuntu/ubuntu-cuda.def b/definition-files/tscc/ubuntu/ubuntu-cuda.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/tscc/ubuntu/ubuntu-cuda.def
rename to definition-files/tscc/ubuntu/ubuntu-cuda.def
diff --git a/definition-files/us/ucsd/sdsc/tscc/ubuntu/ubuntu.def b/definition-files/tscc/ubuntu/ubuntu.def
similarity index 100%
rename from definition-files/us/ucsd/sdsc/tscc/ubuntu/ubuntu.def
rename to definition-files/tscc/ubuntu/ubuntu.def
diff --git a/naked-singularity.sh b/naked-singularity.sh
index b971713db2a1d45b64c8d700d7b2f85bb70ba079..4be5adf456e93440628b24eeafd47da1ef518370 100755
--- a/naked-singularity.sh
+++ b/naked-singularity.sh
@@ -17,9 +17,9 @@
#
# ./naked-singularity.sh install
#
-# 2. Build a simple Ubuntu Singularity container.
+# 2. Build a simple Ubuntu Singularity container for Comet at SDSC.
#
-# ./naked-singularity.sh build -a ubuntu -d ubuntu.def
+# ./naked-singularity.sh build -s comet -a ubuntu -d ubuntu.def
#
# 3. Uninstall Singularity from your local desktop, laptop, or
# virtual machine.
@@ -28,7 +28,7 @@
#
# LAST UPDATED
#
-# Friday, May 18th, 2018
+# Tuesday, November 6th, 2018
#
# ----------------------------------------------------------------------
@@ -58,10 +58,7 @@ naked_build() {
local path_to_definition_file="${naked_dir}/definition-files"
local path_to_image="${naked_dir}/images"
- local country='us'
- local organization='ucsd'
- local unit='sdsc'
- local system='comet'
+ local system=''
local application=''
local definition_file=''
local image=''
@@ -74,18 +71,6 @@ naked_build() {
while (( "${#}" > 0 )); do
naked_out "Read in command-line option '${1}' with input value '${2}' ... "
case "${1}" in
- -c | --country )
- country="${2,,}"
- shift 2
- ;;
- -o | --organization )
- organization="${2,,}"
- shift 2
- ;;
- -u | --unit )
- unit="${2,,}"
- shift 2
- ;;
-s | --system )
system="${2,,}"
shift 2
@@ -124,66 +109,6 @@ naked_build() {
naked_out 'Check if DEFINITION FILE is exists ...'
- if [[ -z "${country}" ]]; then
- naked_err 'No COUNTRY code was provided.'
- naked_err 'Use the -c (or --country) command-line option to specify the two-letter COUNTRY code where the target SYSTEM is located.'
- naked_err 'Listing COUNTRY codes to choose from ... '
- echo "ls ${path_to_definition_file}"
- echo "$(ls "${path_to_definition_file}")"
- return 1
- fi
-
- path_to_definition_file+="/${country}"
-
- if [[ ! -d "${path_to_definition_file}" ]]; then
- naked_err "${path_to_definition_file} does not exist."
- naked_err 'Use the -c (or --country) command-line option to specify the two-letter COUNTRY code where the target SYSTEM is located.'
- naked_err 'Listing all COUNTRYs to choose from ...'
- echo "ls ${path_to_definition_file%/${country}}"
- echo "$(ls "${path_to_definition_file%/${country}}")"
- return 1
- fi
-
- if [[ -z "${organization}" ]]; then
- naked_err 'No ORGANIZATION was provided.'
- naked_err 'Use the -o (or --organization) command-line option to specify the acronym of the ORGANIZATION where the target SYSTEM is located.'
- naked_err 'Listing all ORGANIZATIONs to choose from ... '
- echo "ls ${path_to_definition_file}"
- echo "$(ls "${path_to_definition_file}")"
- return 1
- fi
-
- path_to_definition_file+="/${organization}"
-
- if [[ ! -d "${path_to_definition_file}" ]]; then
- naked_err "${path_to_definition_file} does not exist."
- naked_err 'Use the -o (or --organization) command-line option to specify the acronym of the ORGANIZATION where the target SYSTEM is located.'
- naked_err 'Listing all ORGANIZATIONs to choose from ...'
- echo "ls ${path_to_definition_file%/${organization}}"
- echo "$(ls "${path_to_definition_file%/${organization}}")"
- return 1
- fi
-
- if [[ -z "${unit}" ]]; then
- naked_err 'No UNIT was provided.'
- naked_err 'Use the -u (or --unit) command-line option to specify the acronym of the UNIT that administers the target SYSTEM.'
- naked_err 'Listing all UNITs to choose from ...'
- echo "ls ${path_to_definition_file}"
- echo "$(ls "${path_to_definition_file}")"
- return 1
- fi
-
- path_to_definition_file+="/${unit}"
-
- if [[ ! -d "${path_to_definition_file}" ]]; then
- naked_err "${path_to_definition_file} does not exist."
- naked_err 'Use the -u (or --unit) command-line option to specify the acronym of the UNIT that administers the target SYSTEM.'
- naked_err 'Listing all UNITs to choose from ...'
- echo "ls ${path_to_definition_file%/${unit}}"
- echo "$(ls "${path_to_definition_file%/${unit}}")"
- return 1
- fi
-
if [[ -z "${system}" ]]; then
naked_err 'No SYSTEM name was provided.'
naked_err 'Use the -s (or --system) command-line option to specify the name of the target SYSTEM.'
@@ -260,9 +185,6 @@ naked_build() {
naked_out "Setting IMAGE name ... ${image}"
fi
- path_to_image+="/${country}"
- path_to_image+="/${organization}"
- path_to_image+="/${unit}"
path_to_image+="/${system}"
path_to_image+="/${application}"
path_to_image+="/${image}"