-
Notifications
You must be signed in to change notification settings - Fork 739
omega-h: Use seacas for exodus (instead of trilinos) #4672
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
f80c434
e514d02
b7f9b00
4ecae1c
0776e43
8724f45
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -21,6 +21,11 @@ class OmegaH(CMakePackage, CudaPackage): | |||||||||||||||
| maintainers("cwsmith") | ||||||||||||||||
| tags = ["e4s"] | ||||||||||||||||
| version("main", branch="main") | ||||||||||||||||
| version( | ||||||||||||||||
| "11.1.0-scorec", | ||||||||||||||||
| commit="9254be597e6460df497724e11b466485c37e94ff", | ||||||||||||||||
| git="https://github.com/SCOREC/omega_h.git", | ||||||||||||||||
| ) | ||||||||||||||||
| version( | ||||||||||||||||
| "11.0.0-scorec", | ||||||||||||||||
| commit="fbe1cc131fb1b5ac840129ecd8bd7b42ab244000", | ||||||||||||||||
|
|
@@ -67,7 +72,7 @@ class OmegaH(CMakePackage, CudaPackage): | |||||||||||||||
| variant("shared", default=True, description="Build shared libraries") | ||||||||||||||||
| variant("mpi", default=True, description="Activates MPI support") | ||||||||||||||||
| variant("zlib", default=True, description="Activates ZLib support") | ||||||||||||||||
| variant("trilinos", default=True, description="Use Teuchos and Kokkos") | ||||||||||||||||
| variant("trilinos", default=False, description="Use Kokkos and SEACASExodus from trilinos") | ||||||||||||||||
| variant( | ||||||||||||||||
| "exodus", | ||||||||||||||||
| default=False, | ||||||||||||||||
|
|
@@ -89,10 +94,19 @@ class OmegaH(CMakePackage, CudaPackage): | |||||||||||||||
| depends_on("gmsh", when="+examples") | ||||||||||||||||
| depends_on("gmsh@4.4.1:", when="+gmsh") | ||||||||||||||||
| depends_on("mpi", when="+mpi") | ||||||||||||||||
| depends_on("trilinos +kokkos", when="+trilinos") | ||||||||||||||||
| depends_on("trilinos +exodus", when="+exodus") | ||||||||||||||||
| depends_on("trilinos +kokkos+exodus", when="+trilinos") | ||||||||||||||||
| depends_on("trilinos +kokkos+exodus", when="@:11.0.0-scorec+exodus") | ||||||||||||||||
| depends_on("kokkos", when="+kokkos") | ||||||||||||||||
| depends_on("kokkos@4.3.00:", when="@10.10.0-scorec:+kokkos") | ||||||||||||||||
| depends_on("zlib-api", when="+zlib") | ||||||||||||||||
| depends_on("seacas~x11~tests~fortran", when="@11.1.0-scorec:+exodus") | ||||||||||||||||
|
|
||||||||||||||||
| conflicts("+trilinos", when="+kokkos", msg="Use Kokkos directly or via Trilinos, not both") | ||||||||||||||||
| conflicts( | ||||||||||||||||
| "+trilinos", | ||||||||||||||||
| when="@11.1.0-scorec:+exodus", | ||||||||||||||||
| msg="Use SEACASExodus directly or via Trilinos, not both", | ||||||||||||||||
| ) | ||||||||||||||||
|
|
||||||||||||||||
| with when("+cuda"): | ||||||||||||||||
| # https://github.com/SCOREC/omega_h/commit/40a2d36d0b747a7147aeed238a0323f40b227cb2 | ||||||||||||||||
|
|
@@ -113,8 +127,6 @@ class OmegaH(CMakePackage, CudaPackage): | |||||||||||||||
| # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86610 | ||||||||||||||||
| conflicts("%gcc@8:8.2", when="@:9.22.1") | ||||||||||||||||
|
|
||||||||||||||||
| conflicts("+exodus", when="~trilinos", msg="exodus requires trilinos to be enabled") | ||||||||||||||||
|
|
||||||||||||||||
| def patch(self): | ||||||||||||||||
| if "@:9.34.8" in self.spec: | ||||||||||||||||
|
Comment on lines
130
to
131
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @cwsmith, this
Suggested change
I guess a would be worth a suggestion to #5792 or alternatively a new PR. Suggestion submitted: #5792 (comment) BTW, off-topic: Is deprecating some of the older versions of omega-h a consideration for spack? |
||||||||||||||||
| filter_file( | ||||||||||||||||
|
|
||||||||||||||||
Uh oh!
There was an error while loading. Please reload this page.