Merge branch 'fix_nvhpc_modules' into 'main'

Fix missing modules for acceleration

See merge request !9

stacks/pinot-noir/modules_acc_cuda.yaml

@@ -5,42 +5,14 @@ modules:
       #   environment:
       #     unset:
       #     - CUDA_ROOT
-      nvhpc+mpi@24.3:
-        environment:
-          set:
-            HPCX_DIR: "{prefix}/Linux_x86_64/24.3/comm_libs/12.3/hpcx/hpcx-2.17.1"
-            OPAL_PREFIX: "${HPCX_DIR}/ompi"
-          prepend_path:
-            LD_LIBRARY_PATH: "${HPCX_DIR}/ompi/lib"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/ucx/lib"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/ucx/lib/ucx"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/ucc/lib"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/ucc/lib/ucc"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/hcoll/lib"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/sharp/lib"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/nccl_rdma_sharp_plugin/lib"
-            PATH: "${HPCX_DIR}/ucx/bin"
-            PATH: "${HPCX_DIR}/ucc/bin"
-            PATH: "${HPCX_DIR}/hcoll/bin"
-            PATH: "${HPCX_DIR}/sharp/bin"
       nvhpc+mpi@24.7:
         environment:
           set:
-            HPCX_DIR: "{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/hpcx-2.19"
-            OPAL_PREFIX: "${HPCX_DIR}/ompi"
+            HPCX_DIR: "{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest"
+            OPAL_PREFIX: "{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/ompi"
           prepend_path:
-            LD_LIBRARY_PATH: "${HPCX_DIR}/ompi/lib"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/ucx/lib"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/ucx/lib/ucx"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/ucc/lib"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/ucc/lib/ucc"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/hcoll/lib"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/sharp/lib"
-            LD_LIBRARY_PATH: "${HPCX_DIR}/nccl_rdma_sharp_plugin/lib"
-            PATH: "${HPCX_DIR}/ucx/bin"
-            PATH: "${HPCX_DIR}/ucc/bin"
-            PATH: "${HPCX_DIR}/hcoll/bin"
-            PATH: "${HPCX_DIR}/sharp/bin"
+            LD_LIBRARY_PATH: '{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/ompi/lib:{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/ucx/lib:{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/ucx/lib/ucx:{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/ucc/lib:{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/ucc/lib/ucc:{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/hcoll/lib:{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/sharp/lib:{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/nccl_rdma_sharp_plugin/lib'
+            PATH: '{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/ucx/bin:{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/ucc/bin:{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/hcoll/bin:{prefix}/Linux_x86_64/24.7/comm_libs/12.5/hpcx/latest/sharp/bin'
       nccl:
         environment:
           set:

stacks/pinot-noir/spack.yaml

@@ -8,6 +8,7 @@ spack:
 
       - modules_stack.yaml
       - modules_env.yaml
+      - modules_accel.yaml
 
       - definitions_stack.yaml
       - definitions_accel.yaml

stacks/pinot-noir/spack_aocc.yaml

@@ -8,6 +8,7 @@ spack:
 
       - modules_stack.yaml
       - modules_env.yaml
+      - modules_accel.yaml
 
       - definitions_accel.yaml
       - definitions_env.yaml

stacks/pinot-noir/spack_nvhpc.yaml

@@ -8,6 +8,7 @@ spack:
 
       - modules_stack.yaml
       - modules_env.yaml
+      - modules_accel.yaml
 
       - definitions_accel.yaml
       - definitions_env.yaml

stacks/pinot-noir/spack_oneapi.yaml

@@ -8,6 +8,7 @@ spack:
 
       - modules_stack.yaml
       - modules_env.yaml
+      - modules_accel.yaml
 
       - definitions_accel.yaml
       - definitions_env.yaml