Skip to content

Commit 3ac87e4

Browse files
authored
Rename BITROUND plugin folder to GRANULAR_BITROUND (#266)
The folder held the Granular BitRound plugin (filter ID 32023, src/H5Zgranularbr.c) under a misleading BITROUND/H5BITROUND CMake identity. Rename the folder and its full CMake package identity to GRANULAR_BITROUND (package name granular_bitround). The filter ID and the algorithm source are unchanged.
1 parent 3bead3c commit 3ac87e4

107 files changed

Lines changed: 315 additions & 315 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/main-fetchcontent-mac.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
-DENABLE_ZFP=ON \
8383
-DENABLE_ZSTD=OFF \
8484
-DENABLE_BITGROOM=ON \
85-
-DENABLE_BITROUND=ON \
85+
-DENABLE_GRANULAR_BITROUND=ON \
8686
-DENABLE_BSHUF=ON \
8787
..
8888
cmake --build . --parallel 3 --config ${{ inputs.build_mode }}
@@ -165,7 +165,7 @@ jobs:
165165
-DENABLE_ZFP=ON \
166166
-DENABLE_ZSTD=ON \
167167
-DENABLE_BITGROOM=ON \
168-
-DENABLE_BITROUND=ON \
168+
-DENABLE_GRANULAR_BITROUND=ON \
169169
-DENABLE_BSHUF=ON \
170170
$GITHUB_WORKSPACE
171171
cmake --build . --parallel 3 --config ${{ inputs.build_mode }}
@@ -240,7 +240,7 @@ jobs:
240240
-DENABLE_ZFP=ON \
241241
-DENABLE_ZSTD=ON \
242242
-DENABLE_BITGROOM=ON \
243-
-DENABLE_BITROUND=ON \
243+
-DENABLE_GRANULAR_BITROUND=ON \
244244
-DENABLE_BSHUF=ON \
245245
$GITHUB_WORKSPACE
246246
cmake --build . --parallel 3 --config ${{ inputs.build_mode }}

.github/workflows/main-fetchcontent-ubuntu.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
-DENABLE_ZFP=ON \
7878
-DENABLE_ZSTD=OFF \
7979
-DENABLE_BITGROOM=ON \
80-
-DENABLE_BITROUND=ON \
80+
-DENABLE_GRANULAR_BITROUND=ON \
8181
-DENABLE_BSHUF=ON \
8282
..
8383
# NOTE: Currently a serial build has to be forced, as Blosc and Blosc2
@@ -157,7 +157,7 @@ jobs:
157157
-DENABLE_ZFP=ON \
158158
-DENABLE_ZSTD=ON \
159159
-DENABLE_BITGROOM=ON \
160-
-DENABLE_BITROUND=ON \
160+
-DENABLE_GRANULAR_BITROUND=ON \
161161
-DENABLE_BSHUF=ON \
162162
$GITHUB_WORKSPACE
163163
# NOTE: Currently, a serial build has to be forced as Blosc and Blosc2
@@ -234,7 +234,7 @@ jobs:
234234
-DENABLE_ZFP=ON \
235235
-DENABLE_ZSTD=ON \
236236
-DENABLE_BITGROOM=ON \
237-
-DENABLE_BITROUND=ON \
237+
-DENABLE_GRANULAR_BITROUND=ON \
238238
-DENABLE_BSHUF=ON \
239239
$GITHUB_WORKSPACE
240240
# NOTE: Currently, a serial build has to be forced as Blosc and Blosc2

.github/workflows/main-fetchcontent-win.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
-DENABLE_ZFP=ON \
8787
-DENABLE_ZSTD=OFF \
8888
-DENABLE_BITGROOM=ON \
89-
-DENABLE_BITROUND=ON \
89+
-DENABLE_GRANULAR_BITROUND=ON \
9090
-DENABLE_BSHUF=ON \
9191
..
9292
cmake --build . --parallel 4 --config ${{ inputs.build_mode }}
@@ -174,7 +174,7 @@ jobs:
174174
-DENABLE_ZFP=ON \
175175
-DENABLE_ZSTD=ON \
176176
-DENABLE_BITGROOM=ON \
177-
-DENABLE_BITROUND=ON \
177+
-DENABLE_GRANULAR_BITROUND=ON \
178178
-DENABLE_BSHUF=ON \
179179
$GITHUB_WORKSPACE
180180
cmake --build . --parallel 4 --config ${{ inputs.build_mode }}
@@ -260,7 +260,7 @@ jobs:
260260
-DENABLE_ZFP=ON \
261261
-DENABLE_ZSTD=ON \
262262
-DENABLE_BITGROOM=ON \
263-
-DENABLE_BITROUND=ON \
263+
-DENABLE_GRANULAR_BITROUND=ON \
264264
-DENABLE_BSHUF=ON \
265265
$GITHUB_WORKSPACE
266266
cmake --build . --parallel 4 --config ${{ inputs.build_mode }}

.github/workflows/main-package-managers-mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
-DENABLE_ZFP=OFF \
123123
-DENABLE_ZSTD=ON \
124124
-DENABLE_BITGROOM=OFF \
125-
-DENABLE_BITROUND=OFF \
125+
-DENABLE_GRANULAR_BITROUND=OFF \
126126
-DENABLE_BSHUF=OFF \
127127
$GITHUB_WORKSPACE
128128
cmake --build . --parallel 3 --config ${{ inputs.build_mode }}

.github/workflows/main-package-managers-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
-DENABLE_JPEG=ON \
9797
-DENABLE_ZFP=OFF \
9898
-DENABLE_BITGROOM=OFF \
99-
-DENABLE_BITROUND=OFF \
99+
-DENABLE_GRANULAR_BITROUND=OFF \
100100
-DENABLE_BLOSC=OFF \
101101
-DENABLE_BSHUF=OFF \
102102
-DENABLE_BZIP2=OFF \

.github/workflows/main-package-managers-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
-DENABLE_ZFP=OFF \
136136
-DENABLE_ZSTD=ON \
137137
-DENABLE_BITGROOM=OFF \
138-
-DENABLE_BITROUND=OFF \
138+
-DENABLE_GRANULAR_BITROUND=OFF \
139139
-DENABLE_BSHUF=OFF \
140140
$GITHUB_WORKSPACE
141141
cmake --build . --parallel 4 --config ${{ inputs.build_mode }}

BITGROOM/config/cmake/binex/example/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ endforeach ()
3535

3636
if (H5PL_BUILD_TESTING)
3737
# h5repack test input generator. Target name is plugin-suffixed because the
38-
# BITROUND and BITGROOM trees share the same CMake project and source file
38+
# GRANULAR_BITROUND and BITGROOM trees share the same CMake project and source file
3939
# basename (issue #240).
4040
add_executable (h5repack_floats_bitgroom ${PROJECT_SOURCE_DIR}/h5repack_floats.c)
4141
target_include_directories(h5repack_floats_bitgroom PRIVATE ${H5PL_HDF5_INCLUDE_DIRS})

BITGROOM/example/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ endforeach ()
3434

3535
if (H5PL_BUILD_TESTING)
3636
# h5repack test input generator. Target name is plugin-suffixed because the
37-
# BITROUND and BITGROOM trees share the same CMake project and source file
37+
# GRANULAR_BITROUND and BITGROOM trees share the same CMake project and source file
3838
# basename (issue #240).
3939
add_executable (h5repack_floats_bitgroom ${PROJECT_SOURCE_DIR}/h5repack_floats.c)
4040
TARGET_C_PROPERTIES (h5repack_floats_bitgroom ${LIB_TYPE})
@@ -224,7 +224,7 @@ if (H5PL_BUILD_TESTING)
224224
# Verify that the filter actually modifies the dataset values: dump the
225225
# data (no -pH) and compare against a captured reference of the quantized
226226
# output. BitGroom's encoding is bit-deterministic across platforms, so
227-
# the captured reference is portable. The companion BITROUND test suite
227+
# the captured reference is portable. The companion GRANULAR_BITROUND test suite
228228
# intentionally omits an equivalent check because the testing indicated
229229
# the Granular BitRound encoding introduces platform-dependent
230230
# 1-bit-different stored output.

BITROUND/config/cmake/h5bitround-config.cmake.in

Lines changed: 0 additions & 70 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ set_property (CACHE H5PL_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
9595
# Bitgroom filter
9696
FILTER_OPTION (BITGROOM)
9797

98-
# Bitround filter
99-
FILTER_OPTION (BITROUND)
98+
# Granular Bitround filter
99+
FILTER_OPTION (GRANULAR_BITROUND)
100100

101101
# Bitshuffle filter
102102
FILTER_OPTION (BSHUF)

0 commit comments

Comments
 (0)