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

trilinos +shylu: patch to resolve trilinos issue #12048 (#40169)

Browse Source 
* trilinos +shylu: patch to resolve trilinos issue #12048

* e4s ci: build xyce ^trilinos+shylu

---------

Co-authored-by: Seth R. Johnson <johnsonsr@ornl.gov>
This commit is contained in:
eugeneswalker 2023-09-24 00:28:03 -07:00 committed by GitHub
parent d7e9a13f53
commit 95b737d923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
View File

@ -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

2
var/spack/repos/builtin/packages/trilinos/package.py
View File

@ -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)

10
var/spack/repos/builtin/packages/trilinos/shylu-node-optional.patch Normal file
View File

@ -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)