Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup the blosc testing in nc_test4 and nczarr_test. #3046

Merged
merged 8 commits into from
Oct 29, 2024
Merged

Cleanup the blosc testing in nc_test4 and nczarr_test. #3046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6085237
push
DennisHeimbigner Sep 14, 2024
70440ae
Merge branch 'master' of https://github.com/DennisHeimbigner/netcdf-c
DennisHeimbigner Sep 14, 2024
17ce360
unpush
DennisHeimbigner Sep 14, 2024
4bf7e6f
Merge remote-tracking branch 'Unidata/main'
DennisHeimbigner Sep 30, 2024
83c890a
Merge remote-tracking branch 'Unidata/main'
DennisHeimbigner Oct 8, 2024
a747f5e
Merge remote-tracking branch 'Unidata/main'
DennisHeimbigner Oct 16, 2024
73ce129
Cleanup the blosc testing in nc_test4 and nczarr_test.
DennisHeimbigner Oct 29, 2024
7dda2c4
Update RELEASE notes
DennisHeimbigner Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ This file contains a high-level description of this package's evolution. Release

> Note: To avoid a conflict between `_FillValue` and `libc++18`, we have introduced a new option, `--enable-legacy-macros` for autotools and `NETCDF_ENABLE_LEGACY_MACROS` for cmake. These are turned on by default currently but will be turned off eventually. Developers are encouraged to move away from the `FillValue` macro and replace it with the new `NC_FillValue` macro. See [Github #2858](https://github.com/Unidata/netcdf-c/issues/2858) for more information.

* Cleanup the blosc testing in nc_test4 and nczarr_test. See [Github #3046](https://github.com/Unidata/netcdf-c/pull/3046) for more information.
* Provide better documentation for the .rc file mechanism and API. See [Github #2956](https://github.com/Unidata/netcdf-c/pull/2956) for more information.
* Convert NCZarr V2 to store all netcdf-4 specific info as attributes. This improves interoperability with other Zarr implementations by no longer using non-standard keys. The price to be paid is that lazy attribute reading cannot be supported. See [Github #2836](https://github.com/Unidata/netcdf-c/pull/2936) for more information.
* Cleanup the option code for NETCDF_ENABLE_SET_LOG_LEVEL\[_FUNC\] See [Github #2931](https://github.com/Unidata/netcdf-c/pull/2931) for more information.
Expand Down
16 changes: 11 additions & 5 deletions nc_test4/tst_specific_filters.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ THISDIR=`pwd`
cd $ISOPATH
fi

if test "x$TESTNCZARR" = x1 ; then
BLOSCARGS="32001,0,0,0,256,5,1,1"
BLOSCCODEC='[{\"id\": \"blosc\",\"clevel\": 5,\"blocksize\": 256,\"cname\": \"lz4\",\"shuffle\": 1}]'
else
if test"x$FP_ISMINGW" == xyes || test"x$FP_ISMSYS" == xyes || test"x$FP_ISMSVC" == xyes ; then
BLOSCARGS="32001,0,0,4,256,5,1,1"
BLOSCCODEC='[{\"id\": \"blosc\",\"clevel\": 5,\"blocksize\": 256,\"cname\": \"lz4\",\"shuffle\": 1}]'
else
BLOSCARGS="32001,0,0,0,256,5,1,1"
fi
BLOSCARGSALT="32001,0,0,4,256,5,1,1"
BLOSCCODEC='[{\"id\": \"blosc\",\"clevel\": 5,\"blocksize\": 256,\"cname\": \"lz4\",\"shuffle\": 1}]'

# Load the findplugins function
. ${builddir}/findplugin.sh
Expand Down Expand Up @@ -157,6 +157,12 @@ testblosc() {
zext=$1
if ! avail blosc; then return 0; fi
runfilter $zext blosc $BLOSCARGS "$BLOSCCODEC"
# Need to ignore the first three parameters by setting them to 0
if test 1 = 0 ; then
sed -e "s|${BLOSCARGSALT}|${BLOSCARGS}|" < tmp_filter_blosc.dump > tmp.dump
rm -f tmp_filter_blosc.dump
mv -f tmp.dump tmp_filter_blosc.dump
fi
diff -b -w "tmp_filt_blosc.cdl" "tmp_filt_blosc.dump"
}

Expand Down
Loading