diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2020-06-08 16:06:06 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2020-06-08 16:06:06 (GMT) |
| commit | ab3721a7709665942c5d4066aa2de9c2da36ab3f (patch) | |
| tree | 2e4ad82093b9322b9297d8fec2cd11d012c0d11b | |
| parent | 1030a7ac9a2a77e03f6fc496ccc88b8bceae203a (diff) | |
| parent | b0f921c53fe4aa60bc0ed0fa10942da11ac4a3cd (diff) | |
| download | hdf5-ab3721a7709665942c5d4066aa2de9c2da36ab3f.zip hdf5-ab3721a7709665942c5d4066aa2de9c2da36ab3f.tar.gz hdf5-ab3721a7709665942c5d4066aa2de9c2da36ab3f.tar.bz2 | |
Merge pull request #2628 in HDFFV/hdf5 from hdf5_1_12_tiny_shape_same_opt to hdf5_1_12
* commit 'b0f921c53fe4aa60bc0ed0fa10942da11ac4a3cd':
Add info about optimization to release notes
Detect when there's the same-shaped selection of a single block of elements on both selections, but with different selection types (i.e. one selection defined as an 'all' type and the other as a hyperslab or point type), without falling into the generic selection iteration case.
| -rw-r--r-- | release_docs/RELEASE.txt | 5 | ||||
| -rw-r--r-- | src/H5Sselect.c | 9 | ||||
| -rw-r--r-- | test/tselect.c | 14 |
3 files changed, 21 insertions, 7 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index a7f585a..847bd12 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -109,6 +109,11 @@ Bug Fixes since HDF5-1.12.0 release ================================== Library ------- + - Better detect selections with the same shape, improving performance for + some uses of H5DOappend (and other situations). + + (QAK - 2020/06/07) + - Don't allocate an empty (0-dimensioned) chunked dataset's chunk index, until the dataset's dimensions are increased. diff --git a/src/H5Sselect.c b/src/H5Sselect.c index e433dc1..47909f5 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -1885,6 +1885,15 @@ H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2) space_a_dim--; } /* end while */ + + /* Check for a single block in each selection */ + if(H5S_SELECT_IS_SINGLE(space_a) && H5S_SELECT_IS_SINGLE(space_b)) { + /* If both selections are a single block and their bounds are + * the same, then the selections are the same, even if the + * selection types are different. + */ + HGOTO_DONE(TRUE) + } /* end if */ } /* end if */ /* If the dataspaces have the same selection type, use the selection's diff --git a/test/tselect.c b/test/tselect.c index 492a917..cadd350 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -9388,15 +9388,15 @@ test_shape_same_dr__smoke_check_1(void) ** a "checker board" hyperslab as follows: ** ** * * - - * * - - * * -** * * - - * * - - * * -** - - * * - - * * - - -** - - * * - - * * - - ** * * - - * * - - * * -** * * - - * * - - * * -** - - * * - - * * - - -** - - * * - - * * - - +** - - * * - - * * - - +** - - * * - - * * - - +** * * - - * * - - * * +** * * - - * * - - * * +** - - * * - - * * - - +** - - * * - - * * - - +** * * - - * * - - * * ** * * - - * * - - * * -** * * - - * * - - * * ** ** where asterisks indicate selected elements, and dashes ** indicate unselected elements. |