summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@lbl.gov>2020-06-06 15:06:04 (GMT)
committerQuincey Koziol <koziol@lbl.gov>2020-06-06 15:06:04 (GMT)
commitaa338c3a87a4544ccb164832422e3e2462a57b88 (patch)
treec520135f611179c89a549c5e59a2198248295fea
parent8a2c6d868b70c56622e65cb46e163d2856e1098e (diff)
parentde54cff50c419751e0080b6a732facac43f87ba6 (diff)
downloadhdf5-aa338c3a87a4544ccb164832422e3e2462a57b88.zip
hdf5-aa338c3a87a4544ccb164832422e3e2462a57b88.tar.gz
hdf5-aa338c3a87a4544ccb164832422e3e2462a57b88.tar.bz2
Merge pull request #2626 in HDFFV/hdf5 from tiny_shape_same_opt to develop
* commit 'de54cff50c419751e0080b6a732facac43f87ba6': 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--src/H5Sselect.c9
-rw-r--r--test/tselect.c14
2 files changed, 16 insertions, 7 deletions
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index 56f14ba..1072d7d 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 45806ae..aa0ab11 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.