added singularity def file and fixed typos

Author: James

Deployment_Guide.md

@@ -38,7 +38,7 @@ For instance:
   4. Now, open the jupyter lab in browser: http://localhost:8888, and start working on the lab by clicking on the `_start_nways.ipynb` notebook
 
 
-- To build the singularity container, for N-Ways to GPU Programming-C-Fortran, follow the below steps:  
+- To build the docker container, for N-Ways to GPU Programming-C-Fortran, follow the below steps:  
 
   1. `sudo docker build -f nways_Dockerfile -t openhackathons:nways_CFortran .`
   2. `sudo docker run --rm -it --gpus=all -p 8888:8888 openhackathons:nways_CFortran`

README.md

@@ -14,6 +14,7 @@ The content is structured in multiple options covering the following:
   - Lab 2: OpenACC
   - Lab 3: OpenMP offloading
   - Lab 4: CUDA
+  - Lab 5: Memory Coherent Architectures
 
 - Option 2: N-Ways to GPU Programming-Python
   - NVIDIA® Nsight™ Systems

nways_Dockerfile

@@ -42,6 +42,5 @@ RUN python3 /labs/_common/dataset.py
 ENV PATH="/usr/local/bin:/opt/anaconda3/bin:/usr/bin:$PATH"
 #################################################
 
-#ADD nways_labs/ /labs
 WORKDIR /labs
 CMD jupyter-lab --no-browser --allow-root --ip=0.0.0.0 --port=8888 --NotebookApp.token="" --notebook-dir=/labs

nways_Singularity

@@ -6,22 +6,22 @@
 # Finally, open http://localhost:8888/
 
 Bootstrap: docker
-FROM nvcr.io/nvidia/nvhpc:24.1-devel-cuda_multi-ubuntu22.04
+FROM: nvcr.io/nvidia/nvhpc:24.1-devel-cuda_multi-ubuntu22.04
 
 %environment
     export XDG_RUNTIME_DIR=
     export PATH="$PATH:/usr/local/bin:/opt/anaconda3/bin:/usr/bin"
+    export VER=24.1
 
 %post
-    build_tmp=$(mktemp -d) && cd ${build_tmp}
-
+    #build_tmp=$(mktemp -d) && cd ${build_tmp}
+    . /.singularity.d/env/10-docker*.sh
     apt-get -y update
-    apt-get -y dist-upgrade 
+    #apt-get -y dist-upgrade 
     DEBIAN_FRONTEND=noninteractive apt-get -yq install --no-install-recommends \
-	    m4 vim-nox emacs-nox nano zip\
- 	    python3-pip python3-setuptools git-core inotify-tools python3-dev \
-	    curl git-lfs \
-	    build-essential libtbb-dev
+        python3-pip python3-setuptools nginx zip make build-essential libtbb-dev python3-dev\
+	    curl git-lfs 
+    
     rm -rf /var/lib/apt/cache/* 
 
     pip3 install --upgrade pip
@@ -31,19 +31,23 @@ FROM nvcr.io/nvidia/nvhpc:24.1-devel-cuda_multi-ubuntu22.04
     pip3 install jupyterlab
     pip3 install ipywidgets
 
-    apt-get install --no-install-recommends -y build-essential 
+    apt-get update -y
 
-    python3 /labs/_common/dataset.py
+    git clone https://github.com/NVIDIA/nvbandwidth.git
+    cd nvbandwidth && apt update && apt install -y libboost-program-options-dev && ./debian_install.sh
+    cd ..
 
+   ############################################ 
     apt-get update -y 
-    apt-get install --no-install-recommends -y build-essential
 
-    wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh 
-    bash Miniconda3-latest-Linux-x86_64.sh -b -p /opt/anaconda3 
-    rm Miniconda3-latest-Linux-x86_64.sh 
+    python3 /labs/_common/dataset.py
+
+    #wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh 
+    #bash Miniconda3-latest-Linux-x86_64.sh -b -p /opt/anaconda3 
+    #rm Miniconda3-latest-Linux-x86_64.sh 
 
-    cd /
-    rm -rf ${build_tmp}
+    #cd /
+    #rm -rf ${build_tmp}
 
 %files
     _basic/openacc/ /labs/openacc