Pulling in new Spack package, updating to point at Robert's PR

LLNL · Apr 15, 2024 · 9b283d6 · 9b283d6
1 parent 6b31c47
commit 9b283d6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 29 deletions.
diff --git a/experiments/kripke/cuda/ramble.yaml b/experiments/kripke/cuda/ramble.yaml
@@ -19,10 +19,7 @@ ramble:
       workloads:
         problem1:
           env_vars:
-            set:
-              OMP_NUM_THREADS: '{omp_num_threads}'
           variables:
-            n_ranks: '{processes_per_node} * {n_nodes}'
             p: 2
             px: '{p}'
             py: '{p}'
@@ -32,23 +29,23 @@ ramble:
             ny: '{n}'
             nz: '{n}'
             experiment_setup: ''
-            processes_per_node: ['8', '4']
+            processes_per_node: ['4']
             n_nodes: ['1', '2']
-            threads_per_node_core: ['8', '10', '13'] #TODO: Specify n_threads according to available n_nodes and n_ranks
-            omp_num_threads: '{threads_per_node_core} * {n_nodes}'
+            n_ranks: '{processes_per_node} * {n_nodes}'
           experiments:
-            kripke_omp_problem1_{n_nodes}_{omp_num_threads}_{px}_{py}_{pz}_{nx}_{ny}_{nz}:
+            kripke_rocm_problem1_{n_nodes}_{n_ranks}_{px}_{py}_{pz}_{nx}_{ny}_{nz}:
               variables:
                 env_name: kripke
               matrices:
-                - size_threads:
+                - size_jobs:
                   - n # TODO: Filter matrix
-                  - threads_per_node_core # TODO: Filter matrix
+                  - n_nodes # TODO: Filter matrix
+
   spack:
     concretized: true
     packages:
       kripke-cuda:
-        spack_spec: kripke@develop +cude
+        spack_spec: kripke@updateRCU2024.02 +cuda
         compiler: default-compiler
     environments:
       kripke-cuda:

diff --git a/experiments/kripke/rocm/ramble.yaml b/experiments/kripke/rocm/ramble.yaml
@@ -19,10 +19,7 @@ ramble:
       workloads:
         problem1:
           env_vars:
-            set:
-              OMP_NUM_THREADS: '{omp_num_threads}'
           variables:
-            n_ranks: '{processes_per_node} * {n_nodes}'
             p: 2
             px: '{p}'
             py: '{p}'
@@ -32,26 +29,25 @@ ramble:
             ny: '{n}'
             nz: '{n}'
             experiment_setup: ''
-            processes_per_node: ['8', '4']
+            processes_per_node: ['4']
             n_nodes: ['1', '2']
-            threads_per_node_core: ['8', '10', '13'] #TODO: Specify n_threads according to available n_nodes and n_ranks
-            omp_num_threads: '{threads_per_node_core} * {n_nodes}'
+            n_ranks: '{processes_per_node} * {n_nodes}'
           experiments:
-            kripke_omp_problem1_{n_nodes}_{omp_num_threads}_{px}_{py}_{pz}_{nx}_{ny}_{nz}:
+            kripke_rocm_problem1_{n_nodes}_{n_ranks}_{px}_{py}_{pz}_{nx}_{ny}_{nz}:
               variables:
                 env_name: kripke
               matrices:
-                - size_threads:
+                - size_jobs:
                   - n # TODO: Filter matrix
-                  - threads_per_node_core # TODO: Filter matrix
+                  - n_nodes # TODO: Filter matrix
   spack:
     concretized: true
     packages:
-      kripke-omp:
-        spack_spec: kripke@develop +mpi+openmp
+      kripke-rocm:
+        spack_spec: kripke@updateRCU2024.02 +mpi+rocm
         compiler: default-compiler
     environments:
-      kripke-omp:
+      kripke-rocm:
         packages:
         - default-mpi
-        - kripke-omp
+        - kripke-rocm
diff --git a/repo/kripke/package.py b/repo/kripke/package.py
@@ -22,8 +22,7 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage):
 
     version("develop", branch="develop", submodules=False)
     version(
-        "1.2.7", submodules=False, tag="v1.2.7", commit="ddcac43"
-    )
+        "updateRCU2024.02", branch="task/chen59/updateRCU2024.02", submodules=False)
     version(
         "1.2.4", submodules=False, tag="v1.2.4", commit="d85c6bc462f17a2382b11ba363059febc487f771"
     )
@@ -54,11 +53,12 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage):
     variant("caliper", default=False, description="Build with Caliper support enabled.")
 
     depends_on("mpi", when="+mpi")
-    depends_on("blt", type="build")
+    depends_on("blt@0.6.2", type="build")
     depends_on("caliper", when="+caliper")
-    depends_on("chai~examples+raja")
-    depends_on("raja~exercises~examples")
-    depends_on("umpire~examples")
+    depends_on("[email protected]:", when="+caliper")
+    depends_on("[email protected]~examples+raja")
+    depends_on("[email protected]~exercises~examples")
+    depends_on("[email protected]~examples")
     conflicts("^blt@:0.3.6", when="+rocm")
 
     def cmake_args(self):