From 25a5585f7d404d102826f4ad3066b34012d6ded7 Mon Sep 17 00:00:00 2001
From: Jon Rood <jon.rood@nrel.gov>
Date: Mon, 28 Oct 2024 21:26:11 -0600
Subject: exawind: remove generated fortran dependencies (#47276)
---
.../repos/builtin/packages/amr-wind/package.py | 135 ++++++---------------
.../repos/builtin/packages/exawind/package.py | 5 +-
.../repos/builtin/packages/nalu-wind/package.py | 21 ++--
var/spack/repos/builtin/packages/tioga/package.py | 3 +-
4 files changed, 47 insertions(+), 117 deletions(-)
diff --git a/var/spack/repos/builtin/packages/amr-wind/package.py b/var/spack/repos/builtin/packages/amr-wind/package.py
index 75a3a0d575..4791948900 100644
--- a/var/spack/repos/builtin/packages/amr-wind/package.py
+++ b/var/spack/repos/builtin/packages/amr-wind/package.py
@@ -21,106 +21,41 @@ class AmrWind(CMakePackage, CudaPackage, ROCmPackage):
license("BSD-3-Clause")
version("main", branch="main", submodules=True)
- version(
- "3.1.6", tag="v3.1.6", commit="ca437affc6fd00490d8b14e244e53bf641207224", submodules=True
- )
- version(
- "3.1.5", tag="v3.1.5", commit="554f8aa1ac36c2bae17565c64d5bc33333cee396", submodules=True
- )
- version(
- "3.1.4", tag="v3.1.4", commit="e10f5ebd3141b9990a65ebe9f1bdca8554b59472", submodules=True
- )
- version(
- "3.1.3", tag="v3.1.3", commit="af8231ace69119133c4c8a906e98946ec5aa79c8", submodules=True
- )
- version(
- "3.1.2", tag="v3.1.2", commit="5edcac4496e30e450c0f21e7fa74f8b590dc3860", submodules=True
- )
- version(
- "3.1.1", tag="v3.1.1", commit="8ae06194fa47bf473615988f97a7b423d467b023", submodules=True
- )
- version(
- "3.1.0", tag="v3.1.0", commit="3e23581b132532bf70b09c38217ff9c46204f047", submodules=True
- )
- version(
- "3.0.2", tag="v3.0.2", commit="f867288dffecc6404189afa965189c2558cf9922", submodules=True
- )
- version(
- "3.0.1", tag="v3.0.1", commit="65aa85db5cb3bbabc767d5dde4b106b7022a0f90", submodules=True
- )
- version(
- "3.0.0", tag="v3.0.0", commit="2fbd345cfa7cb7277c1cb6a1323247579e1bbc32", submodules=True
- )
- version(
- "2.6.0", tag="v2.6.0", commit="31ef1137b00b304b62b84edaa5b819c0bf0b7436", submodules=True
- )
- version(
- "2.5.0", tag="v2.5.0", commit="f9f499b6926339f96b3ff260495b8782c045555c", submodules=True
- )
- version(
- "2.4.3", tag="v2.4.3", commit="4be85f376d4939f8e5534b7985917e4cfccedfaf", submodules=True
- )
- version(
- "2.4.2", tag="v2.4.2", commit="5ebb2abf2df9c87e6086d8f55a4d929ff0cdb37b", submodules=True
- )
- version(
- "2.4.1", tag="v2.4.1", commit="40accd372f850e10fcbeee6ddecc4d15fd6364c6", submodules=True
- )
- version(
- "2.4.0", tag="v2.4.0", commit="b8ab898b7e9e8e78455b61e303940b80d00d18ca", submodules=True
- )
- version(
- "2.3.2", tag="v2.3.2", commit="61cbb21e8dfdeea47a0add772cd52abac33c4901", submodules=True
- )
- version(
- "2.3.1", tag="v2.3.1", commit="cc51dadb34de9f333605a5bfb83b72c9310f676a", submodules=True
- )
- version(
- "2.3.0", tag="v2.3.0", commit="6ba000b628aa3178545cdbbea508cc2cb2e5c76c", submodules=True
- )
- version(
- "2.2.1", tag="v2.2.1", commit="e131a79f8e68be181390a2656f54268f90a9e78a", submodules=True
- )
- version(
- "2.2.0", tag="v2.2.0", commit="bc787f21deca9239928182e27400133934c62658", submodules=True
- )
- version(
- "2.1.0", tag="v2.1.0", commit="13e15b52f4a1651a3d72324a71ba1e18255663e7", submodules=True
- )
- version(
- "2.0.0", tag="v2.0.0", commit="ea448365033fc6bc9ee0febeb369b377f4fd8240", submodules=True
- )
- version(
- "1.4.0", tag="v1.4.0", commit="bdddf133e41a9b7b4c8ce28f1ea1bebec47678f5", submodules=True
- )
- version(
- "1.3.1", tag="v1.3.1", commit="63692889143599de57232e64a9c7e4af8f0a2e1e", submodules=True
- )
- version(
- "1.3.0", tag="v1.3.0", commit="f74d7b3801f0492e586d440fac729d9dec595a8b", submodules=True
- )
- version(
- "1.2.1", tag="v1.2.1", commit="7291737434ca339ecc765355eab88ddd529ff68f", submodules=True
- )
- version(
- "1.2.0", tag="v1.2.0", commit="db9add5c1c68583a9019cb7ba6776bd580b0ab3e", submodules=True
- )
- version(
- "1.1.0", tag="v1.1.0", commit="30396bf70f0bd5ac65dd0f7b29757b0e02b22459", submodules=True
- )
- version(
- "1.0.1", tag="v1.0.1", commit="aa9b7e8e63833e6ac1cc3f60fcba5140416cc139", submodules=True
- )
- version(
- "1.0.0", tag="v1.0.0", commit="885f4137ce7b9e6c60f48aa5e4c1a54f1418ea9e", submodules=True
- )
- version(
- "0.9.0", tag="v0.9.0", commit="cf66ebe31fd5f27b76a83451cd22f346e7a67160", submodules=True
- )
-
- depends_on("c", type="build") # generated
- depends_on("cxx", type="build") # generated
- depends_on("fortran", type="build") # generated
+ version("3.1.6", tag="v3.1.6", submodules=True)
+ version("3.1.5", tag="v3.1.5", submodules=True)
+ version("3.1.4", tag="v3.1.4", submodules=True)
+ version("3.1.3", tag="v3.1.3", submodules=True)
+ version("3.1.2", tag="v3.1.2", submodules=True)
+ version("3.1.1", tag="v3.1.1", submodules=True)
+ version("3.1.0", tag="v3.1.0", submodules=True)
+ version("3.0.2", tag="v3.0.2", submodules=True)
+ version("3.0.1", tag="v3.0.1", submodules=True)
+ version("3.0.0", tag="v3.0.0", submodules=True)
+ version("2.6.0", tag="v2.6.0", submodules=True)
+ version("2.5.0", tag="v2.5.0", submodules=True)
+ version("2.4.3", tag="v2.4.3", submodules=True)
+ version("2.4.2", tag="v2.4.2", submodules=True)
+ version("2.4.1", tag="v2.4.1", submodules=True)
+ version("2.4.0", tag="v2.4.0", submodules=True)
+ version("2.3.2", tag="v2.3.2", submodules=True)
+ version("2.3.1", tag="v2.3.1", submodules=True)
+ version("2.3.0", tag="v2.3.0", submodules=True)
+ version("2.2.1", tag="v2.2.1", submodules=True)
+ version("2.2.0", tag="v2.2.0", submodules=True)
+ version("2.1.0", tag="v2.1.0", submodules=True)
+ version("2.0.0", tag="v2.0.0", submodules=True)
+ version("1.4.0", tag="v1.4.0", submodules=True)
+ version("1.3.1", tag="v1.3.1", submodules=True)
+ version("1.3.0", tag="v1.3.0", submodules=True)
+ version("1.2.1", tag="v1.2.1", submodules=True)
+ version("1.2.0", tag="v1.2.0", submodules=True)
+ version("1.1.0", tag="v1.1.0", submodules=True)
+ version("1.0.1", tag="v1.0.1", submodules=True)
+ version("1.0.0", tag="v1.0.0", submodules=True)
+ version("0.9.0", tag="v0.9.0", submodules=True)
+
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
variant("hypre", default=False, description="Enable Hypre integration")
variant("ascent", default=False, description="Enable Ascent integration")
diff --git a/var/spack/repos/builtin/packages/exawind/package.py b/var/spack/repos/builtin/packages/exawind/package.py
index 28e304bffa..f7c611a918 100644
--- a/var/spack/repos/builtin/packages/exawind/package.py
+++ b/var/spack/repos/builtin/packages/exawind/package.py
@@ -18,11 +18,12 @@ class Exawind(CMakePackage, CudaPackage, ROCmPackage):
license("Apache-2.0")
- version("master", branch="main", submodules=True, preferred=True)
+ version("master", branch="main", submodules=True)
version("1.1.0", tag="v1.1.0", submodules=True)
version("1.0.0", tag="v1.0.0", submodules=True)
- depends_on("cxx", type="build") # generated
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
variant("amr_wind_gpu", default=False, description="Enable AMR-Wind on the GPU")
variant("nalu_wind_gpu", default=False, description="Enable Nalu-Wind on the GPU")
diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py
index 5e991e9028..d7247d7acd 100644
--- a/var/spack/repos/builtin/packages/nalu-wind/package.py
+++ b/var/spack/repos/builtin/packages/nalu-wind/package.py
@@ -13,15 +13,6 @@ def _parse_float(val):
return False
-def submodules(package):
- submodules = []
- if package.spec.satisfies("+wind-utils"):
- submodules.append("wind-utils")
- if package.spec.satisfies("+tests"):
- submodules.append("reg_tests/mesh")
- return submodules
-
-
class NaluWind(CMakePackage, CudaPackage, ROCmPackage):
"""Nalu-Wind: Wind energy focused variant of Nalu."""
@@ -33,9 +24,9 @@ class NaluWind(CMakePackage, CudaPackage, ROCmPackage):
tags = ["ecp", "ecp-apps"]
- version("master", branch="master", submodules=submodules)
- version("2.1.0", tag="v2.1.0", submodules=submodules)
- version("2.0.0", tag="v2.0.0", submodules=submodules)
+ version("master", branch="master", submodules=True)
+ version("2.1.0", tag="v2.1.0", submodules=True)
+ version("2.0.0", tag="v2.0.0", submodules=True)
variant("pic", default=True, description="Position independent code")
variant(
@@ -66,6 +57,10 @@ class NaluWind(CMakePackage, CudaPackage, ROCmPackage):
"tests", default=False, description="Enable regression tests and clone the mesh submodule"
)
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
+ depends_on("fortran", type="build", when="+openfast")
+
depends_on("mpi")
depends_on("yaml-cpp@0.5.3:")
depends_on("openfast@4.0.0:+cxx+netcdf", when="+fsi")
@@ -156,7 +151,6 @@ class NaluWind(CMakePackage, CudaPackage, ROCmPackage):
args = [
self.define("CMAKE_CXX_COMPILER", spec["mpi"].mpicxx),
- self.define("CMAKE_Fortran_COMPILER", spec["mpi"].mpifc),
self.define("Trilinos_DIR", spec["trilinos"].prefix),
self.define("YAML_DIR", spec["yaml-cpp"].prefix),
self.define("CMAKE_CXX_STANDARD", "17"),
@@ -177,6 +171,7 @@ class NaluWind(CMakePackage, CudaPackage, ROCmPackage):
if spec.satisfies("+openfast"):
args.append(self.define("OpenFAST_DIR", spec["openfast"].prefix))
+ args.append(self.define("CMAKE_Fortran_COMPILER", spec["mpi"].mpifc))
if spec.satisfies("+tioga"):
args.append(self.define("TIOGA_DIR", spec["tioga"].prefix))
diff --git a/var/spack/repos/builtin/packages/tioga/package.py b/var/spack/repos/builtin/packages/tioga/package.py
index 29b8bb6289..62e3234ab1 100644
--- a/var/spack/repos/builtin/packages/tioga/package.py
+++ b/var/spack/repos/builtin/packages/tioga/package.py
@@ -25,8 +25,7 @@ class Tioga(CMakePackage):
version("1.0.0", git="https://github.com/Exawind/tioga.git", tag="v1.0.0")
version("master", branch="master")
- depends_on("cxx", type="build") # generated
- depends_on("fortran", type="build") # generated
+ depends_on("cxx", type="build")
variant("shared", default=sys.platform != "darwin", description="Build shared libraries")
variant("pic", default=True, description="Position independent code")
--
cgit v1.2.3-70-g09d2