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.

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

Update mpi on frontier and simplify openfast #234

Merged
merged 2 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/frontier/compilers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ compilers:
paths:
cc: /opt/rocm-6.1.3/bin/amdclang
cxx: /opt/rocm-6.1.3/bin/amdclang++
f77: /opt/rocm-6.1.3/bin/amdflang
fc: /opt/rocm-6.1.3/bin/amdflang
f77: /opt/cray/pe/gcc-native/12/bin/gfortran
fc: /opt/cray/pe/gcc-native/12/bin/gfortran
flags: {}
operating_system: sles15
target: any
modules:
- PrgEnv-amd/8.5.0
- amd/6.1.3
- PrgEnv-gnu-amd/8.6.0
- amd-mixed/6.1.3
- rocm/6.1.3
- craype-x86-trento
extra_rpaths: []
Expand Down
18 changes: 10 additions & 8 deletions configs/frontier/packages.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
packages:
cray-mpich:
require: "@8.1.27"
require: "@8.1.28"
buildable: false
externals:
- spec: "[email protected].27%[email protected]"
prefix: /opt/cray/pe/mpich/8.1.27/ofi/amd/5.0
- spec: "[email protected].28%[email protected]"
prefix: /opt/cray/pe/mpich/8.1.28/ofi/amd/5.0
modules:
- cray-mpich/8.1.27
- cray-mpich/8.1.28
- craype-network-ofi
- libfabric/1.15.2.0
- cray-pmi/6.1.8
- xpmem/2.6.2-2.5_2.22__gd067c3f.shasta
- libfabric/1.20.1
- cray-pmi/6.1.13
- xpmem/2.8.4-1.0_7.3__ga37cbd9.shasta
rocprim:
require: "@6.1.3"
buildable: false
Expand Down Expand Up @@ -79,7 +79,9 @@ packages:
nalu-wind:
require: "~trilinos-solvers"
mpi:
require: "[email protected]"
require: "[email protected]"
openfast:
require: "~shared"
all:
require:
- "%[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion repos/exawind/packages/nalu-wind/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class NaluWind(bNaluWind, CtestPackage):
variant("asan", default=False, description="Turn on address sanitizer")
variant("unit-tests", default=True, description="Activate unit tests")

depends_on("openfast@develop", when="+fsi")
depends_on("openfast@4.0.0", when="+fsi")

requires("+tests", when="+cdash_submit")

Expand Down
3 changes: 0 additions & 3 deletions repos/exawind/packages/openfast/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,4 @@
from spack.pkg.builtin.openfast import Openfast as bOpenfast

class Openfast(bOpenfast):
version("develop", commit="024dbc1816ca8caeefcc720b1099397730b1ec0a")
version("4.0.0", tag="v4.0.0")
version("3.5.5", tag="v3.5.5")
patch("openmp.patch", when="@3.5.3:3.5.4")