From d1bf4494cdb08982ad2b617a969fd21e6249dbb9 Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Sun, 21 Jul 2024 23:10:55 -0700 Subject: [PATCH 1/6] osu benchpark version --- experiments/osu-micro-benchmarks/mpi-only/ramble.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: From 753882983f067f3ebddab7f583e298556dfc5fcb Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Mon, 22 Jul 2024 16:15:09 -0700 Subject: [PATCH 2/6] add hypre versio --- repo/amg2023/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repo/amg2023/package.py b/repo/amg2023/package.py index 0d512aee..172c24f0 100644 --- a/repo/amg2023/package.py +++ b/repo/amg2023/package.py @@ -30,7 +30,8 @@ class Amg2023(CMakePackage, CudaPackage, ROCmPackage): requires("+mpi", when="^hypre+mpi") depends_on("caliper", when="+caliper") depends_on("adiak", when="+caliper") - depends_on("hypre+caliper", when="+caliper") + # depends_on("hypre+caliper", when="+caliper") + depends_on("hypre@3.1_comm_cali", when="+caliper") depends_on("hypre@2.31.0:") depends_on("hypre+cuda", when="+cuda") requires("+cuda", when="^hypre+cuda") From b931a1a69b75df06007436e2dccc006f5d6497d9 Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Mon, 22 Jul 2024 16:19:51 -0700 Subject: [PATCH 3/6] add hypre version --- repo/hypre/package.py | 1 + 1 file changed, 1 insertion(+) 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() From 96f23d3d9fe0e33743d864ac60ff7f7c0703129c Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Mon, 22 Jul 2024 16:23:54 -0700 Subject: [PATCH 4/6] add hypre version --- experiments/amg2023/openmp/ramble.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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} From 82fa275818c77eb4a6b8ea661ae0a8f76fdbb778 Mon Sep 17 00:00:00 2001 From: pearce8 Date: Tue, 23 Jul 2024 15:07:41 -0500 Subject: [PATCH 5/6] Update package.py to do +caliper and depend on 3.1 --- repo/amg2023/package.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/repo/amg2023/package.py b/repo/amg2023/package.py index 172c24f0..bcbe2a61 100644 --- a/repo/amg2023/package.py +++ b/repo/amg2023/package.py @@ -30,9 +30,8 @@ class Amg2023(CMakePackage, CudaPackage, ROCmPackage): requires("+mpi", when="^hypre+mpi") depends_on("caliper", when="+caliper") depends_on("adiak", when="+caliper") - # depends_on("hypre+caliper", when="+caliper") - depends_on("hypre@3.1_comm_cali", when="+caliper") - depends_on("hypre@2.31.0:") + depends_on("hypre+caliper", when="+caliper") + 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") From 1fde852dce7753bdbb7020802f64cc6f05907620 Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Fri, 20 Sep 2024 14:19:15 -0700 Subject: [PATCH 6/6] added new caliper pattern --- modifiers/caliper-mpi/modifier.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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"], )