Skip to content

Commit 01ecfae

Browse files
committed
mgard: Add 1.6.0 release
Also update the patches so that they get applied to the previous version (1.5) but not this one (as they are already applied).
1 parent 58da510 commit 01ecfae

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

repos/spack_repo/builtin/packages/mgard/package.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,18 @@ class Mgard(CMakePackage, CudaPackage, ROCmPackage):
3030
license("Apache-2.0")
3131

3232
# In spack numbers take precedence over alphabetic chars when sorting versions.
33+
version(
34+
"1.6.0",
35+
sha256="06b1b2839a1794ec006db8f86683189bdd974e0404167ff3fc3705f0af02de4e",
36+
preferred=True,
37+
)
3338
version("1.5.2", sha256="d78ff8735e9fc6f86abc4830563799a3dd3c9abf33d13d82ed42dbc28d48685d")
3439

3540
# Historical versions using fork (with patches for Spack compatibility)
3641
version(
3742
"compat-2023-12-09",
3843
commit="d61d8c06c49a72b2e582cc02de88b7b27e1275d2",
3944
git="https://github.com/robertu94/MGARD.git",
40-
preferred=True,
4145
)
4246
version(
4347
"compat-2023-03-31",
@@ -121,9 +125,16 @@ class Mgard(CMakePackage, CudaPackage, ROCmPackage):
121125
# https://github.com/abseil/abseil-cpp/issues/1629
122126
conflicts("[email protected]", when="+cuda", msg="triggers nvcc parser bug")
123127

124-
patch("hip-pointer-attribute-struct-fix.patch", when="@:2023-12-09")
125-
patch("hip-cub-configure.patch", when="@:2023-12-09")
126-
patch("hip-abs-reduce-type.patch", when="@:2023-12-09")
128+
patch("hip-pointer-attribute-struct-fix.patch", when="@:1.5")
129+
patch("hip-cub-configure.patch", when="@:1.5")
130+
patch("hip-abs-reduce-type.patch", when="@:1.5")
131+
132+
# https://github.com/CODARcode/MGARD/issues/252
133+
patch(
134+
"https://github.com/CODARcode/MGARD/pull/253.patch?full_index=1",
135+
sha256="84d88176b639b59a2da233d45ceb6703a98320bb5ac644f9166d192f0dae277a",
136+
when="@1.5:1.6",
137+
)
127138

128139
def flag_handler(self, name, flags):
129140
if name == "cxxflags":

0 commit comments

Comments
 (0)