From 0191e15a6a0c86520152694d2a75c3e595763d0a Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Thu, 26 Sep 2024 13:07:40 -0400 Subject: omega-h: add version scorec.10.8.5 and test support (#45990) --- var/spack/repos/builtin/packages/omega-h/package.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py index 63a1d45ff6..e4432f2e10 100644 --- a/var/spack/repos/builtin/packages/omega-h/package.py +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -19,6 +19,11 @@ class OmegaH(CMakePackage, CudaPackage): maintainers("cwsmith") tags = ["e4s"] version("main", branch="main") + version( + "scorec.10.8.5", + commit="62026fc305356abb5e02a9fce3fead9cf5077fbe", + git="https://github.com/SCOREC/omega_h.git", + ) version( "scorec.10.7.0", commit="0e5de8618c3370f702e08c1b1af476dbbc118892", @@ -75,6 +80,12 @@ class OmegaH(CMakePackage, CudaPackage): when="@scorec.10.1.0:", msg="Thrust is broken in CUDA = 11.2.* see https://github.com/sandialabs/omega_h/issues/366", ) + conflicts( + "^cuda@:11.3", + when="@scorec.10.8.5:", + msg="see https://github.com/SCOREC/omega_h/issues/66", + ) + # the sandia repo has a fix for cuda > 11.2 support # see github.com/sandialabs/omega_h/pull/373 conflicts( @@ -163,7 +174,7 @@ class OmegaH(CMakePackage, CudaPackage): def test_mesh(self): """test construction, adaptation, and conversion of a mesh""" - if self.spec.satisfies("@:9.34.0"): + if self.spec.satisfies("@:9.34.0") and not self.spec.satisfies("@:scorec"): raise SkipTest("Package must be installed as version 9.34.1 or later") with test_part(self, "test_mesh_create", purpose="mesh construction"): -- cgit v1.2.3-70-g09d2