diff --git a/features/src/nvhpc/devcontainer-feature.json b/features/src/nvhpc/devcontainer-feature.json index 97ed553d..ef4b4aaa 100644 --- a/features/src/nvhpc/devcontainer-feature.json +++ b/features/src/nvhpc/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "NVHPC SDK", "id": "nvhpc", - "version": "26.4.3", + "version": "26.4.4", "description": "A feature to install the NVHPC SDK", "options": { "version": { diff --git a/features/src/nvhpc/load-nvhpc.sh b/features/src/nvhpc/load-nvhpc.sh index bd2bccd2..eb7361ea 100755 --- a/features/src/nvhpc/load-nvhpc.sh +++ b/features/src/nvhpc/load-nvhpc.sh @@ -23,6 +23,11 @@ if ! test "${DEVCONTAINERS_NVHPC_LOADED_BY:-}" = "$(whoami)"; then done unset NVHPC_MODULEFILES_DIR; + if ! test -n "${MODULEPATH:+x}"; then + MODULEPATH="$(IFS=:; echo "${NVHPC_MODULEFILE_DIRS[*]}")"; + export MODULEPATH; + fi + # Load the NHVPC modules again for NVHPC_MODULE_NAME in "nvhpc-hpcx-cuda${NVHPC_CUDA_VERSION_MAJOR}/${NVHPC_VERSION}" \ "nvhpc-hpcx/${NVHPC_VERSION}"; do