hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

trilinos: new pytrilinos2 variant (#40615)

Browse source
This commit is contained in:
jmlapre 2023-11-30 16:08:58 -05:00 committed by GitHub
parent 5be3ca396b
commit 779fef7d41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
var/spack/repos/builtin/packages/binder/package.py
View file

@ -49,6 +49,6 @@ def cmake_args(self):
def setup_dependent_package(self, module, dependent_spec):
llvm_dir = self.spec["llvm"].prefix
self.spec.clang_include_dirs = llvm_dir.include
self.spec.LibClang_include_dir = llvm_dir.lib.clang.join(
self.spec.libclang_include_dir = llvm_dir.lib.clang.join(
format(self.spec["llvm"].version)
).include

20
var/spack/repos/builtin/packages/trilinos/package.py
View file

@ -137,6 +137,8 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
variant("nox", default=False, description="Compile with NOX")
variant("panzer", default=False, description="Compile with Panzer")
variant("piro", default=False, description="Compile with Piro")
variant("pytrilinos2", default=False, when="@develop", description="Compile with PyTrilinos2")
extends("python", when="+pytrilinos2")
variant("phalanx", default=False, description="Compile with Phalanx")
variant("rol", default=False, description="Compile with ROL")
variant("rythmos", default=False, description="Compile with Rythmos")
@ -289,6 +291,9 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
conflicts("~ifpack")
conflicts("~aztec")
# Don't disable python when building pytrilinos2
conflicts("~python", when="+pytrilinos2")
# Known requirements from tribits dependencies
conflicts("~thyra", when="+stratimikos")
conflicts("+adelus", when="~kokkos")
@ -401,6 +406,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
depends_on(kokkos_spec, when="@14.4.0 +kokkos {0}".format(arch_str))
depends_on("adios2", when="+adios2")
depends_on("binder@1.3:", when="+pytrilinos2", type="build")
depends_on("blas")
depends_on("boost+graph+math+exception+stacktrace", when="+boost")
# Need to revisit the requirement of STK
@ -420,12 +426,16 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
depends_on("matio", when="+exodus")
depends_on("metis", when="+zoltan")
depends_on("mpi", when="+mpi")
depends_on("mpi", when="+pytrilinos2")
depends_on("netcdf-c", when="+exodus")
depends_on("parallel-netcdf", when="+exodus+mpi")
depends_on("parmetis", when="+mpi +zoltan")
depends_on("parmetis", when="+scorec")
depends_on("py-mpi4py", when="+mpi+python", type=("build", "run"))
depends_on("py-mpi4py", when="+pytrilinos2", type=("build", "run"))
depends_on("py-numpy", when="+python", type=("build", "run"))
depends_on("py-numpy", when="+pytrilinos2", type=("build", "run"))
depends_on("py-pybind11", when="+pytrilinos2", type=("build", "link"))
depends_on("python", when="+python")
depends_on("python", when="@13.2: +ifpack +hypre", type="build")
depends_on("python", when="@13.2: +ifpack2 +hypre", type="build")
@ -671,6 +681,7 @@ def define_enable(suffix, value=None):
define_trilinos_enable("Piro"),
define_trilinos_enable("Phalanx"),
define_trilinos_enable("PyTrilinos", "python"),
define_trilinos_enable("PyTrilinos2"),
define_trilinos_enable("ROL"),
define_trilinos_enable("Rythmos"),
define_trilinos_enable("Sacado"),
@ -743,6 +754,15 @@ def define_enable(suffix, value=None):
]
)
if "+pytrilinos2" in spec:
binder = spec["binder"].prefix.bin.binder
clang_include_dirs = spec["binder"].clang_include_dirs
libclang_include_dir = spec["binder"].libclang_include_dir
options.append(define("PyTrilinos2_BINDER_EXECUTABLE", binder))
options.append(define("PyTrilinos2_BINDER_clang_include_dirs", clang_include_dirs))
options.append(define("PyTrilinos2_BINDER_LibClang_include_dir", libclang_include_dir))
options.append(define_from_variant("PyTrilinos2_ENABLE_TESTS", "test"))
if "+stratimikos" in spec:
# Explicitly enable Thyra (ThyraCore is required). If you don't do
# this, then you get "NOT setting ${pkg}_ENABLE_Thyra=ON since