Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions features/src/nvhpc/.bashrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
export NVHPC_CUDA_VERSION="${NVHPC_CUDA_VERSION}";
export NVHPC_CUDA_VERSION_MAJOR="${NVHPC_CUDA_VERSION_MAJOR}";
export NVHPC_CUDA_VERSION_MINOR="${NVHPC_CUDA_VERSION_MINOR}";
export NVHPC_CUDA_VERSION_PATCH="${NVHPC_CUDA_VERSION_PATCH}";
export NVHPC="${NVHPC}";
export NVHPC_VERSION="${NVHPC_VERSION}";
export NVHPC_VERSION_MAJOR="${NVHPC_VERSION_MAJOR}";
Expand Down
2 changes: 1 addition & 1 deletion features/src/nvhpc/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "NVHPC SDK",
"id": "nvhpc",
"version": "26.4.1",
"version": "26.4.2",
"description": "A feature to install the NVHPC SDK",
"options": {
"version": {
Expand Down
3 changes: 2 additions & 1 deletion features/src/nvhpc/etc/profile.d/nvhpc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ if [ -n "${PATH##*"${NVHPC_ROOT}/compilers/bin"*}" ]; then
fi
done
unset NVHPC_MODULEFILES_DIR;
for NVHPC_MODULE_NAME in "nvhpc-hpcx/${NVHPC_VERSION}"; do
for NVHPC_MODULE_NAME in "nvhpc-hpcx-cuda${NVHPC_CUDA_VERSION_MAJOR}/${NVHPC_VERSION}" \
"nvhpc-hpcx/${NVHPC_VERSION}"; do
if ! module list "${NVHPC_MODULE_NAME}" 2>&1 | grep -q 'None found.'; then
if ! module list 2>&1 | grep -q "${NVHPC_MODULE_NAME}"; then
module try-load "${NVHPC_MODULE_NAME}" >/dev/null 2>&1;
Expand Down
10 changes: 10 additions & 0 deletions features/src/nvhpc/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ if ! test -L /usr/local/cuda; then
ln -s "${NVHPC_CUDA_HOME}" /usr/local/cuda;
fi

cuda_ver=$(grep "#define CUDA_VERSION" "${NVHPC_CUDA_HOME}/include/cuda.h" | cut -d' ' -f3);
export NVHPC_CUDA_VERSION_MAJOR="$((cuda_ver / 1000))";
export NVHPC_CUDA_VERSION_MINOR="$((cuda_ver / 10 % 100))";
export NVHPC_CUDA_VERSION_PATCH="$((cuda_ver % 10))";
export NVHPC_CUDA_VERSION="$NVHPC_CUDA_VERSION_MAJOR.$NVHPC_CUDA_VERSION_MINOR.$NVHPC_CUDA_VERSION_PATCH";

bash "${NVHPC_ROOT}/compilers/bin/makelocalrc" \
-x "${NVHPC_ROOT}/compilers/bin" \
-gcc "$(which gcc)" \
Expand All @@ -76,6 +82,10 @@ bash "${NVHPC_ROOT}/compilers/bin/makelocalrc" \

vars_=();
vars_+=('$NVHPC');
vars_+=('$NVHPC_CUDA_VERSION');
vars_+=('$NVHPC_CUDA_VERSION_MAJOR');
vars_+=('$NVHPC_CUDA_VERSION_MINOR');
vars_+=('$NVHPC_CUDA_VERSION_PATCH');
vars_+=('$NVHPC_VERSION');
vars_+=('$NVHPC_VERSION_MAJOR');
vars_+=('$NVHPC_VERSION_MINOR');
Expand Down