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

Remove boost as dependency for trilinos+stk (#39556)

Browse Source 
* Remove boost as dependency for trilinos+stk.

* Formatting.

* Put bounds on STK requirement of Boost.
This commit is contained in:
Jon Rood
2024-02-13 13:28:25 -07:00
committed by GitHub
parent e4c871489a
commit 59f56327fe
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/nalu-wind/package.py
View File

@@ -52,9 +52,7 @@ class NaluWind(CMakePackage, CudaPackage):
depends_on("mpi") depends_on("mpi")
depends_on("yaml-cpp@0.5.3:") depends_on("yaml-cpp@0.5.3:")
depends_on( depends_on(
"trilinos@13:" "trilinos@13:+exodus+tpetra+zoltan+stk~superlu-dist~superlu+hdf5+shards~hypre+gtest"
"+exodus+tpetra+zoltan+stk+boost"
"~superlu-dist~superlu+hdf5+shards~hypre+gtest"
) )
depends_on("trilinos~cuda~wrapper", when="~cuda") depends_on("trilinos~cuda~wrapper", when="~cuda")
# Cannot build Trilinos as a shared library with STK on Darwin # Cannot build Trilinos as a shared library with STK on Darwin

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

@@ -328,12 +328,6 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
# see https://trilinos.org/pipermail/trilinos-users/2015-March/004731.html # see https://trilinos.org/pipermail/trilinos-users/2015-March/004731.html
# and https://trilinos.org/pipermail/trilinos-users/2015-March/004802.html # and https://trilinos.org/pipermail/trilinos-users/2015-March/004802.html
conflicts("+superlu-dist", when="+complex+amesos2") conflicts("+superlu-dist", when="+complex+amesos2")
# https://github.com/trilinos/Trilinos/issues/2994
conflicts(
"+shared",
when="+stk platform=darwin",
msg="Cannot build Trilinos with STK as a shared library on Darwin.",
)
conflicts("+adios2", when="@:12.14.1") conflicts("+adios2", when="@:12.14.1")
conflicts("cxxstd=11", when="@13.2:") conflicts("cxxstd=11", when="@13.2:")
conflicts("cxxstd=14", when="@14:") conflicts("cxxstd=14", when="@14:")
@@ -406,10 +400,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
depends_on("binder@1.3:", when="@15: +python", type="build") depends_on("binder@1.3:", when="@15: +python", type="build")
depends_on("blas") depends_on("blas")
depends_on("boost+graph+math+exception+stacktrace", when="+boost") depends_on("boost+graph+math+exception+stacktrace", when="+boost")
# Need to revisit the requirement of STK depends_on("boost+graph+math+exception+stacktrace", when="@:14.0.0 +stk")
depends_on("boost+graph+math+exception+stacktrace", when="+stk")
#
depends_on("cgns", when="+exodus") depends_on("cgns", when="+exodus")
depends_on("cmake@3.23:", type="build", when="@14.0.0:") depends_on("cmake@3.23:", type="build", when="@14.0.0:")
depends_on("hdf5+hl", when="+hdf5") depends_on("hdf5+hl", when="+hdf5")