From 827481c6a9a0850b24def5438a6da20ba07cff0c Mon Sep 17 00:00:00 2001
From: Marty Kandes <mkandes@sdsc.edu>
Date: Fri, 3 Sep 2021 21:14:35 +0000
Subject: [PATCH] rm all older Ubuntu + MPI def files w/o separate MLNX_OFED
 layer

---
 README.md                                     |   2 +-
 ...y.ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4 |  98 ------------
 ...arity.ubuntu-18.04-cuda-10.2-openmpi-3.1.6 | 144 ------------------
 ...arity.ubuntu-18.04-cuda-11.2-openmpi-4.0.5 | 144 ------------------
 .../Singularity.ubuntu-18.04-mvapich-2.3.2    |  94 ------------
 .../Singularity.ubuntu-18.04-openmpi-3.1.4    |  94 ------------
 .../Singularity.ubuntu-18.04-openmpi-3.1.6    | 134 ----------------
 .../Singularity.ubuntu-18.04-openmpi-4.0.5    | 134 ----------------
 8 files changed, 1 insertion(+), 843 deletions(-)
 delete mode 100644 definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
 delete mode 100644 definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-openmpi-3.1.6
 delete mode 100644 definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-openmpi-4.0.5
 delete mode 100644 definition-files/ubuntu/Singularity.ubuntu-18.04-mvapich-2.3.2
 delete mode 100644 definition-files/ubuntu/Singularity.ubuntu-18.04-openmpi-3.1.4
 delete mode 100644 definition-files/ubuntu/Singularity.ubuntu-18.04-openmpi-3.1.6
 delete mode 100644 definition-files/ubuntu/Singularity.ubuntu-18.04-openmpi-4.0.5

diff --git a/README.md b/README.md
index 57c757a..8fdb2f5 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ University of California, San Diego
 
 ## Version
 
-1.8.9
+1.9.1
 
 ## Last Updated
 
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4 b/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
deleted file mode 100644
index bacf531..0000000
--- a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
+++ /dev/null
@@ -1,98 +0,0 @@
-Bootstrap: shub
-From: mkandes/naked-singularity:ubuntu-18.04-cuda-10.1.168
-
-%labels
-
-    APPLICATION_NAME ubuntu + cuda + openmpi
-    APPLICATION_VERSION 18.04 + 10.1.168 + 3.1.4
-    APPLICATION_URL https://www.open-mpi.org/faq/?category=runcuda
-
-    AUTHOR_NAME Marty Kandes
-    AUTHOR_EMAIL mkandes@sdsc.edu
-
-    LAST_UPDATED 20201227
-
-%setup
-
-%environment
-
-    # Set paths to OpenMPI binaries and libraries
-    export PATH="/opt/openmpi-3.1.4/bin:${PATH}"
-    export LD_LIBRARY_PATH="/opt/openmpi-3.1.4/lib:${LD_LIBRARY_PATH}"
-
-%post -c /bin/bash
-
-    # Set operating system mirror URL
-    export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
-
-    # Set operating system version
-    export OSVERSION='bionic'
-
-    # Set system locale
-    export LC_ALL='C'
-
-    # Set debian frontend interface
-    export DEBIAN_FRONTEND='noninteractive'
-
-    # Set paths to CUDA binaries and libraries
-    export CUDA_HOME='/usr/local/cuda-10.1'
-    export PATH="${CUDA_HOME}/bin${PATH:+:${PATH}}"
-    export LD_LIBRARY_PATH="${CUDA_HOME}/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
-
-    # Upgrade all software packages to their latest versions
-    apt-get -y update && apt-get -y upgrade
-
-    # 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
-    apt-get -y install infiniband-diags
-    apt-get -y install libibverbs-dev
-    apt-get -y install ibacm
-    apt-get -y install librdmacm-dev
-    #apt-get -y install libmlx4-dev
-    #apt-get -y install libmlx5-dev
-    apt-get -y install mstflint
-    #apt-get -y install libibcm-dev
-    apt-get -y install libibmad-dev
-    apt-get -y install libibumad-dev
-    apt-get -y install opensm
-    apt-get -y install srptools
-
-    # Install additional tools
-    apt-get -y install ibutils
-    apt-get -y install ibverbs-utils
-    apt-get -y install rdmacm-utils
-    apt-get -y install perftest
-    apt-get -y install numactl
-    apt-get -y install libnuma-dev
-
-    # Install libnl
-    apt-get -y install libnl-3-200
-    apt-get -y install libnl-route-3-200
-    apt-get -y install libnl-route-3-dev
-    apt-get -y install libnl-utils
-
-    # Install OpenMPI dependencies
-    apt-get -y install zlib1g-dev
-
-    cd /tmp
-
-    # Download, build, and install OpenMPI
-    wget https://download.open-mpi.org/release/open-mpi/v3.1/openmpi-3.1.4.tar.gz
-    tar -xf openmpi-3.1.4.tar.gz
-    cd openmpi-3.1.4
-    ./configure --prefix=/opt/openmpi-3.1.4 --with-cuda
-    make all install
-
-    # Cleanup
-    apt-get -y autoremove --purge
-    apt-get -y clean
-
-    # Update database for mlocate
-    updatedb
-
-%files
-
-%runscript
-
-%test
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-openmpi-3.1.6 b/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-openmpi-3.1.6
deleted file mode 100644
index b996ba4..0000000
--- a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-openmpi-3.1.6
+++ /dev/null
@@ -1,144 +0,0 @@
-Bootstrap: shub
-From: mkandes/naked-singularity:ubuntu-18.04-cuda-10.2
-
-%labels
-
-    APPLICATION_NAME ubuntu + cuda + openmpi
-    APPLICATION_VERSION 18.04 + 10.2 + 3.1.6
-    APPLICATION_URL https://www.open-mpi.org
-
-    AUTHOR_NAME Marty Kandes
-    AUTHOR_EMAIL mkandes@sdsc.edu
-
-    LAST_UPDATED 20210424
-
-%setup
-
-%environment
-
-    # Set Mellanox OFED version, operating system, and hardware platform
-    export MLNX_ROOT_URL='http://www.mellanox.com/downloads/ofed'
-    export MLNX_OFED_VERSION='4.7-3.2.9.0'
-    export MLNX_OS_VERSION='ubuntu18.04'
-    export MLNX_PLATFORM='x86_64'
-
-    # Set OpenMPI major, minor, and revision numbers, root and
-    # installation directories
-    export OMPI_ROOT_URL='https://download.open-mpi.org/release/open-mpi'
-    export OMPI_MAJOR='3'
-    export OMPI_MINOR='1'
-    export OMPI_REVISION='6'
-    export OMPI_VERSION="${OMPI_MAJOR}.${OMPI_MINOR}.${OMPI_REVISION}"
-    export OMPI_ROOT_DIR='/opt/openmpi'
-    export OMPI_INSTALL_DIR="${OMPI_ROOT_DIR}/${OMPI_VERSION}"
-
-    # Set paths to OpenMPI binaries and libraries
-    export PATH="${OMPI_INSTALL_DIR}/bin:${PATH}"
-    export LD_LIBRARY_PATH="${OMPI_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}"
-
-%post -c /bin/bash
-
-    # Set operating system mirror URL
-    export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
-
-    # Set operating system version
-    export OSVERSION='bionic'
-
-    # Set system locale
-    export LC_ALL='C'
-
-    # Set debian frontend interface
-    export DEBIAN_FRONTEND='noninteractive'
-
-    # Upgrade all software packages to their latest versions
-    apt-get -y update && apt-get -y upgrade
-
-    # Set CUDA version
-    export CUDA_MAJOR='10'
-    export CUDA_MINOR='2'
-    export CUDA_VERSION="${CUDA_MAJOR}.${CUDA_MINOR}"
-
-    # Set paths to CUDA binaries and libraries
-    export CUDA_HOME="/usr/local/cuda-${CUDA_VERSION}"
-    export PATH="${CUDA_HOME}/bin${PATH:+:${PATH}}"
-    export LD_LIBRARY_PATH="${CUDA_HOME}/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
-
-    # Install all dependencies and/or prerequisites for Mellanox OFED
-    apt-get -y install bison
-    apt-get -y install chrpath
-    apt-get -y install debhelper
-    apt-get -y install dpatch
-    apt-get -y install flex
-    apt-get -y install graphviz
-    apt-get -y install libnl-3-dev
-    apt-get -y install libnl-route-3-200
-    apt-get -y install tcl-dev
-    apt-get -y install tk-dev
-    apt-get -y install swig
-
-    cd /tmp
-
-    # Set Mellanox OFED version, operating system, and hardware platform
-    export MLNX_ROOT_URL='http://www.mellanox.com/downloads/ofed'
-    export MLNX_OFED_VERSION='4.7-3.2.9.0'
-    export MLNX_OS_VERSION='ubuntu18.04'
-    export MLNX_PLATFORM='x86_64'
-
-    # Download and install Mellanox OFED drivers and supporting
-    # libraries for userspace access to Ethernet, RDMA, and Infiniband. 
-    # https://docs.mellanox.com/pages/releaseview.action?pageId=15049785
-    wget "${MLNX_ROOT_URL}/MLNX_OFED-${MLNX_OFED_VERSION}/MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}.tgz"
-    tar -xf "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}.tgz"
-    cd "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}"
-    ./mlnxofedinstall --user-space-only --without-fw-update --force
-
-    cd /tmp
-
-    # Remove Mellanox OFED archive directory and tarball
-    rm -rf "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}"
-    rm "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}.tgz"
-
-    # Install additional tools
-    apt-get -y install numactl
-    apt-get -y install libnuma-dev
-
-    # Install OpenMPI dependencies
-    apt-get -y install zlib1g-dev
-
-    cd /tmp
-
-    # Set OpenMPI major, minor, and revision numbers, root and
-    # installation directories
-    export OMPI_ROOT_URL='https://download.open-mpi.org/release/open-mpi'
-    export OMPI_MAJOR='3'
-    export OMPI_MINOR='1'
-    export OMPI_REVISION='6'
-    export OMPI_VERSION="${OMPI_MAJOR}.${OMPI_MINOR}.${OMPI_REVISION}"
-    export OMPI_ROOT_DIR='/opt/openmpi'
-    export OMPI_INSTALL_DIR="${OMPI_ROOT_DIR}/${OMPI_VERSION}"
-
-    # Download, build, and install OpenMPI
-    wget "${OMPI_ROOT_URL}/v${OMPI_MAJOR}.${OMPI_MINOR}/openmpi-${OMPI_VERSION}.tar.gz"
-    tar -xf "openmpi-${OMPI_VERSION}.tar.gz"
-    cd "openmpi-${OMPI_VERSION}"
-    ./configure --prefix="${OMPI_INSTALL_DIR}" --with-cuda
-    make all install
-
-    cd /tmp
-
-    # Remove OpenMPI build directory and source tarball
-    rm -rf "openmpi-${OMPI_VERSION}"
-    rm "openmpi-${OMPI_VERSION}.tar.gz"
-
-    # Cleanup
-    apt-get -y autoremove --purge
-    apt-get -y clean
-
-    # Update database for mlocate
-    updatedb
-
-%files
-
-%runscript
-
-%test
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-openmpi-4.0.5 b/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-openmpi-4.0.5
deleted file mode 100644
index ab44f42..0000000
--- a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-openmpi-4.0.5
+++ /dev/null
@@ -1,144 +0,0 @@
-Bootstrap: shub
-From: mkandes/naked-singularity:ubuntu-18.04-cuda-11.2
-
-%labels
-
-    APPLICATION_NAME ubuntu + cuda + openmpi
-    APPLICATION_VERSION 18.04 + 11.2 + 4.0.5
-    APPLICATION_URL https://www.open-mpi.org
-
-    AUTHOR_NAME Marty Kandes
-    AUTHOR_EMAIL mkandes@sdsc.edu
-
-    LAST_UPDATED 20210324
-
-%setup
-
-%environment
-
-    # Set Mellanox OFED version, operating system, and hardware platform
-    export MLNX_ROOT_URL='http://www.mellanox.com/downloads/ofed'
-    export MLNX_OFED_VERSION='4.7-3.2.9.0'
-    export MLNX_OS_VERSION='ubuntu18.04'
-    export MLNX_PLATFORM='x86_64'
-
-    # Set OpenMPI major, minor, and revision numbers, root and
-    # installation directories
-    export OMPI_ROOT_URL='https://download.open-mpi.org/release/open-mpi'
-    export OMPI_MAJOR='4'
-    export OMPI_MINOR='0'
-    export OMPI_REVISION='5'
-    export OMPI_VERSION="${OMPI_MAJOR}.${OMPI_MINOR}.${OMPI_REVISION}"
-    export OMPI_ROOT_DIR='/opt/openmpi'
-    export OMPI_INSTALL_DIR="${OMPI_ROOT_DIR}/${OMPI_VERSION}"
-
-    # Set paths to OpenMPI binaries and libraries
-    export PATH="${OMPI_INSTALL_DIR}/bin:${PATH}"
-    export LD_LIBRARY_PATH="${OMPI_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}"
-
-%post -c /bin/bash
-
-    # Set operating system mirror URL
-    export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
-
-    # Set operating system version
-    export OSVERSION='bionic'
-
-    # Set system locale
-    export LC_ALL='C'
-
-    # Set debian frontend interface
-    export DEBIAN_FRONTEND='noninteractive'
-
-    # Upgrade all software packages to their latest versions
-    apt-get -y update && apt-get -y upgrade
-
-    # Set CUDA version
-    export CUDA_MAJOR='11'
-    export CUDA_MINOR='2'
-    export CUDA_VERSION="${CUDA_MAJOR}.${CUDA_MINOR}"
-
-    # Set paths to CUDA binaries and libraries
-    export CUDA_HOME="/usr/local/cuda-${CUDA_VERSION}"
-    export PATH="${CUDA_HOME}/bin${PATH:+:${PATH}}"
-    export LD_LIBRARY_PATH="${CUDA_HOME}/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
-
-    # Install all dependencies and/or prerequisites for Mellanox OFED
-    apt-get -y install bison
-    apt-get -y install chrpath
-    apt-get -y install debhelper
-    apt-get -y install dpatch
-    apt-get -y install flex
-    apt-get -y install graphviz
-    apt-get -y install libnl-3-dev
-    apt-get -y install libnl-route-3-200
-    apt-get -y install tcl-dev
-    apt-get -y install tk-dev
-    apt-get -y install swig
-
-    cd /tmp
-
-    # Set Mellanox OFED version, operating system, and hardware platform
-    export MLNX_ROOT_URL='http://www.mellanox.com/downloads/ofed'
-    export MLNX_OFED_VERSION='4.7-3.2.9.0'
-    export MLNX_OS_VERSION='ubuntu18.04'
-    export MLNX_PLATFORM='x86_64'
-
-    # Download and install Mellanox OFED drivers and supporting
-    # libraries for userspace access to Ethernet, RDMA, and Infiniband. 
-    # https://docs.mellanox.com/pages/releaseview.action?pageId=15049785
-    wget "${MLNX_ROOT_URL}/MLNX_OFED-${MLNX_OFED_VERSION}/MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}.tgz"
-    tar -xf "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}.tgz"
-    cd "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}"
-    ./mlnxofedinstall --user-space-only --without-fw-update --force
-
-    cd /tmp
-
-    # Remove Mellanox OFED archive directory and tarball
-    rm -rf "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}"
-    rm "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}.tgz"
-
-    # Install additional tools
-    apt-get -y install numactl
-    apt-get -y install libnuma-dev
-
-    # Install OpenMPI dependencies
-    apt-get -y install zlib1g-dev
-
-    cd /tmp
-
-    # Set OpenMPI major, minor, and revision numbers, root and
-    # installation directories
-    export OMPI_ROOT_URL='https://download.open-mpi.org/release/open-mpi'
-    export OMPI_MAJOR='4'
-    export OMPI_MINOR='0'
-    export OMPI_REVISION='5'
-    export OMPI_VERSION="${OMPI_MAJOR}.${OMPI_MINOR}.${OMPI_REVISION}"
-    export OMPI_ROOT_DIR='/opt/openmpi'
-    export OMPI_INSTALL_DIR="${OMPI_ROOT_DIR}/${OMPI_VERSION}"
-
-    # Download, build, and install OpenMPI
-    wget "${OMPI_ROOT_URL}/v${OMPI_MAJOR}.${OMPI_MINOR}/openmpi-${OMPI_VERSION}.tar.gz"
-    tar -xf "openmpi-${OMPI_VERSION}.tar.gz"
-    cd "openmpi-${OMPI_VERSION}"
-    ./configure --prefix="${OMPI_INSTALL_DIR}" --without-verbs --with-cuda
-    make all install
-
-    cd /tmp
-
-    # Remove OpenMPI build directory and source tarball
-    rm -rf "openmpi-${OMPI_VERSION}"
-    rm "openmpi-${OMPI_VERSION}.tar.gz"
-
-    # Cleanup
-    apt-get -y autoremove --purge
-    apt-get -y clean
-
-    # Update database for mlocate
-    updatedb
-
-%files
-
-%runscript
-
-%test
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-mvapich-2.3.2 b/definition-files/ubuntu/Singularity.ubuntu-18.04-mvapich-2.3.2
deleted file mode 100644
index 6668668..0000000
--- a/definition-files/ubuntu/Singularity.ubuntu-18.04-mvapich-2.3.2
+++ /dev/null
@@ -1,94 +0,0 @@
-Bootstrap: shub
-From: mkandes/naked-singularity:ubuntu-18.04
-
-%labels
-
-    APPLICATION_NAME ubuntu + mvapich
-    APPLICATION_VERSION 18.04 + 2.3.2
-    APPLICATION_URL https://mvapich.cse.ohio-state.edu
-
-    AUTHOR_NAME Marty Kandes
-    AUTHOR_EMAIL mkandes@sdsc.edu
-
-    LAST_UPDATED 20201226
-
-%setup
-
-%environment
-
-    # Set paths to MVAPICH2 binaries and libraries
-    export PATH="/opt/mvapich2-2.3.2/bin:${PATH}"
-    export LD_LIBRARY_PATH="/opt/mvapich2-2.3.2/lib:${LD_LIBRARY_PATH}"
-
-%post -c /bin/bash
-
-    # Set operating system mirror URL
-    export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
-
-    # Set operating system version
-    export OSVERSION='bionic'
-
-    # Set system locale
-    export LC_ALL='C'
-
-    # Set debian frontend interface
-    export DEBIAN_FRONTEND='noninteractive'
-
-    # Upgrade all software packages to their latest versions
-    apt-get -y update && apt-get -y upgrade
-
-    # 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
-    apt-get -y install infiniband-diags
-    apt-get -y install libibverbs-dev
-    apt-get -y install ibacm
-    apt-get -y install librdmacm-dev
-    #apt-get -y install libmlx4-dev
-    #apt-get -y install libmlx5-dev
-    apt-get -y install mstflint
-    #apt-get -y install libibcm-dev
-    apt-get -y install libibmad-dev
-    apt-get -y install libibumad-dev
-    apt-get -y install opensm
-    apt-get -y install srptools
-
-    # Install additional tools
-    apt-get -y install ibutils
-    apt-get -y install ibverbs-utils
-    apt-get -y install rdmacm-utils
-    apt-get -y install perftest
-    apt-get -y install numactl
-    apt-get -y install libnuma-dev
-
-    # Install libnl
-    apt-get -y install libnl-3-200
-    apt-get -y install libnl-route-3-200
-    apt-get -y install libnl-route-3-dev
-    apt-get -y install libnl-utils
-
-    # Install mvapich2 (build) dependencies
-    apt-get -y install bison
-
-    cd /tmp
-
-    # Download, build, and install mvapich2
-    wget http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.3.2.tar.gz
-    tar -xzvf mvapich2-2.3.2.tar.gz
-    cd mvapich2-2.3.2
-    ./configure --prefix=/opt/mvapich2-2.3.2
-    make
-    make install
-
-    # Cleanup
-    apt-get -y autoremove --purge
-    apt-get -y clean
-
-    # Update database for mlocate
-    updatedb
-
-%files
-
-%runscript
-
-%test
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-openmpi-3.1.4 b/definition-files/ubuntu/Singularity.ubuntu-18.04-openmpi-3.1.4
deleted file mode 100644
index 458c1ef..0000000
--- a/definition-files/ubuntu/Singularity.ubuntu-18.04-openmpi-3.1.4
+++ /dev/null
@@ -1,94 +0,0 @@
-Bootstrap: shub
-From: mkandes/naked-singularity:ubuntu-18.04
-
-%labels
-
-    APPLICATION_NAME ubuntu + openmpi
-    APPLICATION_VERSION 18.04 + 3.1.4
-    APPLICATION_URL https://www.open-mpi.org
-
-    AUTHOR_NAME Marty Kandes
-    AUTHOR_EMAIL mkandes@sdsc.edu
-
-    LAST_UPDATED 20201226
-
-%setup
-
-%environment
-
-    # Set paths to OpenMPI binaries and libraries
-    export PATH="/opt/openmpi-3.1.4/bin:${PATH}"
-    export LD_LIBRARY_PATH="/opt/openmpi-3.1.4/lib:${LD_LIBRARY_PATH}"
-
-%post -c /bin/bash
-
-    # Set operating system mirror URL
-    export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
-
-    # Set operating system version
-    export OSVERSION='bionic'
-
-    # Set system locale
-    export LC_ALL='C'
-
-    # Set debian frontend interface
-    export DEBIAN_FRONTEND='noninteractive'
-
-    # Upgrade all software packages to their latest versions
-    apt-get -y update && apt-get -y upgrade
-
-    # 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
-
-    apt-get -y install infiniband-diags
-    apt-get -y install libibverbs-dev
-    apt-get -y install ibacm
-    apt-get -y install librdmacm-dev
-    #apt-get -y install libmlx4-dev
-    #apt-get -y install libmlx5-dev
-    apt-get -y install mstflint
-    #apt-get -y install libibcm-dev
-    apt-get -y install libibmad-dev
-    apt-get -y install libibumad-dev
-    apt-get -y install opensm
-    apt-get -y install srptools
-
-    # Install additional tools
-    apt-get -y install ibutils
-    apt-get -y install ibverbs-utils
-    apt-get -y install rdmacm-utils
-    apt-get -y install perftest
-    apt-get -y install numactl
-    apt-get -y install libnuma-dev
-
-    # Install libnl
-    apt-get -y install libnl-3-200
-    apt-get -y install libnl-route-3-200
-    apt-get -y install libnl-route-3-dev
-    apt-get -y install libnl-utils
-
-    # Install OpenMPI dependencies
-    apt-get -y install zlib1g-dev
-
-    cd /tmp
-
-    # Download, build, and install OpenMPI
-    wget https://download.open-mpi.org/release/open-mpi/v3.1/openmpi-3.1.4.tar.gz
-    tar -xf openmpi-3.1.4.tar.gz
-    cd openmpi-3.1.4
-    ./configure --prefix=/opt/openmpi-3.1.4
-    make all install
-
-    # Cleanup
-    apt-get -y autoremove --purge
-    apt-get -y clean
-
-    # Update database for mlocate
-    updatedb
-
-%files
-
-%runscript
-
-%test
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-openmpi-3.1.6 b/definition-files/ubuntu/Singularity.ubuntu-18.04-openmpi-3.1.6
deleted file mode 100644
index 50be8d8..0000000
--- a/definition-files/ubuntu/Singularity.ubuntu-18.04-openmpi-3.1.6
+++ /dev/null
@@ -1,134 +0,0 @@
-Bootstrap: oras
-From: ghcr.io/mkandes/naked-singularity:ubuntu-18.04
-
-%labels
-
-    APPLICATION_NAME ubuntu + openmpi
-    APPLICATION_VERSION 18.04 + 3.1.6
-    APPLICATION_URL https://www.open-mpi.org
-
-    AUTHOR_NAME Marty Kandes
-    AUTHOR_EMAIL mkandes@sdsc.edu
-
-    LAST_UPDATED 20210803
-
-%setup
-
-%environment
-
-    # Set Mellanox OFED version, operating system, and hardware platform
-    export MLNX_ROOT_URL='http://www.mellanox.com/downloads/ofed'
-    export MLNX_OFED_VERSION='4.7-3.2.9.0'
-    export MLNX_OS_VERSION='ubuntu18.04'
-    export MLNX_PLATFORM='x86_64'
-
-    # Set OpenMPI major, minor, and revision numbers, root and
-    # installation directories
-    export OMPI_ROOT_URL='https://download.open-mpi.org/release/open-mpi'
-    export OMPI_MAJOR='3'
-    export OMPI_MINOR='1'
-    export OMPI_REVISION='6'
-    export OMPI_VERSION="${OMPI_MAJOR}.${OMPI_MINOR}.${OMPI_REVISION}"
-    export OMPI_ROOT_DIR='/opt/openmpi'
-    export OMPI_INSTALL_DIR="${OMPI_ROOT_DIR}/${OMPI_VERSION}"
-
-    # Set paths to OpenMPI binaries and libraries
-    export PATH="${OMPI_INSTALL_DIR}/bin:${PATH}"
-    export LD_LIBRARY_PATH="${OMPI_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}"
-
-%post -c /bin/bash
-
-    # Set operating system mirror URL
-    export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
-
-    # Set operating system version
-    export OSVERSION='bionic'
-
-    # Set system locale
-    export LC_ALL='C'
-
-    # Set debian frontend interface
-    export DEBIAN_FRONTEND='noninteractive'
-
-    # Upgrade all software packages to their latest versions
-    apt-get -y update && apt-get -y upgrade
-
-    # Install all dependencies and/or prerequisites for Mellanox OFED
-    apt-get -y install bison
-    apt-get -y install chrpath
-    apt-get -y install debhelper
-    apt-get -y install dpatch
-    apt-get -y install flex
-    apt-get -y install graphviz
-    apt-get -y install libnl-3-dev
-    apt-get -y install libnl-route-3-200
-    apt-get -y install tcl-dev
-    apt-get -y install tk-dev
-    apt-get -y install swig
-
-    cd /tmp
-
-    # Set Mellanox OFED version, operating system, and hardware platform
-    export MLNX_ROOT_URL='http://www.mellanox.com/downloads/ofed'
-    export MLNX_OFED_VERSION='4.7-3.2.9.0'
-    export MLNX_OS_VERSION='ubuntu18.04'
-    export MLNX_PLATFORM='x86_64'
-
-    # Download and install Mellanox OFED drivers and supporting
-    # libraries for userspace access to Ethernet, RDMA, and Infiniband. 
-    # https://docs.mellanox.com/pages/releaseview.action?pageId=15049785
-    wget "${MLNX_ROOT_URL}/MLNX_OFED-${MLNX_OFED_VERSION}/MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}.tgz"
-    tar -xf "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}.tgz"
-    cd "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}"
-    ./mlnxofedinstall --user-space-only --without-fw-update --force
-
-    cd /tmp
-
-    # Remove Mellanox OFED archive directory and tarball
-    rm -rf "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}"
-    rm "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}.tgz"
-
-    # Install additional tools
-    apt-get -y install numactl
-    apt-get -y install libnuma-dev
-
-    # Install OpenMPI dependencies
-    apt-get -y install zlib1g-dev
-
-    cd /tmp
-
-    # Set OpenMPI major, minor, and revision numbers, root and
-    # installation directories
-    export OMPI_ROOT_URL='https://download.open-mpi.org/release/open-mpi'
-    export OMPI_MAJOR='3'
-    export OMPI_MINOR='1'
-    export OMPI_REVISION='6'
-    export OMPI_VERSION="${OMPI_MAJOR}.${OMPI_MINOR}.${OMPI_REVISION}"
-    export OMPI_ROOT_DIR='/opt/openmpi'
-    export OMPI_INSTALL_DIR="${OMPI_ROOT_DIR}/${OMPI_VERSION}"
-
-    # Download, build, and install OpenMPI
-    wget "${OMPI_ROOT_URL}/v${OMPI_MAJOR}.${OMPI_MINOR}/openmpi-${OMPI_VERSION}.tar.gz"
-    tar -xf "openmpi-${OMPI_VERSION}.tar.gz"
-    cd "openmpi-${OMPI_VERSION}"
-    ./configure --prefix="${OMPI_INSTALL_DIR}"
-    make all install
-
-    cd /tmp
-
-    # Remove OpenMPI build directory and source tarball
-    rm -rf "openmpi-${OMPI_VERSION}"
-    rm "openmpi-${OMPI_VERSION}.tar.gz"
-
-    # Cleanup
-    apt-get -y autoremove --purge
-    apt-get -y clean
-
-    # Update database for mlocate
-    updatedb
-
-%files
-
-%runscript
-
-%test
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-openmpi-4.0.5 b/definition-files/ubuntu/Singularity.ubuntu-18.04-openmpi-4.0.5
deleted file mode 100644
index df94ed9..0000000
--- a/definition-files/ubuntu/Singularity.ubuntu-18.04-openmpi-4.0.5
+++ /dev/null
@@ -1,134 +0,0 @@
-Bootstrap: shub
-From: mkandes/naked-singularity:ubuntu-18.04
-
-%labels
-
-    APPLICATION_NAME ubuntu + openmpi
-    APPLICATION_VERSION 18.04 + 4.0.5
-    APPLICATION_URL https://www.open-mpi.org
-
-    AUTHOR_NAME Marty Kandes
-    AUTHOR_EMAIL mkandes@sdsc.edu
-
-    LAST_UPDATED 20210319
-
-%setup
-
-%environment
-
-    # Set Mellanox OFED version, operating system, and hardware platform
-    export MLNX_ROOT_URL='http://www.mellanox.com/downloads/ofed'
-    export MLNX_OFED_VERSION='4.7-3.2.9.0'
-    export MLNX_OS_VERSION='ubuntu18.04'
-    export MLNX_PLATFORM='x86_64'
-
-    # Set OpenMPI major, minor, and revision numbers, root and
-    # installation directories
-    export OMPI_ROOT_URL='https://download.open-mpi.org/release/open-mpi'
-    export OMPI_MAJOR='4'
-    export OMPI_MINOR='0'
-    export OMPI_REVISION='5'
-    export OMPI_VERSION="${OMPI_MAJOR}.${OMPI_MINOR}.${OMPI_REVISION}"
-    export OMPI_ROOT_DIR='/opt/openmpi'
-    export OMPI_INSTALL_DIR="${OMPI_ROOT_DIR}/${OMPI_VERSION}"
-
-    # Set paths to OpenMPI binaries and libraries
-    export PATH="${OMPI_INSTALL_DIR}/bin:${PATH}"
-    export LD_LIBRARY_PATH="${OMPI_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}"
-
-%post -c /bin/bash
-
-    # Set operating system mirror URL
-    export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
-
-    # Set operating system version
-    export OSVERSION='bionic'
-
-    # Set system locale
-    export LC_ALL='C'
-
-    # Set debian frontend interface
-    export DEBIAN_FRONTEND='noninteractive'
-
-    # Upgrade all software packages to their latest versions
-    apt-get -y update && apt-get -y upgrade
-
-    # Install all dependencies and/or prerequisites for Mellanox OFED
-    apt-get -y install bison
-    apt-get -y install chrpath
-    apt-get -y install debhelper
-    apt-get -y install dpatch
-    apt-get -y install flex
-    apt-get -y install graphviz
-    apt-get -y install libnl-3-dev
-    apt-get -y install libnl-route-3-200
-    apt-get -y install tcl-dev
-    apt-get -y install tk-dev
-    apt-get -y install swig
-
-    cd /tmp
-
-    # Set Mellanox OFED version, operating system, and hardware platform
-    export MLNX_ROOT_URL='http://www.mellanox.com/downloads/ofed'
-    export MLNX_OFED_VERSION='4.7-3.2.9.0'
-    export MLNX_OS_VERSION='ubuntu18.04'
-    export MLNX_PLATFORM='x86_64'
-
-    # Download and install Mellanox OFED drivers and supporting
-    # libraries for userspace access to Ethernet, RDMA, and Infiniband. 
-    # https://docs.mellanox.com/pages/releaseview.action?pageId=15049785
-    wget "${MLNX_ROOT_URL}/MLNX_OFED-${MLNX_OFED_VERSION}/MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}.tgz"
-    tar -xf "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}.tgz"
-    cd "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}"
-    ./mlnxofedinstall --user-space-only --without-fw-update --force
-
-    cd /tmp
-
-    # Remove Mellanox OFED archive directory and tarball
-    rm -rf "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}"
-    rm "MLNX_OFED_LINUX-${MLNX_OFED_VERSION}-${MLNX_OS_VERSION}-${MLNX_PLATFORM}.tgz"
-
-    # Install additional tools
-    apt-get -y install numactl
-    apt-get -y install libnuma-dev
-
-    # Install OpenMPI dependencies
-    apt-get -y install zlib1g-dev
-
-    cd /tmp
-
-    # Set OpenMPI major, minor, and revision numbers, root and
-    # installation directories
-    export OMPI_ROOT_URL='https://download.open-mpi.org/release/open-mpi'
-    export OMPI_MAJOR='4'
-    export OMPI_MINOR='0'
-    export OMPI_REVISION='5'
-    export OMPI_VERSION="${OMPI_MAJOR}.${OMPI_MINOR}.${OMPI_REVISION}"
-    export OMPI_ROOT_DIR='/opt/openmpi'
-    export OMPI_INSTALL_DIR="${OMPI_ROOT_DIR}/${OMPI_VERSION}"
-
-    # Download, build, and install OpenMPI
-    wget "${OMPI_ROOT_URL}/v${OMPI_MAJOR}.${OMPI_MINOR}/openmpi-${OMPI_VERSION}.tar.gz"
-    tar -xf "openmpi-${OMPI_VERSION}.tar.gz"
-    cd "openmpi-${OMPI_VERSION}"
-    ./configure --prefix="${OMPI_INSTALL_DIR}" --without-verbs
-    make all install
-
-    cd /tmp
-
-    # Remove OpenMPI build directory and source tarball
-    rm -rf "openmpi-${OMPI_VERSION}"
-    rm "openmpi-${OMPI_VERSION}.tar.gz"
-
-    # Cleanup
-    apt-get -y autoremove --purge
-    apt-get -y clean
-
-    # Update database for mlocate
-    updatedb
-
-%files
-
-%runscript
-
-%test
-- 
GitLab