diff options
| author | eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> | 2023-09-24 00:28:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-24 16:28:03 +0900 |
| commit | 95b737d9238d14f388c58e65fdb77e3538be8473 (patch) | |
| tree | 51a99def05806900e32da348b9e92274bf070a66 | |
| parent | d7e9a13f53972bf2500c5d22fd160b323dab5feb (diff) | |
| download | spack-95b737d9238d14f388c58e65fdb77e3538be8473.tar.gz spack-95b737d9238d14f388c58e65fdb77e3538be8473.tar.bz2 spack-95b737d9238d14f388c58e65fdb77e3538be8473.tar.xz spack-95b737d9238d14f388c58e65fdb77e3538be8473.zip | |
trilinos +shylu: patch to resolve trilinos issue #12048 (#40169)
* trilinos +shylu: patch to resolve trilinos issue #12048
* e4s ci: build xyce ^trilinos+shylu
---------
Co-authored-by: Seth R. Johnson <johnsonsr@ornl.gov>
3 files changed, 13 insertions, 1 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml index 9374e69ec7..7a07de5778 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml @@ -153,7 +153,7 @@ spack: - variorum - veloc - wannier90 - - xyce +mpi +shared +pymi +pymi_static_tpls ^trilinos~shylu + - xyce +mpi +shared +pymi +pymi_static_tpls ^trilinos +shylu # CUDA - amrex +cuda diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 2c7acc1d10..20a8d290e2 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -447,6 +447,8 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): # ###################### Patches ########################## + patch("shylu-node-optional.patch", when="@13:14.4.0 +shylu") + patch("umfpack_from_suitesparse.patch", when="@11.14.1:12.8.1") for _compiler in ["xl", "xl_r", "clang"]: patch("xlf_seacas.patch", when="@12.10.1:12.12.1 %" + _compiler) diff --git a/var/spack/repos/builtin/packages/trilinos/shylu-node-optional.patch b/var/spack/repos/builtin/packages/trilinos/shylu-node-optional.patch new file mode 100644 index 0000000000..491b8aa490 --- /dev/null +++ b/var/spack/repos/builtin/packages/trilinos/shylu-node-optional.patch @@ -0,0 +1,10 @@ +diff -ruN spack-src/packages/shylu/cmake/Dependencies.cmake spack-src-patched/packages/shylu/cmake/Dependencies.cmake +--- spack-src/packages/shylu/cmake/Dependencies.cmake 2023-08-01 15:08:54.000000000 -0700 ++++ spack-src-patched/packages/shylu/cmake/Dependencies.cmake 2023-09-22 12:53:28.755219076 -0700 +@@ -1,4 +1,5 @@ +-SET(LIB_REQUIRED_DEP_PACKAGES ShyLU_DD ShyLU_Node) ++SET(LIB_REQUIRED_DEP_PACKAGES ShyLU_DD) ++SET(LIB_OPTIONAL_DEP_PACKAGES ShyLU_Node) + SET(LIB_OPTIONAL_DEP_PACKAGES) + SET(TEST_REQUIRED_DEP_PACKAGES) + SET(TEST_OPTIONAL_DEP_PACKAGES) |