Skip to content

Commit 2c4b202

Browse files
committed
Update nvc++ to 22.9 and simplify Lab 1 DAXPY
1 parent c1b1311 commit 2c4b202

File tree

12 files changed

+246
-556
lines changed

12 files changed

+246
-556
lines changed

ci/recipe.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
HPCCM development container for the C++ HPC tutorial
33
https://github.com/NVIDIA/hpc-container-maker/
44
"""
5-
nvhpc_ver = '22.5'
5+
nvhpc_ver = '22.9'
66
cuda_ver = '11.7'
7+
gcc_ver = '12'
8+
llvm_ver = '16'
79

810
#Stage0 += baseimage(image = f'nvcr.io/nvidia/nvhpc:{nvhpc_ver}-devel-cuda{cuda_ver}-ubuntu20.04')
9-
Stage0 += baseimage(image = f'nvcr.io/nvidia/nvhpc:{nvhpc_ver}-devel-cuda_multi-ubuntu20.04')
11+
Stage0 += baseimage(image = f'nvcr.io/nvidia/nvhpc:{nvhpc_ver}-devel-cuda_multi-ubuntu22.04')
1012

1113
Stage0 += packages(ospackages=[
1214
'libtbb-dev', # Required for GCC C++ parallel STL
@@ -18,9 +20,9 @@
1820
])
1921

2022
# Install GNU and LLVM toolchains and CMake
21-
Stage0 += gnu(version='11', extra_repository=True)
22-
Stage0 += llvm(version='15', upstream=True, extra_tools=True, toolset=True)
23-
Stage0 += cmake(eula=True, version='3.23.2')
23+
Stage0 += gnu(version=gcc_ver, extra_repository=True)
24+
Stage0 += llvm(version=llvm_ver, upstream=True, extra_tools=True, toolset=True)
25+
Stage0 += cmake(eula=True, version='3.24.2')
2426

2527
# Install NSight Systems and NSight Compute profilers
2628
# These are shipped with the HPC SDK containers now
@@ -53,11 +55,12 @@
5355

5456
# libc++abi : make sure clang with -stdlib=libc++ can find it
5557
Stage0 += shell(commands=[
56-
'ln -sf /usr/lib/llvm-15/lib/libc++abi.so.1 /usr/lib/llvm-15/lib/libc++abi.so',
58+
f'ln -sf /usr/lib/llvm-{llvm_ver}/lib/libc++abi.so.1 /usr/lib/llvm-{llvm_ver}/lib/libc++abi.so',
5759
])
5860
Stage0 += environment(variables={
59-
'LD_LIBRARY_PATH':'/usr/lib/llvm-15/lib:$LD_LIBRARY_PATH',
60-
'LIBRARY_PATH':'/usr/lib/llvm-15/lib:$LIBRARY_PATH',
61+
'LD_LIBRARY_PATH': f'/usr/lib/llvm-{llvm_ver}/lib:$LD_LIBRARY_PATH',
62+
'LIBRARY_PATH': f'/usr/lib/llvm-{llvm_ver}/lib:$LIBRARY_PATH',
63+
'OMPI_MCA_coll_hcoll_enable':'0',
6164
})
6265
Stage0 += copy(src='labs/', dest='/labs/')
6366

ci/run

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ PORT=8888
88

99
DOCKER_CMDS="\
1010
--gpus=all \
11+
--privileged \
1112
-u $(id -u):$(id -g) \
1213
-h $(hostname) \
1314
-v $(pwd):/src \

0 commit comments

Comments
 (0)