Changes for ats4

configs/ats4/spack.yaml

@@ -4,21 +4,17 @@ spack:
       spack_spec: [email protected]
     default-mpi:
       spack_spec: [email protected]%cce ~gtl
-    compiler-rocm:
-      spack_spec: [email protected]
     compiler-gcc:
       spack_spec: [email protected]
+    compiler-rocm:
+      spack_spec: [email protected]
     blas-rocm:
       spack_spec: [email protected]
-#    lapack-rocm:
-#      spack_spec: [email protected]
     lapack:
       spack_spec: [email protected]
-    mpi-compiler-rocm:
-      spack_spec: [email protected]%cce ~gtl
-    mpi-compiler-gcc:
-      spack_spec: [email protected]%gcc ~gtl
-    mpi-gtl:
+    mpi-rocm-gtl:
       spack_spec: [email protected]%cce +gtl
-    mpi-no-gtl:
+    mpi-rocm-no-gtl:
       spack_spec: [email protected]%cce ~gtl
+    mpi-gcc:
+      spack_spec: [email protected]%gcc ~gtl

configs/ats4/variables.yaml

@@ -1,6 +1,6 @@
 variables:
   gtl_flag: ''  # to be overwritten by tests that need GTL
-  compilers: [compiler-rocm, compiler-gcc]
+  rocm_arch: 'gfx90a'
   scheduler: 'flux'
   flux_batch_time: '120m'
   slurm_batch_time: '02:00'

experiments/amg2023/rocm/ramble.yaml

@@ -27,50 +27,25 @@ ramble:
                 processes_per_node: ['8', '4']
                 n_nodes: ['1', '2']
               matrices:
-                - size:
-                  - n # TODO: Filter matrix
-            '{env_name}_problem1_{n_nodes}_{omp_num_threads}_{px}_{py}_{pz}_{nx}_{ny}_{nz}':
-              env_vars:
-                set:
-                  OMP_NUM_THREADS: '{omp_num_threads}'
-              variables:
-                env_name: 'amg2023-omp'
-                processes_per_node: ['8', '4']
-                n_nodes: ['1', '2']
-                omp_num_threads: ['1', '2', '4']
-              matrices:
-                - size_threads:
-                  - n # TODO: Filter matrix
-                  - omp_num_threads # TODO: Filter matrix
+                - size_gtl:
+                  - n
+                  - gtl
   spack:
     concretized: true
     variables:
       gtl: ["gtl", "no-gtl"]
     packages:
       hypre-{gtl}:
-        spack_spec: [email protected] +mpi+rocm+mixedint amdgpu_target="gfx90a"
+        spack_spec: [email protected] +mpi+rocm+mixedint amdgpu_target="{rocm_arch}"
         compiler: compiler-rocm
       amg2023-gpu-{gtl}:
-        spack_spec: amg2023@develop +mpi+rocm amdgpu_target="gfx90a"
-        compiler: compiler-rocm
-      hypre-omp:
-        spack_spec: [email protected] +mpi+openmp+mixedint
-        compiler: compiler-rocm
-      amg2023-omp:
-        spack_spec: amg2023@develop +mpi+openmp
+        spack_spec: amg2023@develop +mpi+rocm amdgpu_target="{rocm_arch}"
         compiler: compiler-rocm
     environments:
       amg2023-gpu-{gtl}:
         packages:
         - blas-rocm
         - lapack
-        - mpi-{gtl}
+        - mpi-rocm-{gtl}
         - hypre-{gtl}
         - amg2023-gpu-{gtl}
-      amg2023-omp:
-        packages:
-        - blas-rocm
-        - lapack
-        - default-mpi
-        - hypre-omp
-        - amg2023-omp

experiments/raja-perf/rocm/ramble.yaml

@@ -19,15 +19,14 @@ ramble:
                 n_ranks: '1'
                 n_nodes: '1'
                 n_gpus_per_task: '1'
-                compilers: ''
   spack:
     concretized: true
     packages:
       blt:
         spack_spec: '[email protected]:'
         compiler: compiler-gcc
       raja-perf:
-        spack_spec: raja-perf@develop +rocm~openmp amdgpu_target=gfx90a
+        spack_spec: raja-perf@develop +rocm~openmp amdgpu_target="{rocm_arch}"
         compiler: default-compiler
     environments:
       raja-perf:

experiments/saxpy/rocm/ramble.yaml

@@ -26,7 +26,7 @@ ramble:
     concretized: true
     packages:
       saxpy:
-        spack_spec: [email protected] +rocm amdgpu_target="gfx90a"
+        spack_spec: [email protected] +rocm amdgpu_target="{rocm_arch}"
         compiler: default-compiler
     environments:
       saxpy: