Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions repos/spack_repo/builtin/packages/omega_h/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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,
Expand All @@ -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")
Comment thread
Fuad-HH marked this conversation as resolved.
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
Expand All @@ -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

@bernhardkaindl bernhardkaindl Aug 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cwsmith, this filter_file() removes (tested to build both affected versions) remaining debug call for the +exodus versions that still have the debug call:

Suggested change
def patch(self):
if "@:9.34.8" in self.spec:
def patch(self):
# https://github.com/SCOREC/omega_h/commit/4dd682ef16ebf2502239ad06883e9f10c611f1c4
if self.spec.satisfies("@10.8.6-scorec:11.0.0-scorec"):
filter_file(r"nc_set_log_level\(5\);", "", "src/Omega_h_exodus.cpp")
if self.spec.satisfies("@:9.34.8"):

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(
Expand Down
Loading