philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hdf5 1 12 merge cmake ninja and java refs (#698)

Browse Source 
* OESS-98 fix tools test for plugins

* sync fork

* Merge of changes from dev

* Move problem option to bottom of the list until fixed

* HDFFV-11106 - fix parsing optional args

* HDFFV-11106 add note

* grammer fix

* Whitespace after clang formatting

* Undo format version 11 changes

* Update check to working version

* Merge workflow and minor changes from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge serval small changes from dev

* fix typo

* Minor non-space formatting changes

* GH #386 copyright corrections for java folder

* revert because logic requires false return

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Remove case statement for H5I_EVENTSET

* Correct call with versioning

* Remove tabs

* Double underscore change

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
Remove more underscores from header guards

* Merge #380 from develop

* Correct date entry

* Split format source and commit changes on repo push

* remove pre-split setting

* Change windows TS to use older VS.

* HDFFV-11212 JNI export util and Javadoc

* Suggested review changes

* Another change found

* Committing clang-format changes

* Some Javadoc warning fixes

* Committing clang-format changes

* Updated javadoc fixes

* HDFFV-11228/9 merges from develop

* remove obsolete debug comment

* Fix conflict

* HDFFV-11229 merge changes from develop

* HDFFV-11229 merge second compare from develop

* HDFFV-11229 fix reference file

* HDFFV-11229 update autotools test script for two ref files

* HDFFV-11229 merge dev changes for long double display in tools

* Committing clang-format changes

* Update with changes from develop

* Add "option" command for clang options

* Rework CMake add_custom to use the BYPRODUCTS argument

Update pkgconfig scripts for parallel builds.
Fix install COPYING file reference.
Remove unused round defines.
Change CMake default setting of BUILD_CPP to off.

* Whitespace changes

* Rework CMake add_custom to use the BYPRODUCTS argument

* Revert CMake configure checks for round defines

* With VS 2015 minimum strdup is supported

* Doxygen comments merged from develop

* doxygen build updates

* Correct version string for map functions

* TRILAB-227 and tools debug merge from develop

* TRILAB-227 Enable test

* Quote subset args

* Use MATCHES in compiler id compare, merge from dev

* Revert test enable

* Add file to list

* doxygen version errors

* if blocks needed for build modes

* Update list of test platforms

* Issue #669 remove version from pkgcfg filename

* remove version from h5cc script

* Merge CMake and java refs from dev

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Allen Byrne
2021-05-29 15:30:27 -05:00
committed by GitHub
parent f1e81e8fa5
commit 3bbc4f0df4
9 changed files with 122 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
java/test/TestH5Rref.java
View File

@@ -134,7 +134,7 @@ public class TestH5Rref {
try {H5.H5Tclose(f_type);} catch (Exception ex) {}
}
try {
ndims = H5.H5Sget_simple_extent_ndims(H5dsid);
ndims = (int)H5.H5Sget_simple_extent_npoints(H5dsid);
}
catch (Throwable err) {
err.printStackTrace();
@@ -209,7 +209,7 @@ public class TestH5Rref {
try {H5.H5Tclose(f_type);} catch (Exception ex) {}
}
try {
ndims = H5.H5Sget_simple_extent_ndims(H5dsid);
ndims = (int)H5.H5Sget_simple_extent_npoints(H5dsid);
}
catch (Throwable err) {
err.printStackTrace();
@@ -286,7 +286,7 @@ public class TestH5Rref {
try {H5.H5Tclose(f_type);} catch (Exception ex) {}
}
try {
ndims = H5.H5Sget_simple_extent_ndims(H5dsid);
ndims = (int)H5.H5Sget_simple_extent_npoints(H5dsid);
}
catch (Throwable err) {
err.printStackTrace();
@@ -305,80 +305,81 @@ public class TestH5Rref {
}
for (int i = 0; i < ndims; i++) {
try {
ret_val = H5.H5Rget_type(refbuf[i]);
try {
ret_val = H5.H5Rget_type(refbuf[i]);
}
catch (Throwable err) {
err.printStackTrace();
fail("testH5Rget_region_dataset: H5Rget_type["+i+"]: " + err);
}
assertTrue("testH5Rget_region_dataset: H5Rget_type["+i+"]="+ret_val, ret_val == ref_type);
try {
loc_id = H5.H5Ropen_object(refbuf[i], HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
assertTrue(loc_id >= 0);
boolean regionzero = byteArrayCheck(refbuf[i]);
if (i > 1)
assertTrue(regionzero);
else {
try {
loc_sid = H5.H5Ropen_region(refbuf[i], HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
assertTrue(loc_sid >= 0);
int region_type = -1;
try {
loc_sid = H5.H5Ropen_region(refbuf[i], HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
assertTrue(loc_sid >= 0);
int region_type = -1;
try {
int reg_ndims = H5.H5Sget_simple_extent_ndims(loc_sid);
region_type = H5.H5Sget_select_type(loc_sid);
if (i == 1)
assertTrue(region_type == HDF5Constants.H5S_SEL_POINTS);
else
assertTrue(region_type == HDF5Constants.H5S_SEL_HYPERSLABS);
if (region_type == HDF5Constants.H5S_SEL_POINTS) {
long reg_npoints = H5.H5Sget_select_elem_npoints(loc_sid);
// Coordinates for get point selection
long getcoord[] = new long[reg_ndims * (int)reg_npoints];
// Known coordinates for point selection
long coord[][] = {{6,9},{2,2},{8,4},{1,6},{2,8},{3,2},
{0,4},{9,0},{7,1},{3,3}};
try {
H5.H5Sget_select_elem_pointlist(loc_sid, 0, reg_npoints, getcoord);
assertTrue("H5.H5Sget_select_elem_pointlist", coord[0][0] == getcoord[0]);
assertTrue("H5.H5Sget_select_elem_pointlist", coord[0][1] == getcoord[1]);
assertTrue("H5.H5Sget_select_elem_pointlist", coord[1][0] == getcoord[2]);
assertTrue("H5.H5Sget_select_elem_pointlist", coord[1][1] == getcoord[3]);
assertTrue("H5.H5Sget_select_elem_pointlist", coord[2][0] == getcoord[4]);
assertTrue("H5.H5Sget_select_elem_pointlist", coord[2][1] == getcoord[5]);
}
catch (Throwable err3) {
err3.printStackTrace();
fail("H5.H5Sget_select_elem_pointlist: " + err3);
}
int reg_ndims = H5.H5Sget_simple_extent_ndims(loc_sid);
region_type = H5.H5Sget_select_type(loc_sid);
if (i == 1)
assertTrue(region_type == HDF5Constants.H5S_SEL_POINTS);
else
assertTrue(region_type == HDF5Constants.H5S_SEL_HYPERSLABS);
if (region_type == HDF5Constants.H5S_SEL_POINTS) {
long reg_npoints = H5.H5Sget_select_elem_npoints(loc_sid);
// Coordinates for get point selection
long getcoord[] = new long[reg_ndims * (int)reg_npoints];
// Known coordinates for point selection
long coord[][] = {{6,9},{2,2},{8,4},{1,6},{2,8},{3,2},
{0,4},{9,0},{7,1},{3,3}};
try {
H5.H5Sget_select_elem_pointlist(loc_sid, 0, reg_npoints, getcoord);
assertTrue("H5.H5Sget_select_elem_pointlist", coord[0][0] == getcoord[0]);
assertTrue("H5.H5Sget_select_elem_pointlist", coord[0][1] == getcoord[1]);
assertTrue("H5.H5Sget_select_elem_pointlist", coord[1][0] == getcoord[2]);
assertTrue("H5.H5Sget_select_elem_pointlist", coord[1][1] == getcoord[3]);
assertTrue("H5.H5Sget_select_elem_pointlist", coord[2][0] == getcoord[4]);
assertTrue("H5.H5Sget_select_elem_pointlist", coord[2][1] == getcoord[5]);
}
else if (region_type == HDF5Constants.H5S_SEL_HYPERSLABS) {
long reg_nblocks = H5.H5Sget_select_hyper_nblocks(loc_sid);
assertTrue("H5Sget_select_hyper_nblocks", reg_nblocks == 1);
// Coordinates for get block selection
long getblocks[] = new long[reg_ndims * (int)reg_nblocks * 2];
long start[] = {2,2};
long block[] = {8,8};
try {
H5.H5Sget_select_hyper_blocklist(loc_sid, 0, reg_nblocks, getblocks);
assertTrue("H5.H5Sget_select_hyper_blocklist", start[0] == getblocks[0]);
assertTrue("H5.H5Sget_select_hyper_blocklist", start[1] == getblocks[1]);
assertTrue("H5.H5Sget_select_hyper_blocklist", (block[0]-1) == getblocks[2]);
assertTrue("H5.H5Sget_select_hyper_blocklist", (block[1]-1) == getblocks[3]);
}
catch (Throwable err3) {
err3.printStackTrace();
fail("H5.H5Sget_select_hyper_blocklist: " + err3);
}
catch (Throwable err3) {
err3.printStackTrace();
fail("H5.H5Sget_select_elem_pointlist: " + err3);
}
}
catch (Throwable err2) {
err2.printStackTrace();
fail("testH5Rget_region_dataset: H5Sget_select_type: " + err2);
else if (region_type == HDF5Constants.H5S_SEL_HYPERSLABS) {
long reg_nblocks = H5.H5Sget_select_hyper_nblocks(loc_sid);
assertTrue("H5Sget_select_hyper_nblocks", reg_nblocks == 1);
// Coordinates for get block selection
long getblocks[] = new long[reg_ndims * (int)reg_nblocks * 2];
long start[] = {2,2};
long block[] = {8,8};
try {
H5.H5Sget_select_hyper_blocklist(loc_sid, 0, reg_nblocks, getblocks);
assertTrue("H5.H5Sget_select_hyper_blocklist", start[0] == getblocks[0]);
assertTrue("H5.H5Sget_select_hyper_blocklist", start[1] == getblocks[1]);
assertTrue("H5.H5Sget_select_hyper_blocklist", (block[0]-1) == getblocks[2]);
assertTrue("H5.H5Sget_select_hyper_blocklist", (block[1]-1) == getblocks[3]);
}
catch (Throwable err3) {
err3.printStackTrace();
fail("H5.H5Sget_select_hyper_blocklist: " + err3);
}
}
}
catch (Throwable err1) {
err1.printStackTrace();
fail("testH5Rget_region_dataset: " + err1);
}
finally {
try {H5.H5Sclose(loc_sid);} catch (Exception ex) {}
catch (Throwable err2) {
err2.printStackTrace();
assertTrue("testH5Rget_region_dataset: H5Sget_select_type: " + err2, i > 1);
}
}
catch (Throwable err1) {
err1.printStackTrace();
fail("testH5Rget_region_dataset: " + err1);
}
finally {
try {H5.H5Sclose(loc_sid);} catch (Exception ex) {}
}
}
catch (Throwable err0) {
err0.printStackTrace();
@@ -432,7 +433,7 @@ public class TestH5Rref {
try {H5.H5Tclose(f_type);} catch (Exception ex) {}
}
try {
ndims = H5.H5Sget_simple_extent_ndims(H5dsid);
ndims = (int)H5.H5Sget_simple_extent_npoints(H5dsid);
}
catch (Throwable err) {
err.printStackTrace();
@@ -473,7 +474,8 @@ public class TestH5Rref {
}
catch (Throwable err0) {
err0.printStackTrace();
fail("testH5Rget_region_attribute: " + err0);
// second attribute is null
assertTrue("testH5Rget_region_attribute: " + err0, i == 1);
}
finally {
try {H5.H5Aclose(loc_id);} catch (Exception ex) {}