From b9dc300145799d2e3c8d174d4c47ebe82cefa89d Mon Sep 17 00:00:00 2001 From: jananzhu Date: Mon, 11 Jan 2021 16:41:55 -0500 Subject: [PATCH 1/4] iterate over chunks on dataset initialization --- h5pyd/_hl/group.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/h5pyd/_hl/group.py b/h5pyd/_hl/group.py index b28d321f..69211e53 100644 --- a/h5pyd/_hl/group.py +++ b/h5pyd/_hl/group.py @@ -24,6 +24,7 @@ from .table import Table from .datatype import Datatype from . import h5type +from h5pyd._apps.chunkiter import ChunkIterator class Group(HLObject, MutableMappingHDF5): @@ -333,7 +334,9 @@ def create_dataset(self, name, shape=None, dtype=None, data=None, **kwds): dset = dataset.Dataset(dsid) if data is not None: self.log.info("initialize data") - dset[...] = data + it = ChunkIterator(dset) + for chunk in it: + dset[chunk] = data[chunk] if name is not None: items = name.split('/') From 7d7e657ea10ee64db912f251a838abc42d49798b Mon Sep 17 00:00:00 2001 From: jananzhu Date: Wed, 9 Mar 2022 16:26:37 -0500 Subject: [PATCH 2/4] define dataset shape and dtype when data is passed --- h5pyd/_hl/group.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/h5pyd/_hl/group.py b/h5pyd/_hl/group.py index e868c9d3..5e254517 100644 --- a/h5pyd/_hl/group.py +++ b/h5pyd/_hl/group.py @@ -359,6 +359,9 @@ def create_dataset(self, name, shape=None, dtype=None, data=None, **kwds): if data is not None and not isinstance(data, Empty) and (numpy.product(shape) != numpy.product(data.shape)): raise ValueError("Shape tuple is incompatible with data") """ + if data is not None and (shape is None or dtype is None): + shape = data.shape + dtype = data.dtype dsid = dataset.make_new_dset(self, shape=shape, dtype=dtype, **kwds) dset = dataset.Dataset(dsid) @@ -367,7 +370,6 @@ def create_dataset(self, name, shape=None, dtype=None, data=None, **kwds): it = ChunkIterator(dset) for chunk in it: dset[chunk] = data[chunk] - dset[...] = data if name is not None: items = name.split('/') From 263ccf0af3d37b643e47ae761cdcfdd0c303a129 Mon Sep 17 00:00:00 2001 From: Janan Zhu Date: Tue, 20 Dec 2022 15:21:00 -0500 Subject: [PATCH 3/4] update version --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 9bb8bd55..8ed0e5f0 100644 --- a/setup.py +++ b/setup.py @@ -20,8 +20,8 @@ with open(path.join(here, 'README.rst'), encoding='utf-8') as f: long_description = f.read() -setup(name='h5pyd', - version='0.10.0', +setup(name='h5pyd-redesign', + version='0.10.2', description='h5py compatible client lib for HDF REST API', long_description=long_description, url='http://github.com/HDFGroup/h5pyd', From 5d815926dcb3ee2bb3d2fcfaa8d3a5d469903469 Mon Sep 17 00:00:00 2001 From: Janan Zhu Date: Tue, 20 Dec 2022 15:27:41 -0500 Subject: [PATCH 4/4] pin google-auth-oauthlib dependency --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 8ed0e5f0..2a8dbeb5 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ long_description = f.read() setup(name='h5pyd-redesign', - version='0.10.2', + version='0.10.3', description='h5py compatible client lib for HDF REST API', long_description=long_description, url='http://github.com/HDFGroup/h5pyd', @@ -37,7 +37,7 @@ 'msrestazure', 'cryptography', 'google-api-python-client', - 'google-auth-oauthlib', + 'google-auth-oauthlib<=0.5.3', 'google-auth<2.0dev', 'adal'], setup_requires=['pkgconfig'],