Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hdf5 merge issue 537 v110 #545

Merged
merged 31 commits into from
Apr 6, 2021
Merged

Hdf5 merge issue 537 v110 #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
efb50c1
close #195. (#196)
hyoklee Dec 17, 2020
e954812
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Dec 23, 2020
f479c5f
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Jan 6, 2021
a032262
Modify temporary rpath for testing in java example scripts. (#230)
lrknox Dec 29, 2020
ed287c3
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Jan 9, 2021
64f7179
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Feb 23, 2021
8b0662e
Fix undefined left shifting of negative numbers (#338)
seanm Feb 19, 2021
d59490f
Update license url (#332)
lrknox Feb 17, 2021
9d43eae
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Mar 8, 2021
f4ab4c7
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Mar 10, 2021
8aebdfd
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Mar 10, 2021
ce7870d
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Mar 21, 2021
bac8e2f
Cleans up a couple of MSVC warnings in testhdf5 (#475)
derobins Mar 17, 2021
61c1e68
Fix typos and grammar errors. (#476)
hyoklee Mar 17, 2021
b68fede
Suppresses the tcheck_version test's abort dialog on Windows (#477)
derobins Mar 17, 2021
b009b7e
Merge branch 'hdf5_1_10' of https://github.com/lrknox/hdf5 into hdf5_…
lrknox Apr 1, 2021
23dc162
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Apr 1, 2021
2923bac
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Apr 2, 2021
ed1a6fd
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Apr 5, 2021
1324190
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf…
lrknox Apr 6, 2021
f4028cd
More warning fixes (#400)
seanm Mar 4, 2021
67c1dc7
Changes found during merge to 1.12 (#414)
byrnHDF Mar 4, 2021
614dad6
File locks now work on Windows (#480)
derobins Mar 22, 2021
80b82f5
small edits (#481)
brtnfld Mar 22, 2021
8b8b47d
Adds an implementation for nanosleep on Windows (#483)
derobins Mar 22, 2021
3f7ca0e
Updates HSYS_GOTO_ERROR to emit GetLastError() values on Win32 (#492)
derobins Mar 23, 2021
c8637d6
Updates that allow accum SWMR tests to work on Windows (#493)
derobins Mar 27, 2021
56f632d
Disable long double tests and remove CMake flag groups (#494)
byrnHDF Mar 22, 2021
6127418
Misc warning fixes (#495)
derobins Mar 24, 2021
beb6cee
Correct merge errors.
lrknox Apr 6, 2021
60fb916
Committing clang-format changes
github-actions[bot] Apr 6, 2021
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
6 changes: 3 additions & 3 deletions c++/src/H5AbstractDs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef AbstractDs_H
#define AbstractDs_H
#ifndef H5AbstractDs_H
#define H5AbstractDs_H

namespace H5 {

Expand Down Expand Up @@ -81,4 +81,4 @@ class H5_DLLCPP AbstractDs {
}; // end of AbstractDs
} // namespace H5

#endif // AbstractDs_H
#endif // H5AbstractDs_H
6 changes: 3 additions & 3 deletions c++/src/H5CommonFG.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef CommonFG_H
#define CommonFG_H
#ifndef H5CommonFG_H
#define H5CommonFG_H

namespace H5 {

Expand Down Expand Up @@ -83,7 +83,7 @@ class H5_DLLCPP CommonFG {
}; // end of CommonFG
} // namespace H5

#endif // CommonFG_H
#endif // H5CommonFG_H

/***************************************************************************
Design Note
Expand Down
6 changes: 3 additions & 3 deletions c++/src/H5Group.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef Group_H
#define Group_H
#ifndef H5Group_H
#define H5Group_H

namespace H5 {

Expand Down Expand Up @@ -83,4 +83,4 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
}; // end of Group
} // namespace H5

#endif // Group_H
#endif // H5Group_H
6 changes: 3 additions & 3 deletions c++/src/H5IdComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* [email protected]. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

#ifndef IdComponent_H
#define IdComponent_H
#ifndef H5IdComponent_H
#define H5IdComponent_H

namespace H5 {

Expand Down Expand Up @@ -113,4 +113,4 @@ class H5_DLLCPP IdComponent {
}; // end class IdComponent
} // namespace H5

#endif // IdComponent_H
#endif // H5IdComponent_H
27 changes: 15 additions & 12 deletions c++/test/tarray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ test_array_compound_array()
// Initialize array data to write
for (idxi = 0; idxi < SPACE1_DIM1; idxi++)
for (idxj = 0; idxj < ARRAY1_DIM1; idxj++) {
wdata[idxi][idxj].i = idxi * 10 + idxj;
wdata[idxi][idxj].i = static_cast<int>(idxi * 10 + idxj);
for (idxk = 0; idxk < ARRAY1_DIM1; idxk++) {
float temp = idxi * 10.0 + idxj * 2.5 + idxk;
wdata[idxi][idxj].f[idxk] = temp;
Expand Down Expand Up @@ -178,8 +178,9 @@ test_array_compound_array()
// Check the array dimensions
for (ii = 0; ii < ndims; ii++)
if (rdims1[ii] != tdims1[ii]) {
TestErrPrintf("Array dimension information doesn't match!, rdims1[%d]=%zd, tdims1[%d]=z%d\n",
ii, rdims1[ii], ii, tdims1[ii]);
TestErrPrintf(
"Array dimension information doesn't match!, rdims1[%d]=%lld, tdims1[%d]=%lld\n", ii,
rdims1[ii], ii, tdims1[ii]);
continue;
} // end if

Expand All @@ -196,8 +197,9 @@ test_array_compound_array()
// Check the array dimensions
for (ii = 0; ii < ndims; ii++)
if (rdims1[ii] != tdims1[ii]) {
TestErrPrintf("Array dimension information doesn't match!, rdims1[%d]=%zd, tdims1[%d]=%zd\n",
ii, rdims1[ii], ii, tdims1[ii]);
TestErrPrintf(
"Array dimension information doesn't match!, rdims1[%d]=%lld, tdims1[%d]=%lld\n", ii,
rdims1[ii], ii, tdims1[ii]);
continue;
} // end if

Expand Down Expand Up @@ -246,8 +248,9 @@ test_array_compound_array()
// Check the array dimensions
for (ii = 0; ii < ndims; ii++)
if (rdims1[ii] != tdims1[ii]) {
TestErrPrintf("Array dimension information doesn't match!, rdims1[%d]=%zd, tdims1[%d]=%zd\n",
ii, rdims1[ii], ii, tdims1[ii]);
TestErrPrintf(
"Array dimension information doesn't match!, rdims1[%d]=%lld, tdims1[%d]=%lld\n", ii,
rdims1[ii], ii, tdims1[ii]);
continue;
} // end if

Expand All @@ -262,9 +265,9 @@ test_array_compound_array()
for (idxi = 0; idxi < SPACE1_DIM1; idxi++) {
for (idxj = 0; idxj < ARRAY1_DIM1; idxj++) {
if (wdata[idxi][idxj].i != rdata[idxi][idxj].i) {
TestErrPrintf(
"Array data information doesn't match!, wdata[%d][%d].i=%d, rdata[%d][%d].i=%d\n",
idxi, idxj, wdata[idxi][idxj].i, idxi, idxj, rdata[idxi][idxj].i);
TestErrPrintf("Array data information doesn't match!, wdata[%lld][%lld].i=%d, "
"rdata[%lld][%lld].i=%d\n",
idxi, idxj, wdata[idxi][idxj].i, idxi, idxj, rdata[idxi][idxj].i);
continue;
} // end if
} // end for
Expand Down Expand Up @@ -383,7 +386,7 @@ test_array_info()
// Initialize array data to write
for (idxi = 0; idxi < SPACE1_DIM1; idxi++)
for (idxj = 0; idxj < ARRAY1_DIM1; idxj++) {
wdata[idxi][idxj].i = idxi * 10 + idxj;
wdata[idxi][idxj].i = static_cast<int>(idxi * 10 + idxj);
for (idxk = 0; idxk < ARRAY1_DIM1; idxk++) {
float temp = idxi * 10.0 + idxj * 2.5 + idxk;
wdata[idxi][idxj].f[idxk] = temp;
Expand Down Expand Up @@ -455,7 +458,7 @@ test_array_info()
for (ii = 0; ii < ndims; ii++)
if (rdims1[ii] != tdims1[ii]) {
TestErrPrintf(
"Array dimension information doesn't match!, rdims1[%d]=%zd, tdims1[%d]=z%d\n", ii,
"Array dimension information doesn't match!, rdims1[%d]=%llu, tdims1[%d]=z%llu\n", ii,
rdims1[ii], ii, tdims1[ii]);
continue;
} // end if
Expand Down
36 changes: 18 additions & 18 deletions c++/test/tattr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ test_attr_basic_write()
// Verify values read in
for (i = 0; i < ATTR1_DIM1; i++)
if (attr_data1[i] != read_data1[i])
TestErrPrintf("%d: attribute data different: attr_data1[%d]=%d,read_data1[%d]=%d\n", __LINE__,
i, attr_data1[i], i, read_data1[i]);
TestErrPrintf("%d: attribute data different: attr_data1[%llu]=%d,read_data1[%llu]=%d\n",
__LINE__, i, attr_data1[i], i, read_data1[i]);

// Create two more attributes for this dataset, but only write to one.
Attribute ds_attr2 = dataset.createAttribute(ATTR2_NAME, PredType::NATIVE_INT, att_space);
Expand All @@ -185,7 +185,7 @@ test_attr_basic_write()
// Verify values read in
for (i = 0; i < ATTR1_DIM1; i++)
if (attr_data1a[i] != read_data1[i])
TestErrPrintf("%d: attribute data different: attr_data1a[%d]=%d,read_data1[%d]=%d\n",
TestErrPrintf("%d: attribute data different: attr_data1a[%llu]=%d,read_data1[%llu]=%d\n",
__LINE__, i, attr_data1a[i], i, read_data1[i]);

// Close both attributes
Expand Down Expand Up @@ -448,8 +448,8 @@ test_attr_rename()
// Verify values read in
for (i = 0; i < ATTR1_DIM1; i++)
if (attr_data1[i] != read_data1[i])
TestErrPrintf("%d: attribute data different: attr_data1[%d]=%d,read_data1[%d]=%d\n", __LINE__,
i, attr_data1[i], i, read_data1[i]);
TestErrPrintf("%d: attribute data different: attr_data1[%llu]=%d,read_data1[%llu%d\n",
__LINE__, i, attr_data1[i], i, read_data1[i]);

// Close attribute
attr1.close();
Expand All @@ -472,7 +472,7 @@ test_attr_rename()
// Verify values read in
for (i = 0; i < ATTR1_DIM1; i++)
if (attr_data1a[i] != read_data1[i])
TestErrPrintf("%d: attribute data different: attr_data1a[%d]=%d,read_data1[%d]=%d\n",
TestErrPrintf("%d: attribute data different: attr_data1a[%llu]=%d,read_data1[%llu]=%d\n",
__LINE__, i, attr_data1a[i], i, read_data1[i]);

// Close attribute
Expand Down Expand Up @@ -537,7 +537,7 @@ test_attr_basic_read()
// Verify values read in
for (i = 0; i < ATTR1_DIM1; i++)
if (attr_data1[i] != read_data1[i])
TestErrPrintf("%d: attribute data different: attr_data1[%d]=%d, read_data1[%d]=%d\n",
TestErrPrintf("%d: attribute data different: attr_data1[%llu]=%d, read_data1[%llu]=%d\n",
__LINE__, i, attr_data1[i], i, read_data1[i]);

/*
Expand Down Expand Up @@ -568,9 +568,9 @@ test_attr_basic_read()
for (i = 0; i < ATTR2_DIM1; i++)
for (j = 0; j < ATTR2_DIM2; j++)
if (attr_data2[i][j] != read_data2[i][j]) {
TestErrPrintf(
"%d: attribute data different: attr_data2[%d][%d]=%d, read_data2[%d][%d]=%d\n",
__LINE__, i, j, attr_data2[i][j], i, j, read_data2[i][j]);
TestErrPrintf("%d: attribute data different: attr_data2[%llu][%llu]=%d, "
"read_data2[%llu][%llu]=%d\n",
__LINE__, i, j, attr_data2[i][j], i, j, read_data2[i][j]);
}
PASSED();
} // end try block
Expand Down Expand Up @@ -1044,7 +1044,7 @@ test_attr_mult_read()
hsize_t dims[ATTR_MAX_DIMS]; // Attribute dimensions
int ndims = space.getSimpleExtentDims(dims);
if ((long)dims[0] != (long)ATTR1_DIM1)
TestErrPrintf("%d:attribute dimensions different: dims[0]=%d, should be %d\n", __LINE__,
TestErrPrintf("%d:attribute dimensions different: dims[0]=%d, should be %llu\n", __LINE__,
(int)dims[0], ATTR1_DIM1);

/* Verify Datatype */
Expand Down Expand Up @@ -1072,8 +1072,8 @@ test_attr_mult_read()
// Verify values read in
for (i = 0; i < ATTR1_DIM1; i++)
if (attr_data1[i] != read_data1[i])
TestErrPrintf("%d: attribute data different: attr_data1[%d]=%d,read_data1[%d]=%d\n", __LINE__,
i, attr_data1[i], i, read_data1[i]);
TestErrPrintf("%d: attribute data different: attr_data1[%llu]=%d,read_data1[%llu]=%d\n",
__LINE__, i, attr_data1[i], i, read_data1[i]);

// Verify Name
H5std_string attr_name = attr.getName();
Expand Down Expand Up @@ -1127,9 +1127,9 @@ test_attr_mult_read()
for (i = 0; i < ATTR2_DIM1; i++)
for (j = 0; j < ATTR2_DIM2; j++)
if (attr_data2[i][j] != read_data2[i][j])
TestErrPrintf(
"%d: attribute data different: attr_data2[%d][%d]=%d, read_data2[%d][%d]=%d\n",
__LINE__, i, j, attr_data2[i][j], i, j, read_data2[i][j]);
TestErrPrintf("%d: attribute data different: attr_data2[%llu][%llu]=%d, "
"read_data2[%llu][%llu]=%d\n",
__LINE__, i, j, attr_data2[i][j], i, j, read_data2[i][j]);

// Verify Name
attr_name = attr.getName();
Expand Down Expand Up @@ -1182,8 +1182,8 @@ test_attr_mult_read()
for (j = 0; j < ATTR3_DIM2; j++)
for (k = 0; k < ATTR3_DIM3; k++)
if (attr_data3[i][j][k] != read_data3[i][j][k])
TestErrPrintf("%d: attribute data different: attr_data3[%d][%d][%d]=%f, "
"read_data3[%d][%d][%d]=%f\n",
TestErrPrintf("%d: attribute data different: attr_data3[%llu][%llu][%llu]=%f, "
"read_data3[%llu][%llu][%llu]=%f\n",
__LINE__, i, j, k, attr_data3[i][j][k], i, j, k, read_data3[i][j][k]);

// Verify Name
Expand Down
Loading