diff --git a/experiments/amg2023/openmp/ramble.yaml b/experiments/amg2023/openmp/ramble.yaml index f926d042..7cf94cf1 100644 --- a/experiments/amg2023/openmp/ramble.yaml +++ b/experiments/amg2023/openmp/ramble.yaml @@ -115,7 +115,7 @@ ramble: software: packages: hypre-omp: - pkg_spec: hypre@2.31.0 +mpi+openmp+mixedint~fortran{modifier_spack_variant} + pkg_spec: hypre@3.1_comm_cali +mpi+openmp+mixedint~fortran{modifier_spack_variant} compiler: default-compiler amg2023-omp: pkg_spec: amg2023@develop +mpi+openmp{modifier_spack_variant} diff --git a/experiments/osu-micro-benchmarks/mpi-only/ramble.yaml b/experiments/osu-micro-benchmarks/mpi-only/ramble.yaml index f30a5b49..654e27cf 100644 --- a/experiments/osu-micro-benchmarks/mpi-only/ramble.yaml +++ b/experiments/osu-micro-benchmarks/mpi-only/ramble.yaml @@ -34,7 +34,7 @@ ramble: software: packages: osu-micro-benchmarks: - pkg_spec: osu-micro-benchmarks + pkg_spec: osu-micro-benchmarks@comm_cali +mpi+openmp{modifier_spack_variant} compiler: default-compiler environments: osu-micro-benchmarks: diff --git a/modifiers/caliper-mpi/modifier.py b/modifiers/caliper-mpi/modifier.py index f742cd87..5c1130d6 100644 --- a/modifiers/caliper-mpi/modifier.py +++ b/modifiers/caliper-mpi/modifier.py @@ -21,9 +21,7 @@ class CaliperMpi(CaliperBase): env_var_modification( "CALI_CONFIG", - "spot(output={},profile.mpi,mpi.message.size,mpi.message.count)".format( - _cali_datafile - ), + "spot(output={},profile.mpi,comm.stats)".format(_cali_datafile), method="set", modes=["mpi"], ) diff --git a/repo/amg2023/package.py b/repo/amg2023/package.py index 0d512aee..bcbe2a61 100644 --- a/repo/amg2023/package.py +++ b/repo/amg2023/package.py @@ -31,7 +31,7 @@ class Amg2023(CMakePackage, CudaPackage, ROCmPackage): depends_on("caliper", when="+caliper") depends_on("adiak", when="+caliper") depends_on("hypre+caliper", when="+caliper") - depends_on("hypre@2.31.0:") + depends_on("hypre@3.1_comm_cali") #depends_on("hypre@2.31.0:") depends_on("hypre+cuda", when="+cuda") requires("+cuda", when="^hypre+cuda") depends_on("hypre+rocm", when="+rocm") diff --git a/repo/hypre/package.py b/repo/hypre/package.py index 31613bcd..e0c01a99 100644 --- a/repo/hypre/package.py +++ b/repo/hypre/package.py @@ -18,6 +18,7 @@ class Hypre(BuiltinHypre): "gcc": "gnu", } + version("3.1_comm_cali", branch="comm_cali", submodules=False, git="https://github.com/gracenansamba/hypre.git") def configure_args(self): configure_args = super().configure_args()