From 0685c6277eeb90158df49ae68ad5da12bb184422 Mon Sep 17 00:00:00 2001 From: Nai-Yuan Chiang Date: Tue, 29 Apr 2025 11:16:10 -0700 Subject: [PATCH] hiop: add v1.1.1 (#50069) * use hiop new release v1.1.1 * remove "# generated" comments on language dependencies Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com> --------- Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com> --- .../repos/builtin/packages/hiop/package.py | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index f8b46161d08..9afe3602178 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -21,6 +21,9 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") # Most recent tagged snapshot is the preferred version when profiling. + version( + "1.1.1", tag="v1.1.1", commit="d8762e05150b2040a27f69d8bf6603f22190a869", submodules=True + ) version( "1.1.0", tag="v1.1.0", commit="7ccfa86a71fdb670ae690199ac676f3c1365799a", submodules=True ) @@ -72,10 +75,6 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): version("master", branch="master") version("develop", branch="develop") - depends_on("c", type="build") - depends_on("cxx", type="build") - depends_on("fortran", type="build") - variant( "axom", default=False, @@ -100,9 +99,9 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): description="Enable/disable cuSovler LU refactorization", ) - depends_on("c", type="build") # generated - depends_on("cxx", type="build") # generated - depends_on("fortran", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") + depends_on("fortran", type="build") depends_on("lapack") depends_on("blas") @@ -152,11 +151,14 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): # RAJA > 0.14 and Umpire > 6.0 require c++ std 14 # We are working on supporting newer Umpire/RAJA versions - depends_on("raja@0.14", when="@0.5:+raja") + depends_on("raja@2024.07.0", when="@1.1.1:+raja") + depends_on("raja@0.14", when="@0.5:1.1.0+raja") depends_on("raja@:0.13", when="@0.3.99:0.4+raja") - depends_on("umpire@6", when="@0.5:+raja") + depends_on("umpire@2024.07.0", when="@1.1.1:+raja") + depends_on("umpire@6", when="@0.5:1.1.0+raja") depends_on("umpire@:5", when="@0.3.99:0.4+raja") - depends_on("camp@0.2.3:0.2", when="@0.3.99:+raja") + depends_on("camp@0.2.3:0.2", when="@0.3.99:1.1.0+raja") + depends_on("camp@2024.07.0", when="@1.1.1+raja") # This is no longer a requirement in RAJA > 0.14 depends_on("umpire+cuda~shared", when="+raja+cuda ^raja@:0.14")