updated singularity examples

Author: jordiblasco

user-training/examples/singularity/demo-01.def

@@ -1,11 +1,11 @@
-Bootstrap: docker
+Bootstrap: localimage
 
-From: ubuntu 
+From: ./demo-template.sif
 
 
 %help
 
-Supermagic is a MPI sanity check - https://github.com/hpc/supermagic
+    Supermagic is a MPI sanity check - https://github.com/hpc/supermagic
 
 #%setup
 
@@ -20,57 +20,24 @@ Supermagic is a MPI sanity check - https://github.com/hpc/supermagic
     Version v1.0
 
 
-#%environment
+%environment
+
+    LD_LIBRARY_PATH=/usr/lib/libibverbs:$LD_LIBRARY_PATH
 
 
 %post
 
-    echo "Creating required mount points"
-    mkdir /scratch
-    mkdir /checkpoint
-
-    echo "Installing Development Tools group"
-    apt-get update && apt-get install -y --no-install-recommends \
-        apt-utils \
-        build-essential \
-        wget \
-        curl \
-        git \
-        libopenblas-dev \
-        libcurl4-openssl-dev \
-        libfreetype6-dev \
-        libpng-dev \
-        libzmq3-dev \
-        python-pip \
-        pkg-config \
-        python-dev \
-        python-setuptools \
-        rsync \
-        software-properties-common \
-        unzip \
-        vim \
-        zip \
-        zlib1g-dev
-    apt-get clean
-
-    echo "Installing OpenMPI into container..."
-    #git clone https://github.com/open-mpi/ompi.git
-    wget https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.0.tar.gz
-    tar -zxf openmpi-4.0.0.tar.gz
-    cd openmpi-4.0.0
-    #./autogen.pl
-    ./configure --prefix=/usr/local
-    make
-    make install
-#    /usr/local/bin/mpicc examples/ring_c.c -o /usr/bin/mpi_ring
-
-
-#%runscript
-
-#    echo "Rooooar!"
-#    echo "Arguments received: $*"
-#    exec echo "$@"
-
-#%test
-
-#    /usr/local/bin/mpirun --allow-run-as-root /usr/bin/mpi_test
+    echo "Installing Supermagic"
+    git clone https://github.com/hpc/supermagic.git
+    cd supermagic
+    make MPICC=cc
+    cp -p supermagic /usr/bin/
+
+%runscript
+
+    /usr/bin/supermagic
+
+%test
+
+    #/usr/local/bin/mpirun --allow-run-as-root /usr/bin/supermagic
+    /usr/local/bin/mpirun /usr/bin/supermagic

user-training/examples/singularity/demo-03.def

@@ -1,6 +1,6 @@
 Bootstrap: localimage
 
-From: ./demo-template.simg
+From: ./demo-template.sif
 
 
 %help
@@ -82,5 +82,3 @@ This is a help message for the container
 %test
 
     /usr/local/bin/mpirun --allow-run-as-root /usr/bin/mpi_test
-
-

user-training/examples/singularity/demo-mpich.def renamed to user-training/examples/singularity/demo-openmpi.def

@@ -1,11 +1,11 @@
 Bootstrap: docker
 
-From: ubuntu 
+From: ubuntu
 
 
 %help
 
-Development Enviroment with OpenMPI support
+Development Environment with OpenMPI support
 
 #%setup
 
@@ -23,12 +23,15 @@ Development Enviroment with OpenMPI support
 
     echo "Creating required mount points"
     mkdir /scratch
-    mkdir /checkpoint
+    mkdir /chk
 
-    echo "Installing Development Tools group"
+    echo "Installing Development Environment"
     apt-get update && apt-get install -y --no-install-recommends \
         apt-utils \
         build-essential \
+        libtool \
+        autoconf \
+        automake \
         wget \
         curl \
         git \
@@ -47,24 +50,28 @@ Development Enviroment with OpenMPI support
         vim \
         zip \
         zlib1g-dev
-    apt-get clean
 
     # IB MLNX OFED
+    echo "Installing Infiniband Libraries and Utils"
     apt-get install -y dkms infiniband-diags libibverbs* ibacm librdmacm* libmlx4* libmlx5* mstflint libibmad.* libibumad* opensm srptools librdmacm-dev rdmacm-utils ibverbs-utils perftest vlan ibutils
-    apt-get install -y libtool autoconf automake build-essential ibutils ibverbs-utils rdmacm-utils infiniband-diags perftest librdmacm-dev libibverbs-dev libmlx4-1 numactl libnuma-dev autoconf automake gcc g++ git libtool pkg-config
+    apt-get install -y ibutils ibverbs-utils rdmacm-utils infiniband-diags perftest librdmacm-dev libibverbs-dev libmlx4-1 numactl libnuma-dev
     apt-get install -y libnl-3-200 libnl-route-3-200 libnl-route-3-dev libnl-utils
 
-    echo "Installing OpenMPI into container..."
+    # Installing OpenMPI
+    echo "Installing OpenMPI"
     wget https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.0.tar.gz
     tar -zxf openmpi-4.0.0.tar.gz
     cd openmpi-4.0.0
     ./configure --prefix=/usr/local
     make
     make install
-#    /usr/local/bin/mpicc examples/ring_c.c -o /usr/bin/mpi_ring
+    /usr/local/bin/mpicc examples/ring_c.c -o /usr/bin/mpi_ring
 
+    # Cleaning
+    apt-get clean
+    rm -fr /openmpi-4.0.0.tar.gz openmpi-4.0.0
 
-%environment    
+%environment
     LD_LIBRARY_PATH=/usr/lib/libibverbs:$LD_LIBRARY_PATH