Skip to content

Commit aeaf2c3

Browse files
committed
fix
1 parent ed508dc commit aeaf2c3

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

packaging/spack/SPACK.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ Runtime dependencies (always required):
8989

9090
Optional dependencies (variant-controlled):
9191
- mpi - Message Passing Interface (when +mpi)
92-
- hdf5 - HDF5 data format (when +post_process)
93-
- silo - Silo data format (when +post_process)
94-
- cuda - NVIDIA CUDA toolkit (when +openacc with NVHPC)
92+
- silo - Silo data format with HDF5 support (when +post_process)
93+
- hdf5 - HDF5 data format (transitive dependency via Silo when +post_process)
94+
- cuda - NVIDIA CUDA toolkit (when +openacc or +openmp with NVHPC)
9595
- hip - AMD ROCm HIP (when +openacc or +openmp with Cray)
9696

9797
### Compiler Support

packaging/spack/package.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,18 @@ class Mfc(CMakePackage):
4141
depends_on("python@3:", type="build")
4242

4343
# Runtime dependencies
44-
depends_on("fftw@3:")
44+
depends_on("fftw@3:", when="~mpi")
45+
depends_on("fftw@3:+mpi", when="+mpi")
4546
depends_on("lapack")
4647

4748
# Optional dependencies
4849
depends_on("mpi", when="+mpi")
49-
depends_on("silo+hdf5", when="+post_process")
50+
depends_on("silo+hdf5", when="+post_process~mpi")
51+
depends_on("silo+hdf5+mpi", when="+post_process+mpi")
5052

5153
# GPU dependencies
5254
depends_on("cuda", when="+openacc %nvhpc")
55+
depends_on("cuda", when="+openmp %nvhpc")
5356
depends_on("hip", when="+openacc %cce")
5457
depends_on("hip", when="+openmp %cce")
5558

@@ -59,6 +62,7 @@ class Mfc(CMakePackage):
5962
conflicts("%apple-clang", msg="MFC does not support Apple Clang")
6063
conflicts("+openacc", when="%gcc", msg="OpenACC requires NVHPC or Cray compilers")
6164
conflicts("+openacc", when="+openmp", msg="OpenACC and OpenMP GPU offload are mutually exclusive")
65+
conflicts("+openmp", when="+openacc", msg="OpenACC and OpenMP GPU offload are mutually exclusive")
6266

6367
def cmake_args(self):
6468
args = [

0 commit comments

Comments
 (0)