Skip to content

Commit 2a1e3c0

Browse files
committed
Update exercises
1 parent 98c166d commit 2a1e3c0

23 files changed

+893
-852
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ target/
22
lab2_dataset/
33
output*
44
labs/lab1_daxpy/daxpy
5+
labs/lab1_select/select
56
labs/lab2_heat/heat
7+
labs/lab2_heat/heat_equation.png
68
labs/lab2_heat/output*
79
labs/lab3_tree/tree
810
labs/lab3_tree/*.txt

ci/recipe.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
HPCCM development container for the C++ HPC tutorial
33
https://github.com/NVIDIA/hpc-container-maker/
44
"""
5-
nvhpc_ver = '22.3'
6-
cuda_ver = '11.6'
5+
nvhpc_ver = '22.5'
6+
cuda_ver = '11.7'
77

88
#Stage0 += baseimage(image = f'nvcr.io/nvidia/nvhpc:{nvhpc_ver}-devel-cuda{cuda_ver}-ubuntu20.04')
99
Stage0 += baseimage(image = f'nvcr.io/nvidia/nvhpc:{nvhpc_ver}-devel-cuda_multi-ubuntu20.04')
@@ -13,15 +13,19 @@
1313
'python3', 'python3-pip', 'python-is-python3', 'python3-setuptools',
1414
'nginx', 'zip', 'make', 'build-essential', 'curl',
1515
'git', 'bc', 'debianutils', 'libnuma1', 'openssh-client', 'wget', 'numactl',
16+
# editors
17+
'emacs', 'vim',
1618
])
1719

1820
# Install GNU and LLVM toolchains and CMake
1921
Stage0 += gnu(version='11', extra_repository=True)
2022
Stage0 += llvm(version='15', upstream=True, extra_tools=True, toolset=True)
21-
Stage0 += cmake(eula=True, version='3.22.2')
23+
Stage0 += cmake(eula=True, version='3.23.2')
2224

23-
# Install NSight Systems profiler
24-
Stage0 += nsight_systems(eula=True)
25+
# Install NSight Systems and NSight Compute profilers
26+
# These are shipped with the HPC SDK containers now
27+
# Stage0 += nsight_systems(eula=True)
28+
# Stage0 += nsight_compute(eula=True)
2529

2630
Stage0 += shell(commands=[
2731
'set -ex', # Exit on first error and debug output
@@ -58,7 +62,7 @@
5862
Stage0 += copy(src='labs/', dest='/labs/')
5963

6064
# Install Intel's OneAPI toolchain
61-
Stage0 += packages(ospackages=['linux-headers-generic', 'intel-basekit', 'intel-hpckit'],
62-
apt_keys=['https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB'],
63-
apt_repositories=['deb https://apt.repos.intel.com/oneapi all main']
64-
)
65+
#Stage0 += packages(ospackages=['linux-headers-generic', 'intel-basekit', 'intel-hpckit'],
66+
# apt_keys=['https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB'],
67+
# apt_repositories=['deb https://apt.repos.intel.com/oneapi all main']
68+
#)

ci/run

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ SING_CMDS="\
2626
${SING_IMG} \
2727
"
2828

29-
RUN_LAB="source /opt/intel/oneapi/setvars.sh intel64 && jupyter-lab \
29+
#RUN_LAB="source /opt/intel/oneapi/setvars.sh intel64 && jupyter-lab \
30+
31+
RUN_LAB="jupyter-lab \
3032
--no-browser \
3133
--allow-root \
3234
--ip=0.0.0.0 \

0 commit comments

Comments
 (0)