diff --git a/repos/spack_repo/builtin/packages/mgard/package.py b/repos/spack_repo/builtin/packages/mgard/package.py index b8d06ea8406..1230780be11 100644 --- a/repos/spack_repo/builtin/packages/mgard/package.py +++ b/repos/spack_repo/builtin/packages/mgard/package.py @@ -30,6 +30,11 @@ class Mgard(CMakePackage, CudaPackage, ROCmPackage): license("Apache-2.0") # In spack numbers take precedence over alphabetic chars when sorting versions. + version( + "1.6.0", + sha256="06b1b2839a1794ec006db8f86683189bdd974e0404167ff3fc3705f0af02de4e", + preferred=True, + ) version("1.5.2", sha256="d78ff8735e9fc6f86abc4830563799a3dd3c9abf33d13d82ed42dbc28d48685d") # Historical versions using fork (with patches for Spack compatibility) @@ -37,7 +42,6 @@ class Mgard(CMakePackage, CudaPackage, ROCmPackage): "compat-2023-12-09", commit="d61d8c06c49a72b2e582cc02de88b7b27e1275d2", git="https://github.com/robertu94/MGARD.git", - preferred=True, ) version( "compat-2023-03-31", @@ -121,9 +125,16 @@ class Mgard(CMakePackage, CudaPackage, ROCmPackage): # https://github.com/abseil/abseil-cpp/issues/1629 conflicts("abseil-cpp@20240116.1", when="+cuda", msg="triggers nvcc parser bug") - patch("hip-pointer-attribute-struct-fix.patch", when="@:2023-12-09") - patch("hip-cub-configure.patch", when="@:2023-12-09") - patch("hip-abs-reduce-type.patch", when="@:2023-12-09") + patch("hip-pointer-attribute-struct-fix.patch", when="@:1.5") + patch("hip-cub-configure.patch", when="@:1.5") + patch("hip-abs-reduce-type.patch", when="@:1.5") + + # https://github.com/CODARcode/MGARD/issues/252 + patch( + "https://github.com/CODARcode/MGARD/commit/8d13307586cc0e87b2d1164bd0b4dd2cc18f9dc2.patch?full_index=1", + sha256="1c64ad285f616d87d13ae4faa1ef57adeb6a3f20013f78b3e36d2beae479b4db", + when="@1.6", + ) def flag_handler(self, name, flags): if name == "cxxflags":