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

Jump to bottom

Amg comm cali v2 #318

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Amg comm cali v2 #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d1bf449
osu benchpark version
Jul 22, 2024
7538829
add hypre versio
Jul 22, 2024
b931a1a
add hypre version
Jul 22, 2024
96f23d3
add hypre version
Jul 22, 2024
82fa275
Update package.py to do +caliper and depend on 3.1
pearce8 Jul 23, 2024
1fde852
added new caliper pattern
Sep 20, 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
2 changes: 1 addition & 1 deletion experiments/amg2023/openmp/ramble.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion experiments/osu-micro-benchmarks/mpi-only/ramble.yaml
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

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

This file should not be in this PR.

Copy link
Collaborator

@pearce8 pearce8 Jul 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@gracenansamba Please test this on Dane using the Dane config I just added. We should stop using the Magma config on other systems. Please also test the develop on Dane.

Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 1 addition & 3 deletions modifiers/caliper-mpi/modifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
2 changes: 1 addition & 1 deletion repo/amg2023/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("[email protected]:")
depends_on("hypre@3.1_comm_cali") #depends_on("hypre@2.31.0:")
Copy link
Collaborator

@rfhaque rfhaque Aug 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
depends_on("hypre@3.1_comm_cali") #depends_on("hypre@2.31.0:")
depends_on("[email protected]:", when="~caliper")
depends_on("[email protected]_comm_cali", when="+caliper")

depends_on("hypre+cuda", when="+cuda")
requires("+cuda", when="^hypre+cuda")
depends_on("hypre+rocm", when="+rocm")
Expand Down
1 change: 1 addition & 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,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()

Expand Down