updated container hpcsdk

hpc/miniprofiler/Dockerfile

@@ -4,56 +4,47 @@
 # To run: $ sudo docker run --rm -it --gpus=all -p 8888:8888 nvidia_nsight_profiling_openacc:latest
 # Finally, open http://127.0.0.1:8888/
 
-FROM nvcr.io/hpc/pgi-compilers:ce
+FROM nvcr.io/nvidia/nvhpc:20.9-devel-ubuntu20.04
 
 RUN apt-get update -y && \
     apt-get dist-upgrade -y && \
-    apt-get install --no-install-recommends -y \
-    openssh-server m4 vim-nox emacs-nox nano zip && \
+    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 \
+    curl git-lfs nginx\
+    build-essential openssh-server openssh-client && \
     rm -rf /var/lib/apt/cache/* 
 
 RUN apt-get update 
-RUN apt-get install --no-install-recommends -y python3 python3-pip nginx 
+RUN apt-get install --no-install-recommends -y python3
 RUN pip3 install --upgrade pip
-RUN apt-get install --no-install-recommends -y python3-setuptools
-RUN apt-get install --no-install-recommends -y git-core
-RUN apt-get install --no-install-recommends -y openssh-client 
-RUN apt-get install --no-install-recommends -y inotify-tools 
-RUN pip3 install jupyter
+
+RUN pip3 install --no-cache-dir jupyter
 RUN pip3 install netcdf4
-RUN apt-get install --no-install-recommends -y curl
-RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-RUN apt-get install --no-install-recommends -y git-lfs
-RUN git lfs install
 
-# NVIDIA Nsight Systems 
+# NVIDIA nsight-systems-2020.2.1 
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     apt-transport-https \
     ca-certificates \
     gnupg \
     wget && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys F60F4B3D7FA2AF80 && \
     echo "deb https://developer.download.nvidia.com/devtools/repo-deb/x86_64/ /" >> /etc/apt/sources.list.d/nsight.list && \
-    echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /" >> /etc/apt/sources.list.d/nsight.list  &&\
     apt-get update -y
 
-RUN apt-get update -y
-
-# NVIDIA nsight-systems-2020.2.1 nsight-compute-2020.1.1
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends nsight-systems-2020.2.1 nsight-compute-2020.1.1
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends nsight-systems-2020.2.1
 
 RUN apt-get install --no-install-recommends -y build-essential
 
-
-ENV PATH="$PATH:/usr/local/bin:/opt/anaconda3/bin:/usr/bin" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" LIBRARY_PATH="$LIBRARY_PATH:/usr/local/lib" CPATH="$CPATH:/usr/local/include"
+ENV PATH="$PATH:/usr/local/bin:/opt/anaconda3/bin:/usr/bin" 
 
 RUN 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 && \
     /opt/anaconda3/bin/conda install -y -q netcdf4
 
-ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/pgi/linux86-64-llvm/2019/cuda/10.1/lib64/" 
-ENV PATH="$PATH:/opt/nvidia/nsight-systems/2020.2.1/bin:/opt/nvidia/nsight-compute/2020.1.1/"
+ENV PATH="/opt/nvidia/nsight-systems/2020.2.1/bin:$PATH"
 
 ADD English/ /labs
 WORKDIR /labs

hpc/miniprofiler/English/C/source_code/lab1/Makefile

@@ -3,7 +3,7 @@
 CC := pgc++
 CFLAGS := -O3 -w -ldl
 ACCFLAGS := -Minfo=accel
-NVTXLIB := -I/opt/pgi/linux86-64-llvm/2019/cuda/10.1/include/
+NVTXLIB := -I/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/include
 
 miniWeather: miniWeather_serial.cpp
 	${CC} ${CFLAGS} ${ACCFLAGS} -o miniWeather miniWeather_serial.cpp ${NVTXLIB} 

hpc/miniprofiler/English/Fortran/source_code/lab1/Makefile

@@ -4,8 +4,8 @@ FCC := pgfortran
 FFLAGS := -fast
 LDFLAGS := -lnvToolsExt 
 ACCFLAGS := -Minfo=accel
-NVTXINC := -I/opt/pgi/linux86-64-llvm/2019/cuda/10.1/include/
-NVTXLIB := -L/opt/pgi/linux86-64-llvm/2019/cuda/10.0/lib64/
+NVTXINC := -I/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/include
+NVTXLIB := -L/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/lib64/
 
 miniWeather: nvtx.f90 miniWeather_serial.f90
 	$(FC) $(FFLAGS) $(ACCFLAGS) $(NVTXINC) nvtx.f90 miniWeather_serial.f90 -o miniWeather $(NVTXLIB) $(LDFLAGS)

hpc/miniprofiler/English/Fortran/source_code/lab2/Makefile

@@ -4,8 +4,8 @@ FCC := pgfortran
 FFLAGS := -fast
 LDFLAGS := -lnvToolsExt 
 ACCFLAGS := -ta=tesla:managed -Minfo=accel
-NVTXINC := -I/opt/pgi/linux86-64-llvm/2019/cuda/10.1/include/
-NVTXLIB := -L/opt/pgi/linux86-64-llvm/2019/cuda/10.0/lib64/
+NVTXINC := -I/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/include
+NVTXLIB := -L/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/lib64/
 
 miniWeather: nvtx.f90 miniWeather_openacc.f90
 	$(FC) $(FFLAGS) $(ACCFLAGS) $(NVTXINC) nvtx.f90 miniWeather_openacc.f90 -o miniWeather $(NVTXLIB) $(LDFLAGS)

hpc/miniprofiler/English/Fortran/source_code/lab3/Makefile

@@ -4,8 +4,8 @@ FCC := pgfortran
 FFLAGS := -fast
 LDFLAGS := -lnvToolsExt 
 ACCFLAGS := -ta=tesla:managed -Minfo=accel
-NVTXINC := -I/opt/pgi/linux86-64-llvm/2019/cuda/10.1/include/
-NVTXLIB := -L/opt/pgi/linux86-64-llvm/2019/cuda/10.0/lib64/
+NVTXINC := -I/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/include
+NVTXLIB := -L/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/lib64/
 
 miniWeather: nvtx.f90 miniWeather_openacc.f90
 	$(FC) $(FFLAGS) $(ACCFLAGS) $(NVTXINC) nvtx.f90 miniWeather_openacc.f90 -o miniWeather $(NVTXLIB) $(LDFLAGS)

hpc/miniprofiler/English/Fortran/source_code/lab4/Makefile

@@ -4,8 +4,8 @@ FCC := pgfortran
 FFLAGS := -fast
 LDFLAGS := -lnvToolsExt 
 ACCFLAGS := -ta=tesla:managed -Minfo=accel
-NVTXINC := -I/opt/pgi/linux86-64-llvm/2019/cuda/10.1/include/
-NVTXLIB := -L/opt/pgi/linux86-64-llvm/2019/cuda/10.0/lib64/
+NVTXINC := -I/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/include
+NVTXLIB := -L/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/lib64/
 
 miniWeather: nvtx.f90 miniWeather_openacc.f90
 	$(FC) $(FFLAGS) $(ACCFLAGS) $(NVTXINC) nvtx.f90 miniWeather_openacc.f90 -o miniWeather $(NVTXLIB) $(LDFLAGS)

hpc/miniprofiler/English/Fortran/source_code/lab5/Makefile

@@ -3,8 +3,8 @@ FC := pgf90
 FFLAGS := -fast
 LDFLAGS := -lnvToolsExt 
 ACCFLAGS := -ta=tesla:managed -Minfo=accel
-NVTXINC := -I/opt/pgi/linux86-64-llvm/2019/cuda/10.1/include/
-NVTXLIB := -L/opt/pgi/linux86-64-llvm/2019/cuda/10.0/lib64/
+NVTXINC := -I/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/include
+NVTXLIB := -L/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/lib64/
 
 miniWeather: nvtx.f90 miniWeather_openacc.f90
 	$(FC) $(FFLAGS) $(ACCFLAGS) $(NVTXINC) nvtx.f90 miniWeather_openacc.f90 -o miniWeather $(NVTXLIB) $(LDFLAGS)

hpc/miniprofiler/English/Fortran/source_code/solutions/Makefile

@@ -4,8 +4,8 @@ FCC := pgfortran
 FFLAGS := -fast
 LDFLAGS := -lnvToolsExt 
 ACCFLAGS := -ta=tesla:managed -Minfo=accel
-NVTXINC := -I/opt/pgi/linux86-64-llvm/2019/cuda/10.1/include/
-NVTXLIB := -L/opt/pgi/linux86-64-llvm/2019/cuda/10.0/lib64/
+NVTXINC := -I/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/include
+NVTXLIB := -L/opt/nvidia/hpc_sdk/Linux_x86_64/20.9/cuda/11.0/lib64/
 
 miniWeather: nvtx.f90 miniWeather_openacc.f90
 	$(FC) $(FFLAGS) $(ACCFLAGS) $(NVTXINC) nvtx.f90 miniWeather_openacc.f90 -o miniWeather $(NVTXLIB) $(LDFLAGS)

hpc/miniprofiler/Singularity

@@ -1,46 +1,39 @@
 # Copyright (c) 2020 NVIDIA Corporation.  All rights reserved. 
 
 Bootstrap: docker
-FROM: nvcr.io/hpc/pgi-compilers:ce
+FROM: nvcr.io/nvidia/nvhpc:20.9-devel-ubuntu20.04
 
 %environment
     export XDG_RUNTIME_DIR=
-    export PATH="$PATH:/opt/pgi/linux86-64/19.10/bin:/usr/local/bin:/opt/anaconda3/bin:/usr/bin"
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib:/opt/pgi/linux86-64-llvm/2019/cuda/10.1/lib64/:/opt/pgi/linux86-64-llvm/19.10/lib" 
-    export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/lib" CPATH="$CPATH:/usr/local/include"
-    export PATH=/opt/nvidia/nsight-systems/2020.2.1/bin:/opt/nvidia/nsight-compute/2020.1.1/:$PATH
-
+    export PATH="$PATH:/usr/local/bin:/opt/anaconda3/bin:/usr/bin"
+    export PATH=/opt/nvidia/nsight-systems/2020.2.1/bin:$PATH
 
 %post
     build_tmp=$(mktemp -d) && cd ${build_tmp}
 
-    export PATH=/opt/pgi/linux86-64/19.10/bin:$PATH
-
     apt-get -y update
     apt-get -y dist-upgrade 
-    apt-get -y install --no-install-recommends \
-	    m4 vim-nox emacs-nox nano zip \
- 	    python3 python3-pip python3-setuptools git-core inotify-tools \
+    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 \
 	    curl git-lfs \
 	    build-essential
     rm -rf /var/lib/apt/cache/* 
 
     pip3 install --upgrade pip
+    pip3 install --no-cache-dir jupyter
     pip3 install jupyter netcdf4
 
     apt-get install --no-install-recommends -y build-essential 
 
-# NVIDIA nsight-systems-2020.2.1 nsight-compute-2020.1.1
-    apt-get update -y 
+# NVIDIA nsight-systems-2020.2.1 
+    apt-get update -y   
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends apt-transport-https ca-certificates gnupg wget
-    echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /" >> /etc/apt/sources.list.d/nsight.list 
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys F60F4B3D7FA2AF80
     echo "deb https://developer.download.nvidia.com/devtools/repo-deb/x86_64/ /" >> /etc/apt/sources.list.d/nsight.list 
     apt-get update -y 
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends nsight-systems-2020.2.1 nsight-compute-2020.1.1
-
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends nsight-systems-2020.2.1 
     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 
@@ -57,4 +50,4 @@ FROM: nvcr.io/hpc/pgi-compilers:ce
     "$@"
 
 %labels
-    AUTHOR mozhgank
+    AUTHOR mozhgank

hpc/openacc/Dockerfile

@@ -4,10 +4,10 @@
 # To run: $ sudo docker run --rm -it --gpus=all -p 8888:8888 openacc-labs:latest
 # Finally, open http://127.0.0.1:8888/
 
-FROM nvcr.io/hpc/pgi-compilers:ce
+FROM nvcr.io/nvidia/nvhpc:20.9-devel-ubuntu20.04
 
-RUN apt update && \
-    apt install -y --no-install-recommends python3-pip python3-setuptools nginx zip build-essential && \
+RUN apt-get -y update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install --no-install-recommends python3-pip python3-setuptools nginx zip build-essential && \
     rm -rf /var/lib/apt/lists/* && \
     pip3 install --no-cache-dir jupyter
 

hpc/openacc/Singularity

@@ -1,7 +1,7 @@
 # Copyright (c) 2020 NVIDIA Corporation.  All rights reserved. 
 
 Bootstrap: docker
-From: nvcr.io/hpc/pgi-compilers:ce
+From: nvcr.io/nvidia/nvhpc:20.9-devel-ubuntu20.04
 
 %runscript
  
@@ -10,7 +10,7 @@ From: nvcr.io/hpc/pgi-compilers:ce
 %post
 
     apt-get -y update
-    apt-get -y install --no-install-recommends python3-pip python3-setuptools zip build-essential
+    DEBIAN_FRONTEND=noninteractive apt-get -yq install --no-install-recommends python3-pip python3-setuptools zip build-essential
     rm -rf /var/lib/apt/lists/*
     pip3 install --no-cache-dir jupyter