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

Now return error of user tries to use both szip and zlib on same var #1627

Closed
wants to merge 30 commits into from
Closed

Now return error of user tries to use both szip and zlib on same var #1627

wants to merge 30 commits into from

Conversation

edwardhartnett
Copy link
Contributor

Fixes #1616

This PR includes #1623 and #1625

In this PR I change the code to return error if user selects both szip and zlib. See the issue for a (lengthy) discussion of why this is being done.

@edwardhartnett
more HDF5 tests for szip functionality
e793764
@edwardhartnett
testing nc_def_var_szip when szip has not been built into HDF5
e363bd5
@edwardhartnett
more tests
bf3407c
@edwardhartnett
more documentation for nc_inq_var_szip
626f408
@edwardhartnett
fix problem with pre-enddef call to nc_inq_var_szip()
a6fbc3e
@edwardhartnett
now remember szip setting in filter fields
52d745d
@edwardhartnett
test nc_inq_var_szip after call to nc_def_var_szip, but before enddef
b09446b
@edwardhartnett
use nc_def_var_filter in nc_def_var_szip
517ef4f
@edwardhartnett
rely completely on nc_def_var_filter for setting szip
1817790
@edwardhartnett
adding szip test to tst_parallel_zlib2.c
3247061
@edwardhartnett
more of szip test in tst_parallel_zlib2.c
6c39c1d
@edwardhartnett
now parallel szip test working in tst_parallel_zlib2.c
4a2ac1a
@edwardhartnett
moved tst_parallel_zlib2 to tst_parallel_compress
cf74f49
@edwardhartnett
merged ejh_more_szip
120c9e0
@edwardhartnett
not return 0 for parameters to nc_inq_var_szip if szip is not turned …
d5859e9 
…on for var
@edwardhartnett
renamed var for clarity
ca5c023
@edwardhartnett
turned on some previously failing tests for nc_inq_var_szip()
6d50ba6
@edwardhartnett
documentation improvements for nc_inq_var_szip()
fb2a104
@edwardhartnett
fixed call to AC_SUBST inside an if-endif in configure.ac
2daeae5
@edwardhartnett
merged master
a306bdf
@edwardhartnett
fix error in makefile building tst_parallel_compress.c
04624c7
@edwardhartnett
removed unnecessary library check for szip library, cleaned up comments
b3fe7e5
@edwardhartnett
merged changes from master
dfc49ac
@edwardhartnett
adding test for zlib+szip in HDF5
6b29478
@edwardhartnett
finished test for zlib+szip in HDF5
cd3740e
@edwardhartnett
removed redundant test
3d169c4
@edwardhartnett
removed unneeded var
78cd7f7
@edwardhartnett
disallow szip if zlib already in use
dc4e880
@edwardhartnett
disallow zlib if szip already in use
6d2d751
@edwardhartnett
updated documentation
cbc2677
@edwardhartnett edwardhartnett requested a review from WardF as a code owner February 7, 2020 12:08
@edwardhartnett
Copy link
Contributor Author

I'm going to take this PR down. These changes are included in #1629

@edwardhartnett edwardhartnett deleted the ejh_more_szip_6 branch March 6, 2020 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WardF WardF Awaiting requested review from WardF

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

need better handling of case when both szip and zlib are chosen for compression
1 participant
@edwardhartnett