diff --git a/configs/LLNL-Magma-Penguin-icelake-OmniPath/spack.yaml b/configs/LLNL-Magma-Penguin-icelake-OmniPath/spack.yaml index 5668e42f7..7435b14b7 100644 --- a/configs/LLNL-Magma-Penguin-icelake-OmniPath/spack.yaml +++ b/configs/LLNL-Magma-Penguin-icelake-OmniPath/spack.yaml @@ -6,17 +6,17 @@ spack: packages: default-compiler: - spack_spec: gcc@12.1.1 + spack_spec: '{compiler_spec}' default-mpi: - spack_spec: mvapich2@2.3.7-gcc1211 + spack_spec: '{mpi_spec}' compiler-gcc: spack_spec: gcc@12.1.1 compiler-intel: spack_spec: intel@2021.6.0-classic blas: - spack_spec: intel-oneapi-mkl@2022.1.0 + spack_spec: '{blas_spec}' lapack: - spack_spec: intel-oneapi-mkl@2022.1.0 + spack_spec: '{lapack_spec}' mpi-gcc: spack_spec: mvapich2@2.3.7-gcc1211 mpi-intel: diff --git a/configs/LLNL-Magma-Penguin-icelake-OmniPath/spack_config_variables.yaml b/configs/LLNL-Magma-Penguin-icelake-OmniPath/spack_config_variables.yaml new file mode 100644 index 000000000..bead546c0 --- /dev/null +++ b/configs/LLNL-Magma-Penguin-icelake-OmniPath/spack_config_variables.yaml @@ -0,0 +1,18 @@ +# 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 + +variables: + build_toolchain: [gcc, intel] + compiler_spec: ['gcc@12.1.1', 'intel@2021.6.0-classic'] + mpi_spec: ['mvapich2@2.3.7-gcc1211', 'mvapich2@2.3.7-intel202160classic'] + blas_spec: ['intel-oneapi-mkl@2022.1.0', 'intel-oneapi-mkl@2022.1.0'] + lapack_spec: ['intel-oneapi-mkl@2022.1.0', 'intel-oneapi-mkl@2022.1.0'] + +#variables: +# build_toolchain: gcc +# compiler_spec: 'gcc@12.1.1' +# mpi_spec: 'mvapich2@2.3.7-gcc1211' +# blas_spec: 'intel-oneapi-mkl@2022.1.0' +# lapack_spec: 'intel-oneapi-mkl@2022.1.0' diff --git a/configs/LLNL-Magma-Penguin-icelake-OmniPath/zips.yaml b/configs/LLNL-Magma-Penguin-icelake-OmniPath/zips.yaml new file mode 100644 index 000000000..172ce16ff --- /dev/null +++ b/configs/LLNL-Magma-Penguin-icelake-OmniPath/zips.yaml @@ -0,0 +1,12 @@ +# 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 + +zips: + toolchain: + - build_toolchain + - compiler_spec + - mpi_spec + - blas_spec + - lapack_spec diff --git a/experiments/saxpy/openmp/ramble.yaml b/experiments/saxpy/openmp/ramble.yaml index f4e601edf..c9f61e67a 100644 --- a/experiments/saxpy/openmp/ramble.yaml +++ b/experiments/saxpy/openmp/ramble.yaml @@ -5,6 +5,8 @@ ramble: include: + - ./configs/spack_config_variables.yaml + - ./configs/zips.yaml - ./configs/spack.yaml - ./configs/variables.yaml - ./configs/modifier.yaml