From 5113774f4b94be4c4a9b5469679b7b34df13a872 Mon Sep 17 00:00:00 2001 From: Riyaz Haque <5333387+rfhaque@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:25:40 -0700 Subject: [PATCH] Update hypre, remove magic compiler (#270) Update hypre, removve magic compiler Co-authored-by: Riyaz Haque Co-authored-by: pearce8 --- experiments/amg2023/cuda/ramble.yaml | 2 +- experiments/amg2023/openmp/ramble.yaml | 2 +- experiments/amg2023/rocm/ramble.yaml | 2 +- repo/hypre/package.py | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/experiments/amg2023/cuda/ramble.yaml b/experiments/amg2023/cuda/ramble.yaml index 45c4d415b..cc8248e87 100644 --- a/experiments/amg2023/cuda/ramble.yaml +++ b/experiments/amg2023/cuda/ramble.yaml @@ -53,7 +53,7 @@ ramble: spack_spec: cuda@{default_cuda_version}+allow-unsupported-compilers compiler: default-compiler hypre: - spack_spec: hypre@2.28.0 +mpi+cuda+mixedint{modifier_spack_variant} cuda_arch=={cuda_arch} + spack_spec: hypre@2.31.0 +mpi+cuda+mixedint~fortran{modifier_spack_variant} cuda_arch=={cuda_arch} compiler: default-compiler amg2023: spack_spec: amg2023@develop +mpi+cuda{modifier_spack_variant} cuda_arch=={cuda_arch} diff --git a/experiments/amg2023/openmp/ramble.yaml b/experiments/amg2023/openmp/ramble.yaml index b58284b81..cad7f24bd 100644 --- a/experiments/amg2023/openmp/ramble.yaml +++ b/experiments/amg2023/openmp/ramble.yaml @@ -46,7 +46,7 @@ ramble: concretized: true packages: hypre-omp: - spack_spec: hypre@2.31.0 +mpi+openmp+mixedint{modifier_spack_variant} + spack_spec: hypre@2.31.0 +mpi+openmp+mixedint~fortran{modifier_spack_variant} compiler: default-compiler amg2023-omp: spack_spec: amg2023@develop +mpi+openmp{modifier_spack_variant} diff --git a/experiments/amg2023/rocm/ramble.yaml b/experiments/amg2023/rocm/ramble.yaml index c2ec20ebb..4878d451f 100644 --- a/experiments/amg2023/rocm/ramble.yaml +++ b/experiments/amg2023/rocm/ramble.yaml @@ -47,7 +47,7 @@ ramble: gtl: ["gtl", "no-gtl"] packages: hypre-{gtl}: - spack_spec: hypre@2.28.0 +mpi+rocm+mixedint{modifier_spack_variant} amdgpu_target={rocm_arch} + spack_spec: hypre@2.31.0 +mpi+rocm+mixedint~fortran{modifier_spack_variant} amdgpu_target={rocm_arch} compiler: compiler-rocm amg2023-gpu-{gtl}: spack_spec: amg2023@develop +mpi+rocm{modifier_spack_variant} amdgpu_target={rocm_arch} diff --git a/repo/hypre/package.py b/repo/hypre/package.py index 359536004..31613bcd3 100644 --- a/repo/hypre/package.py +++ b/repo/hypre/package.py @@ -21,6 +21,12 @@ class Hypre(BuiltinHypre): def configure_args(self): configure_args = super().configure_args() + if (self.compiler.fc and 'xlf' in self.compiler.fc) or (self.compiler.f77 and 'xlf' in self.compiler.f77): + 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"):