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

Removing magic #79

Merged
merged 17 commits into from
Dec 28, 2023
Merged

Removing magic #79

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
739a605
Removing magic
pearce8 Dec 18, 2023
33c1d76
Update packages.yaml
pearce8 Dec 18, 2023
7558874
Update packages.yaml
pearce8 Dec 18, 2023
7a21d1d
Update variables.yaml
pearce8 Dec 18, 2023
df7715c
There is no way to update ats2 to new compilers without tce, abort th…
pearce8 Dec 18, 2023
d1a5653
Merge branch 'develop' into patch-removing-magic
pearce8 Dec 18, 2023
67d5125
Merge branch 'develop' into patch-removing-magic
pearce8 Dec 18, 2023
9621d53
Merge branch 'develop' into patch-removing-magic
pearce8 Dec 20, 2023
2a9e1b4
Update packages.yaml
pearce8 Dec 20, 2023
1c119ef
Merge branch 'develop' into patch-removing-magic
pearce8 Dec 21, 2023
263e4ce
Update packages.yaml
pearce8 Dec 22, 2023
f406414
Merge branch 'develop' into patch-removing-magic
pearce8 Dec 22, 2023
9f19d05
Merge branch 'develop' into patch-removing-magic
pearce8 Dec 22, 2023
6b1ec7d
Disable fortran in amg2023
Dec 23, 2023
cf69a5b
Merge branch 'patch-removing-magic' of github.com:LLNL/benchpark into…
Dec 23, 2023
f1052b5
Revert "Disable fortran in amg2023". Moving it to a separate branch/PR.
pearce8 Dec 28, 2023
9b15b44
Removing definition of gcc since it does not currently work with rocm
pearce8 Dec 28, 2023
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
8 changes: 4 additions & 4 deletions configs/HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/compilers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ compilers:
- compiler:
spec: [email protected]
paths:
cc: /usr/tce/packages/cce-tce/cce-16.0.0/bin/craycc
cxx: /usr/tce/packages/cce-tce/cce-16.0.0/bin/crayCC
f77: /usr/tce/packages/cce-tce/cce-16.0.0/bin/crayftn
fc: /usr/tce/packages/cce-tce/cce-16.0.0/bin/crayftn
cc: /opt/cray/pe/cce/16.0.0/bin/craycc
cxx: /opt/cray/pe/cce/16.0.0/bin/crayCC
f77: /opt/cray/pe/cce/16.0.0/bin/crayftn
fc: /opt/cray/pe/cce/16.0.0/bin/crayftn
flags:
cflags: -g -O2
cxxflags: -g -O2 -std=c++14
Expand Down
2 changes: 1 addition & 1 deletion experiments/amg2023/cuda/ramble.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ ramble:
versions: ['10', 'default']
packages:
hypre-cuda-{versions}:
spack_spec: '[email protected] +mpi+cuda+mixedint cuda_arch=={cuda_arch} ^cuda@{cuda_version}'
spack_spec: '[email protected] +mpi+cuda+mixedint~fortran cuda_arch=={cuda_arch} ^cuda@{cuda_version}'
compiler: '{cuda_compiler}'
amg2023-cuda-{versions}:
spack_spec: 'amg2023@develop +mpi+cuda ^cuda@{cuda_version}'
Expand Down
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 @@ -48,7 +48,7 @@ ramble:
concretized: true
packages:
hypre-omp:
spack_spec: [email protected] +mpi+openmp+mixedint
spack_spec: [email protected] +mpi+openmp+mixedint~fortran
compiler: default-compiler
amg2023-omp:
spack_spec: amg2023@develop +mpi+openmp
Expand Down
2 changes: 1 addition & 1 deletion experiments/amg2023/rocm/ramble.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ramble:
gtl: ["gtl", "no-gtl"]
packages:
hypre-{gtl}:
spack_spec: [email protected] +mpi+rocm+mixedint amdgpu_target={rocm_arch}
spack_spec: [email protected] +mpi+rocm+mixedint~fortran amdgpu_target={rocm_arch}
compiler: compiler-rocm
amg2023-gpu-{gtl}:
spack_spec: amg2023@develop +mpi+rocm amdgpu_target={rocm_arch}
Expand Down
6 changes: 6 additions & 0 deletions repo/hypre/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ class Hypre(BuiltinHypre):
def configure_args(self):
configure_args = super().configure_args()

if self.spec["blas"].satisfies("cublas"):
if not "+fortran" in self.spec:
configure_args.append("--with-fmangle=no-underscores")
configure_args.append("--with-fmangle-blas=no-underscores")
configure_args.append("--with-fmangle-lapack=no-underscores")

if self.spec["blas"].satisfies("rocblas"):
configure_args.append("--enable-rocblas")
if self.spec.satisfies("^cray-mpich+gtl"):
Expand Down