Experiment/kripke new

checkout-versions.yaml

@@ -5,4 +5,4 @@
 
 versions:
   ramble: bb664f142b2cbdb2b2ea39e70a8535c9f27c1179
-  spack: 31de670bd26beca979ebd75dcb0ce90c535a78c4
+  spack: c2eef8bab26adb00b250992e29d697b4706356a0

configs/LLNL-Magma-Penguin-icelake-OmniPath/auxiliary_software_files/packages.yaml

@@ -16,9 +16,9 @@ packages:
       buildable: false
   cmake:
     externals:
-    - spec: cmake@3.23.1
-      prefix: /usr/tce/packages/cmake/cmake-3.23.1
-      buildable: false
+    - spec: cmake@3.26.3
+      prefix: /usr/tce/packages/cmake/cmake-3.26.3
+    buildable: false
   gmake:
     externals:
     - spec: [email protected]

configs/LLNL-Pascal-Penguin-broadwell-P100-OmniPath/auxiliary_software_files/packages.yaml

@@ -16,8 +16,8 @@ packages:
     buildable: false
   cmake:
     externals:
-    - spec: cmake@3.23.1
-      prefix: /usr/tce/packages/cmake/cmake-3.23.1
+    - spec: cmake@3.26.3
+      prefix: /usr/tce/packages/cmake/cmake-3.26.3
     buildable: false
   gmake:
     externals:
@@ -48,6 +48,11 @@ packages:
       prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0/
     - spec: [email protected]
       prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6
+  cub:
+    buildable: false
+    externals:
+    - spec: [email protected]
+      prefix: /usr/tce/packages/cuda/cuda-11.8.0/
   cuda:
     buildable: false
     externals:

configs/LLNL-Sierra-IBM-power9-V100-Infiniband/auxiliary_software_files/compilers.yaml

@@ -4,6 +4,22 @@
 # SPDX-License-Identifier: Apache-2.0
 
 compilers:
+- compiler:
+    spec: [email protected]
+    paths:
+      cc: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlc
+      cxx: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlC
+      f77: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlf
+      fc: /usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/bin/xlf
+    flags:
+      cflags: -g -O2
+      cxxflags: -g -O2 -std=c++14
+      fflags: -g -O2
+    operating_system: rhel7
+    target: ppc64le
+    modules: [cuda/11.8.0, xl/2023.06.28-cuda-11.8.0-gcc-11.2.1]
+    environment: {}
+    extra_rpaths: []
 - compiler:
     spec: [email protected]
     paths:
@@ -29,7 +45,7 @@ compilers:
       fc: /usr/tce/packages/xl/xl-2022.08.19/bin/xlf
     flags:
       cflags: -g -O2
-      cxxflags: -g -O2 -std=c++11
+      cxxflags: -g -O2 -std=c++14
       fflags: -g -O2
     operating_system: rhel7
     target: ppc64le
@@ -45,7 +61,7 @@ compilers:
       fc: /usr/tce/packages/xl/xl-2022.08.19-cuda-11.8.0/bin/xlf
     flags: # TODO: Fix spack concretization bug
       cflags: -g -O2
-      cxxflags: -g -O2 -std=c++11
+      cxxflags: -g -O2 -std=c++14
       fflags: -g -O2
     operating_system: rhel7
     target: ppc64le

configs/LLNL-Sierra-IBM-power9-V100-Infiniband/auxiliary_software_files/packages.yaml

@@ -11,8 +11,8 @@ packages:
     buildable: false
   cmake:
     externals:
-    - spec: cmake@3.23.1
-      prefix: /usr/tce/packages/cmake/cmake-3.23.1
+    - spec: cmake@3.29.2
+      prefix: /usr/tce/packages/cmake/cmake-3.29.2
     buildable: false
   gmake:
     externals:
@@ -41,6 +41,11 @@ packages:
     - spec: [email protected]
       prefix: /usr/tce/packages/cuda/cuda-11.8.0
     buildable: false
+  cub:
+    buildable: false
+    externals:
+    - spec: [email protected]
+      prefix: /usr/tce/packages/cuda/cuda-11.8.0/
   cuda:
     externals:
     - spec: [email protected]
@@ -72,6 +77,10 @@ packages:
       buildable: false
   mpi:
     externals:
+    - spec: [email protected]
+      prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2023.06.28-cuda-11.8.0-gcc-11.2.1
+      extra_attributes:
+        ldflags: "-lmpiprofilesupport -lmpi_ibm_usempi -lmpi_ibm_mpifh -lmpi_ibm"
     - spec: [email protected]
       prefix: /usr/tce/packages/spectrum-mpi/spectrum-mpi-rolling-release-xl-2022.08.19-cuda-11.8.0
       extra_attributes:

configs/LLNL-Sierra-IBM-power9-V100-Infiniband/spack.yaml

@@ -6,9 +6,9 @@
 spack:
   packages:
     default-compiler:
-      spack_spec: [email protected]2022.08.19-cuda{default_cuda_version}
+      spack_spec: [email protected]2023.06.28-cuda-{default_cuda_version}-gcc-11.2.1
     default-mpi:
-      spack_spec: spectrum-mpi@2022.08.19
+      spack_spec: spectrum-mpi@2023.06.28-cuda-{default_cuda_version}-gcc-11.2.1
     compiler-gcc:
       spack_spec: [email protected]
     compiler-clang:

configs/LLNL-Tioga-HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/packages.yaml

@@ -41,6 +41,7 @@ packages:
       prefix: /usr
     - spec: [email protected]
       prefix: /usr/tce
+    buildable: false
   pkgconf:
     externals:
     - spec: [email protected]

experiments/kripke/cuda/execute_experiment.tpl

@@ -1,5 +1,4 @@
 #!/bin/bash
-#
 # Copyright 2023 Lawrence Livermore National Security, LLC and other
 # Benchpark Project Developers. See the top-level COPYRIGHT file for details.
 #
@@ -11,8 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
-{experiment_setup}
-
 {command}

experiments/kripke/cuda/ramble.yaml

@@ -7,6 +7,7 @@ ramble:
   include:
   - ./configs/spack.yaml
   - ./configs/variables.yaml
+  - ./configs/modifier.yaml
 
   config:
     deprecated: true
@@ -17,38 +18,37 @@ ramble:
   applications:
     kripke:
       workloads:
-        problem1:
+        kripke:
           env_vars:
           variables:
-            p: 2
-            px: '{p}'
-            py: '{p}'
-            pz: '{p}'
-            n: ['55', '110']
-            nx: '{n}'
-            ny: '{n}'
-            nz: '{n}'
-            experiment_setup: ''
-            processes_per_node: ['4']
-            n_nodes: ['1', '2']
             n_ranks: '{processes_per_node} * {n_nodes}'
+            experiment_setup: ''
+            processes_per_node: '2'
+            n_nodes: '2'
+            arch: 'CUDA'
           experiments:
-            kripke_rocm_problem1_{n_nodes}_{n_ranks}_{px}_{py}_{pz}_{nx}_{ny}_{nz}:
+            kripke_cuda_{n_nodes}_{ngroups}_{gs}_{nquad}_{ds}_{lorder}_{nzx}_{nzy}_{nzz}_{npx}_{npy}_{npz}:
               variables:
-                env_name: kripke
-              matrices:
-                - size_jobs:
-                  - n # TODO: Filter matrix
-                  - n_nodes # TODO: Filter matrix
-
+                ngroups: 64
+                gs: 1
+                nquad: 128
+                ds: 128
+                lorder: 4
+                nzx: '64'
+                nzy: '64'
+                nzz: '32'
+                npx: '2'
+                npy: '2'
+                npz: '1'
   spack:
     concretized: true
     packages:
-      kripke-cuda:
-        spack_spec: kripke@updateRCU2024.02 +cuda
+      kripke:
+        spack_spec: kripke@1.2.7.0 +mpi+cuda{modifier_spack_variant} ^[email protected]
         compiler: default-compiler
     environments:
-      kripke-cuda:
+      kripke:
         packages:
         - default-mpi
-        - kripke-cuda
+        - kripke
+        - '{modifier_package_name}'

experiments/kripke/openmp/execute_experiment.tpl

@@ -1,5 +1,4 @@
 #!/bin/bash
-#
 # Copyright 2023 Lawrence Livermore National Security, LLC and other
 # Benchpark Project Developers. See the top-level COPYRIGHT file for details.
 #
@@ -11,8 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
-{experiment_setup}
-
 {command}

experiments/kripke/openmp/ramble.yaml

@@ -7,6 +7,7 @@ ramble:
   include:
   - ./configs/spack.yaml
   - ./configs/variables.yaml
+  - ./configs/modifier.yaml
 
   config:
     deprecated: true
@@ -17,41 +18,40 @@ ramble:
   applications:
     kripke:
       workloads:
-        problem1:
+        kripke:
           env_vars:
             set:
               OMP_NUM_THREADS: '{omp_num_threads}'
           variables:
             n_ranks: '{processes_per_node} * {n_nodes}'
-            p: 2
-            px: '{p}'
-            py: '{p}'
-            pz: '{p}'
-            n: ['55', '110']
-            nx: '{n}'
-            ny: '{n}'
-            nz: '{n}'
             experiment_setup: ''
-            processes_per_node: ['8', '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}'
+            processes_per_node: ['1', '16']
+            n_nodes: '1'
+            omp_num_threads: ['32', '2']
+            arch: 'OpenMP'
           experiments:
-            kripke_omp_problem1_{n_nodes}_{omp_num_threads}_{px}_{py}_{pz}_{nx}_{ny}_{nz}:
+            kripke_omp_{n_nodes}_{omp_num_threads}_{ngroups}_{gs}_{nquad}_{ds}_{lorder}_{nzx}_{nzy}_{nzz}_{npx}_{npy}_{npz}:
               variables:
-                env_name: kripke
-              matrices:
-                - size_threads:
-                  - n # TODO: Filter matrix
-                  - threads_per_node_core # TODO: Filter matrix
+                ngroups: 64
+                gs: 1
+                nquad: 128
+                ds: 128
+                lorder: 4
+                nzx: '64'
+                nzy: '32'
+                nzz: '32'
+                npx: ['1', '4']
+                npy: ['1', '2']
+                npz: ['1', '2']
   spack:
     concretized: true
     packages:
-      kripke-omp:
-        spack_spec: kripke@develop +mpi+openmp
+      kripke:
+        spack_spec: kripke@1.2.7.0 +mpi+openmp{modifier_spack_variant} ^[email protected]
         compiler: default-compiler
     environments:
-      kripke-omp:
+      kripke:
         packages:
         - default-mpi
-        - kripke-omp
+        - kripke
+        - '{modifier_package_name}'

experiments/kripke/rocm/execute_experiment.tpl

@@ -1,5 +1,4 @@
 #!/bin/bash
-#
 # Copyright 2023 Lawrence Livermore National Security, LLC and other
 # Benchpark Project Developers. See the top-level COPYRIGHT file for details.
 #
@@ -11,8 +10,4 @@
 
 cd {experiment_run_dir}
 
-{spack_setup}
-
-{experiment_setup}
-
 {command}

experiments/kripke/rocm/ramble.yaml

@@ -7,6 +7,7 @@ ramble:
   include:
   - ./configs/spack.yaml
   - ./configs/variables.yaml
+  - ./configs/modifier.yaml
 
   config:
     deprecated: true
@@ -17,37 +18,37 @@ ramble:
   applications:
     kripke:
       workloads:
-        problem1:
+        kripke:
           env_vars:
           variables:
-            p: 2
-            px: '{p}'
-            py: '{p}'
-            pz: '{p}'
-            n: ['55', '110']
-            nx: '{n}'
-            ny: '{n}'
-            nz: '{n}'
-            experiment_setup: ''
-            processes_per_node: ['4']
-            n_nodes: ['1', '2']
             n_ranks: '{processes_per_node} * {n_nodes}'
+            experiment_setup: ''
+            processes_per_node: ['8']
+            n_nodes: '1'
+            arch: 'HIP'
           experiments:
-            kripke_rocm_problem1_{n_nodes}_{n_ranks}_{px}_{py}_{pz}_{nx}_{ny}_{nz}:
+            kripke_rocm_{n_nodes}_{ngroups}_{gs}_{nquad}_{ds}_{lorder}_{nzx}_{nzy}_{nzz}_{npx}_{npy}_{npz}:
               variables:
-                env_name: kripke
-              matrices:
-                - size_jobs:
-                  - n # TODO: Filter matrix
-                  - n_nodes # TODO: Filter matrix
+                ngroups: 64
+                gs: 1
+                nquad: 128
+                ds: 128
+                lorder: 4
+                nzx: '64'
+                nzy: '64'
+                nzz: '64'
+                npx: '2'
+                npy: '2'
+                npz: '2'
   spack:
     concretized: true
     packages:
-      kripke-rocm:
-        spack_spec: kripke@updateRCU2024.02 +mpi+rocm
+      kripke:
+        spack_spec: kripke@1.2.7.0 +mpi+rocm{modifier_spack_variant} ^[email protected]
         compiler: default-compiler
     environments:
-      kripke-rocm:
+      kripke:
         packages:
         - default-mpi
-        - kripke-rocm
+        - kripke
+        - '{modifier_package_name}'