Skip to content

Commit c1e11d3

Browse files
byrnHDFbyrnHDF
authored
Update compression libs versions (#156)
1 parent 8864b05 commit c1e11d3

28 files changed

+608
-110
lines changed

‎.github/workflows/check-releases.yml‎

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
name: hdf5 plugins check compression releases
2+
3+
# Triggers the workflow on a call from another workflow
4+
on:
5+
workflow_call:
6+
7+
jobs:
8+
check-compression-releases:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Get bitshuffle release version
12+
id: get-bitshuffle-release
13+
uses: cardinalby/git-get-release-action@v1
14+
env:
15+
GITHUB_TOKEN: ${{ github.token }}
16+
with:
17+
repo: 'kiyo-masui/bitshuffle'
18+
latest: true
19+
20+
- name: Report bitshuffle release version
21+
run: |
22+
echo "BSHUF=${{ steps.get-bitshuffle-release.outputs.tag_name }}" >> $GITHUB_OUTPUT
23+
24+
- name: Get blosc release version
25+
id: get-blosc-release
26+
uses: cardinalby/git-get-release-action@v1
27+
env:
28+
GITHUB_TOKEN: ${{ github.token }}
29+
with:
30+
repo: 'Blosc/c-blosc'
31+
latest: true
32+
33+
- name: Report blosc release version
34+
run: |
35+
echo "BLOSC=${{ steps.get-blosc-release.outputs.tag_name }}" >> $GITHUB_OUTPUT
36+
37+
- name: Get blosc2 release version
38+
id: get-blosc2-release
39+
uses: cardinalby/git-get-release-action@v1
40+
env:
41+
GITHUB_TOKEN: ${{ github.token }}
42+
with:
43+
repo: 'Blosc/c-blosc2'
44+
latest: true
45+
46+
- name: Report blosc2 release version
47+
run: |
48+
echo "BLOSC2=${{ steps.get-blosc2-release.outputs.tag_name }}" >> $GITHUB_OUTPUT
49+
50+
# - name: Get bzip2 release version
51+
# id: get-bzip2-release
52+
# uses: cardinalby/git-get-release-action@v1
53+
# env:
54+
# GITHUB_TOKEN: ${{ github.token }}
55+
# with:
56+
# repo: 'libarchive/bzip2'
57+
# latest: true
58+
#
59+
# - name: Report bzip2 release version
60+
# run: |
61+
# echo "BZIP2=bzip2: ${{ steps.get-bzip2-release.outputs.tag_name }}" >> $GITHUB_OUTPUT
62+
63+
- name: Get fpzip release version
64+
id: get-fpzip-release
65+
uses: cardinalby/git-get-release-action@v1
66+
env:
67+
GITHUB_TOKEN: ${{ github.token }}
68+
with:
69+
repo: 'LLNL/fpzip'
70+
latest: true
71+
72+
- name: Report fpzip release version
73+
run: |
74+
echo "FPZIP=${{ steps.get-fpzip-release.outputs.tag_name }}" >> $GITHUB_OUTPUT
75+
76+
- name: Get libjpeg release version
77+
id: get-libjpeg-release
78+
uses: cardinalby/git-get-release-action@v1
79+
env:
80+
GITHUB_TOKEN: ${{ github.token }}
81+
with:
82+
repo: 'libjpeg-turbo/libjpeg-turbo'
83+
latest: true
84+
85+
- name: Report libjpeg release version
86+
run: |
87+
echo "JPEG=${{ steps.get-libjpeg-release.outputs.tag_name }}" >> $GITHUB_OUTPUT
88+
89+
- name: Get lz4 release version
90+
id: get-lz4-release
91+
uses: cardinalby/git-get-release-action@v1
92+
env:
93+
GITHUB_TOKEN: ${{ github.token }}
94+
with:
95+
repo: 'lz4/lz4'
96+
latest: true
97+
98+
- name: Report lz4 release version
99+
run: |
100+
echo "LZ4=${{ steps.get-lz4-release.outputs.tag_name }}" >> $GITHUB_OUTPUT
101+
102+
- name: Get zfp release version
103+
id: get-zfp-release
104+
uses: cardinalby/git-get-release-action@v1
105+
env:
106+
GITHUB_TOKEN: ${{ github.token }}
107+
with:
108+
repo: 'LLNL/zfp'
109+
latest: true
110+
111+
- name: Report zfp release version
112+
run: |
113+
echo "ZFP=${{ steps.get-zfp-release.outputs.tag_name }}" >> $GITHUB_OUTPUT
114+
115+
- name: Get zstd release version
116+
id: get-zstd-release
117+
uses: cardinalby/git-get-release-action@v1
118+
env:
119+
GITHUB_TOKEN: ${{ github.token }}
120+
with:
121+
repo: 'facebook/zstd'
122+
latest: true
123+
124+
- name: Report zstd release version
125+
run: |
126+
echo "ZSTD=${{ steps.get-zstd-release.outputs.tag_name }}" >> $GITHUB_OUTPUT
127+
128+
- name: Get zlib release version
129+
id: get-zlib-release
130+
uses: cardinalby/git-get-release-action@v1
131+
env:
132+
GITHUB_TOKEN: ${{ github.token }}
133+
with:
134+
repo: 'madler/zlib'
135+
latest: true
136+
137+
- name: Report zlib release version
138+
run: |
139+
echo "ZLIB=${{ steps.get-zlib-release.outputs.tag_name }}" >> $GITHUB_OUTPUT
140+
141+
- name: Get zlib-ng release version
142+
id: get-zlib-ng-release
143+
uses: cardinalby/git-get-release-action@v1
144+
env:
145+
GITHUB_TOKEN: ${{ github.token }}
146+
with:
147+
repo: 'zlib-ng/zlib-ng'
148+
latest: true
149+
150+
- name: Report zlib-ng release version
151+
run: |
152+
echo "ZLIBNG=${{ steps.get-zlib-ng-release.outputs.tag_name }}" >> $GITHUB_OUTPUT
153+
154+
- name: create-json
155+
id: create-json
156+
uses: jsdaniell/[email protected]
157+
with:
158+
name: "versions-file.json"
159+
json: '{"bitshuffle":"${{ steps.get-bitshuffle-release.outputs.tag_name }}"",
160+
"blosc":"${{ steps.get-blosc-release.outputs.tag_name }}"
161+
"blosc2":"${{ steps.get-blosc2-release.outputs.tag_name }}"
162+
"fpzip":"${{ steps.get-fpzip-release.outputs.tag_name }}"
163+
"libjpeg":"${{ steps.get-libjpeg-release.outputs.tag_name }}"
164+
"lz4":"${{ steps.get-lz4-release.outputs.tag_name }}"
165+
"zfp":"${{ steps.get-zfp-release.outputs.tag_name }}"
166+
"zstd":"${{ steps.get-zstd-release.outputs.tag_name }}"
167+
"zlib":"${{ steps.get-zlib-release.outputs.tag_name }}"
168+
"zlib-ng":"${{ steps.get-zlib-ng-release.outputs.tag_name }}"
169+
}'
170+
171+
# Save json report
172+
- name: Save json report
173+
uses: actions/upload-artifact@v4
174+
with:
175+
name: compression-versions
176+
path: versions-file.json
177+
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
178+

‎.github/workflows/daily-build.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,6 @@ jobs:
121121
use_environ: snapshots
122122
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-base-names.outputs.run-ignore == 'ignore')) && (needs.get-old-names.outputs.hdf5-name != needs.call-workflow-tarball.outputs.file_base) }}
123123

124+
call-workflow-versions:
125+
uses: ./.github/workflows/check-releases.yml
126+

‎BLOSC/config/cmake/cacheinit.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ set (BLOSC_GIT_URL "https://github.com/Blosc/c-blosc.git" CACHE STRING "Use BLOS
2727
set (BLOSC_GIT_BRANCH "master" CACHE STRING "" FORCE)
2828

2929
set (BLOSC_TGZ_ORIGPATH "https://github.com/Blosc/c-blosc/archive/refs/tags" CACHE STRING "Use PLUGINS from original location" FORCE)
30-
set (BLOSC_TGZ_NAME "c-blosc-1.21.5.tar.gz" CACHE STRING "Use BLOSC from compressed file" FORCE)
30+
set (BLOSC_TGZ_NAME "c-blosc-1.21.6.tar.gz" CACHE STRING "Use BLOSC from compressed file" FORCE)
3131

3232
set (BLOSC_PACKAGE_NAME "blosc" CACHE STRING "Name of BLOSC package" FORCE)
3333
set (H5BLOSC_CPACK_ENABLE ON CACHE BOOL "Enable the CPACK include and components" FORCE)

‎BLOSC2/config/cmake/cacheinit.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ set (BLOSC2_GIT_URL "https://github.com/Blosc/c-blosc2.git" CACHE STRING "Use BL
2727
set (BLOSC2_GIT_BRANCH "master" CACHE STRING "" FORCE)
2828

2929
set (BLOSC2_TGZ_ORIGPATH "https://github.com/Blosc/c-blosc2/archive/refs/tags" CACHE STRING "Use PLUGINS from original location" FORCE)
30-
set (BLOSC2_TGZ_NAME "c-blosc2-1.21.5.tar.gz" CACHE STRING "Use BLOSC2 from compressed file" FORCE)
30+
set (BLOSC2_TGZ_NAME "c-blosc2-2.15.1.tar.gz" CACHE STRING "Use BLOSC2 from compressed file" FORCE)
3131

3232
set (BLOSC2_PACKAGE_NAME "blosc2" CACHE STRING "Name of BLOSC2 package" FORCE)
3333
set (H5BLOSC2_CPACK_ENABLE ON CACHE BOOL "Enable the CPACK include and components" FORCE)

‎BSHUF/config/cmake/cacheinit.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ set (BUILD_BSHUF_LZ4_LIBRARY_SOURCE ON CACHE BOOL "build the lz4 library within
2828
set (LZ4_GIT_URL "https://github.com/lz4/lz4.git" CACHE STRING "Use LZ4 from GitHub repository" FORCE)
2929
set (LZ4_GIT_BRANCH "dev" CACHE STRING "" FORCE)
3030

31-
set (LZ4_TGZ_ORIGPATH "https://github.com/lz4/lz4/releases/download/v1.9.4" CACHE STRING "Use PLUGINS from original location" FORCE)
32-
set (LZ4_TGZ_NAME "lz4-1.9.4.tar.gz" CACHE STRING "Use LZ4 from compressed file" FORCE)
31+
set (LZ4_TGZ_ORIGPATH "https://github.com/lz4/lz4/releases/download/v1.10.0" CACHE STRING "Use PLUGINS from original location" FORCE)
32+
set (LZ4_TGZ_NAME "lz4-1.10.0.tar.gz" CACHE STRING "Use LZ4 from compressed file" FORCE)
3333

3434
set (LZ4_PACKAGE_NAME "lz4" CACHE STRING "Name of LZ4 package" FORCE)
3535

‎CMakePresets.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
"BUILD_BSHUF_LZ4_LIBRARY_SOURCE": "ON",
3131
"BSHUF_TGZ_NAME": {"type": "STRING", "value": "bitshuffle-0.5.1.tar.gz"},
3232
"BSHUF_PACKAGE_NAME": {"type": "STRING", "value": "bshuf"},
33-
"BLOSC_TGZ_NAME": {"type": "STRING", "value": "c-blosc-1.21.5.tar.gz"},
33+
"BLOSC_TGZ_NAME": {"type": "STRING", "value": "c-blosc-1.21.6.tar.gz"},
3434
"BLOSC_PACKAGE_NAME": {"type": "STRING", "value": "blosc"},
3535
"BLOSC_ZLIB_TGZ_NAME": {"type": "STRING", "value": "zlib-1.3.tar.gz"},
3636
"BLOSC_ZLIB_PACKAGE_NAME": {"type": "STRING", "value": "zlib"},
37-
"BLOSC2_TGZ_NAME": {"type": "STRING", "value": "c-blosc2-2.14.4.tar.gz"},
37+
"BLOSC2_TGZ_NAME": {"type": "STRING", "value": "c-blosc2-2.15.1.tar.gz"},
3838
"BLOSC2_PACKAGE_NAME": {"type": "STRING", "value": "blosc2"},
3939
"BLOSC2_ZLIB_TGZ_NAME": {"type": "STRING", "value": "zlib-1.3.tar.gz"},
4040
"BLOSC2_ZLIB_PACKAGE_NAME": {"type": "STRING", "value": "zlib"},
@@ -45,15 +45,15 @@
4545
"JPEG_TGZ_NAME": {"type": "STRING", "value": "jpegsrc.v9e.tar.gz"},
4646
"JPEG_PACKAGE_NAME": {"type": "STRING", "value": "jpeg"},
4747
"BUILD_LZ4_LIBRARY_SOURCE": "ON",
48-
"LZ4_TGZ_NAME": {"type": "STRING", "value": "lz4-1.9.4.tar.gz"},
48+
"LZ4_TGZ_NAME": {"type": "STRING", "value": "lz4-1.10.0.tar.gz"},
4949
"LZ4_PACKAGE_NAME": {"type": "STRING", "value": "lz4"},
5050
"LZF_TGZ_NAME": {"type": "STRING", "value": "liblzf-3.6.tar.gz"},
5151
"LZF_PACKAGE_NAME": {"type": "STRING", "value": "lzf"},
5252
"SZ_TGZ_NAME": {"type": "STRING", "value": "SZ-2.1.12.5.tar.gz"},
5353
"SZ_PACKAGE_NAME": {"type": "STRING", "value": "SZ"},
5454
"ZFP_TGZ_NAME": {"type": "STRING", "value": "zfp-1.0.0.tar.gz"},
5555
"ZFP_PACKAGE_NAME": {"type": "STRING", "value": "zfp"},
56-
"ZSTD_TGZ_NAME": {"type": "STRING", "value": "zstd-1.5.5.tar.gz"},
56+
"ZSTD_TGZ_NAME": {"type": "STRING", "value": "zstd-1.5.6.tar.gz"},
5757
"ZSTD_PACKAGE_NAME": {"type": "STRING", "value": "zstd"}
5858
}
5959
},

‎LZ4/CMakeLists.txt‎

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -83,36 +83,33 @@ message (STATUS "H5LZ4 link libs: ${H5PL_LINK_LIBS}")
8383
#-----------------------------------------------------------------------------
8484
configure_file (${H5LZ4_RESOURCES_DIR}/config.h.in ${H5LZ4_BINARY_DIR}/lz4_config.h @ONLY)
8585

86-
INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIR})
87-
88-
option (BUILD_LZ4_LIBRARY_SOURCE "build the lz4 library within the plugin" ON)
89-
if (NOT BUILD_LZ4_LIBRARY_SOURCE)
90-
include (ExternalProject)
91-
set (H5PL_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT TGZ)")
92-
set_property (CACHE H5PL_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
93-
if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
94-
option (LZ4_USE_EXTERNAL "Use External Library Building for LZ4" 1)
95-
if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT")
96-
set (LZ4_URL ${LZ4_GIT_URL} CACHE STRING "Path to lz4 git repository")
97-
set (LZ4_BRANCH ${LZ4_GIT_BRANCH})
98-
elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
99-
if (NOT H5PL_COMP_TGZPATH)
100-
set (H5PL_COMP_TGZPATH ${H5LZ4_SOURCE_DIR})
101-
endif ()
102-
set (LZ4_URL ${H5PL_COMP_TGZPATH}/${LZ4_TGZ_NAME})
103-
else ()
104-
set (LZ4_USE_EXTERNAL 0)
86+
include (ExternalProject)
87+
set (H5PL_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT TGZ)")
88+
set_property (CACHE H5PL_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
89+
if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
90+
option (LZ4_USE_EXTERNAL "Use External Library Building for LZ4" 1)
91+
if (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT")
92+
set (LZ4_URL ${LZ4_GIT_URL} CACHE STRING "Path to lz4 git repository")
93+
set (LZ4_BRANCH ${LZ4_GIT_BRANCH})
94+
elseif (H5PL_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
95+
if (NOT H5PL_COMP_TGZPATH)
96+
set (H5PL_COMP_TGZPATH ${H5LZ4_SOURCE_DIR})
10597
endif ()
98+
set (LZ4_URL ${H5PL_COMP_TGZPATH}/${LZ4_TGZ_NAME})
99+
else ()
100+
set (LZ4_USE_EXTERNAL 0)
106101
endif ()
107-
#-----------------------------------------------------------------------------
108-
# lz4 Library Settings
109-
#-----------------------------------------------------------------------------
102+
endif ()
103+
#-----------------------------------------------------------------------------
104+
# lz4 Library Settings
105+
#-----------------------------------------------------------------------------
106+
if (NOT H5_LZ4_HEADER)
110107
if (NOT LZ4_USE_EXTERNAL)
111108
find_package (LZ4 NAMES ${LZ4_PACKAGE_NAME})
112109
if (NOT LZ4_FOUND)
113110
find_package (LZ4) # Legacy find
114-
if (NOT LZ4_FOUND)
115-
message (FATAL_ERROR " lz4 is Required for ${H5LZ4_PACKAGE_NAME} library")
111+
if (LZ4_FOUND)
112+
set (H5PL_LINK_LIBS ${H5PL_LINK_LIBS} ${LZ4_LIBRARIES})
116113
endif ()
117114
endif ()
118115
endif ()
@@ -132,13 +129,12 @@ if (NOT BUILD_LZ4_LIBRARY_SOURCE)
132129
message (FATAL_ERROR " LZ4 is Required for ${H5LZ4_PACKAGE_NAME} library")
133130
endif ()
134131
endif ()
135-
message (STATUS "lz4 found: INC=${LZ4_INCLUDE_DIR} TOOLS=${LZ4_LIBRARIES}")
136-
set (H5PL_LINK_LIBS ${H5PL_LINK_LIBS} ${LZ4_LIBRARIES})
137-
138-
if (LZ4_FOUND)
139-
PACKAGE_LZ4_LIBRARY (${H5PL_ALLOW_EXTERNAL_SUPPORT})
140-
endif ()
132+
else ()
133+
# This project is being called from within another and LZ4 is already configured
134+
set (H5_HAVE_LZ4_H 1)
141135
endif ()
136+
message (STATUS "lz4 found: INC=${LZ4_INCLUDE_DIR} TOOLS=${LZ4_LIBRARIES}")
137+
set (H5PL_LINK_LIBS ${H5PL_LINK_LIBS} ${LZ4_LIBRARIES})
142138
#-----------------------------------------------------------------------------
143139

144140
#-----------------------------------------------------------------------------

0 commit comments

Comments
 (0)