Merge branch 'develop' into stream-consistency

LLNL · May 6, 2024 · d673bb8 · d673bb8
2 parents e0e80f7 + 2645909
commit d673bb8
Show file tree

Hide file tree

Showing 13 changed files with 509 additions and 11 deletions.
diff --git a/configs/LLNL-Magma-Penguin-icelake-OmniPath/auxiliary_software_files/packages.yaml b/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]

diff --git a/configs/LLNL-Pascal-Penguin-broadwell-P100-OmniPath/auxiliary_software_files/packages.yaml b/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:

diff --git a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/auxiliary_software_files/compilers.yaml b/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

diff --git a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/auxiliary_software_files/packages.yaml b/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:

diff --git a/configs/LLNL-Sierra-IBM-power9-V100-Infiniband/spack.yaml b/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:

diff --git a/experiments/kripke/cuda/execute_experiment.tpl b/experiments/kripke/cuda/execute_experiment.tpl
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Copyright 2023 Lawrence Livermore National Security, LLC and other
+# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+{batch_nodes}
+{batch_ranks}
+{batch_timeout}
+
+cd {experiment_run_dir}
+
+{command}
diff --git a/experiments/kripke/cuda/ramble.yaml b/experiments/kripke/cuda/ramble.yaml
@@ -0,0 +1,54 @@
+# Copyright 2023 Lawrence Livermore National Security, LLC and other
+# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+ramble:
+  include:
+  - ./configs/spack.yaml
+  - ./configs/variables.yaml
+  - ./configs/modifier.yaml
+
+  config:
+    deprecated: true
+    spack_flags:
+      install: '--add --keep-stage'
+      concretize: '-U -f'
+
+  applications:
+    kripke:
+      workloads:
+        kripke:
+          env_vars:
+          variables:
+            n_ranks: '{processes_per_node} * {n_nodes}'
+            experiment_setup: ''
+            processes_per_node: '2'
+            n_nodes: '2'
+            arch: 'CUDA'
+          experiments:
+            kripke_cuda_{n_nodes}_{ngroups}_{gs}_{nquad}_{ds}_{lorder}_{nzx}_{nzy}_{nzz}_{npx}_{npy}_{npz}:
+              variables:
+                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:
+        spack_spec: [email protected] +mpi+cuda{modifier_spack_variant} ^[email protected]
+        compiler: default-compiler
+    environments:
+      kripke:
+        packages:
+        - default-mpi
+        - kripke
+        - '{modifier_package_name}'
diff --git a/experiments/kripke/openmp/execute_experiment.tpl b/experiments/kripke/openmp/execute_experiment.tpl
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Copyright 2023 Lawrence Livermore National Security, LLC and other
+# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+{batch_nodes}
+{batch_ranks}
+{batch_timeout}
+
+cd {experiment_run_dir}
+
+{command}
diff --git a/experiments/kripke/openmp/ramble.yaml b/experiments/kripke/openmp/ramble.yaml
@@ -0,0 +1,57 @@
+# Copyright 2023 Lawrence Livermore National Security, LLC and other
+# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+ramble:
+  include:
+  - ./configs/spack.yaml
+  - ./configs/variables.yaml
+  - ./configs/modifier.yaml
+
+  config:
+    deprecated: true
+    spack_flags:
+      install: '--add --keep-stage'
+      concretize: '-U -f'
+
+  applications:
+    kripke:
+      workloads:
+        kripke:
+          env_vars:
+            set:
+              OMP_NUM_THREADS: '{omp_num_threads}'
+          variables:
+            n_ranks: '{processes_per_node} * {n_nodes}'
+            experiment_setup: ''
+            processes_per_node: ['1', '16']
+            n_nodes: '1'
+            omp_num_threads: ['32', '2']
+            arch: 'OpenMP'
+          experiments:
+            kripke_omp_{n_nodes}_{omp_num_threads}_{ngroups}_{gs}_{nquad}_{ds}_{lorder}_{nzx}_{nzy}_{nzz}_{npx}_{npy}_{npz}:
+              variables:
+                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:
+        spack_spec: [email protected] +mpi+openmp{modifier_spack_variant} ^[email protected]
+        compiler: default-compiler
+    environments:
+      kripke:
+        packages:
+        - default-mpi
+        - kripke
+        - '{modifier_package_name}'
diff --git a/experiments/kripke/rocm/execute_experiment.tpl b/experiments/kripke/rocm/execute_experiment.tpl
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Copyright 2023 Lawrence Livermore National Security, LLC and other
+# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+{batch_nodes}
+{batch_ranks}
+{batch_timeout}
+
+cd {experiment_run_dir}
+
+{command}
diff --git a/experiments/kripke/rocm/ramble.yaml b/experiments/kripke/rocm/ramble.yaml
@@ -0,0 +1,54 @@
+# Copyright 2023 Lawrence Livermore National Security, LLC and other
+# Benchpark Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+ramble:
+  include:
+  - ./configs/spack.yaml
+  - ./configs/variables.yaml
+  - ./configs/modifier.yaml
+
+  config:
+    deprecated: true
+    spack_flags:
+      install: '--add --keep-stage'
+      concretize: '-U -f'
+
+  applications:
+    kripke:
+      workloads:
+        kripke:
+          env_vars:
+          variables:
+            n_ranks: '{processes_per_node} * {n_nodes}'
+            experiment_setup: ''
+            processes_per_node: ['8']
+            n_nodes: '1'
+            arch: 'HIP'
+          experiments:
+            kripke_rocm_{n_nodes}_{ngroups}_{gs}_{nquad}_{ds}_{lorder}_{nzx}_{nzy}_{nzz}_{npx}_{npy}_{npz}:
+              variables:
+                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:
+        spack_spec: [email protected] +mpi+rocm{modifier_spack_variant} ^[email protected]
+        compiler: default-compiler
+    environments:
+      kripke:
+        packages:
+        - default-mpi
+        - kripke
+        - '{modifier_package_name}'