diff options
author | Jon Rood <jon.rood@nrel.gov> | 2022-10-19 14:33:01 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-19 13:33:01 -0700 |
commit | ae7999d7a1957465bd5848b263352ebf49ef8015 (patch) | |
tree | 80e5451a98549125825478dec9ef2ed51cad7b43 | |
parent | 4b0832d3bca5deabc51b0727b554d6db5edcd4a9 (diff) | |
download | spack-ae7999d7a1957465bd5848b263352ebf49ef8015.tar.gz spack-ae7999d7a1957465bd5848b263352ebf49ef8015.tar.bz2 spack-ae7999d7a1957465bd5848b263352ebf49ef8015.tar.xz spack-ae7999d7a1957465bd5848b263352ebf49ef8015.zip |
Simplify TIOGA package (#33396)
* Update TIOGA package.
* Add comment.
* Remove cuda variant and MPI_ROOT.
* Style.
-rw-r--r-- | var/spack/repos/builtin/packages/tioga/package.py | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/var/spack/repos/builtin/packages/tioga/package.py b/var/spack/repos/builtin/packages/tioga/package.py index 1374ad76fb..2716d13dfa 100644 --- a/var/spack/repos/builtin/packages/tioga/package.py +++ b/var/spack/repos/builtin/packages/tioga/package.py @@ -7,15 +7,17 @@ import sys from spack.package import * -class Tioga(CMakePackage, CudaPackage): +class Tioga(CMakePackage): """Topology Independent Overset Grid Assembly (TIOGA)""" homepage = "https://github.com/jsitaraman/tioga" git = "https://github.com/jsitaraman/tioga.git" - maintainers = ["jsitaraman", "sayerhs"] + maintainers = ["jrood-nrel"] - version("develop", branch="exawind") + # The original TIOGA repo has possibly been abandoned, + # so work on TIOGA has continued in the Exawind project + version("develop", git="https://github.com/Exawind/tioga.git", branch="exawind") version("master", branch="master") variant("shared", default=sys.platform != "darwin", description="Build shared libraries") @@ -23,39 +25,16 @@ class Tioga(CMakePackage, CudaPackage): variant("nodegid", default=True, description="Enable support for global Node IDs") variant("timers", default=False, description="Enable timers") variant("stats", default=False, description="Enable output of holecut stats") - variant( - "cxxstd", default="11", values=("11", "14"), multi=False, description="C++ standard to use" - ) depends_on("mpi") - depends_on("cuda@9.0.0:", when="+cuda") - - # Tioga has the fortran module file problem with parallel builds - parallel = False def cmake_args(self): - spec = self.spec - args = [ self.define_from_variant("BUILD_SHARED_LIBS", "shared"), self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic"), - self.define_from_variant("CMAKE_CXX_STANDARD", "cxxstd"), self.define_from_variant("TIOGA_HAS_NODEGID", "nodegid"), self.define_from_variant("TIOGA_ENABLE_TIMERS", "timers"), self.define_from_variant("TIOGA_OUTPUT_STATS", "stats"), - self.define_from_variant("TIOGA_ENABLE_CUDA", "cuda"), ] - if "+cuda" in self.spec: - args.append(self.define("CMAKE_CUDA_SEPARABLE_COMPILATION", True)) - - # Currently TIOGA only supports one device arch during specialization - cuda_arch = self.spec.variants["cuda_arch"].value - if cuda_arch: - arch_sorted = list(sorted(cuda_arch, reverse=True)) - args.append(self.define("TIOGA_CUDA_SM", arch_sorted[0])) - - if "darwin" in spec.architecture: - args.append(self.define("CMAKE_MACOSX_RPATH", True)) - return args |