From f024a984d0fd9ad2a30f5c60dc1af455b9d2a669 Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Mon, 10 Jun 2024 14:06:38 -0700 Subject: [PATCH 01/17] updated source to fork --- repo/kripke/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repo/kripke/package.py b/repo/kripke/package.py index 7f126955..ed97ba1e 100644 --- a/repo/kripke/package.py +++ b/repo/kripke/package.py @@ -12,7 +12,8 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): """ homepage = "https://computing.llnl.gov/projects/co-design/kripke" - git = "https://github.com/LLNL/Kripke.git" + # git = "https://github.com/LLNL/Kripke.git" + git = "https://github.com/gracenansamba/Kripke.git" tags = ["proxy-app"] From ab004b0e7e0c5a4e305b9f159048ba5b588b875b Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Mon, 17 Jun 2024 15:49:42 -0700 Subject: [PATCH 02/17] grace, edited spack spec version --- experiments/kripke/openmp/ramble.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiments/kripke/openmp/ramble.yaml b/experiments/kripke/openmp/ramble.yaml index 3e02dae6..ab9f5e38 100644 --- a/experiments/kripke/openmp/ramble.yaml +++ b/experiments/kripke/openmp/ramble.yaml @@ -63,7 +63,7 @@ ramble: software: packages: kripke: - pkg_spec: kripke@develop +mpi+openmp{modifier_spack_variant} ^chai@2024.02 + spack_spec: kripke@comm_cali +mpi+openmp{modifier_spack_variant} ^chai@2024.02 compiler: default-compiler environments: kripke: From cd1cdad0174899aca6dd8c919d8e7e33cf045a6e Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Fri, 14 Jun 2024 11:52:40 -0700 Subject: [PATCH 03/17] use versions in grace fork, comm_cali branch --- repo/kripke/package.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/repo/kripke/package.py b/repo/kripke/package.py index ed97ba1e..984c3b8d 100644 --- a/repo/kripke/package.py +++ b/repo/kripke/package.py @@ -11,7 +11,8 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): transport proxy/mini app. """ - homepage = "https://computing.llnl.gov/projects/co-design/kripke" + # homepage = "https://computing.llnl.gov/projects/co-design/kripke" + homepage = "https://github.com/gracenansamba/Kripke.git" # git = "https://github.com/LLNL/Kripke.git" git = "https://github.com/gracenansamba/Kripke.git" @@ -21,6 +22,7 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") + version("comm_cali", branch="comm_cali", submodules=False) version("develop", branch="develop", submodules=False) version( "1.2.7.0", submodules=False, commit="db920c1f5e1dcbb9e949d120e7d86efcdb777635" @@ -55,7 +57,7 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): variant("caliper", default=False, description="Build with Caliper support enabled.") depends_on("mpi", when="+mpi") - depends_on("caliper", when="+caliper") + depends_on("caliper@master", when="+caliper") depends_on("adiak@0.4:", when="+caliper") conflicts("^blt@:0.3.6", when="+rocm") From 7a06b22553d46950905597b335504fc0e3391923 Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Tue, 18 Jun 2024 17:06:19 -0700 Subject: [PATCH 04/17] made changed to hypre --- 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..0403810f 100644 --- a/repo/amg2023/package.py +++ b/repo/amg2023/package.py @@ -31,7 +31,8 @@ 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@2.31.0:") + depends_on("hypre@comm_cali:") depends_on("hypre+cuda", when="+cuda") requires("+cuda", when="^hypre+cuda") depends_on("hypre+rocm", when="+rocm") From 180ce7ba5951e3b325fb5d6f075cebd386257641 Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Wed, 19 Jun 2024 23:53:11 -0700 Subject: [PATCH 05/17] edited hypre version --- repo/amg2023/package.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/repo/amg2023/package.py b/repo/amg2023/package.py index 0403810f..2517829c 100644 --- a/repo/amg2023/package.py +++ b/repo/amg2023/package.py @@ -16,10 +16,12 @@ class Amg2023(CMakePackage, CudaPackage, ROCmPackage): tags = ["benchmark"] homepage = "https://github.com/LLNL/AMG2023" git = "https://github.com/LLNL/AMG2023.git" + git = "https://github.com/gracenansamba/hypre.git" license("Apache-2.0") version("develop", branch="main") + version("comm_cali", branch="comm_cali") variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=False, description="Enable OpenMP support") From 1497b74fb2c2ea8ce41dec485bba41b8582d2596 Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Thu, 20 Jun 2024 00:08:21 -0700 Subject: [PATCH 06/17] adjusting hypre versions --- repo/amg2023/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repo/amg2023/package.py b/repo/amg2023/package.py index 2517829c..a557d753 100644 --- a/repo/amg2023/package.py +++ b/repo/amg2023/package.py @@ -16,7 +16,7 @@ class Amg2023(CMakePackage, CudaPackage, ROCmPackage): tags = ["benchmark"] homepage = "https://github.com/LLNL/AMG2023" git = "https://github.com/LLNL/AMG2023.git" - git = "https://github.com/gracenansamba/hypre.git" + # git = "https://github.com/gracenansamba/hypre.git" license("Apache-2.0") @@ -33,8 +33,8 @@ 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@comm_cali:") + depends_on("hypre@2.31.0:") + # depends_on("hypre@comm_cali:") depends_on("hypre+cuda", when="+cuda") requires("+cuda", when="^hypre+cuda") depends_on("hypre+rocm", when="+rocm") From 330f702c878081e6de420c0a1a8571590583a2e3 Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Thu, 20 Jun 2024 00:38:25 -0700 Subject: [PATCH 07/17] edited hypre version in AMG --- repo/amg2023/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repo/amg2023/package.py b/repo/amg2023/package.py index a557d753..eaa27268 100644 --- a/repo/amg2023/package.py +++ b/repo/amg2023/package.py @@ -21,7 +21,7 @@ class Amg2023(CMakePackage, CudaPackage, ROCmPackage): license("Apache-2.0") version("develop", branch="main") - version("comm_cali", branch="comm_cali") + version("devlop", branch="comm_cali") variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=False, description="Enable OpenMP support") @@ -33,8 +33,8 @@ 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@comm_cali:") + # depends_on("hypre@2.31.0:") + depends_on("hypre@comm_cali:") depends_on("hypre+cuda", when="+cuda") requires("+cuda", when="^hypre+cuda") depends_on("hypre+rocm", when="+rocm") From 0867ce8755082adf1eefb7dbaa0f4c584f0965f5 Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Thu, 20 Jun 2024 10:52:21 -0700 Subject: [PATCH 08/17] adding hypre version --- repo/amg2023/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo/amg2023/package.py b/repo/amg2023/package.py index eaa27268..a164b224 100644 --- a/repo/amg2023/package.py +++ b/repo/amg2023/package.py @@ -34,7 +34,7 @@ class Amg2023(CMakePackage, CudaPackage, ROCmPackage): depends_on("adiak", when="+caliper") depends_on("hypre+caliper", when="+caliper") # depends_on("hypre@2.31.0:") - depends_on("hypre@comm_cali:") + depends_on("hypre@comm_cali") depends_on("hypre+cuda", when="+cuda") requires("+cuda", when="^hypre+cuda") depends_on("hypre+rocm", when="+rocm") From 340cd7aa3ce48b3723b2a510ba1a9e7dc279cec8 Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Wed, 26 Jun 2024 11:58:02 -0700 Subject: [PATCH 09/17] hypre version adjusted --- repo/amg2023/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo/amg2023/package.py b/repo/amg2023/package.py index a164b224..65ec932c 100644 --- a/repo/amg2023/package.py +++ b/repo/amg2023/package.py @@ -21,7 +21,7 @@ class Amg2023(CMakePackage, CudaPackage, ROCmPackage): license("Apache-2.0") version("develop", branch="main") - version("devlop", branch="comm_cali") + version("comm_cali", branch="comm_cali") variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=False, description="Enable OpenMP support") From 7419d6ec65a869f817bc160089c767ec2a42060c Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Mon, 22 Jul 2024 12:05:08 -0700 Subject: [PATCH 10/17] updated versions of comm_cali --- repo/amg2023/package.py | 2 +- repo/hypre/package.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/repo/amg2023/package.py b/repo/amg2023/package.py index 65ec932c..6b81bb7f 100644 --- a/repo/amg2023/package.py +++ b/repo/amg2023/package.py @@ -34,7 +34,7 @@ class Amg2023(CMakePackage, CudaPackage, ROCmPackage): depends_on("adiak", when="+caliper") depends_on("hypre+caliper", when="+caliper") # depends_on("hypre@2.31.0:") - depends_on("hypre@comm_cali") + depends_on("hypre@3.1_comm_cali") 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..7252caa2 100644 --- a/repo/hypre/package.py +++ b/repo/hypre/package.py @@ -18,6 +18,8 @@ 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 f23df0e414493e061adbce8fb523fca08f667bbb Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Wed, 4 Sep 2024 13:13:26 -0700 Subject: [PATCH 11/17] changed spack_spec to pkg_spec --- experiments/kripke/openmp/ramble.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiments/kripke/openmp/ramble.yaml b/experiments/kripke/openmp/ramble.yaml index ab9f5e38..520e176a 100644 --- a/experiments/kripke/openmp/ramble.yaml +++ b/experiments/kripke/openmp/ramble.yaml @@ -63,7 +63,7 @@ ramble: software: packages: kripke: - spack_spec: kripke@comm_cali +mpi+openmp{modifier_spack_variant} ^chai@2024.02 + pkg_spec: kripke@comm_cali +mpi+openmp{modifier_spack_variant} ^chai@2024.02 compiler: default-compiler environments: kripke: From cbc0a20293c3f9b6092a309dd1d39bfa27383f25 Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Thu, 5 Sep 2024 19:19:41 -0700 Subject: [PATCH 12/17] change to kripke_comm_cali branch --- experiments/kripke/openmp/ramble.yaml | 1 + repo/kripke/package.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/experiments/kripke/openmp/ramble.yaml b/experiments/kripke/openmp/ramble.yaml index 520e176a..d6708270 100644 --- a/experiments/kripke/openmp/ramble.yaml +++ b/experiments/kripke/openmp/ramble.yaml @@ -63,6 +63,7 @@ ramble: software: packages: kripke: + #pkg_spec: kripke@develop +mpi+openmp{modifier_spack_variant} ^chai@2024.02 pkg_spec: kripke@comm_cali +mpi+openmp{modifier_spack_variant} ^chai@2024.02 compiler: default-compiler environments: diff --git a/repo/kripke/package.py b/repo/kripke/package.py index 984c3b8d..f99be7ef 100644 --- a/repo/kripke/package.py +++ b/repo/kripke/package.py @@ -11,10 +11,10 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): transport proxy/mini app. """ - # homepage = "https://computing.llnl.gov/projects/co-design/kripke" - homepage = "https://github.com/gracenansamba/Kripke.git" - # git = "https://github.com/LLNL/Kripke.git" - git = "https://github.com/gracenansamba/Kripke.git" + homepage = "https://computing.llnl.gov/projects/co-design/kripke" + #homepage = "https://github.com/gracenansamba/Kripke.git" + git = "https://github.com/LLNL/Kripke.git" + #git = "https://github.com/gracenansamba/Kripke.git" tags = ["proxy-app"] @@ -22,7 +22,7 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") - version("comm_cali", branch="comm_cali", submodules=False) + #version("comm_cali", branch="comm_cali", submodules=False) version("develop", branch="develop", submodules=False) version( "1.2.7.0", submodules=False, commit="db920c1f5e1dcbb9e949d120e7d86efcdb777635" @@ -58,6 +58,7 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): depends_on("mpi", when="+mpi") depends_on("caliper@master", when="+caliper") + #depends_on("caliper", when="+caliper") depends_on("adiak@0.4:", when="+caliper") conflicts("^blt@:0.3.6", when="+rocm") From 66b48ee02dce17b8ae820c20d12e1dfda8a053fa Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Thu, 12 Sep 2024 11:54:35 -0700 Subject: [PATCH 13/17] adjust caliper version --- repo/kripke/package.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/repo/kripke/package.py b/repo/kripke/package.py index f99be7ef..17b3f9a7 100644 --- a/repo/kripke/package.py +++ b/repo/kripke/package.py @@ -11,10 +11,10 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): transport proxy/mini app. """ - homepage = "https://computing.llnl.gov/projects/co-design/kripke" - #homepage = "https://github.com/gracenansamba/Kripke.git" - git = "https://github.com/LLNL/Kripke.git" - #git = "https://github.com/gracenansamba/Kripke.git" + #homepage = "https://computing.llnl.gov/projects/co-design/kripke" + homepage = "https://github.com/gracenansamba/Kripke.git" + #git = "https://github.com/LLNL/Kripke.git" + git = "https://github.com/gracenansamba/Kripke.git" tags = ["proxy-app"] @@ -22,8 +22,8 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") - #version("comm_cali", branch="comm_cali", submodules=False) - version("develop", branch="develop", submodules=False) + version("comm_cali", branch="comm_cali", submodules=False) + #version("develop", branch="develop", submodules=False) version( "1.2.7.0", submodules=False, commit="db920c1f5e1dcbb9e949d120e7d86efcdb777635" ) @@ -57,8 +57,8 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): variant("caliper", default=False, description="Build with Caliper support enabled.") depends_on("mpi", when="+mpi") - depends_on("caliper@master", when="+caliper") - #depends_on("caliper", when="+caliper") + #depends_on("caliper@master", when="+caliper") + depends_on("caliper", when="+caliper") depends_on("adiak@0.4:", when="+caliper") conflicts("^blt@:0.3.6", when="+rocm") From 7443ec6b452c0fda498be747f26b088f707729da Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Thu, 12 Sep 2024 17:25:21 -0700 Subject: [PATCH 14/17] caliper master --- repo/kripke/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo/kripke/package.py b/repo/kripke/package.py index 17b3f9a7..4d26ce11 100644 --- a/repo/kripke/package.py +++ b/repo/kripke/package.py @@ -57,8 +57,8 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): variant("caliper", default=False, description="Build with Caliper support enabled.") depends_on("mpi", when="+mpi") - #depends_on("caliper@master", when="+caliper") - depends_on("caliper", when="+caliper") + depends_on("caliper@master", when="+caliper") + #depends_on("caliper", when="+caliper") depends_on("adiak@0.4:", when="+caliper") conflicts("^blt@:0.3.6", when="+rocm") From 7822ec624c282a12a92c3b90b4373d868ffc5e45 Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Sun, 15 Sep 2024 14:52:42 -0700 Subject: [PATCH 15/17] added caliper to spec --- experiments/kripke/openmp/ramble.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiments/kripke/openmp/ramble.yaml b/experiments/kripke/openmp/ramble.yaml index d6708270..d107c897 100644 --- a/experiments/kripke/openmp/ramble.yaml +++ b/experiments/kripke/openmp/ramble.yaml @@ -64,7 +64,7 @@ ramble: packages: kripke: #pkg_spec: kripke@develop +mpi+openmp{modifier_spack_variant} ^chai@2024.02 - pkg_spec: kripke@comm_cali +mpi+openmp{modifier_spack_variant} ^chai@2024.02 + pkg_spec: kripke@comm_cali +caliper +mpi+openmp{modifier_spack_variant} ^chai@2024.02 compiler: default-compiler environments: kripke: From c1d5723cb1fdcb9d61f1c7ff77a94d56985298ba Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Wed, 18 Sep 2024 17:19:45 -0700 Subject: [PATCH 16/17] adjsted to test Caliper modifier --- experiments/kripke/openmp/ramble.yaml | 3 +-- repo/kripke/package.py | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/experiments/kripke/openmp/ramble.yaml b/experiments/kripke/openmp/ramble.yaml index d107c897..520e176a 100644 --- a/experiments/kripke/openmp/ramble.yaml +++ b/experiments/kripke/openmp/ramble.yaml @@ -63,8 +63,7 @@ ramble: software: packages: kripke: - #pkg_spec: kripke@develop +mpi+openmp{modifier_spack_variant} ^chai@2024.02 - pkg_spec: kripke@comm_cali +caliper +mpi+openmp{modifier_spack_variant} ^chai@2024.02 + pkg_spec: kripke@comm_cali +mpi+openmp{modifier_spack_variant} ^chai@2024.02 compiler: default-compiler environments: kripke: diff --git a/repo/kripke/package.py b/repo/kripke/package.py index 4d26ce11..c64075c6 100644 --- a/repo/kripke/package.py +++ b/repo/kripke/package.py @@ -11,9 +11,7 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): transport proxy/mini app. """ - #homepage = "https://computing.llnl.gov/projects/co-design/kripke" homepage = "https://github.com/gracenansamba/Kripke.git" - #git = "https://github.com/LLNL/Kripke.git" git = "https://github.com/gracenansamba/Kripke.git" tags = ["proxy-app"] @@ -22,8 +20,7 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") - version("comm_cali", branch="comm_cali", submodules=False) - #version("develop", branch="develop", submodules=False) + version("comm_cali", branch="comm_cali", submodules=False, git="https://github.com/gracenansamba/Kripke.git") version( "1.2.7.0", submodules=False, commit="db920c1f5e1dcbb9e949d120e7d86efcdb777635" ) @@ -58,7 +55,6 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): depends_on("mpi", when="+mpi") depends_on("caliper@master", when="+caliper") - #depends_on("caliper", when="+caliper") depends_on("adiak@0.4:", when="+caliper") conflicts("^blt@:0.3.6", when="+rocm") From b1318cdcdf59c0b2d854008875c3a59976d5e83d Mon Sep 17 00:00:00 2001 From: Grace Nansamba Date: Fri, 20 Sep 2024 13:34:00 -0700 Subject: [PATCH 17/17] added new caliper pattern --- modifiers/caliper-mpi/modifier.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modifiers/caliper-mpi/modifier.py b/modifiers/caliper-mpi/modifier.py index 444a7436..5c1130d6 100644 --- a/modifiers/caliper-mpi/modifier.py +++ b/modifiers/caliper-mpi/modifier.py @@ -21,7 +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"], )