Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions pyfive/btree.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,15 +242,13 @@ def _verify_fletcher32(chunk_buffer):
arr = np.frombuffer(chunk_buffer[:-4]+b'\x00', '<u2')
else:
arr = np.frombuffer(chunk_buffer[:-4], '<u2')
sum1 = sum2 = 0
sum1 = sum2 = np.uint32(0)
for i in arr:
sum1 = (sum1 + i) % 65535
sum2 = (sum2 + sum1) % 65535

# extract stored checksums
ref_sum1, ref_sum2 = np.frombuffer(chunk_buffer[-4:], '>u2')
ref_sum1 = ref_sum1 % 65535
ref_sum2 = ref_sum2 % 65535

# compare
if sum1 != ref_sum1 or sum2 != ref_sum2:
Expand Down
23 changes: 22 additions & 1 deletion tests/test_filter_pipeline_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,35 @@
(as is found in some new netCDF4 files) """
import os

import h5py
import numpy as np
from numpy.testing import assert_almost_equal

import pytest
import pyfive

DIRNAME = os.path.dirname(__file__)
FILTER_PIPELINE_V2_FILE = os.path.join(DIRNAME, 'data', 'filter_pipeline_v2.hdf5')


@pytest.fixture
def generate_data():
return np.random.rand(100, 100)


@pytest.mark.parametrize("chunk_size", [None, (10, 10), (20, 20)], ids=lambda x: f"chunk_{x}")
@pytest.mark.parametrize("compression", [None, 9], ids=lambda x: f"compression_{x}")
@pytest.mark.parametrize("shuffle", [True, False], ids=lambda x: f"shuffle_{x}")
@pytest.mark.parametrize("fletcher32", [True, False], ids=lambda x: f"fletcher32_{x}")
def test_hdf5_filters(modular_tmp_path, generate_data, chunk_size, compression, shuffle, fletcher32):
data = generate_data
file_name = f"test_{chunk_size}_{compression}_{shuffle}_{fletcher32}.hdf5"

with h5py.File(file_name, "w") as f:
f.create_dataset("data", data=data, chunks=chunk_size, shuffle=shuffle, fletcher32=fletcher32, compression=compression)

with pyfive.File(file_name, 'r') as f:
assert_almost_equal(f["data"][:], data)

def test_filter_pipeline_descr_v2():

with pyfive.File(FILTER_PIPELINE_V2_FILE) as hfile:
Expand Down
Loading