zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

amr-wind: add missing variants (#44078)

Browse Source 
* amr-wind: add missing variants

* Fix copy and paste.

* waves2amr is only available on amr-wind@2.0

* Style.

* Use satisfies.
This commit is contained in:
Jon Rood 2024-05-09 02:38:16 -06:00 committed by GitHub
parent 762833a663
commit 24cd0da7fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
var/spack/repos/builtin/packages/amr-wind/package.py
View File

@ -63,6 +63,10 @@ class AmrWind(CMakePackage, CudaPackage, ROCmPackage):
variant("umpire", default=False, description="Enable UMPIRE memory pooling") variant("umpire", default=False, description="Enable UMPIRE memory pooling")
variant("sycl", default=False, description="Enable SYCL backend") variant("sycl", default=False, description="Enable SYCL backend")
variant("gpu-aware-mpi", default=False, description="Enable GPU aware MPI") variant("gpu-aware-mpi", default=False, description="Enable GPU aware MPI")
variant("helics", default=False, description="Enable HELICS support for control interface")
variant(
"waves2amr", default=False, description="Enable Waves2AMR support for ocean wave input"
)
depends_on("mpi", when="+mpi") depends_on("mpi", when="+mpi")
depends_on("hdf5~mpi", when="+hdf5~mpi") depends_on("hdf5~mpi", when="+hdf5~mpi")
@ -85,6 +89,9 @@ class AmrWind(CMakePackage, CudaPackage, ROCmPackage):
depends_on("openfast+netcdf", when="+openfast+netcdf") depends_on("openfast+netcdf", when="+openfast+netcdf")
depends_on("openfast@2.6.0:3.4.1", when="@0.9.0:1 +openfast") depends_on("openfast@2.6.0:3.4.1", when="@0.9.0:1 +openfast")
depends_on("openfast@3.5:", when="@2: +openfast") depends_on("openfast@3.5:", when="@2: +openfast")
depends_on("helics@:3.3.2", when="+helics")
depends_on("helics@:3.3.2+mpi", when="+helics+mpi")
depends_on("fftw", when="@2: +waves2amr")
for arch in CudaPackage.cuda_arch_values: for arch in CudaPackage.cuda_arch_values:
depends_on("hypre+cuda cuda_arch=%s" % arch, when="+cuda+hypre cuda_arch=%s" % arch) depends_on("hypre+cuda cuda_arch=%s" % arch, when="+cuda+hypre cuda_arch=%s" % arch)
@ -97,14 +104,16 @@ class AmrWind(CMakePackage, CudaPackage, ROCmPackage):
conflicts("+openmp", when="+cuda") conflicts("+openmp", when="+cuda")
conflicts("+shared", when="+cuda") conflicts("+shared", when="+cuda")
conflicts("@:1.4.0", when="+waves2amr")
def setup_build_environment(self, env): def setup_build_environment(self, env):
# Avoid compile errors with Intel interprocedural optimization # Avoid compile errors with Intel interprocedural optimization
if "%intel" in self.spec: if self.spec.satisfies("%intel"):
env.append_flags("CXXFLAGS", "-no-ipo") env.append_flags("CXXFLAGS", "-no-ipo")
def cmake_args(self): def cmake_args(self):
define = self.define define = self.define
spec = self.spec
vs = [ vs = [
"mpi", "mpi",
@ -126,34 +135,42 @@ def cmake_args(self):
self.define_from_variant("BUILD_SHARED_LIBS", "shared"), self.define_from_variant("BUILD_SHARED_LIBS", "shared"),
] ]
if "+mpi" in self.spec: if spec.satisfies("+mpi"):
args.append(define("MPI_HOME", self.spec["mpi"].prefix)) args.append(define("MPI_HOME", spec["mpi"].prefix))
if "+hdf5" in self.spec: if spec.satisfies("+hdf5"):
args.append(self.define("AMR_WIND_ENABLE_HDF5", True)) args.append(define("AMR_WIND_ENABLE_HDF5", True))
args.append(self.define("AMR_WIND_ENABLE_HDF5_ZFP", True)) args.append(define("AMR_WIND_ENABLE_HDF5_ZFP", True))
# Help AMReX understand if HDF5 is parallel or not. # Help AMReX understand if HDF5 is parallel or not.
# Building HDF5 with CMake as Spack does, causes this inspection to break. # Building HDF5 with CMake as Spack does, causes this inspection to break.
args.append(self.define("HDF5_IS_PARALLEL", spec.satisfies("+mpi"))) args.append(define("HDF5_IS_PARALLEL", spec.satisfies("+mpi")))
if "+cuda" in self.spec: if spec.satisfies("+cuda"):
amrex_arch = [ amrex_arch = [
"{0:.1f}".format(float(i) / 10.0) for i in self.spec.variants["cuda_arch"].value "{0:.1f}".format(float(i) / 10.0) for i in spec.variants["cuda_arch"].value
] ]
if amrex_arch: if amrex_arch:
args.append(define("AMReX_CUDA_ARCH", amrex_arch)) args.append(define("AMReX_CUDA_ARCH", amrex_arch))
if "+rocm" in self.spec: if spec.satisfies("+rocm"):
args.append(define("CMAKE_CXX_COMPILER", self.spec["hip"].hipcc)) args.append(define("CMAKE_CXX_COMPILER", spec["hip"].hipcc))
targets = self.spec.variants["amdgpu_target"].value targets = spec.variants["amdgpu_target"].value
args.append("-DAMReX_AMD_ARCH=" + ";".join(str(x) for x in targets)) args.append("-DAMReX_AMD_ARCH=" + ";".join(str(x) for x in targets))
if "+umpire" in self.spec: if spec.satisfies("+umpire"):
args.append(self.define_from_variant("AMR_WIND_ENABLE_UMPIRE", "umpire")) args.append(self.define_from_variant("AMR_WIND_ENABLE_UMPIRE", "umpire"))
args.append(self.define("UMPIRE_DIR", self.spec["umpire"].prefix)) args.append(define("UMPIRE_DIR", spec["umpire"].prefix))
if "+sycl" in self.spec: if spec.satisfies("+helics"):
args.append(self.define("AMR_WIND_ENABLE_SYCL", True)) args.append(self.define_from_variant("AMR_WIND_ENABLE_HELICS", "helics"))
args.append(define("HELICS_DIR", spec["helics"].prefix))
if spec.satisfies("+waves2amr"):
args.append(self.define_from_variant("AMR_WIND_ENABLE_W2A", "waves2amr"))
args.append(define("FFTW_DIR", spec["fftw"].prefix))
if spec.satisfies("+sycl"):
args.append(define("AMR_WIND_ENABLE_SYCL", True))
requires( requires(
"%dpcpp", "%dpcpp",
"%oneapi", "%oneapi",