Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kripke comm cali #334

Draft
wants to merge 24 commits into
base: develop
Choose a base branch
from
+58 −19
Draft

Kripke comm cali #334

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f024a98
updated source to fork
Jun 10, 2024
ab004b0
grace, edited spack spec version
Jun 17, 2024
cd1cdad
use versions in grace fork, comm_cali branch
Jun 14, 2024
7a06b22
made changed to hypre
Jun 19, 2024
180ce7b
edited hypre version
Jun 20, 2024
1497b74
adjusting hypre versions
Jun 20, 2024
330f702
edited hypre version in AMG
Jun 20, 2024
0867ce8
adding hypre version
Jun 20, 2024
340cd7a
hypre version adjusted
Jun 26, 2024
7419d6e
updated versions of comm_cali
Jul 22, 2024
f23df0e
changed spack_spec to pkg_spec
Sep 4, 2024
cbc0a20
change to kripke_comm_cali branch
Sep 6, 2024
66b48ee
adjust caliper version
Sep 12, 2024
7443ec6
caliper master
Sep 13, 2024
7822ec6
added caliper to spec
Sep 15, 2024
c1d5723
adjsted to test Caliper modifier
Sep 19, 2024
b1318cd
added new caliper pattern
Sep 20, 2024
cbd0ee3
added comm_cali
Dec 4, 2024
dac58b5
adjustt sizes
Dec 4, 2024
54e2e08
nodes_123
Dec 4, 2024
186e8c9
adjusted size
Dec 4, 2024
632dfcd
adjusted nodes
Dec 6, 2024
4b3dbb7
more nodes
Dec 6, 2024
0e8e80f
adjust ranks/node for dane
Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion experiments/kripke/openmp/ramble.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ ramble:
software:
packages:
kripke:
pkg_spec: kripke@develop +mpi+openmp{modifier_spack_variant} ^chai@2024.02
#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
gracenansamba marked this conversation as resolved.
Show resolved Hide resolved
compiler: default-compiler
environments:
kripke:
Expand Down
5 changes: 4 additions & 1 deletion repo/amg2023/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -31,7 +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@2.31.0:")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gracenansamba It would be good to move the amg2023 changes to its own PR
#318

depends_on("hypre@3.1_comm_cali")
depends_on("hypre+cuda", when="+cuda")
requires("+cuda", when="^hypre+cuda")
depends_on("hypre+rocm", when="+rocm")
Expand Down
2 changes: 2 additions & 0 deletions repo/hypre/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gracenansamba It would be good to move the amg2023 changes to its own PR
#318


def configure_args(self):
configure_args = super().configure_args()

Expand Down
12 changes: 8 additions & 4 deletions repo/kripke/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,19 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage):
transport proxy/mini app.
"""

homepage = "https://computing.llnl.gov/projects/co-design/kripke"
git = "https://github.com/LLNL/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"]

maintainers("vsrana01")

license("BSD-3-Clause")

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"
)
Expand Down Expand Up @@ -54,7 +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", 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")

Expand Down
Loading