Compare commits

...

1491 Commits

Author SHA1 Message Date
Allen Byrne
a033634b6a Merge pull request #1231 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'e1f4d0c5d2bae6eaf5b347cea17c58522d62ca92':
  HDFFV-10568 fix hdf5_java library dependency
  Fix Java library location for testing
  Java groups example fix
2018-09-01 10:01:56 -05:00
Allen Byrne
e1f4d0c5d2 HDFFV-10568 fix hdf5_java library dependency 2018-08-31 20:59:57 -05:00
Allen Byrne
d0a62ef975 Fix Java library location for testing 2018-08-31 14:58:58 -05:00
Allen Byrne
86e489b6ab Java groups example fix 2018-08-31 08:00:06 -05:00
Allen Byrne
930d67649d Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '2ee65646c3afb31194864d36a20817c44b42e677':
  Merge pull request #1224 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
2018-08-28 16:17:28 -05:00
Allen Byrne
2ee65646c3 Merge pull request #1227 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'd8ec4df92880d98907b12af8fc9fff86e0631270':
  Update system commands with HD prefix and whitespace
2018-08-28 16:16:56 -05:00
Larry Knox
99e0c1043e Merge pull request #1225 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'f4f2e83d2233699aaf32f2e7f715504b43542d42':
  Merge pull request #1224 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
2018-08-28 13:57:38 -05:00
Allen Byrne
d8ec4df928 Update system commands with HD prefix and whitespace 2018-08-28 13:32:01 -05:00
Larry Knox
f4f2e83d22 Merge pull request #1224 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '763b95c6b0f027025a5a5bfb203b77317ffa2368':
  Update RELEASE.txt with suggested changes
  Update MANIFEST file for new t_coll_md_read.c file
  Remove now-unused local variable
  Add fix for HDFFV-10501
2018-08-28 08:25:38 -05:00
Larry Knox
ebc3d3eda5 Merge pull request #1223 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '9e466086f49e6e36b2dc71c0e6e94c01368d7d00':
  Disable failing tests because of execution issue
  Add testfiles to data copy
  Same changes needed for examples as test
  Correct name of test jar
  Only remove test jars
  Remove obsolete var
  Correct osx installer extension
  revert build install change for DT
  Merge CMake and Java OSX changes from develop
2018-08-24 13:04:51 -05:00
Allen Byrne
9e466086f4 Disable failing tests because of execution issue 2018-08-24 10:27:15 -05:00
Allen Byrne
87fc66f41b Add testfiles to data copy 2018-08-23 17:27:34 -05:00
Allen Byrne
6e66005441 Same changes needed for examples as test 2018-08-23 16:33:20 -05:00
Allen Byrne
282272a727 Correct name of test jar 2018-08-23 14:53:44 -05:00
Larry Knox
a00d6795ce Merge pull request #1221 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '4393a79e966a946cd7682e4177cbfeacf68e4a92':
  Change prefix in example scripts to relative path to bin. This was done for 1.8, and works wherever installed without the need to replace the original prefix.
2018-08-23 14:33:02 -05:00
Allen Byrne
4363609ef0 Only remove test jars 2018-08-23 14:22:22 -05:00
Allen Byrne
f96190845c Remove obsolete var 2018-08-23 13:21:09 -05:00
Larry Knox
4393a79e96 Change prefix in example scripts to relative path to bin. This was done
for 1.8, and works wherever installed without the need to replace the
original prefix.
2018-08-23 10:50:23 -05:00
Allen Byrne
36d3515ad8 Correct osx installer extension 2018-08-23 09:43:58 -05:00
Allen Byrne
5e6baf8972 revert build install change for DT 2018-08-23 09:23:54 -05:00
Allen Byrne
731ebbb93f Merge CMake and Java OSX changes from develop 2018-08-23 08:46:34 -05:00
Allen Byrne
ed16ca44b5 Merge pull request #1216 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:hdf5_1_10 to hdf5_1_10
* commit '3537a81e35b64903bcafd92a411cd1ca02ce4f2b':
  HDFFV-10536 Convert iterator callbacks from global to stack var
2018-08-21 10:03:03 -05:00
Allen Byrne
3537a81e35 HDFFV-10536 Convert iterator callbacks from global to stack var 2018-08-21 08:23:12 -05:00
Allen Byrne
c9b8f6b44b Merge pull request #1215 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:hdf5_1_10 to hdf5_1_10
* commit '0b87689625f9d9e29692d119d4eb323ece726abb':
  Adjust warning flags to match autotools, add configure status
2018-08-21 08:16:37 -05:00
Allen Byrne
0b87689625 Adjust warning flags to match autotools, add configure status 2018-08-21 08:07:27 -05:00
Allen Byrne
e7ac7c896d Merge pull request #1212 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:hdf5_1_10 to hdf5_1_10
* commit '995d1740476629a80d75033836dac76b91086f26':
  HDFFV-10547 add option to package examples
2018-08-21 07:32:07 -05:00
Allen Byrne
995d174047 HDFFV-10547 add option to package examples 2018-08-20 18:25:11 -05:00
Larry Knox
844e1442e0 Merge pull request #1208 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'bad45f2eefbaa69e28ec0954f84221d5dffe70cb':
  Update contents of COPYING file.
2018-08-17 16:48:26 -05:00
Larry Knox
bad45f2eef Update contents of COPYING file. 2018-08-17 16:39:10 -05:00
Allen Byrne
836c3bcae2 Merge pull request #1207 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'aab40090f0227bec4150f322aee40c1aa4dbd21e':
  HDFFV-10552 Add missing HDF5_USE_110_API_DEFAULT option
2018-08-17 15:09:18 -05:00
Allen Byrne
aab40090f0 HDFFV-10552 Add missing HDF5_USE_110_API_DEFAULT option 2018-08-17 15:01:23 -05:00
Allen Byrne
589845a3ce Merge pull request #1203 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '811abba1c7fa6301072e4ef7d7e77d289e77563f':
  Add extra option for CDash
2018-08-17 12:08:29 -05:00
Allen Byrne
811abba1c7 Add extra option for CDash 2018-08-17 11:36:42 -05:00
Larry Knox
820c51d648 Merge pull request #1202 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '1029540525688e9dd7f487fd0c8e5cd0f8e6c098':
  Update Inel Fortran version for Windows 10.
  Merge pull request #1189 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_10_3 to hdf5_1_10_3
  Merge pull request #1190 in HDFFV/hdf5 from ~BMRIBLER/hdf5_1_10_3-bmr:hdf5_1_10_3 to hdf5_1_10_3
  Merge pull request #1195 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10_3 to hdf5_1_10_3
2018-08-17 08:00:36 -05:00
Larry Knox
1029540525 Update Inel Fortran version for Windows 10. 2018-08-16 22:21:15 -05:00
Scot Breitenfeld
de067e27d4 Merge pull request #1189 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_10_3 to hdf5_1_10_3
* commit '6fde89013a10ebb31aa9e3c2f88a3a9a0d1517c7':
  updated fortran fixes
2018-08-16 22:16:08 -05:00
Larry Knox
3f0655a0a4 Merge pull request #1190 in HDFFV/hdf5 from ~BMRIBLER/hdf5_1_10_3-bmr:hdf5_1_10_3 to hdf5_1_10_3
* commit 'fae6c2fea419eb018414a9eed78a23e133a3660b':
  Revised entry on CVE issues
  Added notes about CVE issues
2018-08-16 22:11:21 -05:00
Dana Robinson
7a7ab1939d Merge pull request #1195 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10_3 to hdf5_1_10_3
* commit '476072a8b469206e2a2de6eb5ad9fcae36c7bdd6':
  Updated the H5Dread/write_chunk() release note.
  Added a release note for the H5Dread/write_chunk() API calls.
2018-08-16 22:08:18 -05:00
Larry Knox
58a42e0039 Merge pull request #1201 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'b14dc67e198ea73fd19312ad048a89eba90a9d6e':
  Correct nested c-style comments.
2018-08-16 18:09:31 -05:00
Larry Knox
b14dc67e19 Correct nested c-style comments. 2018-08-16 18:06:56 -05:00
Larry Knox
a60f7d1dc6 Merge pull request #1197 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:hdf5_1_10 to hdf5_1_10
* commit '09b74727d32a931744b125cb105c61734a0270b8':
  Corrected comment
  Fix JIRA number format
  HDFFV-10552 fix makevers script and undeprecate 1.10 functions
2018-08-16 16:47:56 -05:00
Allen Byrne
09b74727d3 Corrected comment 2018-08-16 16:44:46 -05:00
Vailin Choi
64f5cd75aa Merge pull request #1194 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit '5c3b993e8242fd711baec8a5ddaac793a7bc2a39':
  Revise release notes for H5Oget_info (HDFFV-10180).
  Modify release notes for H5Oget_info (HDFFV-10180).
  Add release notes for HDFFV-10180.
2018-08-16 16:32:18 -05:00
Vailin Choi
5c3b993e82 Revise release notes for H5Oget_info (HDFFV-10180). 2018-08-16 16:27:03 -05:00
Allen Byrne
557406cee8 Fix JIRA number format 2018-08-16 15:38:39 -05:00
Allen Byrne
32719fffd9 HDFFV-10552 fix makevers script and undeprecate 1.10 functions 2018-08-16 15:23:03 -05:00
Vailin Choi
f2d0a34045 Modify release notes for H5Oget_info (HDFFV-10180). 2018-08-16 11:58:04 -05:00
Vailin Choi
b9511a1fc3 Add release notes for HDFFV-10180. 2018-08-15 21:14:58 -05:00
Vailin Choi
423b4ecd65 Merge pull request #1191 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit '08c1bf7b3bf119c91d532e4bc4640d73bf35626e':
  Add release notes for HDFFV-10469.
2018-08-14 15:40:15 -05:00
Vailin Choi
08c1bf7b3b Add release notes for HDFFV-10469. 2018-08-14 14:50:49 -05:00
Larry Knox
2a3442872a Merge pull request #1187 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'da698a07207536a06ff1da8f99dc4e7622215e0d':
  Rearrange issues by date order Update version. Update .so versions to match 1.10.3.
2018-08-09 14:02:26 -05:00
Jordan Henderson
da698a0720 Rearrange issues by date order
Update version.
Update .so versions to match 1.10.3.
2018-08-09 13:48:52 -05:00
Larry Knox
f378513a67 Merge pull request #1182 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '0bc17f0e63ee0298bdc6104416864d1251433438':
  HDFFV-10544 writeVL subfunction is unimplemented
2018-08-08 15:56:57 -05:00
Allen Byrne
0bc17f0e63 HDFFV-10544 writeVL subfunction is unimplemented 2018-08-08 10:45:52 -05:00
Larry Knox
f827e1d045 Merge pull request #1180 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '89c1ce3c1f6d58813e83bf1288410f3190722be7':
  Merge pull request #1178 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
2018-08-07 21:15:19 -05:00
Larry Knox
89c1ce3c1f Merge pull request #1178 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'a3385675b3cdc2102457a9f91877cc27778ab29a':
  Reorder bugfix release notes from latest to earliest, and miscellaneous format cleanup.
  Add RELEASE.txt entry for HDFFV-10475
2018-08-07 15:33:33 -05:00
Jordan Henderson
51b90ecad3 Merge pull request #1172 in HDFFV/hdf5 from ~JHENDERSON/hdf5:feature/1_10_MPI2_only_fixes to hdf5_1_10
* commit 'afa166154f1d4175a9d8cbc2f6bc1584dca859f8': (81 commits)
  Typo fix
  Set CMAKE_REQUIRED_INCLUDES instead of using path in call
  Add Autotools and CMake checks for big I/O MPI-3 functions
  Add hdf5settings section for parallel compression status in CMake builds
  Switch to CheckSymbolExists in CMake
  Add configure check for MPI_Mprobe and MPI_Imrecv functions
  Revert "Merge pull request #1149 in HDFFV/hdf5 from hdf5_1_10.sync to hdf5_1_10"
  Update HDF5 examples to correct version.
  Correct a few typos.
  Correct typo in comment in config/gnu-flags.
  Update bine/release to create batch scripts and build-unix-sh, and to put files in a subdirectory.
  misc. fixed version paths
  misc. versioning fixes
  Fixed versioning
  Add missing '\' in the middle of the public headers list in Makefile.am.
  Fixed typos
  Entered entries for HDFFV-10150, HDFFV-10458, HDFFV-1047
  Updated for C2Cppfunction_map.htm
  Added class DSetAccPropList Description:     - Added class DSetAccPropList for the dataset access property list.     - Added wrapper for H5Dget_access_plist to class DataSet         // Gets the access property list of this dataset.         DSetAccPropList getAccessPlist() const;
  Code improvement Description:     Moved the new H5Object::getInfo member functions to H5Location and     made them overloaded with the existing H5Location::getObjinfo.  This     way is cleaner than the previous approach. Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
  ...
2018-08-07 11:33:07 -05:00
Allen Byrne
f7c115f42a Merge pull request #1177 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '78c4623235ea54ec2adc9d079e9f5c9e87f870ba':
  HDFFV-10544 Improve JNI exception handling
2018-08-07 08:51:52 -05:00
Allen Byrne
78c4623235 HDFFV-10544 Improve JNI exception handling 2018-08-06 13:15:50 -05:00
Allen Byrne
51a5d112ad Merge pull request #1174 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'd7d562339911b1f71c43cb293f90d7d67d33e949':
  Change exception text
  Move unimplemented exception throw to just one function
2018-08-03 12:50:40 -05:00
Allen Byrne
d7d5623399 Change exception text 2018-08-03 11:54:58 -05:00
Allen Byrne
d47ffdb828 Move unimplemented exception throw to just one function 2018-08-03 09:01:29 -05:00
Allen Byrne
afa166154f Typo fix 2018-08-02 11:59:21 -05:00
Allen Byrne
cc2ded2a16 Set CMAKE_REQUIRED_INCLUDES instead of using path in call 2018-08-02 11:59:12 -05:00
Jordan Henderson
bccf6e38a4 Add Autotools and CMake checks for big I/O MPI-3 functions 2018-08-02 09:47:35 -05:00
Jordan Henderson
7a4025f259 Add hdf5settings section for parallel compression status in CMake builds 2018-08-02 09:47:26 -05:00
Jordan Henderson
d4298589fe Switch to CheckSymbolExists in CMake 2018-08-02 09:46:45 -05:00
Jordan Henderson
0623b06b15 Add configure check for MPI_Mprobe and MPI_Imrecv functions
Add line to libhdf5settings file for status of Parallel writes to
filtered datasets status

Surround Parallel Compression code in MPI_VERSION >= 3 checks

Add disabled message for Parallel Compression built w/ MPI-2

Modify Parallel Compression tests to only run the parallel filtered read
tests when parallel filtered writes are disabled

Update big I/O code to handle being built with MPI-2

Add checks to CMakeLists.txt for MPI_Mprobe and MPI_Imrecv
2018-08-02 09:46:34 -05:00
Jordan Henderson
07c33d0eb8 Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '3e7979902ade13ba8f37e020e5ae95f03a82b0f9':
  Merge pull request #1158 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp4:develop to develop
  Merge from develop
2018-08-01 11:29:59 -05:00
Larry Knox
3e7979902a Merge pull request #1169 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '668fd6327911eb8b8efd68219a0cadf13c5d75f8':
  Merge pull request #1158 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp4:develop to develop
2018-07-31 12:04:54 -05:00
Larry Knox
668fd63279 Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit 'b077040516e4091e98777818292fe8fbc38e9f12':
  Merge from develop
2018-07-31 11:35:59 -05:00
Allen Byrne
b077040516 Merge pull request #1168 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
HDFFV-9755, HDFFV-10508 documentation
Fortran configuration fixes
MPI generator expressions

* commit '4f5bdadd50783be3d20949048ede3ec3543ba5a4':
  Merge from develop
2018-07-31 11:14:31 -05:00
Binh-Minh Ribler
929675899f Merge pull request #1158 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp4:develop to develop
Typos in comments

* commit '7d9f5ed49a560fe8801b77cce8ffb60a2ec5e846':
  Fixed document format Platforms tested:     Linux/64 (jelly) (only in comment sections)
  Fixed missing backslash
2018-07-31 11:04:48 -05:00
Allen Byrne
4f5bdadd50 Merge from develop 2018-07-31 10:07:00 -05:00
Jordan Henderson
9002612504 Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '23b96a8dc8ccb7d60150a30133183df3a7ac270d': (53 commits)
  HDFFV-10534 add note
  HDFFV-10534 change to runtime exception
  Revise H5D__mpio_array_gatherv() to not allocate memory needlessly
  Add test to continually grow and shrink chunks
  Changes to test with checksum filter as well as deflate filter
  Eliminate warning about signed to unsigned conversion
  Remove unused local variable
  Fix bug in parallel reads of compressed data
  Add data verification to parallel filtered compound write tests
  Add seven of fourteen parallel filtered data partial read tests
  Add missing file and remove deleted
  Correct git synch error
  Add swmr tests, fix java script
  Update macros and cygwin flags
  Revert Sencode h5dump test
  RELEASE.txt updates for HDFFV-10467 and HDFFV-10509
  Update HDF5 examples to correct version.
  Correct a few typos.
  Correct typo in comment in config/gnu-flags.
  Update bine/release to create batch scripts and build-unix-sh, and to put files in a subdirectory.
  ...
2018-07-31 09:57:02 -05:00
Allen Byrne
23b96a8dc8 Merge pull request #1162 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'e2423982a1e85e8f51ad71808d21fb9185595a27':
  HDFFV-10534 add note
  HDFFV-10534 change to runtime exception
2018-07-30 12:29:51 -05:00
Allen Byrne
e2423982a1 HDFFV-10534 add note 2018-07-30 12:13:03 -05:00
Allen Byrne
4b8047e4c3 HDFFV-10534 change to runtime exception 2018-07-30 10:52:38 -05:00
Scot Breitenfeld
dbeab5ca03 Merge pull request #1156 in HDFFV/hdf5 from hdf5_1_10.sync to hdf5_1_10
* commit 'ed1bfe373316567b57ddf2199853db815fff6b4b': (51 commits)
  Revise H5D__mpio_array_gatherv() to not allocate memory needlessly
  Add test to continually grow and shrink chunks
  Changes to test with checksum filter as well as deflate filter
  Eliminate warning about signed to unsigned conversion
  Remove unused local variable
  Fix bug in parallel reads of compressed data
  Add data verification to parallel filtered compound write tests
  Add seven of fourteen parallel filtered data partial read tests
  Add missing file and remove deleted
  Correct git synch error
  Add swmr tests, fix java script
  Update macros and cygwin flags
  Revert Sencode h5dump test
  RELEASE.txt updates for HDFFV-10467 and HDFFV-10509
  Update HDF5 examples to correct version.
  Correct a few typos.
  Correct typo in comment in config/gnu-flags.
  Update bine/release to create batch scripts and build-unix-sh, and to put files in a subdirectory.
  Add missing '\' in the middle of the public headers list in Makefile.am.
  Fixed typos
  ...
2018-07-27 17:51:04 -05:00
Jordan Henderson
ed1bfe3733 Revise H5D__mpio_array_gatherv() to not allocate memory needlessly 2018-07-27 17:34:36 -05:00
Jordan Henderson
57db75b9de Add test to continually grow and shrink chunks 2018-07-27 17:30:52 -05:00
Jordan Henderson
4694634240 Changes to test with checksum filter as well as deflate filter 2018-07-27 17:30:28 -05:00
Jordan Henderson
c9e737aca2 Eliminate warning about signed to unsigned conversion 2018-07-27 17:30:19 -05:00
Jordan Henderson
5c51cd4212 Remove unused local variable
Ensure frees are done in a more heap-fragmentation friendly order
2018-07-27 17:29:58 -05:00
Jordan Henderson
44507db95d Fix bug in parallel reads of compressed data
Add remaining parallel compound dataset partial read tests
2018-07-27 17:29:45 -05:00
Jordan Henderson
476a6ecc5c Add data verification to parallel filtered compound write tests
Add 3D parallel filtered partial read tests
2018-07-27 17:29:34 -05:00
Jordan Henderson
edf4ff66b2 Add seven of fourteen parallel filtered data partial read tests 2018-07-27 17:29:19 -05:00
Allen Byrne
e205cb8266 Merge pull request #1155 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10.sync to hdf5_1_10.sync
* commit '5fce1be6466177903bf4e192e141b416f9c9a73d':
  Add missing file and remove deleted
2018-07-27 12:27:59 -05:00
Allen Byrne
5fce1be646 Add missing file and remove deleted 2018-07-27 12:07:40 -05:00
Allen Byrne
f9bfd5d9ad Merge pull request #1154 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10.sync to hdf5_1_10.sync
* commit '2c6dadbd132b02ecbe688f48ced3b0703ed1965d':
  Correct git synch error
  Add swmr tests, fix java script
  Update macros and cygwin flags
  Revert Sencode h5dump test
2018-07-27 10:56:17 -05:00
Allen Byrne
2c6dadbd13 Correct git synch error 2018-07-27 10:17:54 -05:00
Allen Byrne
732e996de7 Add swmr tests, fix java script 2018-07-27 10:06:33 -05:00
Allen Byrne
bb436dbc61 Update macros and cygwin flags 2018-07-27 09:58:11 -05:00
Allen Byrne
2c5c115a61 Revert Sencode h5dump test 2018-07-27 09:51:39 -05:00
Jordan Henderson
2b193845d2 RELEASE.txt updates for HDFFV-10467 and HDFFV-10509 2018-07-27 09:06:45 -05:00
Larry Knox
01016b1fec Update HDF5 examples to correct version. 2018-07-26 17:29:00 -05:00
Larry Knox
d3fedf9510 Correct a few typos. 2018-07-26 17:28:53 -05:00
Larry Knox
7de3caf110 Correct typo in comment in config/gnu-flags. 2018-07-26 17:28:46 -05:00
Larry Knox
bf76b30fb8 Update bine/release to create batch scripts and build-unix-sh, and to
put files in a subdirectory.
2018-07-26 17:28:31 -05:00
Larry Knox
ebdd92af19 Add missing '\' in the middle of the public headers list in Makefile.am. 2018-07-26 17:24:00 -05:00
Binh-Minh Ribler
677bcbdfc8 Fixed typos 2018-07-26 17:23:46 -05:00
Binh-Minh Ribler
0ebac51cd5 Entered entries for HDFFV-10150, HDFFV-10458, HDFFV-1047 2018-07-26 17:23:39 -05:00
Binh-Minh Ribler
cb1daac228 Updated for C2Cppfunction_map.htm 2018-07-26 17:23:32 -05:00
Binh-Minh Ribler
386b5f7bf8 Added class DSetAccPropList
Description:
    - Added class DSetAccPropList for the dataset access property list.
    - Added wrapper for H5Dget_access_plist to class DataSet
        // Gets the access property list of this dataset.
        DSetAccPropList getAccessPlist() const;

    - Added wrappers for H5Pset_chunk_cache and H5Pget_chunk_cache to class
      DSetAccPropList
        // Sets the raw data chunk cache parameters.
        void setChunkCache(size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0)

        // Retrieves the raw data chunk cache parameters.
        void getChunkCache(size_t &rdcc_nslots, size_t &rdcc_nbytes, double &rdcc_w0)

    - Added two more arguments to H5Location::createDataSet:
        const DSetAccPropList& dapl = DSetAccPropList::DEFAULT
        const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT

    - Added one more argument to H5Location::openDataSet:
        const DSetAccPropList& dapl = DSetAccPropList::DEFAULT

Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-26 17:23:22 -05:00
Binh-Minh Ribler
df934cd665 Code improvement
Description:
    Moved the new H5Object::getInfo member functions to H5Location and
    made them overloaded with the existing H5Location::getObjinfo.  This
    way is cleaner than the previous approach.
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-26 17:23:10 -05:00
Vailin Choi
56d1d200b8 Fix for HDFFV-9277: update the ainfo message after removing an attribute. 2018-07-26 17:23:01 -05:00
Larry Knox
c992df8d8f Add cmakehdf5 command line option to turn on shell script testing.
Option is on by default but can be disabled with --disable-shell-testing.
2018-07-26 17:22:52 -05:00
Larry Knox
35542e9de8 Apply Cygwin pathches from Marco Atzeri.
Commit Joe Lee's typo corrections for src/H5MF.c.
2018-07-26 17:22:09 -05:00
Binh-Minh Ribler
69c3bdc9e8 Fixed EED-319
Description:
    - Fixed doc issue
      Added an html version for the C++ function mapping table and removed
      the single web page version.
      Updated cpp_doc_config to use the html file.
    - Added a couple more minor tests
2018-07-26 17:20:42 -05:00
Binh-Minh Ribler
f9d2edc7ed Fixed HDFFV-10472
Description:
    Added operator!= to DataType
        bool operator!=(const DataType& compared_type)
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-26 17:20:28 -05:00
Binh-Minh Ribler
622806b89d Fixed HDFFV-10458 partially
Description:
    Added wrappers for H5Oget_info_by_idx2.

    // Returns information about an HDF5 object, given its index.
    void getInfo(const char* grp_name, H5_index_t idx_type,
                 H5_iter_order_t order, hsize_t idx, H5O_info_t& objinfo,
                 unsigned fields = H5O_INFO_BASIC,
                 const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
    void getInfo(const H5std_string& grp_name, H5_index_t idx_type,
                 H5_iter_order_t order, hsize_t idx, H5O_info_t& objinfo,
                 unsigned fields = H5O_INFO_BASIC,
                 const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-26 17:20:20 -05:00
Binh-Minh Ribler
edeac9f067 Fixed comments 2018-07-26 17:20:12 -05:00
Binh-Minh Ribler
f706bd0da1 Fixed HDFFV-10458 partially
Description:
    Added wrappers for H5Oget_info2 and H5Oget_info_by_name2.

    // Returns information about an HDF5 object.
    void getInfo(H5O_info_t& objinfo, unsigned fields = H5O_INFO_BASIC)

    // Returns information about an HDF5 object, given its name.
    void getInfo(const char* name, H5O_info_t& objinfo,
                 unsigned fields = H5O_INFO_BASIC,
                 const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
    void getInfo(const H5std_string& name, H5O_info_t& objinfo,
                 unsigned fields = H5O_INFO_BASIC,
                 const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-26 17:20:04 -05:00
Binh-Minh Ribler
710771e713 Removed white space 2018-07-26 17:19:52 -05:00
Binh-Minh Ribler
992a199f90 Fixed HDFFV-10476, HDFFV-10478, HDFFV-10480
Description:
    Fixed potential out of bound read and NULL pointer dereferences.
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-26 17:19:43 -05:00
Binh-Minh Ribler
08e71a98e9 Combined macro lines as Dana commented
Platforms tested:
    Linux/64 (jelly) (very minor)
2018-07-26 17:19:34 -05:00
Jerome Soumagne
81f4245a7c Fix evaluation of __has_attribute(no_sanitize_address) on older GCC versions 2018-07-26 17:19:24 -05:00
Binh-Minh Ribler
d0362ce438 Fixed division-by-zero issues
Description:
    Fixed HDFFV-10481 and HDFFV-10477, division by 0.
    Fixed another occurrence beside what were reported.
    Also, changed a local variable to avoid an unnecessary cast.
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-26 17:19:11 -05:00
Binh-Minh Ribler
e57234b027 Fixed HDFFV-10404
Description:
    Applied the typo fixes from user's report.
    The previous pull request couldn't be merged because it was too old,
    and it was too complicated for me to resolve conflicts.
Platform tested:
    Linux/64 (jelly) - very minor
2018-07-26 17:19:03 -05:00
Jordan Henderson
3e510f48a2 Add note about single chunk caching and serial library 2018-07-26 17:18:56 -05:00
Jordan Henderson
c058e5eb7e Add check for actually using the MPI file driver when caching one chunk
Better explain rationale behind chunk caching issue fix
2018-07-26 17:18:46 -05:00
Jordan Henderson
21a5db8d98 Fix error message mentioning wrong MPI function used 2018-07-26 17:18:39 -05:00
Hyo-Kyung Lee
883f0a4eb8 HDFFV-10527:corrected two more typos. 2018-07-26 17:18:30 -05:00
Hyo-Kyung Lee
9e3ee40a3b HDFFV-10527:corrected typos in comment blocks. 2018-07-26 17:18:23 -05:00
Vailin Choi
c3f4af256a Changes based on feedback from pull request. 2018-07-26 17:18:13 -05:00
Larry Knox
076b77891a Vailin's fix for H5open fail when file doesn't have write permissions
for user in test_misc33().  The test file can be
opened read-only because the test doesn't write to it.
2018-07-26 17:17:36 -05:00
Vailin Choi
114a63a258 Fix test_misc33() in test/tmisc.c
Open the test file read-only so that it can be accessed for testing.
2018-07-26 17:17:12 -05:00
Vailin Choi
d79475c482 Modifications made based on feedback from pull request. 2018-07-26 17:17:03 -05:00
Vailin Choi
78d4fbddbd Fix for HDFFV-10333:
1) Check for valid object header version for a refcount messge
2) Check for invalid fill value size
3) Check for invalid dimension size in a layout message
4) Add --enable-error-stack option to h5stat
5) Add error checks to h5stat.c
6) Add tests to h5stat and h5dump
2018-07-26 17:16:50 -05:00
Hyo-Kyung Lee
256f74f532 fixed typo. 2018-07-26 17:16:43 -05:00
Jordan Henderson
f42c00b5ec Fix for HDFFV-10509 2018-07-26 17:16:32 -05:00
Jerome Soumagne
1268499234 Fix H5detect to use no_sanitize_address attribute and support GCC sanitizers 2018-07-26 17:16:15 -05:00
Scot Breitenfeld
44080eeabd Merge pull request #1153 in HDFFV/hdf5 from hdf5_1_10.revert to hdf5_1_10
* commit '4eccacf11cded8605f9bf1761e22945caffe76f9':
  Revert "Merge pull request #1149 in HDFFV/hdf5 from hdf5_1_10.sync to hdf5_1_10"
2018-07-26 10:46:03 -05:00
M. Scot Breitenfeld
4eccacf11c Revert "Merge pull request #1149 in HDFFV/hdf5 from hdf5_1_10.sync to hdf5_1_10"
This reverts commit d99570506c, reversing
changes made to 792b3352b9.
2018-07-26 10:38:36 -05:00
Scot Breitenfeld
d99570506c Merge pull request #1149 in HDFFV/hdf5 from hdf5_1_10.sync to hdf5_1_10
* commit 'fe8d5bcb7aebbade60c8f128758c2c37c6799040': (74 commits)
  Update HDF5 examples to correct version.
  Correct a few typos.
  Correct typo in comment in config/gnu-flags.
  Update bine/release to create batch scripts and build-unix-sh, and to put files in a subdirectory.
  misc. fixed version paths
  misc. versioning fixes
  Fixed versioning
  Add missing '\' in the middle of the public headers list in Makefile.am.
  Fixed typos
  Entered entries for HDFFV-10150, HDFFV-10458, HDFFV-1047
  Updated for C2Cppfunction_map.htm
  Added class DSetAccPropList Description:     - Added class DSetAccPropList for the dataset access property list.     - Added wrapper for H5Dget_access_plist to class DataSet         // Gets the access property list of this dataset.         DSetAccPropList getAccessPlist() const;
  Code improvement Description:     Moved the new H5Object::getInfo member functions to H5Location and     made them overloaded with the existing H5Location::getObjinfo.  This     way is cleaner than the previous approach. Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
  Fix for HDFFV-9277: update the ainfo message after removing an attribute.
  Add cmakehdf5 command line option to turn on shell script testing. Option is on by default but can be disabled with --disable-shell-testing.
  Apply Cygwin pathches from Marco Atzeri. Commit Joe Lee's typo corrections for src/H5MF.c.
  Adjust error handling
  TRILABS-137 Convert tcheck_version script to cmake tests
  Fixed EED-319 Description:     - Fixed doc issue       Added an html version for the C++ function mapping table and removed       the single web page version.       Updated cpp_doc_config to use the html file.     - Added a couple more minor tests
  ifdef around std flag for cygwin
  ...
2018-07-24 17:02:07 -05:00
M. Scot Breitenfeld
fe8d5bcb7a Merge branch 'develop' into hdf5_1_10.sync 2018-07-24 17:00:26 -05:00
Larry Knox
e203b15e94 Merge pull request #1150 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'ac5871c39cd9cd26b4a26041da7f265d5bba64dd':
  Update HDF5 examples to correct version.
  Correct a few typos.
  Correct typo in comment in config/gnu-flags.
  Update bine/release to create batch scripts and build-unix-sh, and to put files in a subdirectory.
2018-07-24 16:42:19 -05:00
Larry Knox
ac5871c39c Update HDF5 examples to correct version. 2018-07-24 16:10:33 -05:00
Larry Knox
208ff1410d Correct a few typos. 2018-07-24 15:48:29 -05:00
Larry Knox
ab31eafa2e Correct typo in comment in config/gnu-flags. 2018-07-24 15:21:55 -05:00
Larry Knox
076ae17a5d Update bine/release to create batch scripts and build-unix-sh, and to
put files in a subdirectory.
2018-07-24 14:47:07 -05:00
M. Scot Breitenfeld
03fe2e65e0 misc. fixed version paths 2018-07-24 13:13:14 -05:00
M. Scot Breitenfeld
cd3362b696 misc. versioning fixes 2018-07-24 12:52:37 -05:00
M. Scot Breitenfeld
73aa776893 Fixed versioning 2018-07-24 12:30:48 -05:00
M. Scot Breitenfeld
8a24e84ac8 Merge branch 'develop' into hdf5_1_10 2018-07-24 11:51:19 -05:00
Binh-Minh Ribler
e2a1ddd814 Merge pull request #1148 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '9838a1a08f946417d6d361b8b2c86307288cc50d':
  Add missing '\' in the middle of the public headers list in Makefile.am.
2018-07-24 08:40:47 -05:00
Larry Knox
9838a1a08f Add missing '\' in the middle of the public headers list in Makefile.am. 2018-07-24 08:36:37 -05:00
Binh-Minh Ribler
98308480f6 Merge pull request #1146 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp4:develop to develop
Code improvement
New class for dataset access property list

* commit '3c6a39858fef9e7207cd7c3e3057267ec380be0b':
  Fixed typos
  Entered entries for HDFFV-10150, HDFFV-10458, HDFFV-1047
  Updated for C2Cppfunction_map.htm
  Added class DSetAccPropList Description:     - Added class DSetAccPropList for the dataset access property list.     - Added wrapper for H5Dget_access_plist to class DataSet         // Gets the access property list of this dataset.         DSetAccPropList getAccessPlist() const;
  Code improvement Description:     Moved the new H5Object::getInfo member functions to H5Location and     made them overloaded with the existing H5Location::getObjinfo.  This     way is cleaner than the previous approach. Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
2018-07-23 23:41:56 -05:00
Binh-Minh Ribler
3c6a39858f Fixed typos 2018-07-23 11:18:43 -05:00
Binh-Minh Ribler
f80cb3f866 Entered entries for HDFFV-10150, HDFFV-10458, HDFFV-1047 2018-07-23 10:57:21 -05:00
Binh-Minh Ribler
55a35a8273 Updated for C2Cppfunction_map.htm 2018-07-23 09:12:30 -05:00
Binh-Minh Ribler
09913e2f8e Added class DSetAccPropList
Description:
    - Added class DSetAccPropList for the dataset access property list.
    - Added wrapper for H5Dget_access_plist to class DataSet
        // Gets the access property list of this dataset.
        DSetAccPropList getAccessPlist() const;

    - Added wrappers for H5Pset_chunk_cache and H5Pget_chunk_cache to class
      DSetAccPropList
        // Sets the raw data chunk cache parameters.
        void setChunkCache(size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0)

        // Retrieves the raw data chunk cache parameters.
        void getChunkCache(size_t &rdcc_nslots, size_t &rdcc_nbytes, double &rdcc_w0)

    - Added two more arguments to H5Location::createDataSet:
        const DSetAccPropList& dapl = DSetAccPropList::DEFAULT
        const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT

    - Added one more argument to H5Location::openDataSet:
        const DSetAccPropList& dapl = DSetAccPropList::DEFAULT

Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-22 15:22:34 -05:00
Binh-Minh Ribler
c983fc3c5b Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_cpp4 into develop 2018-07-21 00:46:34 -05:00
Binh-Minh Ribler
4f37cdcd36 Code improvement
Description:
    Moved the new H5Object::getInfo member functions to H5Location and
    made them overloaded with the existing H5Location::getObjinfo.  This
    way is cleaner than the previous approach.
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-21 00:40:57 -05:00
Vailin Choi
243a36911f Merge pull request #1145 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit 'ad317226eacbf5b0a770e458290236ba91861fdc':
  Fix for HDFFV-9277: update the ainfo message after removing an attribute.
2018-07-20 14:08:00 -05:00
Vailin Choi
ad317226ea Fix for HDFFV-9277: update the ainfo message after removing an attribute. 2018-07-20 11:21:50 -05:00
Binh-Minh Ribler
32d5a3be1c Merge pull request #1141 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp4:develop to develop
Fixed HDFFV-10472 and replaced the C2Cpp function mapping table with a more supported format.

* commit 'dd0a040ec807912b80a9f1779fbf46c65d01cd57':
  Fixed EED-319 Description:     - Fixed doc issue       Added an html version for the C++ function mapping table and removed       the single web page version.       Updated cpp_doc_config to use the html file.     - Added a couple more minor tests
  Fixed HDFFV-10472 Description:     Added operator!= to DataType         bool operator!=(const DataType& compared_type) Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
2018-07-19 15:41:46 -05:00
Allen Byrne
e13beff99f Merge pull request #1144 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '77fa93e07b2b860ca314b2c332ebd440544e3326':
  Add cmakehdf5 command line option to turn on shell script testing. Option is on by default but can be disabled with --disable-shell-testing.
2018-07-19 11:23:38 -05:00
Larry Knox
77fa93e07b Add cmakehdf5 command line option to turn on shell script testing.
Option is on by default but can be disabled with --disable-shell-testing.
2018-07-19 09:49:32 -05:00
Larry Knox
64d8a67943 Merge pull request #1143 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '3c6654921000a8659276f1fcb32dd0ada1353558':
  Apply Cygwin pathches from Marco Atzeri. Commit Joe Lee's typo corrections for src/H5MF.c.
2018-07-18 17:15:42 -05:00
Allen Byrne
dfc06f7948 Merge pull request #1142 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '3a8892a0d90edb6c21c91ede18bf6b3cb2895af0':
  Adjust error handling
  TRILABS-137 Convert tcheck_version script to cmake tests
  ifdef around std flag for cygwin
2018-07-18 17:14:20 -05:00
Larry Knox
3c66549210 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop 2018-07-18 17:06:59 -05:00
Larry Knox
892252106a Apply Cygwin pathches from Marco Atzeri.
Commit Joe Lee's typo corrections for src/H5MF.c.
2018-07-18 17:01:53 -05:00
Allen Byrne
3a8892a0d9 Adjust error handling 2018-07-18 11:58:09 -05:00
Allen Byrne
e5156823bd TRILABS-137 Convert tcheck_version script to cmake tests 2018-07-18 10:42:14 -05:00
Binh-Minh Ribler
dd0a040ec8 Fixed EED-319
Description:
    - Fixed doc issue
      Added an html version for the C++ function mapping table and removed
      the single web page version.
      Updated cpp_doc_config to use the html file.
    - Added a couple more minor tests
2018-07-18 10:36:05 -05:00
Allen Byrne
72931507f9 ifdef around std flag for cygwin 2018-07-18 09:39:13 -05:00
Binh-Minh Ribler
9a306f8311 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_cpp4 into develop 2018-07-17 12:21:39 -05:00
Binh-Minh Ribler
a31cd3623f Fixed HDFFV-10472
Description:
    Added operator!= to DataType
        bool operator!=(const DataType& compared_type)
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-17 12:21:07 -05:00
Binh-Minh Ribler
d95f36686b Merge pull request #1140 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp4:develop to develop
Fixed part of HDFFV-10458: wrappers for H5Oget_info2, H5Oget_info_by_name2, and H5Oget_info_by_idx2.

* commit '3aa24435180d10aeca6493f7c1b277cfd5c73fad':
  Fixed HDFFV-10458 partially Description:     Added wrappers for H5Oget_info_by_idx2.
  Fixed comments
  Fixed HDFFV-10458 partially Description:     Added wrappers for H5Oget_info2 and H5Oget_info_by_name2.
2018-07-17 11:56:53 -05:00
Binh-Minh Ribler
3aa2443518 Fixed HDFFV-10458 partially
Description:
    Added wrappers for H5Oget_info_by_idx2.

    // Returns information about an HDF5 object, given its index.
    void getInfo(const char* grp_name, H5_index_t idx_type,
                 H5_iter_order_t order, hsize_t idx, H5O_info_t& objinfo,
                 unsigned fields = H5O_INFO_BASIC,
                 const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
    void getInfo(const H5std_string& grp_name, H5_index_t idx_type,
                 H5_iter_order_t order, hsize_t idx, H5O_info_t& objinfo,
                 unsigned fields = H5O_INFO_BASIC,
                 const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-17 09:12:10 -05:00
Binh-Minh Ribler
944735221e Fixed comments 2018-07-17 01:32:07 -05:00
Binh-Minh Ribler
c7f42f181c Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_cpp4 into develop 2018-07-17 01:16:56 -05:00
Binh-Minh Ribler
14bf28780a Fixed HDFFV-10458 partially
Description:
    Added wrappers for H5Oget_info2 and H5Oget_info_by_name2.

    // Returns information about an HDF5 object.
    void getInfo(H5O_info_t& objinfo, unsigned fields = H5O_INFO_BASIC)

    // Returns information about an HDF5 object, given its name.
    void getInfo(const char* name, H5O_info_t& objinfo,
                 unsigned fields = H5O_INFO_BASIC,
                 const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
    void getInfo(const H5std_string& name, H5O_info_t& objinfo,
                 unsigned fields = H5O_INFO_BASIC,
                 const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-17 01:09:45 -05:00
Binh-Minh Ribler
8a50402569 Merge pull request #1139 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp4:develop to develop
Fixed HDFFV-10476, HDFFV-10478, HDFFV-10480

* commit 'fe916ada370f33b48b3c39dbf9e3ff73df00fdb7':
  Removed white space
  Fixed HDFFV-10476, HDFFV-10478, HDFFV-10480 Description:     Fixed potential out of bound read and NULL pointer dereferences. Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
2018-07-16 22:12:21 -05:00
Binh-Minh Ribler
fe916ada37 Removed white space 2018-07-16 22:10:50 -05:00
Larry Knox
b888763b6d Merge pull request #1135 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '46986950ad2818a5235c821fa576e0f6470b39be':
  TRILAB-31 add note
  TRILAB-31 Working locally
2018-07-16 20:52:54 -05:00
Binh-Minh Ribler
073e0b1f03 Fixed HDFFV-10476, HDFFV-10478, HDFFV-10480
Description:
    Fixed potential out of bound read and NULL pointer dereferences.
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-16 20:28:27 -05:00
Allen Byrne
46986950ad Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '55666ace551369b3d72430c090ab9f1571e1be75':
  Combined macro lines as Dana commented Platforms tested:     Linux/64 (jelly) (very minor)
  Fix evaluation of __has_attribute(no_sanitize_address) on older GCC versions
  Fixed division-by-zero issues Description:     Fixed HDFFV-10481 and HDFFV-10477, division by 0.     Fixed another occurrence beside what were reported.     Also, changed a local variable to avoid an unnecessary cast. Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
2018-07-16 16:55:46 -05:00
Binh-Minh Ribler
55666ace55 Merge pull request #1134 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp4:develop to develop
Fixed HDFFV-10481 and HDFFV-10477

* commit '83ca39ba9a2d6852dd7754b533f7839e9d2a0107':
  Combined macro lines as Dana commented Platforms tested:     Linux/64 (jelly) (very minor)
  Fixed division-by-zero issues Description:     Fixed HDFFV-10481 and HDFFV-10477, division by 0.     Fixed another occurrence beside what were reported.     Also, changed a local variable to avoid an unnecessary cast. Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
2018-07-16 14:52:43 -05:00
Binh-Minh Ribler
83ca39ba9a Combined macro lines as Dana commented
Platforms tested:
    Linux/64 (jelly) (very minor)
2018-07-16 14:48:11 -05:00
Jerome Soumagne
2725634ed9 Merge pull request #1136 in HDFFV/hdf5 from ~JSOUMAGNE/hdf5_fork:topic_sanitize_gcc48_fix to develop
* commit 'd5e7134df911808bba26ac6629e1fe8324916585':
  Fix evaluation of __has_attribute(no_sanitize_address) on older GCC versions
2018-07-16 13:41:42 -05:00
Jerome Soumagne
d5e7134df9 Fix evaluation of __has_attribute(no_sanitize_address) on older GCC versions 2018-07-16 13:33:23 -05:00
Allen Byrne
7117a66fd0 TRILAB-31 add note 2018-07-16 13:07:50 -05:00
Allen Byrne
47780cb4e0 TRILAB-31 Working locally 2018-07-16 13:01:53 -05:00
Jerome Soumagne
643593dfda Merge pull request #1112 in HDFFV/hdf5 from ~JSOUMAGNE/hdf5_fork:gcc_sanitize to develop
* commit '5afeefe1bae62fa5faf06c0c6f240e10863a2693':
  Fix H5detect to use no_sanitize_address attribute and support GCC sanitizers
2018-07-16 10:39:13 -05:00
Jordan Henderson
f649be9fdc Merge pull request #1127 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit 'a8d6f100cdddbfc42d0c4abfeb4ceb8788b1b087':
  Add note about single chunk caching and serial library
  Add check for actually using the MPI file driver when caching one chunk
  Fix error message mentioning wrong MPI function used
  Fix for HDFFV-10509
  Revise H5D__mpio_array_gatherv() to not allocate memory needlessly
  Add test to continually grow and shrink chunks
  Changes to test with checksum filter as well as deflate filter
  Eliminate warning about signed to unsigned conversion
  Remove unused local variable
  Fix bug in parallel reads of compressed data
  Add data verification to parallel filtered compound write tests
  Add seven of fourteen parallel filtered data partial read tests
2018-07-16 09:37:54 -05:00
Larry Knox
518f4af900 Merge pull request #1131 in HDFFV/hdf5 from HDFFV-10527-typo-in-h5fs.c to develop
* commit 'cb38d210c3ec4945fd47b5861d7db137e0efac55':
  HDFFV-10527:corrected two more typos.
  HDFFV-10527:corrected typos in comment blocks.
2018-07-15 23:36:14 -05:00
Larry Knox
0f6d0803ef Merge pull request #1128 in HDFFV/hdf5 from HDFFV-10525-typo-in-vds.c to develop
* commit '863148d1fe0b6949708698ad9277dbdba8129e0c':
  fixed typo.
2018-07-15 23:35:54 -05:00
Binh-Minh Ribler
fa5d96dc5e Fixed division-by-zero issues
Description:
    Fixed HDFFV-10481 and HDFFV-10477, division by 0.
    Fixed another occurrence beside what were reported.
    Also, changed a local variable to avoid an unnecessary cast.
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-07-15 23:31:09 -05:00
Binh-Minh Ribler
fafa49ef7f Merge pull request #1133 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp4:develop to develop
Fixed HDFFV-10404

* commit 'ec31438afdaf575368938e930eb3af0865a342b3':
  Fixed HDFFV-10404 Description:     Applied the typo fixes from user's report.     The previous pull request couldn't be merged because it was too old,     and it was too complicated for me to resolve conflicts. Platform tested:     Linux/64 (jelly) - very minor
2018-07-14 08:10:49 -05:00
Binh-Minh Ribler
ec31438afd Fixed HDFFV-10404
Description:
    Applied the typo fixes from user's report.
    The previous pull request couldn't be merged because it was too old,
    and it was too complicated for me to resolve conflicts.
Platform tested:
    Linux/64 (jelly) - very minor
2018-07-13 13:40:22 -05:00
Jordan Henderson
a8d6f100cd Add note about single chunk caching and serial library 2018-07-13 10:20:16 -05:00
Vailin Choi
ef30425b1c Merge pull request #1129 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit '08de02c838c05993fea5febb9c320a679e7f841a':
  Changes based on feedback from pull request.
  Fix test_misc33() in test/tmisc.c Open the test file read-only so that it can be accessed for testing.
  Modifications made based on feedback from pull request.
  Fix for HDFFV-10333: 1) Check for valid object header version for a refcount messge 2) Check for invalid fill value size 3) Check for invalid dimension size in a layout message 4) Add --enable-error-stack option to h5stat 5) Add error checks to h5stat.c 6) Add tests to h5stat and h5dump
  Fix daily test failure.
2018-07-13 10:02:24 -05:00
Jordan Henderson
0dc6c3c8b5 Add check for actually using the MPI file driver when caching one chunk
Better explain rationale behind chunk caching issue fix
2018-07-13 09:26:41 -05:00
Jordan Henderson
30d3bc2c91 Fix error message mentioning wrong MPI function used 2018-07-13 08:09:48 -05:00
Hyo-Kyung Lee
cb38d210c3 HDFFV-10527:corrected two more typos. 2018-07-12 18:56:20 -05:00
Hyo-Kyung Lee
5f34de4061 HDFFV-10527:corrected typos in comment blocks. 2018-07-12 18:45:30 -05:00
Vailin Choi
08de02c838 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into develop 2018-07-12 18:26:56 -05:00
Vailin Choi
92bf81a0fb Changes based on feedback from pull request. 2018-07-12 18:25:49 -05:00
Allen Byrne
f1beebe80d Merge pull request #1125 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '8f652a87ca4b77779c4e338d255b4a5217b76227':
  HDFFV-10519 add JNI note
  Add actual file names fo diff
2018-07-12 16:21:14 -05:00
Larry Knox
3d08f00101 Merge pull request #1130 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '08a8202eda7a79495a6d48f6be2c0b114e11750f':
  Vailin's fix for H5open fail when file doesn't have write permissions for user in test_misc33().  The test file can be opened read-only because the test doesn't write to it.
2018-07-12 15:26:42 -05:00
Larry Knox
08a8202eda Vailin's fix for H5open fail when file doesn't have write permissions
for user in test_misc33().  The test file can be
opened read-only because the test doesn't write to it.
2018-07-12 14:31:02 -05:00
Vailin Choi
f369590a10 Fix test_misc33() in test/tmisc.c
Open the test file read-only so that it can be accessed for testing.
2018-07-12 13:55:45 -05:00
Vailin Choi
d1f8ac3312 Modifications made based on feedback from pull request. 2018-07-11 16:02:51 -05:00
Vailin Choi
cf38292064 Fix for HDFFV-10333:
1) Check for valid object header version for a refcount messge
2) Check for invalid fill value size
3) Check for invalid dimension size in a layout message
4) Add --enable-error-stack option to h5stat
5) Add error checks to h5stat.c
6) Add tests to h5stat and h5dump
2018-07-10 22:00:14 -05:00
Hyo-Kyung Lee
863148d1fe fixed typo. 2018-07-10 18:13:44 -05:00
Jordan Henderson
ef10aa6211 Fix for HDFFV-10509 2018-07-03 21:09:19 -05:00
Jordan Henderson
6190641722 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'b6fcbf4bb0f693fd6a0517f0ff3f74d52b329d1e': (400 commits)
  Fix ptr arith
  Correct function call
  Remove writeVL option
  Region reference in compounds need class check
  Correct cast formatting
  Correct var name
  Need to cast from void ptr
  Update Java util lib, Refactor H5D write VL to match read
  Fix attribute Read
  Correct "," handling
  Revert "Merge pull request #1116 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to develop"
  Snapshot version 1.10 release 3 (snap3)
  Remove debug statements
  Split/fix utility for vl types
  fix whitespace
  HDFVIEW compound vlen needed vlen_t size
  Update documents
  Update document
  Update document
  HDFFV-10433 Update file with fix for issues
  ...
2018-07-03 09:57:13 -05:00
Allen Byrne
8f652a87ca HDFFV-10519 add JNI note 2018-07-02 09:13:31 -05:00
Allen Byrne
3c07f4738f Add actual file names fo diff 2018-06-29 13:05:15 -05:00
Allen Byrne
792b3352b9 Merge pull request #1124 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'c0dfec8913497d62cf1ab7e13e62e3fe55d6e859':
  HDFFV-10519 Disable WriteVL JNI function, updgrade JNI
2018-06-29 11:17:57 -05:00
Allen Byrne
b6fcbf4bb0 Merge pull request #1123 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b1f5c9e9d63e16d67089f08ef2becc5119592a76':
  Fix ptr arith
  Correct function call
  Remove writeVL option
  Region reference in compounds need class check
  Correct cast formatting
  Correct var name
  Need to cast from void ptr
  Update Java util lib, Refactor H5D write VL to match read
2018-06-29 11:17:28 -05:00
Allen Byrne
c0dfec8913 HDFFV-10519 Disable WriteVL JNI function, updgrade JNI 2018-06-29 09:57:47 -05:00
Allen Byrne
b1f5c9e9d6 Fix ptr arith 2018-06-29 09:40:34 -05:00
Allen Byrne
2f53075ea9 Correct function call 2018-06-28 16:49:11 -05:00
Allen Byrne
e2d2a410d0 Remove writeVL option 2018-06-28 15:27:08 -05:00
Allen Byrne
5a1d298669 Region reference in compounds need class check 2018-06-28 14:22:50 -05:00
Allen Byrne
c3e666e4b2 Correct cast formatting 2018-06-28 11:33:25 -05:00
Allen Byrne
574941c50d Correct var name 2018-06-28 11:02:40 -05:00
Allen Byrne
f4b8365b32 Need to cast from void ptr 2018-06-28 10:42:02 -05:00
Allen Byrne
792771d52a Update Java util lib, Refactor H5D write VL to match read 2018-06-27 17:53:47 -05:00
Allen Byrne
2e0b958196 Merge pull request #1121 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '7636342d959bfd3d023345bac76650932961d843':
  Push updates from develop
2018-06-26 13:47:36 -05:00
Allen Byrne
7636342d95 Push updates from develop 2018-06-26 09:35:07 -05:00
Allen Byrne
4095b9260d Merge pull request #1120 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '4c1e89fba31abb357a05044c3f6a92450dfb753c':
  Fix attribute Read
2018-06-26 09:03:14 -05:00
Allen Byrne
4c1e89fba3 Fix attribute Read 2018-06-25 17:08:35 -05:00
Allen Byrne
71fac28803 Merge pull request #1119 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'c7b7c109aba0bce3c8180041a983245944d00c46':
  Correct "," handling
2018-06-25 10:55:29 -05:00
Allen Byrne
c7b7c109ab Correct "," handling 2018-06-25 10:46:14 -05:00
Allen Byrne
2b1be811e7 Merge pull request #1115 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '27047165aaa6838c4653daa56a41d7b64b6bf3cd':
  Remove debug statements
  Split/fix utility for vl types
  fix whitespace
  HDFVIEW compound vlen needed vlen_t size
2018-06-25 08:12:36 -05:00
hdftest
f89bdb7753 Merge pull request #1118 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
* commit '25f80cbbec3a7d8036325784168b029cb71cc813':
  Snapshot version 1.10 release 3 (snap3)
2018-06-24 18:37:59 -05:00
hdftest
bac6bc52d3 Merge pull request #1117 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:develop to develop
* commit 'b193bc11c966d79b76ebc3bbe76728f0693693ef':
  Revert "Merge pull request #1116 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to develop"
2018-06-24 18:26:17 -05:00
hdftest
b193bc11c9 Revert "Merge pull request #1116 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to develop"
This reverts commit e9f476dad4, reversing
changes made to 2ff00b1b93.
2018-06-24 18:04:23 -05:00
hdftest
e9f476dad4 Merge pull request #1116 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to develop
* commit '25f80cbbec3a7d8036325784168b029cb71cc813': (324 commits)
  Snapshot version 1.10 release 3 (snap3)
  Update document
  HDFFV-10433 Updated text to address issues raised.
  Snapshot version 1.10 release 3 (snap2)
  Updated version to 1.10.3-snap2
  Merge corrections from develop
  HDFFV-10473 add note for attribute fix
  Correct attribute location
  HDFFV-9739 and cmake improvements merge from develop
  Fix for HDFFV-10469: set to latest format for virtual layout encoding.
  Update Windows test machines
  Fix soversion
  Fixed libver bounds underscore issue
  removed extraneous lib. ver. bound, PR comment
  temporary fix for HDFFV-10469
  Updated version to 1.10.3-snap1
  Add new file
  Correct number of tests
  Whitespace and test reclassify merge from develop
  HDFFV-10444 fix so numbers and merge java test changes
  ...
2018-06-24 17:37:20 -05:00
hdftest
25f80cbbec Snapshot version 1.10 release 3 (snap3) 2018-06-24 17:35:05 -05:00
Allen Byrne
27047165aa Remove debug statements 2018-06-21 16:52:07 -05:00
Allen Byrne
4e3b33e4ae Split/fix utility for vl types 2018-06-21 16:43:32 -05:00
Allen Byrne
3f47c38868 fix whitespace 2018-06-21 11:34:13 -05:00
Allen Byrne
651b728a62 HDFVIEW compound vlen needed vlen_t size 2018-06-20 16:06:18 -05:00
Allen Byrne
5c2699fe51 Merge pull request #1110 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'd5e78d2ecfd19e8e912cce654462ccc6e853fb72':
  Update document
  HDFFV-10433 Updated text to address issues raised.
  Merge corrections from develop
2018-06-19 10:06:54 -05:00
Allen Byrne
2ff00b1b93 Merge pull request #1109 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '5f2700f256b981f555a6a6b4b2caa61fa184554b':
  Update documents
  Update document
  HDFFV-10433 Update file with fix for issues
2018-06-19 10:06:33 -05:00
Allen Byrne
5f2700f256 Update documents 2018-06-19 10:04:49 -05:00
Allen Byrne
fd20f7c0bb Update document 2018-06-19 09:52:19 -05:00
Allen Byrne
d5e78d2ecf Update document 2018-06-19 09:51:49 -05:00
hdftest
64a22d4965 Merge pull request #1113 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
Update version to snap3

* commit '67d6f8d405b16c99590f112f429a352157be3554':
  Snapshot version 1.10 release 3 (snap2)
2018-06-16 17:52:04 -05:00
hdftest
67d6f8d405 Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '87829e06189cd9b29583b5ca8065b52b1f4cd523': (30 commits)
  HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
  HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
  HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
  Cleaned up H5Fmount/unmount code.
  Normalization with vol_integration branch.
  Add fortran MPI to test and example
  Add mpi include folders for fortran C objects
  Normalization with the vol_integration branch.
  Fixed MANIFEST
  Fix usage of compression lib in shared tests
  Fix jni function call version
  Fix the error found after earlier checkin.
  H5O_info fixes for java and examples
  Added a RELASE.txt entry for HDFFV-10505.
  Changed 'deprecated' to indicate 'no longer supported' in the --enable-debug/production configure flags.
  (1) Made the change according to the pull request feedback. (2) Removed the performance test form test/th5o.c: will decide on what needs to be done to show speedup via HDFFV-10463.
  Normalize with vol_integration.
  Removed unused H5MF functions and updated FUNC_ENTER macros and naming in H5MFsection.c.
  Restored some unused #defines to the deprecated section of H5Dpublic.h.
  Changes made based on feedback from pull request #1039.
  ...
2018-06-16 17:47:39 -05:00
Jerome Soumagne
5afeefe1ba Fix H5detect to use no_sanitize_address attribute and support GCC sanitizers 2018-06-15 16:49:54 -05:00
Scot Breitenfeld
87829e0618 Merge pull request #1111 in HDFFV/hdf5 from hdf5_1_10.sync to hdf5_1_10
* commit '57f64b92d19fed2879ee9bafe1d29bfac865d54c': (30 commits)
  HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
  HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
  HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
  Cleaned up H5Fmount/unmount code.
  Normalization with vol_integration branch.
  Add fortran MPI to test and example
  Add mpi include folders for fortran C objects
  Normalization with the vol_integration branch.
  Fixed MANIFEST
  Fix usage of compression lib in shared tests
  Fix jni function call version
  Fix the error found after earlier checkin.
  H5O_info fixes for java and examples
  Added a RELASE.txt entry for HDFFV-10505.
  Changed 'deprecated' to indicate 'no longer supported' in the --enable-debug/production configure flags.
  (1) Made the change according to the pull request feedback. (2) Removed the performance test form test/th5o.c: will decide on what needs to be done to show speedup via HDFFV-10463.
  Normalize with vol_integration.
  Removed unused H5MF functions and updated FUNC_ENTER macros and naming in H5MFsection.c.
  Restored some unused #defines to the deprecated section of H5Dpublic.h.
  Changes made based on feedback from pull request #1039.
  ...
2018-06-15 13:53:36 -05:00
M. Scot Breitenfeld
57f64b92d1 Merge branch 'develop' into hdf5_1_10.sync 2018-06-14 09:17:06 -05:00
Dana Robinson
f62969a76a Merge pull request #1101 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vi_develop_normalize to develop
* commit '18fbdebb977d7a4dbaa99ec6b153a49e3b4883d5':
  Cleaned up H5Fmount/unmount code.
  Normalization with vol_integration branch.
  Normalization with the vol_integration branch.
2018-06-13 14:21:36 -05:00
M. Scot Breitenfeld
88b690c08c Merge branch 'develop' into hdf5_1_10.sync 2018-06-12 10:19:25 -05:00
Allen Byrne
c923219a26 HDFFV-10433 Update file with fix for issues 2018-06-11 14:34:28 -05:00
Allen Byrne
eb9f86e38a HDFFV-10433 Updated text to address issues raised. 2018-06-11 14:32:41 -05:00
Scot Breitenfeld
7bebe91ccf Merge pull request #1108 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'fe325fb554eddceccfa1674d804d5c7aed846bde':
  HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
  HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
  HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
2018-06-11 09:36:15 -05:00
M. Scot Breitenfeld
cc2154c13c Merge branch 'develop' into hdf5_1_10.sync 2018-06-08 15:42:31 -05:00
M. Scot Breitenfeld
fe325fb554 HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
misc. clean-up
2018-06-08 14:45:23 -05:00
M. Scot Breitenfeld
e6aa306354 HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
added dependency on H5ff.F90 for H5_ff.F90
2018-06-08 14:38:22 -05:00
M. Scot Breitenfeld
c52d04320b HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
h5fget_obj_count_f with H5F_OBJ_ALL_F counted objects created in h5open_f, which should not be included in the count. The function now returns the correct number of objects (i.e., objects created in h5open are not included in the total).
2018-06-08 14:19:11 -05:00
Dana Robinson
18fbdebb97 Cleaned up H5Fmount/unmount code. 2018-06-06 23:08:29 -07:00
Dana Robinson
91089de53f Normalization with vol_integration branch. 2018-06-06 21:34:11 -07:00
Scot Breitenfeld
e87be2e9e7 Merge pull request #1103 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'df64de9eedea0cb7796f37f9c141d81c636742c7':
  Add fortran MPI to test and example
2018-06-06 13:46:14 -05:00
Allen Byrne
df64de9eed Add fortran MPI to test and example 2018-06-06 13:44:56 -05:00
Jordan Henderson
8da8a1dcb5 Revise H5D__mpio_array_gatherv() to not allocate memory needlessly 2018-06-06 13:29:03 -05:00
Scot Breitenfeld
a55e79b07d Merge pull request #1102 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '81300213e7837fd980b74d95482e0a71777773fd':
  Add mpi include folders for fortran C objects
2018-06-06 11:32:53 -05:00
Allen Byrne
81300213e7 Add mpi include folders for fortran C objects 2018-06-06 11:16:02 -05:00
Dana Robinson
1a5e7d821b Normalization with the vol_integration branch. 2018-06-05 22:20:22 -07:00
M. Scot Breitenfeld
f484649347 Merge branch 'develop' into hdf5_1_10.sync 2018-06-04 14:41:12 -05:00
Jordan Henderson
9fe86bc51c Add test to continually grow and shrink chunks 2018-06-04 13:49:42 -05:00
Jordan Henderson
e2c9f5a27a Changes to test with checksum filter as well as deflate filter 2018-06-04 10:53:08 -05:00
hdftest
afe28b7607 Snapshot version 1.10 release 3 (snap2) 2018-06-03 21:53:30 -05:00
Vailin Choi
832aced6c1 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into develop 2018-06-01 11:27:43 -05:00
Vailin Choi
12128a4782 Fix daily test failure. 2018-06-01 11:27:00 -05:00
Dana Robinson
afc6beb776 Merge pull request #1097 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'd1719d4906009c76eb286fbfe933328395404443':
  Fixed MANIFEST
2018-06-01 11:01:14 -05:00
Allen Byrne
fa518dfcab Merge pull request #1096 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f5b0b1c60784a3dbfea6cdf6082106fc8bed0462':
  Fix usage of compression lib in shared tests
2018-06-01 10:47:43 -05:00
Dana Robinson
d1719d4906 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop 2018-06-01 08:43:35 -07:00
Dana Robinson
512f1cac54 Fixed MANIFEST 2018-06-01 08:43:13 -07:00
Allen Byrne
f5b0b1c607 Fix usage of compression lib in shared tests 2018-06-01 10:09:53 -05:00
Larry Knox
83d24645a1 Merge pull request #1095 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '1a018cb3340ec8ecd4ded25ec719ac831aa165bd':
  Fix jni function call version
2018-06-01 09:35:18 -05:00
Allen Byrne
1a018cb334 Fix jni function call version 2018-06-01 09:33:51 -05:00
Larry Knox
3ae9a0c3fd Merge pull request #1093 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit '7a5fa418e3edf1f85f3e1462a119c3f5aa41a3d1':
  Fix the error found after earlier checkin.
2018-05-31 20:45:42 -05:00
Vailin Choi
7a5fa418e3 Fix the error found after earlier checkin. 2018-05-31 19:05:58 -05:00
Dana Robinson
dec2f588ac Merge pull request #1043 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5do_direct_chunk_hl_to_src to develop
* commit '1da9c5545c013ebc540ba3044810889d4acfa5be':
  Restored some unused #defines to the deprecated section of H5Dpublic.h.
  Added deprecated symbol wrappers for the H5DOwrite/read_chunk wrappers.
  Updated commenting in the H5DO compat test.
  Stripped out most of the duplicated functionality in the H5DO compat test.
  * Added H5DO compatibility functions. * Changed the offset copy to use an array on the stack. * Yanked some unused #defines.
  * Fixed the error tests * Moved common functionality into helper functions
  Normalize with trunk prior to update merge
  Fixed a warning.
  Finished move of H5DOread/write_chunk calls to H5D.
  First stage of moving H5DOread/write_chunk() to src/ and making them H5D calls. * Moved H5DOread/write_chunk() to H5Dio.c and renamed to H5D*. * Moved the hl/test/test_dset_opt test to test/ and renamed to   direct_chunk. * Moved the hl/test/dectris_hl_perf test to tools/test/perform   and renamed to direct_write_perf. * Updated autotools and CMake files.
2018-05-31 18:14:24 -05:00
Dana Robinson
1c7b0bc857 Merge pull request #1092 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '931bd3aa6a7aa742d3a302b49eb20233b021f1bf':
  Added a RELASE.txt entry for HDFFV-10505.
  Changed 'deprecated' to indicate 'no longer supported' in the --enable-debug/production configure flags.
2018-05-31 17:15:23 -05:00
Allen Byrne
1174119e00 Merge pull request #1091 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b28815c20554f7cd35ec820e1e5ba97624ff8e88':
  H5O_info fixes for java and examples
2018-05-31 17:01:20 -05:00
Allen Byrne
b28815c205 H5O_info fixes for java and examples 2018-05-31 16:09:48 -05:00
Dana Robinson
931bd3aa6a Added a RELASE.txt entry for HDFFV-10505. 2018-05-31 14:08:48 -07:00
Dana Robinson
890203482a Changed 'deprecated' to indicate 'no longer supported' in the
--enable-debug/production configure flags.
2018-05-31 13:17:18 -07:00
Vailin Choi
0de74a8dad Merge pull request #1039 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit '796dc16e3409b9f3746cfa4127adb6dd334ee8c9':
  (1) Made the change according to the pull request feedback. (2) Removed the performance test form test/th5o.c: will decide on what needs to be done to show speedup via HDFFV-10463.
  Changes made based on feedback from pull request #1039.
  Fix for HDFFV-10180 Performance issues with H5Oget_info.
2018-05-31 12:59:42 -05:00
Vailin Choi
796dc16e34 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'e8ece625f223032db0d26cfffafc045e4ccdf37d':
  Normalize with vol_integration.
2018-05-31 11:50:24 -05:00
Vailin Choi
18fe60ae10 (1) Made the change according to the pull request feedback.
(2) Removed the performance test form test/th5o.c: will decide on what needs to be done to show speedup via HDFFV-10463.
2018-05-31 11:45:20 -05:00
Dana Robinson
e8ece625f2 Merge pull request #1088 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vi_develop_normalize to develop
* commit '384a1ec709b841ce1eb8b9bf74be988a1c24d638':
  Normalize with vol_integration.
2018-05-31 00:00:53 -05:00
Vailin Choi
584a810764 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'd184e6db94163dcc8761182744a6c524a4850887':
  Removed unused H5MF functions and updated FUNC_ENTER macros and naming in H5MFsection.c.
  Correct script names
  Fix typo
  Minor H5FS tweaks.
  Put back CTRL-L chars
  Update support link
  Update text
  Valgrind fixed by checking for prefix_len of 0
2018-05-30 14:48:19 -05:00
Allen Byrne
5457cbf30d Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '413bc90ec95524c72d0576bc9f1fc5356e541473':
  Updated version to 1.10.3-snap2
2018-05-29 16:56:35 -05:00
Dana Robinson
384a1ec709 Normalize with vol_integration. 2018-05-29 14:06:01 -07:00
hdftest
413bc90ec9 Merge pull request #1087 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
* commit 'f8690c40b93a44bb2c3947ad41126c13549f2ad4':
  Updated version to 1.10.3-snap2
2018-05-29 15:21:37 -05:00
hdftest
f8690c40b9 Updated version to 1.10.3-snap2 2018-05-29 15:16:31 -05:00
Dana Robinson
d184e6db94 Merge pull request #1085 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vi_develop_normalize to develop
* commit '448cc37a90b2a71aac45c96949da07d5a9cc9cbd':
  Removed unused H5MF functions and updated FUNC_ENTER macros and naming in H5MFsection.c.
2018-05-25 12:02:40 -05:00
Allen Byrne
e83d572b8a Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit 'c1a308d7c9f361cc5720e345685ec43a2dd24297':
  Correct script names
  Fix typo
  Minor H5FS tweaks.
2018-05-25 10:49:17 -05:00
Scot Breitenfeld
c1a308d7c9 Merge pull request #1086 in HDFFV/hdf5 from hdf5_1_10.sync to hdf5_1_10
* commit 'cc611c696fbff4731c4eef3882ef985ac3ebab1d':
  Correct script names
  Fix typo
  Minor H5FS tweaks.
2018-05-25 10:34:59 -05:00
Allen Byrne
d081b0b0f5 Merge corrections from develop 2018-05-25 09:49:21 -05:00
M. Scot Breitenfeld
cc611c696f Merge branch 'develop' into hdf5_1_10.sync 2018-05-25 08:39:47 -05:00
Dana Robinson
448cc37a90 Removed unused H5MF functions and updated FUNC_ENTER macros and
naming in H5MFsection.c.
2018-05-24 14:05:47 -07:00
Allen Byrne
563a17cec0 Merge pull request #1084 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '7c74d1f026cc76d5aa33a10da7b8cffef0ad7cda':
  Correct script names
  Fix typo
2018-05-24 15:31:44 -05:00
Dana Robinson
7b81d526a3 Merge pull request #1082 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vi_develop_normalize to develop
* commit 'a2bafdc7a1021ca608b39f96d1f518701dbd45f8':
  Minor H5FS tweaks.
2018-05-24 14:19:21 -05:00
Allen Byrne
7c74d1f026 Correct script names 2018-05-24 10:50:15 -05:00
Allen Byrne
2be5b1abd4 Fix typo 2018-05-24 09:22:19 -05:00
Dana Robinson
a2bafdc7a1 Minor H5FS tweaks. 2018-05-23 23:40:23 -07:00
Scot Breitenfeld
2e5fece907 Merge pull request #1050 in HDFFV/hdf5 from hdf5_1_10.sync to hdf5_1_10
* commit 'e8eb130ce6f031a3b8ea50dae491b101d92e9c80': (117 commits)
  Put back CTRL-L chars
  Update support link
  Update text
  Valgrind fixed by checking for prefix_len of 0
  HDFFV-9739 only executes H5E tests in production
  Remove link flag from compile command
  fix typo
  Add release note
  Correct attribute location
  HDFFV-9739 fix  copy testfiles command
  HDFFV-9739 remove obsolete test files
  HDFFV-9739 dup test file for concurrent tests
  HDFFV-9739 Fix autotools script
  HDFFV-9739 Change autotools test scripts
  Fix for HDFFV-10469: set to latest format for virtual layout encoding.
  Fix typo
  HDFFV-9739 Update test reference
  Update current windows test machines
  HDFFV-9739 Grab err number before API call
  HDFFV-9739 Add release note
  ...
2018-05-23 17:16:16 -05:00
M. Scot Breitenfeld
e8eb130ce6 Merge branch 'develop' into hdf5_1_10.sync 2018-05-23 17:15:13 -05:00
Allen Byrne
216fffd7cc Merge pull request #1081 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'bcd8b31f3c9ace931df4483b855fae371c27a3dc':
  Put back CTRL-L chars
  Update support link
  Update text
  Valgrind fixed by checking for prefix_len of 0
2018-05-23 15:00:27 -05:00
M. Scot Breitenfeld
d198767957 Merge branch 'develop' into hdf5_1_10.sync 2018-05-23 14:56:16 -05:00
Allen Byrne
bcd8b31f3c Put back CTRL-L chars 2018-05-23 14:56:09 -05:00
Allen Byrne
0ce9d125f6 Update support link 2018-05-23 14:37:30 -05:00
Allen Byrne
13743e6baf Update text 2018-05-23 14:28:58 -05:00
Vailin Choi
be2fc7dcd1 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '2b0fb7e3f1f7da5b23d430702493ed4fb7f87166': (21 commits)
  HDFFV-9739 only executes H5E tests in production
  Remove link flag from compile command
  fix typo
  Add release note
  Correct attribute location
  HDFFV-9739 fix  copy testfiles command
  HDFFV-9739 remove obsolete test files
  HDFFV-9739 dup test file for concurrent tests
  HDFFV-9739 Fix autotools script
  HDFFV-9739 Change autotools test scripts
  Fix typo
  HDFFV-9739 Update test reference
  Update current windows test machines
  HDFFV-9739 Grab err number before API call
  HDFFV-9739 Add release note
  Adjust test names for concurrent tests
  Fix soversion
  HDFFV-9739 Fix copy name
  HDFFV-9739 factor out tests into separate JUnit
  Updated the threadsafety test to use error macros instead of asserts.
  ...
2018-05-23 14:27:05 -05:00
Allen Byrne
1821f8219d Valgrind fixed by checking for prefix_len of 0 2018-05-23 12:08:07 -05:00
Allen Byrne
2b0fb7e3f1 Merge pull request #1077 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '263db01df57a2aa99f81c060b988101c89f34fda':
  HDFFV-9739 only executes H5E tests in production
  Remove link flag from compile command
2018-05-23 11:01:10 -05:00
Allen Byrne
263db01df5 HDFFV-9739 only executes H5E tests in production 2018-05-23 08:55:11 -05:00
Allen Byrne
7c4598cf74 Remove link flag from compile command 2018-05-22 15:48:34 -05:00
M. Scot Breitenfeld
7616677a52 Merge branch 'hdf5_1_10' into hdf5_1_10.sync 2018-05-22 12:12:21 -05:00
M. Scot Breitenfeld
4ddd7704b6 Merge branch 'develop' into hdf5_1_10.sync 2018-05-22 11:48:44 -05:00
Allen Byrne
73a21358a9 Merge pull request #1067 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'ab8a7235c3892ac0427f37661aa0d821993dae9b':
  HDFFV-10473 add note for attribute fix
  Correct attribute location
  HDFFV-9739 and cmake improvements merge from develop
  Update Windows test machines
  Fix soversion
2018-05-22 11:36:23 -05:00
Allen Byrne
eb8d35dd8c Merge pull request #1075 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '78e1372ad5e35fc3ef691767148f7d2eea2feea4':
  fix typo
  Add release note
  Correct attribute location
2018-05-22 11:36:03 -05:00
Allen Byrne
ab8a7235c3 HDFFV-10473 add note for attribute fix 2018-05-22 11:04:50 -05:00
Allen Byrne
78e1372ad5 fix typo 2018-05-22 11:03:04 -05:00
Allen Byrne
11689d9873 Add release note 2018-05-22 11:02:43 -05:00
Allen Byrne
cc5332e1b4 Correct attribute location 2018-05-22 10:43:58 -05:00
Allen Byrne
715ae9c865 Correct attribute location 2018-05-22 10:43:01 -05:00
Allen Byrne
e96ef71034 HDFFV-9739 and cmake improvements merge from develop 2018-05-22 10:23:16 -05:00
Allen Byrne
f4c33600ab Merge pull request #1066 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '926260763940c77cf8f94807823765a3624fa29d':
  HDFFV-9739 fix  copy testfiles command
  HDFFV-9739 remove obsolete test files
  HDFFV-9739 dup test file for concurrent tests
  HDFFV-9739 Fix autotools script
  HDFFV-9739 Change autotools test scripts
  Fix typo
  HDFFV-9739 Update test reference
  Update current windows test machines
  HDFFV-9739 Grab err number before API call
  HDFFV-9739 Add release note
  Adjust test names for concurrent tests
  Fix soversion
  HDFFV-9739 Fix copy name
  HDFFV-9739 factor out tests into separate JUnit
  Fix MPI on Windows by adding MPI include folder
2018-05-22 08:53:14 -05:00
Allen Byrne
9262607639 HDFFV-9739 fix copy testfiles command 2018-05-21 09:44:14 -05:00
Allen Byrne
9d0dfc8485 HDFFV-9739 remove obsolete test files 2018-05-21 09:14:34 -05:00
Allen Byrne
73efe72e0d Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '73d7f7e7d37b869ce9c39cc8e648ef50d563fc93':
  Updated the threadsafety test to use error macros instead of asserts.
2018-05-21 09:11:39 -05:00
Allen Byrne
95a11297ee HDFFV-9739 dup test file for concurrent tests 2018-05-20 11:56:11 -05:00
Allen Byrne
67687ab9a2 HDFFV-9739 Fix autotools script 2018-05-20 10:46:49 -05:00
Dana Robinson
73d7f7e7d3 Merge pull request #1060 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:ttsafe_improvements to develop
* commit '2c3b5981587265f9735b09ee6d9caa60a3d1d4bc':
  Updated the threadsafety test to use error macros instead of asserts.
2018-05-19 14:45:58 -05:00
Allen Byrne
364760e66c HDFFV-9739 Change autotools test scripts 2018-05-18 12:35:40 -05:00
Vailin Choi
32f57355c2 Merge pull request #1071 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10.sync to hdf5_1_10.sync
* commit '4df595946c82f739554060c846e4586d07e3d585':
  Fix for HDFFV-10469: set to latest format for virtual layout encoding.
2018-05-17 13:09:50 -05:00
Vailin Choi
4df595946c Fix for HDFFV-10469: set to latest format for virtual layout encoding. 2018-05-17 11:51:34 -05:00
Jordan Henderson
ee1ed5c064 Eliminate warning about signed to unsigned conversion 2018-05-17 11:17:05 -05:00
Jordan Henderson
eb53d09bb2 Remove unused local variable
Ensure frees are done in a more heap-fragmentation friendly order
2018-05-17 11:14:52 -05:00
Jordan Henderson
6e37dff71f Fix bug in parallel reads of compressed data
Add remaining parallel compound dataset partial read tests
2018-05-17 11:07:23 -05:00
Allen Byrne
832492785c Fix typo 2018-05-17 10:45:36 -05:00
Jordan Henderson
2c8e6e6304 Add data verification to parallel filtered compound write tests
Add 3D parallel filtered partial read tests
2018-05-16 20:29:35 -05:00
Allen Byrne
4157409557 HDFFV-9739 Update test reference 2018-05-16 16:31:39 -05:00
Allen Byrne
e1e63edd35 Update Windows test machines 2018-05-16 15:21:32 -05:00
Allen Byrne
58bec70ccd Update current windows test machines 2018-05-16 15:18:14 -05:00
Allen Byrne
37e4607b91 HDFFV-9739 Grab err number before API call 2018-05-16 15:02:43 -05:00
Allen Byrne
84f1bf6eb1 HDFFV-9739 Add release note 2018-05-16 12:15:02 -05:00
Allen Byrne
b18990526e Adjust test names for concurrent tests 2018-05-16 12:09:48 -05:00
Allen Byrne
d349e90368 Fix soversion 2018-05-16 11:25:24 -05:00
Allen Byrne
955201531f Fix soversion 2018-05-16 11:25:07 -05:00
Allen Byrne
11bbf15ed0 HDFFV-9739 Fix copy name 2018-05-16 10:44:17 -05:00
Allen Byrne
427ac6041a HDFFV-9739 factor out tests into separate JUnit 2018-05-15 18:12:19 -05:00
Jordan Henderson
13f1790851 Add seven of fourteen parallel filtered data partial read tests 2018-05-15 14:12:32 -05:00
Dana Robinson
1da9c5545c Restored some unused #defines to the deprecated section of H5Dpublic.h. 2018-05-14 17:50:11 -07:00
Dana Robinson
0e584c7af2 Merge branch 'develop' into h5do_direct_chunk_hl_to_src 2018-05-14 17:45:23 -07:00
Vailin Choi
b178d80be0 Changes made based on feedback from pull request #1039. 2018-05-14 12:26:48 -05:00
Vailin Choi
ea66ac1e67 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'dcc66a4f157ace0858b788228550f3e104df3242': (35 commits)
  GGC requires attribute before function
  Correct COMPILE defs usage
  Add missing module_dir property
  Text cleanup
  Correct sentence punctuation.
  Add release note.
  Use set_property for MT flag
  Correct command usage
  Remove APPEND
  Fix typo
  Add missing test lib
  add missing folder to path
  Fix another command revert
  Missed a command revert
  Revert to old style for LINK_FLAGS gen expr not working
  LINK_FLAGS must be separate property sets
  Fix link flags syntax
  Revert refactor link flags
  refactor link flags to interface
  Refactor link flags
  ...
2018-05-14 11:20:03 -05:00
Dana Robinson
2c3b598158 Updated the threadsafety test to use error macros instead
of asserts.
2018-05-14 00:44:02 -07:00
M. Scot Breitenfeld
6da75cffd2 Fixed libver bounds underscore issue 2018-05-11 11:45:03 -05:00
M. Scot Breitenfeld
88e0c3e748 Merge branch 'develop' into hdf5_1_10.sync 2018-05-10 09:06:35 -05:00
M. Scot Breitenfeld
1e64801bdd removed extraneous lib. ver. bound, PR comment 2018-05-10 09:05:15 -05:00
M. Scot Breitenfeld
278fdfcbdb temporary fix for HDFFV-10469 2018-05-09 16:26:09 -05:00
Allen Byrne
37c27afde0 Fix MPI on Windows by adding MPI include folder 2018-05-09 14:29:44 -05:00
Allen Byrne
dcc66a4f15 Merge pull request #1049 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'd6ea76ac002cd8483ba8a6aaf55bbce5ed552937':
  GGC requires attribute before function
  Correct COMPILE defs usage
  Add missing module_dir property
2018-05-09 13:45:44 -05:00
Allen Byrne
d6ea76ac00 GGC requires attribute before function 2018-05-09 12:21:32 -05:00
Allen Byrne
f1a668a3b5 Correct COMPILE defs usage 2018-05-09 08:53:25 -05:00
Allen Byrne
4069936ee4 Add missing module_dir property 2018-05-09 08:44:45 -05:00
M. Scot Breitenfeld
b69bd0771e Merge branch 'develop' into hdf5_1_10.sync 2018-05-08 17:17:45 -05:00
Allen Byrne
7aeebec946 Merge pull request #1047 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '0344785872020c4ef1de90cf57f286f1cf4ad2fc': (28 commits)
  Text cleanup
  Correct sentence punctuation.
  Add release note.
  Use set_property for MT flag
  Correct command usage
  Remove APPEND
  Fix typo
  Add missing test lib
  add missing folder to path
  Fix another command revert
  Missed a command revert
  Revert to old style for LINK_FLAGS gen expr not working
  LINK_FLAGS must be separate property sets
  Fix link flags syntax
  Revert refactor link flags
  refactor link flags to interface
  Refactor link flags
  Fix defs and additional MSVC items
  TRILABS-19 fix syntax for windows
  TRILABS-19 Link flags need - character
  ...
2018-05-08 16:50:29 -05:00
Allen Byrne
0344785872 Text cleanup 2018-05-08 15:51:39 -05:00
Allen Byrne
71ce885eec Correct sentence punctuation. 2018-05-08 15:23:41 -05:00
Allen Byrne
ce61ff0954 Add release note. 2018-05-08 15:17:43 -05:00
Allen Byrne
4c4042121c Use set_property for MT flag 2018-05-07 17:23:25 -05:00
Allen Byrne
424e2275bc Correct command usage 2018-05-07 16:08:42 -05:00
Dana Robinson
1c11ddec6d Added deprecated symbol wrappers for the H5DOwrite/read_chunk
wrappers.
2018-05-04 16:43:06 -07:00
Dana Robinson
1b014a111e Updated commenting in the H5DO compat test. 2018-05-04 14:16:56 -07:00
Dana Robinson
def636edb0 Stripped out most of the duplicated functionality in the H5DO
compat test.
2018-05-04 14:13:56 -07:00
Dana Robinson
1fa0c5a4b5 * Added H5DO compatibility functions.
* Changed the offset copy to use an array on the stack.
* Yanked some unused #defines.
2018-05-04 09:01:54 -07:00
Allen Byrne
6fcf4c9aeb Remove APPEND 2018-05-03 15:41:50 -05:00
Allen Byrne
bae6ca856d Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '0cc480d952e2e215f006fc172485fcbabc0f599f':
  Yanked fragile java tests that check for exact line numbers and error text.
2018-05-03 14:02:36 -05:00
Dana Robinson
0cc480d952 Merge pull request #1044 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:remove_fragile_java_error_tests to develop
* commit '5ece75156847cee2c66eb8116f5e01bf75e2b998':
  Yanked fragile java tests that check for exact line numbers and error text.
2018-05-03 12:41:35 -05:00
Allen Byrne
2316a6c927 Fix typo 2018-05-03 12:37:57 -05:00
Allen Byrne
5fefa587e5 Add missing test lib 2018-05-03 12:36:59 -05:00
Allen Byrne
9d13f3b1e1 add missing folder to path 2018-05-03 12:32:36 -05:00
Allen Byrne
ab971fafdd Fix another command revert 2018-05-03 12:10:13 -05:00
Allen Byrne
866337babe Missed a command revert 2018-05-03 12:03:46 -05:00
Allen Byrne
1d1333ed6b Revert to old style for LINK_FLAGS gen expr not working 2018-05-03 11:57:30 -05:00
Allen Byrne
01a77cbfb1 LINK_FLAGS must be separate property sets 2018-05-03 10:44:57 -05:00
Allen Byrne
1ab0814a43 Fix link flags syntax 2018-05-03 09:28:54 -05:00
Allen Byrne
b73c0d2ab8 Revert refactor link flags 2018-05-02 16:33:35 -05:00
Allen Byrne
d906f2dcc5 refactor link flags to interface 2018-05-02 15:42:38 -05:00
Allen Byrne
d3a49988eb Refactor link flags 2018-05-02 15:15:13 -05:00
Allen Byrne
0c77fbaeb9 Fix defs and additional MSVC items 2018-05-02 13:52:02 -05:00
Dana Robinson
5ece751568 Yanked fragile java tests that check for exact line numbers and
error text.
2018-05-02 10:38:57 -07:00
Allen Byrne
c6827191f9 TRILABS-19 fix syntax for windows 2018-05-02 12:19:30 -05:00
Dana Robinson
ac035bf367 * Fixed the error tests
* Moved common functionality into helper functions
2018-05-02 10:11:49 -07:00
Allen Byrne
6dd91d206f TRILABS-19 Link flags need - character 2018-05-02 10:04:14 -05:00
Dana Robinson
64e13ca220 Merge branch 'develop' into h5do_direct_chunk_hl_to_src 2018-04-30 15:22:09 -07:00
Dana Robinson
3313fde3bb Normalize with trunk prior to update merge 2018-04-30 15:15:14 -07:00
Dana Robinson
4fe4394c58 Fixed a warning. 2018-04-30 15:04:45 -07:00
Larry Knox
525b9f40e5 Merge pull request #1042 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
* commit '0c91e6b92217bcf47d3ee21351c5b89d74c36609':
  Updated version to 1.10.3-snap1
2018-04-30 11:41:05 -05:00
Dana Robinson
27f2a961f1 Finished move of H5DOread/write_chunk calls to H5D. 2018-04-30 09:34:53 -07:00
Allen Byrne
fde2d1fe4a Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '1f8cb03e11a46f853881f45dac18eff2dd68401e':
  Fix errors in Makefile.am files that cause "make check" to repeat test, even when there are no changes to source files.  (Also add a ggenerated script to the list of files cleaned up on 'make distclean')
  Further minor cleanups
  Checkpoint normalization against incoming hyperslab / selection / dataspace improvements.
2018-04-30 11:05:26 -05:00
Allen Byrne
6fb94eb3a3 TRILABS-19 fix fortran link flags 2018-04-30 09:56:27 -05:00
Dana Robinson
09b1106e39 First stage of moving H5DOread/write_chunk() to src/ and making
them H5D calls.
* Moved H5DOread/write_chunk() to H5Dio.c and renamed to H5D*.
* Moved the hl/test/test_dset_opt test to test/ and renamed to
  direct_chunk.
* Moved the hl/test/dectris_hl_perf test to tools/test/perform
  and renamed to direct_write_perf.
* Updated autotools and CMake files.
2018-04-30 07:52:07 -07:00
Quincey Koziol
1f8cb03e11 Merge pull request #1041 in HDFFV/hdf5 from merge_hyperslab_updates to develop
* commit '4411bc27ac8842795c73d7a469273a8d831bb835':
  Further minor cleanups
  Checkpoint normalization against incoming hyperslab / selection / dataspace improvements.
2018-04-30 09:45:32 -05:00
Allen Byrne
76d0cc0ca9 TRILABS-19 Refactor fortran properties 2018-04-30 09:03:29 -05:00
hdftest
0c91e6b922 Updated version to 1.10.3-snap1 2018-04-30 08:16:49 -05:00
Quincey Koziol
4411bc27ac Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_hyperslab_updates 2018-04-29 03:05:18 -05:00
Quincey Koziol
01f196b31a Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_hyperslab_updates 2018-04-29 03:04:21 -05:00
Quincey Koziol
5983bded19 Merge pull request #1040 in HDFFV/hdf5 from ~KOZIOL/hdf5:fix_make_check_repeat to develop
* commit '83e2ea681dd73e65c9b153385279b528cfdfe9df':
  Fix errors in Makefile.am files that cause "make check" to repeat test, even when there are no changes to source files.  (Also add a ggenerated script to the list of files cleaned up on 'make distclean')
2018-04-29 02:47:04 -05:00
Quincey Koziol
83e2ea681d Fix errors in Makefile.am files that cause "make check" to repeat test, even
when there are no changes to source files.  (Also add a ggenerated script
to the list of files cleaned up on 'make distclean')
2018-04-28 21:38:49 -05:00
Allen Byrne
80afe46e70 TRILABS-19 revert to previous method 2018-04-27 13:04:40 -05:00
Allen Byrne
120195e5aa TRILABS-19 fix typos 2018-04-27 12:44:42 -05:00
Allen Byrne
a1cb2638f3 TRILABS-19 Fix missing angle char 2018-04-27 07:59:42 -05:00
Allen Byrne
61d818aeda TRILABS-19 add mpi libs to utility programs 2018-04-26 17:19:20 -05:00
Allen Byrne
2347bffaa2 TRILABS-19 remove add_defintions and use generator expressions 2018-04-26 16:41:04 -05:00
Allen Byrne
bc9a773b99 TRILABS-20 Fix fortran configure during fix of CXX configure 2018-04-24 17:22:55 -05:00
Vailin Choi
e6bc326ec0 Fix for HDFFV-10180 Performance issues with H5Oget_info. 2018-04-24 15:10:13 -05:00
Allen Byrne
b3c5284692 Merge pull request #1038 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f435ed67fa53ca35462a60f4025464465d7dc9d0':
  TRILABS-20 set a compiler name on all project commands
  TRILABS-19 All c code INCLUDE_DIRECTORIES converted
  TRILABS-19 Initial conversion of include_directories to targets
2018-04-24 10:25:13 -05:00
Allen Byrne
f435ed67fa Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'fa829e322ed44a67e2b3f2d6adf1306ad794859b':
  Fix non-threadsafe API context head pointer handling.
2018-04-23 07:51:55 -05:00
Allen Byrne
6c82c49dd5 TRILABS-20 set a compiler name on all project commands 2018-04-20 10:11:55 -05:00
Quincey Koziol
fa829e322e Merge pull request #1035 in HDFFV/hdf5 from fix_api_context_filter_plugin to develop
* commit '76cab1f5cb48af8398e1c09c15a974b1f8347da4':
  Fix non-threadsafe API context head pointer handling.
2018-04-18 22:53:18 -05:00
Quincey Koziol
76cab1f5cb Fix non-threadsafe API context head pointer handling. 2018-04-18 22:33:57 -05:00
Allen Byrne
b68321b2b3 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'e217bd113db96b96b485de82395688ca2313918a':
  Resolve memory leak of last API context, by freeing it in H5CX terminate routine.
  Revert "Close memory leak of last API context when shutting library down."
2018-04-18 07:36:57 -05:00
Quincey Koziol
e217bd113d Merge pull request #1034 in HDFFV/hdf5 from fix_api_context_fix to develop
* commit 'bcab84db9f291920ed0fe321116405f73eaddfa5':
  Resolve memory leak of last API context, by freeing it in H5CX terminate routine.
  Revert "Close memory leak of last API context when shutting library down."
2018-04-18 06:41:14 -05:00
Quincey Koziol
bcab84db9f Resolve memory leak of last API context, by freeing it in H5CX terminate
routine.
2018-04-17 22:55:45 -05:00
Quincey Koziol
188539f65e Revert "Close memory leak of last API context when shutting library down."
This reverts commit 0bd3634dc5.
2018-04-17 22:39:20 -05:00
Allen Byrne
03e579f201 TRILABS-19 All c code INCLUDE_DIRECTORIES converted 2018-04-17 22:29:57 -05:00
Allen Byrne
46f2a2a432 TRILABS-19 Initial conversion of include_directories to targets 2018-04-17 15:57:58 -05:00
Quincey Koziol
61a2456995 Merge pull request #1033 in HDFFV/hdf5 from fix_h5cx_pop_special_leak to develop
* commit '0bd3634dc5747d88582a966050896bad57acb892':
  Close memory leak of last API context when shutting library down.
2018-04-17 13:50:57 -05:00
Quincey Koziol
0bd3634dc5 Close memory leak of last API context when shutting library down. 2018-04-17 12:01:26 -05:00
Allen Byrne
037249b9a4 Merge pull request #1029 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'e10df541f074eb4903c1d67982766da8d7ed2879':
  Add new file
  Correct number of tests
2018-04-12 11:48:28 -05:00
Allen Byrne
1fc45adaf4 Merge pull request #1030 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '9a8e1e1a7cad7674de2b183ba530affc0f13c615':
  Add missing file
2018-04-12 11:48:20 -05:00
Allen Byrne
e10df541f0 Add new file 2018-04-12 09:11:03 -05:00
Allen Byrne
9a8e1e1a7c Add missing file 2018-04-12 09:10:28 -05:00
Allen Byrne
947cfd15cf Correct number of tests 2018-04-12 08:22:09 -05:00
Allen Byrne
a80fc54b08 Merge pull request #1025 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'c8974b8a9e49aba96c93f9efa8977a5c57a35a07':
  Whitespace and test reclassify merge from develop
  HDFFV-10444 fix so numbers and merge java test changes
2018-04-11 16:00:25 -05:00
Allen Byrne
9cd4e23ce7 Merge pull request #1024 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '34e3e3ef17f29b721780941866a3ad4c261b7c05':
  Whitespace changes
  Whitespace and test reclassify
  Move two more functions from unit tests
  Reorder of tests for debug APIs option
  HDFFV-10444 fix soversion numbers for libraries
  Fix Java test for DEBUG_APIS
  Use var instead of absolute number
2018-04-11 15:09:32 -05:00
Allen Byrne
c8974b8a9e Whitespace and test reclassify merge from develop 2018-04-10 13:06:56 -05:00
Allen Byrne
34e3e3ef17 Whitespace changes 2018-04-10 13:06:29 -05:00
Allen Byrne
c4ff69d26b Whitespace and test reclassify 2018-04-10 13:01:49 -05:00
Allen Byrne
a9662ba9fb Move two more functions from unit tests 2018-04-10 12:43:43 -05:00
Scot Breitenfeld
f03522c4d7 Merge pull request #1023 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit '05ef85b02dc88ebd738d1332476ae1765a25b191':
  fixed return integer type of C function
2018-04-10 11:21:54 -05:00
M. Scot Breitenfeld
05ef85b02d fixed return integer type of C function 2018-04-10 10:54:31 -05:00
Allen Byrne
df83d78134 HDFFV-10444 fix so numbers and merge java test changes 2018-04-10 10:52:18 -05:00
Allen Byrne
f015c89c5e Reorder of tests for debug APIs option 2018-04-10 10:27:03 -05:00
Allen Byrne
db3d744f25 HDFFV-10444 fix soversion numbers for libraries 2018-04-10 08:55:17 -05:00
Allen Byrne
057a4e7fd6 Fix Java test for DEBUG_APIS 2018-04-09 15:07:29 -05:00
Allen Byrne
38cccb23ba Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '3211e907f4f9349ba7510d70cfbcc6ee36d99c58':
  Remove vestiges of H5_DEBUG_BUILD macro, switching it to the more standard H5CX_DEBUG form.
  Minor warning cleanup while working on VOL issues.
2018-04-09 07:14:53 -05:00
Quincey Koziol
3211e907f4 Merge pull request #1019 in HDFFV/hdf5 from ~KOZIOL/hdf5:update_api_context to develop
* commit '62b4200f580e9ea0b95cbc218bfae50ae38ef25d':
  Remove vestiges of H5_DEBUG_BUILD macro, switching it to the more standard H5CX_DEBUG form.
2018-04-06 17:31:00 -05:00
Quincey Koziol
62b4200f58 Remove vestiges of H5_DEBUG_BUILD macro, switching it to the more
standard H5CX_DEBUG form.
2018-04-06 17:19:29 -05:00
Dana Robinson
051c5fa9b3 Merge pull request #1018 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '02039e0a91cf1baae46d52a77c521fc6357b7c90':
  Minor warning cleanup while working on VOL issues.
2018-04-06 11:12:06 -05:00
Allen Byrne
5e943e85e2 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '048ae59d2970dd21810577c999f756c028b6faaf':
  Correct errors with non-"instrumented library" builds (production & parallel, generally speaking).
  Update java error stack tests
  Revert using H5MF_sect_small_can_shrink and H5MF_sect_small_shrink for the file's free space manager (and add a comment about them).
  Add comment for the file flush when the file low / high bounds are changed after a file is open.
  Expanded comments abuot H5CX_t fields.
  Add an assert to verify that we don't write when between MPI_Barrier() calls during a flush.
  Add comments for internal structs.
  Remove redundant 'is_collective' parameter from H5CX_set_loc.
  Correct typo in comment.
  Revert some tangential code cleanups.
  Add API context source files to CMake configuration file.
  Corrections for parallel I/O & tests.
  Update handling of reporting for breaking collective I/O when the default DXPL is used.
  Update encoded DXPLs to reflect changes in properties.
  Correct typo for error checking malloc return value.
  Refactor H5CX code to reduce duplication.
  Cleanup API context function usage.
  Add API context interface and use it throughout the library.
2018-04-06 09:21:06 -05:00
Dana Robinson
02039e0a91 Minor warning cleanup while working on VOL issues. 2018-04-06 00:11:18 -07:00
Quincey Koziol
048ae59d29 Merge pull request #991 in HDFFV/hdf5 from merge_func_enter_vol to develop
Commit API context and related changes

* commit '01a783dbee8160641a5a682f2116ffbd1ac123fe':
  Correct errors with non-"instrumented library" builds (production & parallel, generally speaking).
  Update java error stack tests
  Revert using H5MF_sect_small_can_shrink and H5MF_sect_small_shrink for the file's free space manager (and add a comment about them).
  Add comment for the file flush when the file low / high bounds are changed after a file is open.
  Expanded comments abuot H5CX_t fields.
  Add an assert to verify that we don't write when between MPI_Barrier() calls during a flush.
  Add comments for internal structs.
  Remove redundant 'is_collective' parameter from H5CX_set_loc.
  Correct typo in comment.
  Revert some tangential code cleanups.
  Add API context source files to CMake configuration file.
  Corrections for parallel I/O & tests.
  Update handling of reporting for breaking collective I/O when the default DXPL is used.
  Update encoded DXPLs to reflect changes in properties.
  Correct typo for error checking malloc return value.
  Refactor H5CX code to reduce duplication.
  Cleanup API context function usage.
  Add API context interface and use it throughout the library.
2018-04-05 18:31:18 -05:00
Allen Byrne
01a783dbee Merge pull request #1015 in HDFFV/hdf5 from ~BYRN/hdf5_adb:merge_func_enter_vol to merge_func_enter_vol
* commit '8c9661ce4d42090fb12c26bedc01af9ecc10b8e2':
  Update java error stack tests
2018-04-05 14:54:34 -05:00
Quincey Koziol
9119e2034e Merge remote-tracking branch 'origin/develop' into merge_func_enter_vol 2018-04-05 13:45:39 -05:00
Quincey Koziol
b51f8e2acd Correct errors with non-"instrumented library" builds (production & parallel,
generally speaking).
2018-04-05 13:44:02 -05:00
Allen Byrne
f6a5236e43 Use var instead of absolute number 2018-04-05 08:16:13 -05:00
Larry Knox
744d2d3d8c Merge pull request #1016 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'dcb8ab121df50662e368ed276468e2540849f62a':
  Typos/omissions.
  Update config/lt_vers.am so that the .so numbers for the hdf5_1_10 snapshots are not behind the 1.10.2 release.
  Clear RELEASE.txt after HDF5 1.10.2 release Bring README.txt and INSTALL* updates from hdf5_1_10_2 branch to hdf5_1_10 branch. Bring bin/release changes to hdff5_1_10 branch.
2018-04-04 11:26:42 -05:00
Larry Knox
fbcd6b6fd0 Merge pull request #1017 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'fa0d7aec1030567f3daa5bd433c86f4dc326cb89':
  Update RELEASE.txt, HISTORY-1_10.txt and INSTALL files with changes from HDF5-1.10.2 release.
2018-04-04 11:26:22 -05:00
lrknox
dcb8ab121d Typos/omissions. 2018-04-03 16:59:57 -05:00
lrknox
fa0d7aec10 Update RELEASE.txt, HISTORY-1_10.txt and INSTALL files with changes from
HDF5-1.10.2 release.
2018-04-03 16:57:26 -05:00
lrknox
8ff01c5fb7 Update config/lt_vers.am so that the .so numbers for the hdf5_1_10
snapshots are not behind the 1.10.2 release.

HDF5 version 1.10.2 released on 2018-03-29
2018-04-03 14:53:25 -05:00
lrknox
725d6cbbf0 Clear RELEASE.txt after HDF5 1.10.2 release
Bring README.txt and INSTALL* updates from hdf5_1_10_2 branch to
hdf5_1_10 branch.
Bring bin/release changes to hdff5_1_10 branch.
2018-04-03 11:54:18 -05:00
Allen Byrne
8c9661ce4d Update java error stack tests 2018-04-03 10:40:54 -05:00
Quincey Koziol
fb3cfc0a79 Revert using H5MF_sect_small_can_shrink and H5MF_sect_small_shrink for the
file's free space manager (and add a comment about them).
2018-04-02 16:33:57 -05:00
Quincey Koziol
be51656400 Add comment for the file flush when the file low / high bounds are changed
after a file is open.
2018-04-01 13:04:37 -05:00
Quincey Koziol
d834e9158c Merge remote-tracking branch 'origin/develop' into merge_func_enter_vol 2018-04-01 12:47:58 -05:00
Dana Robinson
066b342af1 Merge pull request #1013 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_normalization to develop
* commit 'b8f56d22dfd754715d10accc5997fe923bdb7593':
  Created internal functions for a couple of H5F calls.
2018-03-30 10:50:49 -05:00
Dana Robinson
b8f56d22df Created internal functions for a couple of H5F calls. 2018-03-30 01:11:19 -07:00
Quincey Koziol
84ed0b1d57 Merge remote-tracking branch 'origin/develop' into merge_func_enter_vol 2018-03-29 14:25:05 -05:00
Allen Byrne
47b2738f2f Merge pull request #1010 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '94ffe8cc53e77f2761926b135c3aa2d027a417ba':
  Correct public CDash location
2018-03-29 13:23:58 -05:00
Allen Byrne
94ffe8cc53 Correct public CDash location 2018-03-29 13:23:02 -05:00
Allen Byrne
18fd9dec4e Merge pull request #1007 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'e8baae035d8a7ad811fe1b502fa98fd605a762c6':
  Update URLs
2018-03-29 13:19:21 -05:00
Allen Byrne
e8baae035d Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '917ec2272cdeeb07a855df84d2236d6a8b21d289':
  Update email address
2018-03-29 13:18:38 -05:00
Allen Byrne
917ec2272c Merge pull request #1008 in HDFFV/hdf5 from ~LKURZ/hdf5_lck:hdf5_1_10 to hdf5_1_10
* commit '55f1d2945df1bb0b3e0e421dac63079db8b629cd':
  Update email address
2018-03-29 13:16:37 -05:00
Allen Byrne
73acad2919 Merge pull request #1006 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'ba043154e989fce8737df0f2e8999d32bf38e303':
  Correct email
  Update URLs
  Correct hdf5 reference
  Update CDash info
  Update CMake reference and check CDash reference
  Update URLs
  Update section on using CMake source package
2018-03-29 13:02:56 -05:00
Allen Byrne
8186a4f4d0 Merge pull request #1009 in HDFFV/hdf5 from ~LKURZ/hdf5_lck:develop to develop
* commit '8bfa19a8b53e7bf63605efc4c1fdb8aeff97ebce':
  update email address
2018-03-29 13:01:12 -05:00
Allen Byrne
ba043154e9 Correct email 2018-03-29 12:58:25 -05:00
L Kurz
8bfa19a8b5 update email address 2018-03-29 12:58:03 -05:00
L Kurz
55f1d2945d Update email address 2018-03-29 12:52:58 -05:00
Allen Byrne
43f27973c9 Update URLs 2018-03-29 12:24:22 -05:00
Allen Byrne
b3c9bcf92f Update URLs 2018-03-29 12:16:28 -05:00
Allen Byrne
464c22c1f1 Correct hdf5 reference 2018-03-29 11:56:44 -05:00
Allen Byrne
ae48e4337f Update CDash info 2018-03-29 11:35:48 -05:00
Allen Byrne
f977c619d3 Update CMake reference and check CDash reference 2018-03-29 11:22:00 -05:00
Allen Byrne
0a469016e0 Update URLs 2018-03-29 11:19:30 -05:00
Allen Byrne
af2f322937 Update section on using CMake source package 2018-03-29 11:06:14 -05:00
Quincey Koziol
1be6fd0ac1 Merge remote-tracking branch 'origin/develop' into merge_func_enter_vol 2018-03-28 21:36:51 -05:00
Quincey Koziol
174439c95b Expanded comments abuot H5CX_t fields. 2018-03-28 21:36:21 -05:00
Allen Byrne
e8f5787831 Merge pull request #1002 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '7fdad7f3b831e6899566bfa2573b5480bb170134':
  Correct name of hl compile script
2018-03-28 15:06:19 -05:00
Allen Byrne
96ec08a36c Merge pull request #1001 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'adfffd04b1fa01fa4e1e78c489dfb8c2c3d30ce6':
  Correct name of h5 hl compile script
  Add missing test file
2018-03-28 15:06:04 -05:00
Allen Byrne
7fdad7f3b8 Correct name of hl compile script 2018-03-28 12:27:23 -05:00
Allen Byrne
adfffd04b1 Correct name of h5 hl compile script 2018-03-28 12:25:42 -05:00
Allen Byrne
8bfa1b6fc5 Add missing test file 2018-03-28 08:17:36 -05:00
Allen Byrne
a409d22e4f Merge pull request #999 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '9707dbb03cf0a8477055eef01311b8789f88c1c7':
  Remove incorrect line
2018-03-27 17:00:04 -05:00
Allen Byrne
32c524f0f0 Merge pull request #998 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'e1f937f14bbc38651bf72470d1c9f729437357e9':
  Add missing test which is in autotools
  Remove incorrect line
  Update unimplemented lists
2018-03-27 16:59:55 -05:00
Quincey Koziol
c975f49984 Add an assert to verify that we don't write when between MPI_Barrier() calls
during a flush.
2018-03-27 14:20:50 -05:00
Quincey Koziol
711ac55f96 Add comments for internal structs. 2018-03-27 14:20:32 -05:00
Allen Byrne
9707dbb03c Remove incorrect line 2018-03-27 08:42:42 -05:00
Allen Byrne
e1f937f14b Add missing test which is in autotools 2018-03-27 08:41:54 -05:00
Allen Byrne
49829b9117 Remove incorrect line 2018-03-27 08:41:22 -05:00
Quincey Koziol
6303e24a2f Merge remote-tracking branch 'origin/develop' into merge_func_enter_vol 2018-03-26 23:19:52 -05:00
Quincey Koziol
eecf997bf5 Remove redundant 'is_collective' parameter from H5CX_set_loc. 2018-03-26 23:19:08 -05:00
Quincey Koziol
fb20d376ad Correct typo in comment. 2018-03-26 21:44:02 -05:00
Allen Byrne
539b6d4456 Update unimplemented lists 2018-03-26 11:08:41 -05:00
Quincey Koziol
dae5e63cfb Revert some tangential code cleanups. 2018-03-23 12:43:57 -05:00
Allen Byrne
e5e1e7b1c8 Merge pull request #993 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '73e27485470a0e83b6fc03393e1783c9602c0d38':
  Correct Readme VS version merge from develop
2018-03-23 12:37:28 -05:00
Allen Byrne
0e01f589e7 Merge pull request #992 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'ef3e20d9880c7daf0d2ec68d261b94a6a6dbb642':
  Correct if block typo
  Correct VS version for readme
2018-03-23 12:36:30 -05:00
Allen Byrne
73e2748547 Correct Readme VS version merge from develop 2018-03-22 13:09:24 -05:00
Allen Byrne
ef3e20d988 Correct if block typo 2018-03-22 13:08:04 -05:00
Allen Byrne
60eafb9f6c Correct VS version for readme 2018-03-22 13:06:56 -05:00
Quincey Koziol
bda8f41c89 Merge remote-tracking branch 'origin/develop' into merge_func_enter_vol 2018-03-22 11:39:25 -05:00
Larry Knox
aac6eed7ee Merge pull request #990 in HDFFV/hdf5 from develop to hdf5_1_10
* commit 'e79f9a73feb1b18c52a1608336aff612d2732d5b':
  Couple fixes to the test routine for HDFFV-10425.
  Add test and release info for the fix to HDFFV-10425 test failure with H5DOwrite_chunk.
2018-03-21 16:09:22 -05:00
Vailin Choi
e79f9a73fe Merge pull request #988 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit '67c8acdf17c74ae56d72e80c18c6491972909e30':
  Couple fixes to the test routine for HDFFV-10425.
2018-03-21 14:47:02 -05:00
Vailin Choi
67c8acdf17 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into develop 2018-03-21 14:14:23 -05:00
Vailin Choi
1aaed1ba3a Couple fixes to the test routine for HDFFV-10425. 2018-03-21 14:12:30 -05:00
Quincey Koziol
a24ce7b680 Add API context source files to CMake configuration file. 2018-03-21 14:12:14 -05:00
Quincey Koziol
eb69e5b683 Merge remote-tracking branch 'origin/develop' into merge_func_enter_vol 2018-03-21 14:06:14 -05:00
Vailin Choi
519a8fb461 Merge pull request #987 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit 'aa9e1aeea18a0eff050feac19596be6cad9a7c65':
  Add test and release info for the fix to HDFFV-10425 test failure with H5DOwrite_chunk.
2018-03-21 12:33:44 -05:00
Vailin Choi
aa9e1aeea1 Add test and release info for the fix to HDFFV-10425 test failure with H5DOwrite_chunk. 2018-03-21 11:44:24 -05:00
Quincey Koziol
667308c80d Merge remote-tracking branch 'origin/develop' into merge_func_enter_vol 2018-03-21 00:12:02 -05:00
Quincey Koziol
4766d282ff Corrections for parallel I/O & tests. 2018-03-21 00:09:16 -05:00
Quincey Koziol
c5db36c7df Update handling of reporting for breaking collective I/O when the default
DXPL is used.
2018-03-20 17:30:33 -05:00
Larry Knox
0bcaa290e0 Merge pull request #983 in HDFFV/hdf5 from develop to hdf5_1_10
* commit '6a1627f2967099039e11b9e86cf347f6482bdf3c':
  Fix for HDFFV-10425 test failure with H5DOwrite_chunk and latest format
  Fix date.
  Correct the date in RELEASE.txt for H5DOread_chunk.
  Add release info for H5DOread_chunk.
  Updated RELEASE.txt Description:     Wrappers for H5Tencode and H5Tdecode     No code change.
  Fixed HDFFV-10151 Description:     Added a document to the HDF5 C++ API Reference Manual to show the     mapping from a C API to C++ wrappers.
  Fix memory leak simply by capturing allocation in var
  Change max value
  Chnage values so test will fail when new latest is added
  Exception changed
  Exception type changed
  Correct constant var names
  Java constants for new lib verbounds values
2018-03-20 16:28:11 -05:00
Larry Knox
6a1627f296 Merge pull request #981 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit 'bdaacfd58b0b0e6082358d14cea7bb1f886c85f8':
  Fix for HDFFV-10425 test failure with H5DOwrite_chunk and latest format
2018-03-20 14:53:56 -05:00
Quincey Koziol
c135db3365 Update encoded DXPLs to reflect changes in properties. 2018-03-20 13:52:04 -05:00
Quincey Koziol
ea52eabc3d Correct typo for error checking malloc return value. 2018-03-20 13:49:30 -05:00
Vailin Choi
bdaacfd58b Fix for HDFFV-10425 test failure with H5DOwrite_chunk and latest format 2018-03-20 13:39:01 -05:00
Quincey Koziol
91244f1d27 Refactor H5CX code to reduce duplication. 2018-03-20 09:43:18 -05:00
Quincey Koziol
20ff75796e Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_func_enter_vol 2018-03-20 09:42:48 -05:00
Allen Byrne
8b77fd7d1a Merge pull request #980 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'e158ec4d1f50dbba16d3154ebec33472d482707c':
  Merge mem leak fix from develop
2018-03-20 09:22:18 -05:00
Allen Byrne
e158ec4d1f Merge mem leak fix from develop 2018-03-20 09:17:33 -05:00
Larry Knox
0a7ae62dca Merge pull request #978 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '85183a9fbb863b57edf404dc6bd92cd8b89c990e':
  Fix date.
2018-03-19 16:26:37 -05:00
lrknox
85183a9fbb Fix date. 2018-03-19 16:25:02 -05:00
Vailin Choi
e0c25f8f63 Merge pull request #977 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit '1d0ad712e9f33ac30f42b88f0c523470a25c9545':
  Correct the date in RELEASE.txt for H5DOread_chunk.
  Add release info for H5DOread_chunk.
2018-03-19 16:00:21 -05:00
Vailin Choi
1d0ad712e9 Correct the date in RELEASE.txt for H5DOread_chunk. 2018-03-19 15:49:21 -05:00
Vailin Choi
abf8d53395 Add release info for H5DOread_chunk. 2018-03-19 15:30:09 -05:00
Quincey Koziol
d812c6fe60 Cleanup API context function usage. 2018-03-18 22:51:19 -05:00
Quincey Koziol
c31460c1b7 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_func_enter_vol 2018-03-18 18:38:21 -05:00
Quincey Koziol
f38864920d Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_func_enter_vol
Plus initial steps toward merging API context push into FUNC_ENTER_API* macros
2018-03-18 18:36:49 -05:00
Larry Knox
2f0566208e Merge pull request #973 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp3:develop to develop
* commit '6fac268a7e1ee5b6d5314f40ac45630d9c67d873':
  Updated RELEASE.txt Description:     Wrappers for H5Tencode and H5Tdecode     No code change.
  Fixed HDFFV-10151 Description:     Added a document to the HDF5 C++ API Reference Manual to show the     mapping from a C API to C++ wrappers.
2018-03-17 17:17:28 -05:00
Binh-Minh Ribler
6fac268a7e Updated RELEASE.txt
Description:
    Wrappers for H5Tencode and H5Tdecode
    No code change.
2018-03-17 10:19:22 -05:00
Allen Byrne
353b8a34f7 Merge pull request #972 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'a32178ba9408ceffbb1656489703885d69fb5ed0':
  Fix memory leak simply by capturing allocation in var
2018-03-16 12:27:55 -05:00
Binh-Minh Ribler
dda1e103a5 Fixed HDFFV-10151
Description:
    Added a document to the HDF5 C++ API Reference Manual to show the
    mapping from a C API to C++ wrappers.
2018-03-16 10:42:33 -05:00
Allen Byrne
a32178ba94 Fix memory leak simply by capturing allocation in var 2018-03-16 09:03:08 -05:00
Quincey Koziol
4a17aff408 Add API context interface and use it throughout the library. 2018-03-15 16:54:30 -05:00
Allen Byrne
c43b684237 Merge pull request #969 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'cc089dbb15d9562ff226f091cc3481013af2481e':
  Merge from develop
2018-03-15 15:48:10 -05:00
Allen Byrne
7aa4eb1b04 Merge pull request #967 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '57e468aba7ba66bba1f9a1736450ed4295a6c25d':
  Change max value
  Chnage values so test will fail when new latest is added
  Exception changed
  Exception type changed
  Correct constant var names
  Java constants for new lib verbounds values
2018-03-15 14:40:27 -05:00
Allen Byrne
cc089dbb15 Merge from develop 2018-03-15 14:39:56 -05:00
Allen Byrne
57e468aba7 Change max value 2018-03-15 14:35:03 -05:00
Allen Byrne
b2d739ef39 Chnage values so test will fail when new latest is added 2018-03-15 14:28:36 -05:00
Allen Byrne
fe22bb8e44 Exception changed 2018-03-15 14:15:45 -05:00
Allen Byrne
692c7867ef Exception type changed 2018-03-15 14:14:29 -05:00
Allen Byrne
3f221c1347 Correct constant var names 2018-03-15 14:11:24 -05:00
Allen Byrne
7399997968 Java constants for new lib verbounds values 2018-03-15 14:11:24 -05:00
Larry Knox
f398e77707 Merge pull request #965 in HDFFV/hdf5 from develop to hdf5_1_10
* commit '02a9433fa0aac34ae81ab5f0d5b97a7934881215':
  Add 2 parallel test files to CHECK-CLEANFILES so that if their tests fail before removing them, make check-clean will remove them.
  Fixed memory leak Description:     Added LinkCreatPropList to initH5cpp to cleaning up resource at exit. Platforms tested:     Linux/64 (jelly)     Linux/ppc64 (ostrich)
  HDFFV-10412 add note for new H5error_on Java API
2018-03-15 13:08:00 -05:00
Larry Knox
02a9433fa0 Merge pull request #964 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '4b6d3193e1392b64b401e1b4de60a2b0ef586f23':
  Add 2 parallel test files to CHECK-CLEANFILES so that if their tests fail before removing them, make check-clean will remove them.
2018-03-15 12:24:58 -05:00
lrknox
4b6d3193e1 Add 2 parallel test files to CHECK-CLEANFILES so that if their tests
fail before removing them, make check-clean will remove them.
2018-03-15 11:18:47 -05:00
Allen Byrne
429843a5b9 Merge pull request #962 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '5c3598db816979fc6bd930cfec842570bbdae665':
  HDFFV-10412 - Add note for new Java wrapper
2018-03-15 09:42:52 -05:00
Allen Byrne
5c3598db81 HDFFV-10412 - Add note for new Java wrapper 2018-03-15 09:17:39 -05:00
Binh-Minh Ribler
7c6ed5cfcd Merge pull request #961 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp3:develop to develop
* commit '9e6ee84e6bb0194ad4f046c49ed7936dbab234db':
  Fixed memory leak Description:     Added LinkCreatPropList to initH5cpp to cleaning up resource at exit. Platforms tested:     Linux/64 (jelly)     Linux/ppc64 (ostrich)
2018-03-15 09:12:49 -05:00
Allen Byrne
7408b92fdc Merge pull request #958 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '6cbc1104197358b7f56830f5362b24fad5e96631':
  HDFFV-10412 add note for new H5error_on Java API
2018-03-15 09:11:09 -05:00
Binh-Minh Ribler
9e6ee84e6b Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_cpp3 into develop 2018-03-15 09:09:49 -05:00
Binh-Minh Ribler
8f5be458f4 Fixed memory leak
Description:
    Added LinkCreatPropList to initH5cpp to cleaning up resource at exit.
Platforms tested:
    Linux/64 (jelly)
    Linux/ppc64 (ostrich)
2018-03-15 09:06:16 -05:00
Larry Knox
9447204284 Merge pull request #960 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'aa199c893fe5db9ef25c5ee026821333620c4c51':
  Updated version to 1.10.3-snap0
2018-03-14 16:48:29 -05:00
lrknox
aa199c893f Updated version to 1.10.3-snap0 2018-03-14 16:19:26 -05:00
Allen Byrne
6cbc110419 HDFFV-10412 add note for new H5error_on Java API 2018-03-14 15:57:51 -05:00
Larry Knox
5ab5338b12 Merge pull request #957 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '82f0bd089c5288222ac09fc0c0d02f546e72b07b':
  Revised RELEASE.txt.
  Resolve merge conlicts in RELEASE.txt.
  Add info to release notes for: (1) library version bounds (2) HDFFV-10360 (h5clear) (3) HDFFV-10209 (VDS SWMR test failure)
  HDFFV-10412 add error on function for Java
2018-03-14 15:48:23 -05:00
lrknox
82f0bd089c Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_10
Resolved RELEASE.txt conflicts.
2018-03-14 15:42:58 -05:00
lrknox
d75948e15e Revised RELEASE.txt. 2018-03-14 15:29:30 -05:00
Allen Byrne
ff569918f0 Merge pull request #952 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '970857cc91cb82573110fe989053a334bcfb4c89':
  Remove duplication
  HDFFV-10412 add complemnt to java error_off
  Correct cutnpaste
  Merge changes from develop
  Merge 10414, 10292, VFD fix from develop
2018-03-14 15:16:08 -05:00
Allen Byrne
970857cc91 Remove duplication 2018-03-14 15:11:38 -05:00
Allen Byrne
34de732e3e Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit 'f30873136be7cb444166d019c57d3508ff79fc76':
  Rework new tests into one macro
  Added a "won't fix" RELEASE.txt entry for HDFFV-10356.
  Fix CMake test names
  Fixed typo
  Add release note for HDFFFV-10397.
  Added a fix for HDFFV-10358.
  Fixed documentation Description:     - Updated the description of copy constructor for clarification.     - Removed unnecessary comments. Platforms tested:     Linux/64 (jelly)
  Enhancement to the tool h5clear (HDFFV-10360)
  Fix for HDFFV-10209 VDS SWMR test failure Free the object header when there are chksum retries.
2018-03-14 15:00:29 -05:00
lrknox
c2907e8efe Merge commit '7f0650336191d0437d98edf1e0dc5d60da7051f6' into hdf5_1_10 2018-03-14 14:23:32 -05:00
lrknox
ab0e9cac87 Resolve merge conlicts in RELEASE.txt. 2018-03-14 14:03:39 -05:00
Larry Knox
7f06503361 Merge pull request #953 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit '0d5c1153f1e8b55784512a3cb722bda94e1b2080':
  Add info to release notes for: (1) library version bounds (2) HDFFV-10360 (h5clear) (3) HDFFV-10209 (VDS SWMR test failure)
2018-03-14 13:04:04 -05:00
Vailin Choi
0d5c1153f1 Add info to release notes for:
(1) library version bounds
(2) HDFFV-10360 (h5clear)
(3) HDFFV-10209 (VDS SWMR test failure)
2018-03-14 11:13:16 -05:00
Allen Byrne
91b1f74a1e Merge pull request #951 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b5867a05a7adf5d1c89721bf42a5bbaddb47dbd9':
  HDFFV-10412 add error on function for Java
2018-03-14 09:54:27 -05:00
Allen Byrne
880d14d4c5 HDFFV-10412 add complemnt to java error_off 2018-03-13 17:36:08 -05:00
Allen Byrne
b5867a05a7 HDFFV-10412 add error on function for Java 2018-03-13 17:21:10 -05:00
Larry Knox
f30873136b Merge pull request #943 in HDFFV/hdf5 from develop to hdf5_1_10
* commit '9247388c3d14510341ea3f07847ce2cbb6e44a8e':
  Rework new tests into one macro
  Added a "won't fix" RELEASE.txt entry for HDFFV-10356.
  Fix CMake test names
  Fixed typo
  Add release note for HDFFFV-10397.
  Added a fix for HDFFV-10358.
  Fixed documentation Description:     - Updated the description of copy constructor for clarification.     - Removed unnecessary comments. Platforms tested:     Linux/64 (jelly)
  Enhancement to the tool h5clear (HDFFV-10360)
  Fix for HDFFV-10209 VDS SWMR test failure Free the object header when there are chksum retries.
2018-03-13 13:04:03 -05:00
Dana Robinson
9247388c3d Merge pull request #948 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '5c2473a01e8ece7f77836afef885cffed2638970':
  Added a "won't fix" RELEASE.txt entry for HDFFV-10356.
2018-03-13 12:58:29 -05:00
Allen Byrne
6a90c221e2 Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '8a77c7a3e4cd49cc0de824476b04b4926582e1ed':
  Remove obsolete files
  HDFFV-10418 adjust build commands to match main library build
2018-03-13 12:45:52 -05:00
Allen Byrne
2ab4276084 Merge pull request #949 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '6287bac6e5916d69f1df3f3907f2c530c8ba5ada':
  Rework new tests into one macro
  Fix CMake test names
2018-03-13 12:34:56 -05:00
Allen Byrne
6287bac6e5 Rework new tests into one macro 2018-03-13 12:26:24 -05:00
Dana Robinson
5c2473a01e Added a "won't fix" RELEASE.txt entry for HDFFV-10356. 2018-03-13 10:10:14 -07:00
Allen Byrne
cbe8171f67 Fix CMake test names 2018-03-13 10:26:49 -05:00
Dana Robinson
f0238d0346 Merge pull request #945 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdffv_10358 to develop
* commit 'b877534a330a201e3b5c51d97daa8e01a5c1cd3a':
  Added a fix for HDFFV-10358.
2018-03-13 10:13:30 -05:00
Larry Knox
4aa3784f12 Merge pull request #947 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:HDFFV-10397-testphdf5-has-some-memory-leaks to develop
* commit '86890ac84ba74a437f87d98e7d7931dccc0fe856':
  Add release note for HDFFFV-10397.
2018-03-13 09:22:38 -05:00
Binh-Minh Ribler
6c789d2913 Merge pull request #946 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp3:develop to develop
* commit '19d54162ce7e43f04572b7cea12695df11ba7bea':
  Fixed typo
  Fixed documentation Description:     - Updated the description of copy constructor for clarification.     - Removed unnecessary comments. Platforms tested:     Linux/64 (jelly)
2018-03-12 21:08:12 -05:00
Binh-Minh Ribler
19d54162ce Fixed typo 2018-03-12 21:07:24 -05:00
lrknox
86890ac84b Add release note for HDFFFV-10397. 2018-03-12 20:39:03 -05:00
Binh-Minh Ribler
c76411768f Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_cpp3 into develop 2018-03-12 20:06:20 -05:00
Dana Robinson
b877534a33 Added a fix for HDFFV-10358. 2018-03-12 17:56:54 -07:00
Binh-Minh Ribler
2d4d39d157 Fixed documentation
Description:
    - Updated the description of copy constructor for clarification.
    - Removed unnecessary comments.
Platforms tested:
    Linux/64 (jelly)
2018-03-12 19:39:20 -05:00
Vailin Choi
a8afb3ab3b Merge pull request #931 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit 'f08b8fa10e7bac5ae26e3b06f938d38ebb3f28e1':
  Enhancement to the tool h5clear (HDFFV-10360)
  Fix for HDFFV-10209 VDS SWMR test failure Free the object header when there are chksum retries.
2018-03-12 18:00:05 -05:00
Scot Breitenfeld
8a77c7a3e4 Merge pull request #942 in HDFFV/hdf5 from develop to hdf5_1_10
* commit '612fefc435a9bc07ada6a380a54878f1cf71ae09':
  Remove obsolete files
  HDFFV-10418 adjust build commands to match main library build
2018-03-12 17:03:48 -05:00
Allen Byrne
273abad384 Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit 'cf110b33c825f15e8a101b5772d15ec282ff85bf': (105 commits)
  Unify the test (t_bigio.c) between hdf5_1_10 and develop
  Remove comparison to NULL for variables to be freed.
  Add HDfree of vector, matrix_out and matrix_out1 previously HDmalloced in coll_write_test().
  merged from develop
  merged from develop
  removed duplicate code
  Code improvement Description:     - Removed memory leaks caused by accidentally invoking p_get_member_type     - Added the call to test_lcpl, missed previously Platforms tested:     Linux/64 (jelly)     Linux/ppc64 (ostrich)     Darwin (osx1010test)
  Updated RELEASE.txt Description:     - Wrappers for H5Lcreate_soft, H5Lcreate_hard, H5Lcopy, H5Lmove,       H5Ldelete, and H5Lget_info     - Class LinkCreatPropList     - Fixed typo in source file Platforms tested:     Linux/64 (jelly)
  Updated for H5LcreatProp.[h,cpp]
  Updated MANIFEST for H5LcreatProp.[h,cpp]
  HDFFV-10149 continued Description:     - Moved the new wrappers committed on Mar 9:         43158f3bb3       to H5Location and renamed some of them for overloading.       This is because the loc_id in the C APIs can be file, group, dataset,       named datatype, and attribute.  Previous implementation was wrong       following some inaccurate C API reference manual.
  Re-factor coding for H5P/Sencode with libver bounds.
  Removed commented out code from H5FDmpio.c, H5FDprivate.h and H5Fint.c
  Upated cpp doc.
  Added C++ wrappers - HDFFV-10149 Description:     Added the following wrappers to class H5::Group:     + H5Lcreate_soft:         // Creates a soft link from link_name to target_name.         void newLink(const char *target_name, const char *link_name,...)         void newLink(const H5std_string& target_name,...)
  Improve code Description:     Added notes and changed argument to H5Fcreate to clarify the     latest situation Platforms tested:     Linux/64 (jelly)
  Resolve compilation errors.
  Add release note
  Remove obsolete comments
  Change CMake min to 3.10
  ...
2018-03-12 15:59:52 -05:00
Scot Breitenfeld
cf110b33c8 Merge pull request #934 in HDFFV/hdf5 from hdf5_1_10_merge to hdf5_1_10
* commit 'aaff21ff4cef6ffe364ae62e09e5da52a90b77c2': (105 commits)
  Unify the test (t_bigio.c) between hdf5_1_10 and develop
  Remove comparison to NULL for variables to be freed.
  Add HDfree of vector, matrix_out and matrix_out1 previously HDmalloced in coll_write_test().
  merged from develop
  merged from develop
  removed duplicate code
  Code improvement Description:     - Removed memory leaks caused by accidentally invoking p_get_member_type     - Added the call to test_lcpl, missed previously Platforms tested:     Linux/64 (jelly)     Linux/ppc64 (ostrich)     Darwin (osx1010test)
  Updated RELEASE.txt Description:     - Wrappers for H5Lcreate_soft, H5Lcreate_hard, H5Lcopy, H5Lmove,       H5Ldelete, and H5Lget_info     - Class LinkCreatPropList     - Fixed typo in source file Platforms tested:     Linux/64 (jelly)
  Updated for H5LcreatProp.[h,cpp]
  Updated MANIFEST for H5LcreatProp.[h,cpp]
  HDFFV-10149 continued Description:     - Moved the new wrappers committed on Mar 9:         43158f3bb3       to H5Location and renamed some of them for overloading.       This is because the loc_id in the C APIs can be file, group, dataset,       named datatype, and attribute.  Previous implementation was wrong       following some inaccurate C API reference manual.
  Re-factor coding for H5P/Sencode with libver bounds.
  Removed commented out code from H5FDmpio.c, H5FDprivate.h and H5Fint.c
  Upated cpp doc.
  Added C++ wrappers - HDFFV-10149 Description:     Added the following wrappers to class H5::Group:     + H5Lcreate_soft:         // Creates a soft link from link_name to target_name.         void newLink(const char *target_name, const char *link_name,...)         void newLink(const H5std_string& target_name,...)
  Improve code Description:     Added notes and changed argument to H5Fcreate to clarify the     latest situation Platforms tested:     Linux/64 (jelly)
  Resolve compilation errors.
  Add release note
  Remove obsolete comments
  Change CMake min to 3.10
  ...
2018-03-12 15:56:50 -05:00
Allen Byrne
612fefc435 Merge pull request #940 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '2adf6c741fcd984a3067373e03023e71a8d721a9':
  Remove obsolete files
  HDFFV-10418 adjust build commands to match main library build
2018-03-12 15:55:13 -05:00
M. Scot Breitenfeld
aaff21ff4c Merge branch 'develop' into hdf5_1_10_merge 2018-03-12 15:54:09 -05:00
Richard Warren
db5bc1895d Merge pull request #941 in HDFFV/hdf5 from t_bigio_develop to develop
* commit '1a3beaadce81ad257d186c9dca8906577cce58b0':
  Unify the test (t_bigio.c) between hdf5_1_10 and develop
2018-03-12 15:42:37 -05:00
Richard Warren
1a3beaadce Unify the test (t_bigio.c) between hdf5_1_10 and develop 2018-03-12 16:17:10 -04:00
Larry Knox
6492e67cdc Merge pull request #939 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:HDFFV-10397-testphdf5-has-some-memory-leaks to develop
* commit '5d7c18fcfc14a53f4d6321460463357fbda61f4b':
  Remove comparison to NULL for variables to be freed.
  Add HDfree of vector, matrix_out and matrix_out1 previously HDmalloced in coll_write_test().
2018-03-12 14:33:19 -05:00
lrknox
5d7c18fcfc Remove comparison to NULL for variables to be freed. 2018-03-12 14:10:59 -05:00
lrknox
6a53c14240 Add HDfree of vector, matrix_out and matrix_out1 previously HDmalloced
in coll_write_test().
2018-03-12 13:47:27 -05:00
Allen Byrne
2adf6c741f Remove obsolete files 2018-03-12 13:40:38 -05:00
Scot Breitenfeld
1918972960 Merge pull request #938 in HDFFV/hdf5 from avoid_trunc_beta to develop
* commit '4823abf3ee0d9df1c3f23ae7e36ce4d1d146afd6':
  Removed commented out code from H5FDmpio.c, H5FDprivate.h and H5Fint.c
  Optimized version of avoid truncate patch.
2018-03-12 13:03:10 -05:00
Allen Byrne
9ea48ca15a Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '64565f9771a50138e77a806d7ab330e3919c1847':
  Code improvement Description:     - Removed memory leaks caused by accidentally invoking p_get_member_type     - Added the call to test_lcpl, missed previously Platforms tested:     Linux/64 (jelly)     Linux/ppc64 (ostrich)     Darwin (osx1010test)
  Updated RELEASE.txt Description:     - Wrappers for H5Lcreate_soft, H5Lcreate_hard, H5Lcopy, H5Lmove,       H5Ldelete, and H5Lget_info     - Class LinkCreatPropList     - Fixed typo in source file Platforms tested:     Linux/64 (jelly)
  Updated for H5LcreatProp.[h,cpp]
  Updated MANIFEST for H5LcreatProp.[h,cpp]
  HDFFV-10149 continued Description:     - Moved the new wrappers committed on Mar 9:         43158f3bb3       to H5Location and renamed some of them for overloading.       This is because the loc_id in the C APIs can be file, group, dataset,       named datatype, and attribute.  Previous implementation was wrong       following some inaccurate C API reference manual.
  Improve code Description:     Added notes and changed argument to H5Fcreate to clarify the     latest situation Platforms tested:     Linux/64 (jelly)
2018-03-12 12:09:03 -05:00
M. Scot Breitenfeld
48eaac2029 Merge branch 'develop' into hdf5_1_10_merge 2018-03-12 12:07:51 -05:00
Binh-Minh Ribler
64565f9771 Merge pull request #936 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp3:develop to develop
Modified 43158f3bb3 and additional wrappers.

* commit 'b638bbd74b79f935a43aa6a804492e035ec315f6':
  Code improvement Description:     - Removed memory leaks caused by accidentally invoking p_get_member_type     - Added the call to test_lcpl, missed previously Platforms tested:     Linux/64 (jelly)     Linux/ppc64 (ostrich)     Darwin (osx1010test)
  Updated RELEASE.txt Description:     - Wrappers for H5Lcreate_soft, H5Lcreate_hard, H5Lcopy, H5Lmove,       H5Ldelete, and H5Lget_info     - Class LinkCreatPropList     - Fixed typo in source file Platforms tested:     Linux/64 (jelly)
  Updated for H5LcreatProp.[h,cpp]
  Updated MANIFEST for H5LcreatProp.[h,cpp]
  HDFFV-10149 continued Description:     - Moved the new wrappers committed on Mar 9:         43158f3bb3       to H5Location and renamed some of them for overloading.       This is because the loc_id in the C APIs can be file, group, dataset,       named datatype, and attribute.  Previous implementation was wrong       following some inaccurate C API reference manual.
2018-03-12 11:45:23 -05:00
Binh-Minh Ribler
0684235b36 Merge pull request #935 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr:develop to develop
Notes for gen_bounds.c

* commit '8155dba8d7cb8dbe2532c17c7ea5a27f52e3095b':
  Improve code Description:     Added notes and changed argument to H5Fcreate to clarify the     latest situation Platforms tested:     Linux/64 (jelly)
2018-03-12 11:25:03 -05:00
Allen Byrne
1651db0608 HDFFV-10418 adjust build commands to match main library build 2018-03-12 10:59:07 -05:00
M. Scot Breitenfeld
0c3fc68363 merged from develop 2018-03-12 09:28:11 -05:00
M. Scot Breitenfeld
657f51aaa5 merged from develop 2018-03-12 09:22:36 -05:00
M. Scot Breitenfeld
d86b2e298a Merge branch 'hdf5_1_10_merge' of ssh://bitbucket.hdfgroup.org:7999/hdffv/hdf5 into hdf5_1_10_merge 2018-03-12 09:15:05 -05:00
M. Scot Breitenfeld
4460e41dfa removed duplicate code 2018-03-12 09:14:56 -05:00
Allen Byrne
26109aad51 Merge pull request #932 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '75db73efc514aff2af63618cc7be357fc4e77cb6':
  Add release note
  Remove obsolete comments
  Change CMake min to 3.10
2018-03-12 09:04:30 -05:00
Vailin Choi
f08b8fa10e Enhancement to the tool h5clear (HDFFV-10360) 2018-03-12 09:02:15 -05:00
Binh-Minh Ribler
b638bbd74b Code improvement
Description:
    - Removed memory leaks caused by accidentally invoking p_get_member_type
    - Added the call to test_lcpl, missed previously
Platforms tested:
    Linux/64 (jelly)
    Linux/ppc64 (ostrich)
    Darwin (osx1010test)
2018-03-12 00:53:16 -05:00
Vailin Choi
9ebe42cd0d Merge pull request #937 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10_merge to hdf5_1_10_merge
* commit 'd1d91213d0813aed366b2d66a9c031c319070f18':
  Re-factor coding for H5P/Sencode with libver bounds.
2018-03-12 00:46:17 -05:00
Binh-Minh Ribler
5a0d8d0d16 Updated RELEASE.txt
Description:
    - Wrappers for H5Lcreate_soft, H5Lcreate_hard, H5Lcopy, H5Lmove,
      H5Ldelete, and H5Lget_info
    - Class LinkCreatPropList
    - Fixed typo in source file
Platforms tested:
    Linux/64 (jelly)
2018-03-12 00:03:46 -05:00
Binh-Minh Ribler
17af6bcb79 Updated for H5LcreatProp.[h,cpp] 2018-03-11 23:43:52 -05:00
Binh-Minh Ribler
7841653359 Updated MANIFEST for H5LcreatProp.[h,cpp] 2018-03-11 23:39:46 -05:00
Binh-Minh Ribler
3494282d42 HDFFV-10149 continued
Description:
    - Moved the new wrappers committed on Mar 9:
        43158f3bb3
      to H5Location and renamed some of them for overloading.
      This is because the loc_id in the C APIs can be file, group, dataset,
      named datatype, and attribute.  Previous implementation was wrong
      following some inaccurate C API reference manual.

    - Only the following wrappers are modified or added:
      + H5Lcreate_soft: changed name from newLink to link
        // Creates a soft link from link_name to target_name.
        void link(const char *target_name, const char *link_name,...)
        void link(const H5std_string& target_name,...)

      + H5Lcreate_hard: changed name from newLink to link
        // Creates a hard link from new_name to curr_name.
        void link(const char *curr_name, const Group& new_loc,...)
        void link(const H5std_string& curr_name, const Group& new_loc,...)

        // Creates a hard link from new_name to curr_name in same location.
        void link(const char *curr_name, const hid_t same_loc,...)
        void link(const H5std_string& curr_name, const hid_t same_loc,...)

      + H5Ldelete: modified existing functions to add 2nd argument
        // Removes the specified link from this location.
        void unlink(const char *link_name,
            const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)
        void unlink(const H5std_string& link_name,
            const LinkAccPropList& lapl = LinkAccPropList::DEFAULT)

    - copyLink and moveLink were only moved from Group to H5Location, no change

    - Added class LinkCreatPropList

    - Added overloaded functions H5Location::createGroup to take a link creation
      property list
        Group createGroup(const char* name, const LinkCreatPropList& lcpl)
        Group createGroup(const H5std_string& name, const LinkCreatPropList& lcpl)
    - Added wrapper for H5Lget_info() to H5Location
        H5L_info_t getLinkInfo(const H5std_string& link_name,...)

Platforms tested:
    Linux/64 (jelly)
    Linux/ppc64 (ostrich)
    Darwin (osx1010test)
2018-03-11 23:36:48 -05:00
Vailin Choi
d1d91213d0 Merge branch 'hdf5_1_10_merge' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into hdf5_1_10_merge 2018-03-11 23:13:43 -05:00
Vailin Choi
83de2a580b Re-factor coding for H5P/Sencode with libver bounds. 2018-03-11 23:12:30 -05:00
mainzer
4823abf3ee Removed commented out code from H5FDmpio.c, H5FDprivate.h and H5Fint.c
Tested parallel (debug and production) and serial (production)
2018-03-11 22:32:09 -05:00
Binh-Minh Ribler
43158f3bb3 Merge pull request #833 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp3:develop to develop
Update for new support website.

* commit '801191b4c374adc462345f2c068f1cfc6f4adf97':
  Upated cpp doc.
  Added C++ wrappers - HDFFV-10149 Description:     Added the following wrappers to class H5::Group:     + H5Lcreate_soft:         // Creates a soft link from link_name to target_name.         void newLink(const char *target_name, const char *link_name,...)         void newLink(const H5std_string& target_name,...)
  Update for new support website Description:     - Replaced external links with text including the C API name     - Removed links of copyright at the bottom of each page     - Removed logo at top     - Removed document name and version number Platforms tested:     Linux/32 2.6 (jam) - only documentation
2018-03-09 21:40:26 -06:00
Binh-Minh Ribler
801191b4c3 Upated cpp doc. 2018-03-09 21:38:59 -06:00
Binh-Minh Ribler
539f4691fa Added C++ wrappers - HDFFV-10149
Description:
    Added the following wrappers to class H5::Group:
    + H5Lcreate_soft:
        // Creates a soft link from link_name to target_name.
        void newLink(const char *target_name, const char *link_name,...)
        void newLink(const H5std_string& target_name,...)

    + H5Lcreate_hard:
        // Creates a hard link from new_name to curr_name.
        void newLink(const char *curr_name, const Group& new_loc,...)
        void newLink(const H5std_string& curr_name, const Group& new_loc,...)

        // Creates a hard link from new_name to curr_name in same location.
        void newLink(const char *curr_name, const hid_t same_loc,...)
        void newLink(const H5std_string& curr_name, const hid_t same_loc,...)

    + H5Lcopy:
        // Copy an object from a group of file to another.
        void copyLink(const char *src_name, const Group& dst,...)
        void copyLink(const H5std_string& src_name, const Group& dst,...)

        // Copy an object from a group of file to the same location.
        void copyLink(const char *src_name, const char *dst_name,...)
        void copyLink(const H5std_string& src_name,...)

    + H5Lmove:
        // Rename an object in a group or file to a new location.
        void moveLink(const char* src_name, const Group& dst,...)
        void moveLink(const H5std_string& src_name, const Group& dst,...)

        // Rename an object in a group or file to the same location.
        void moveLink(const char* src_name, const char* dst_name,...)
        void moveLink(const H5std_string& src_name,...)
Platforms tested:
    Linux/64 (jelly)
    Linux/ppc64 (ostrich)
    Darwin (osx1010test)
2018-03-09 21:29:28 -06:00
Binh-Minh Ribler
8155dba8d7 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr into develop 2018-03-09 20:46:41 -06:00
Binh-Minh Ribler
4731819b0e Improve code
Description:
    Added notes and changed argument to H5Fcreate to clarify the
    latest situation
Platforms tested:
    Linux/64 (jelly)
2018-03-09 20:44:37 -06:00
M. Scot Breitenfeld
a5d95ec083 Merge branch 'develop' into hdf5_1_10_merge 2018-03-09 16:57:54 -06:00
Vailin Choi
3093cb5bba Merge pull request #933 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10_merge to hdf5_1_10_merge
* commit '6b99b7b02edfbeba9c12f608839c91ba0a0d87b0':
  Resolve compilation errors.
2018-03-09 16:15:10 -06:00
Vailin Choi
6b99b7b02e Resolve compilation errors. 2018-03-09 16:11:07 -06:00
Allen Byrne
75db73efc5 Add release note 2018-03-09 12:49:26 -06:00
Allen Byrne
2d0a0859b2 Remove obsolete comments 2018-03-09 12:45:22 -06:00
Allen Byrne
24c62ba7fe Change CMake min to 3.10 2018-03-09 12:32:06 -06:00
Allen Byrne
2a5d608f7b Merge pull request #929 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '13f5388149a0dd39a6f67d30d63c6d622e249fd9':
  HDFFV-4359 Add HL C++ and fix install parameters
  HDFFV-4359 Add C,HL,CXX files
2018-03-09 12:20:04 -06:00
Binh-Minh Ribler
53235aa24c Merge pull request #930 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr:develop to develop
* commit '7c293908a772dd19d69872b4dbf1fdcbbbf5f94f':
  Improving tests Description:     Fixed typos that caused daily test failure on Ostrich Platforms tested:     Linux/64 (jelly)     Linux/ppc64 (ostrich)
2018-03-09 09:18:06 -06:00
Vailin Choi
8ba788ca89 Fix for HDFFV-10209 VDS SWMR test failure
Free the object header when there are chksum retries.
2018-03-09 01:25:40 -06:00
Binh-Minh Ribler
7c293908a7 Improving tests
Description:
    Fixed typos that caused daily test failure on Ostrich
Platforms tested:
    Linux/64 (jelly)
    Linux/ppc64 (ostrich)
2018-03-09 00:35:42 -06:00
Allen Byrne
13f5388149 HDFFV-4359 Add HL C++ and fix install parameters 2018-03-08 16:39:35 -06:00
Allen Byrne
3712738877 HDFFV-4359 Add C,HL,CXX files 2018-03-08 15:54:40 -06:00
Allen Byrne
00d29181b5 Merge pull request #928 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '6d75a3ffb4b1451ff80b7fdddafa5859376bee77':
  Fix misaligned macro
  Fix CMake missing parens
2018-03-08 08:48:33 -06:00
Allen Byrne
6d75a3ffb4 Fix misaligned macro 2018-03-07 15:55:33 -06:00
M. Scot Breitenfeld
496af1be89 Needs to sync with lib version and Sencode. 2018-03-07 15:49:14 -06:00
Allen Byrne
8347a31871 Fix CMake missing parens 2018-03-07 15:46:58 -06:00
Binh-Minh Ribler
e1721103c5 Merge pull request #901 in HDFFV/hdf5 from ~BMRIBLER/version_bounds_bmr:develop to develop
tests for version bounds.

* commit 'f05f9d4cffab5e008c67e19034c1b248e1b01b3c':
  Miscellaneous test fixes Description:     - dtypes.c: added the use of highest version of nested datatypes to       verify the datatype's version.     - miscellaneous typos Platforms tested:     Linux/64 (jelly)     Darwin (osx1010test)
  Added h5repack tests Description:     Added tests SUPERBLOCK and INVALIDBOUNDS, composed by ADB. Platforms tested:     Linux/64 (jelly) - cmake
  Added bounds_latest_latest.h5
  Misc improvement Description:     - Added test file for h5repack test VERIFY_INVALIDBOUNDS     - Updated MANIFEST     - Removed unnecessary header file in test     - Update h5repack script to copy the new file to the test location Platforms tested:     Linux/64 (jelly)     Darwin (osx1010test)
  Improving tests Description:     - Added test for version bounds with nested datatypes     - Added script for additional version bound test in h5repack     - Cleaned up tests for consistency     - Removed extra included header files Platforms tested:     Linux/64 (jelly)     Linux/64 (moohan)     Darwin (osx1010test)
2018-03-07 15:09:15 -06:00
Allen Byrne
3593694811 Merge pull request #926 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '08fc36b0ca10abb9960c6543b4bc854d8d8aaf31':
  Correct cutnpaste
  Add missing note
2018-03-07 12:24:17 -06:00
Allen Byrne
f0a45a145b Correct cutnpaste 2018-03-07 12:23:46 -06:00
Allen Byrne
08fc36b0ca Correct cutnpaste 2018-03-07 12:23:04 -06:00
Allen Byrne
28566611da Merge changes from develop 2018-03-07 11:43:10 -06:00
Allen Byrne
36bf5edfc9 Add missing note 2018-03-07 11:41:55 -06:00
Allen Byrne
6fb3962d9a Merge pull request #925 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '1428e57fbf03d5ee58e6e4bbc2cdf71c2200607d':
  HDFFV-10414 fix note
  HDDFV-10414 correct location of error change
2018-03-07 11:16:31 -06:00
Allen Byrne
1428e57fbf HDFFV-10414 fix note 2018-03-07 10:53:07 -06:00
Allen Byrne
d981692e63 HDDFV-10414 correct location of error change 2018-03-07 10:52:34 -06:00
Allen Byrne
08d007a307 Merge pull request #924 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '2db84441d742433c0aee26624a7b3fd05c2dbbf2':
  ifdef around another function
2018-03-07 10:29:32 -06:00
Allen Byrne
2db84441d7 ifdef around another function 2018-03-06 16:51:31 -06:00
Allen Byrne
cad9a33760 Merge pull request #923 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b8b0afc4c3e532c07c1284eddb0c5cb7834ea86a':
  Add #ifdef H5_HAVE_FORK eliminates special handling
  Add #ifdef H5_HAVE_FORK
2018-03-06 15:57:16 -06:00
Allen Byrne
b8b0afc4c3 Add #ifdef H5_HAVE_FORK eliminates special handling 2018-03-06 15:41:51 -06:00
Allen Byrne
e5b602fafe Add #ifdef H5_HAVE_FORK 2018-03-06 15:40:15 -06:00
Binh-Minh Ribler
f05f9d4cff Miscellaneous test fixes
Description:
    - dtypes.c: added the use of highest version of nested datatypes to
      verify the datatype's version.
    - miscellaneous typos
Platforms tested:
    Linux/64 (jelly)
    Darwin (osx1010test)
2018-03-06 11:41:33 -06:00
Allen Byrne
f4ac515fed Merge 10414, 10292, VFD fix from develop 2018-03-06 10:03:09 -06:00
Allen Byrne
d8f88eb7b8 Merge pull request #922 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '960a1d55eed8b30350d7a87e1a9a7da72e86d270':
  plist testfiles need to be copied into VFD test folders as well
2018-03-06 09:57:50 -06:00
Allen Byrne
960a1d55ee plist testfiles need to be copied into VFD test folders as well 2018-03-06 09:45:26 -06:00
Larry Knox
56afea019b Merge pull request #920 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'b3142a85fda8670a5780e6d3d080d54a71e0fc1d':
  Update install file for configure revisions.
2018-03-06 09:10:19 -06:00
Binh-Minh Ribler
2b50dc9855 Added h5repack tests
Description:
    Added tests SUPERBLOCK and INVALIDBOUNDS, composed by ADB.
Platforms tested:
    Linux/64 (jelly) - cmake
2018-03-06 09:02:32 -06:00
Allen Byrne
76f58c375f Merge pull request #921 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '1c3ba3721718c8089da65fae02f65068d8530fa7':
  HDFFV-10292 Windows drive letters cause issues in paths
  HDFFV-10414 restore Ctl char - do we really need these anymore
  HDFFV-10414 change minor error_number
2018-03-06 08:57:15 -06:00
Allen Byrne
1c3ba37217 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'd8723ac1178a69c4dff7164203d999d61c2159bb':
  Fix for HDFFV-10357 (CVE-2017-17508).
  Fix for HDFFV-10355 (CVE-2017-17506).
  Fix for HDFFV-10354 (CVE-2017-17505).
2018-03-06 08:29:55 -06:00
Dana Robinson
d8723ac117 Merge pull request #910 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdffv_10355 to develop
* commit 'b61c93acb3c5d50d379950f6e3de5040c71dd041':
  Fix for HDFFV-10355 (CVE-2017-17506).
2018-03-05 18:43:38 -06:00
Dana Robinson
b61c93acb3 Merge branch 'develop' into hdffv_10355 2018-03-05 16:08:28 -08:00
Dana Robinson
bbadec5680 Merge pull request #908 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdffv_10354 to develop
* commit '4faf4d335b638215c2220564b894e909ff322ca8':
  Fix for HDFFV-10354 (CVE-2017-17505).
2018-03-05 17:28:09 -06:00
Dana Robinson
4faf4d335b Merge branch 'develop' into hdffv_10354 2018-03-05 15:27:03 -08:00
M. Scot Breitenfeld
a8bea5fd26 Merge branch 'develop' into avoid_trunc_beta 2018-03-05 15:36:27 -06:00
Allen Byrne
8ae5f68041 HDFFV-10292 Windows drive letters cause issues in paths 2018-03-05 12:43:51 -06:00
Dana Robinson
3b0e80c1dc Merge pull request #911 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdffv_10357 to develop
* commit 'ce005900d6ad539cc7556ab225b771d24632f4f1':
  Fix for HDFFV-10357 (CVE-2017-17508).
2018-03-05 12:38:20 -06:00
Allen Byrne
58094b4f80 HDFFV-10414 restore Ctl char - do we really need these anymore 2018-03-05 12:22:48 -06:00
Allen Byrne
5860384905 HDFFV-10414 change minor error_number 2018-03-05 11:47:09 -06:00
lrknox
b3142a85fd Update install file for configure revisions. 2018-03-05 08:17:39 -06:00
M. Scot Breitenfeld
3dcc827771 Merge branch 'develop' into avoid_trunc_beta 2018-03-02 17:04:02 -06:00
Allen Byrne
a30da017cc Merge pull request #919 in HDFFV/hdf5 from ~JSOUMAGNE/hdf5_fork:topic_cmake_build to develop
* commit '9364df1c6d6d4661b6c32278268ccbe1640a082c':
  Fix CMake build type if none was specified to be cached
2018-03-02 14:04:27 -06:00
Jerome Soumagne
9364df1c6d Fix CMake build type if none was specified to be cached
Restrict CMAKE_BUILD_TYPE to default ones
2018-03-02 13:50:23 -06:00
Richard Warren
d269c3f9cf Merge pull request #918 in HDFFV/hdf5 from reloc_test_fix_for_develop to develop
* commit 'c0aafa78e52fcea5bfc4252fc2c0285b9b983646':
  Fixed t_pread.c to remove the use of h5jam, etc.. This fixes HDFFV-8839 and should merge into develop
2018-03-02 10:52:45 -06:00
Richard Warren
c0aafa78e5 Fixed t_pread.c to remove the use of h5jam, etc.. This fixes HDFFV-8839 and should merge into develop 2018-03-02 11:32:13 -05:00
Richard Warren
5c4bab04f5 Merge pull request #917 in HDFFV/hdf5 from superblock_reloc_test_fix to hdf5_1_10
* commit 'a6e81cf18719bf8f18e226e229ec0e2c40d46871':
  Remove unused variables that were commented out in t_pread.c
  Removal of missing posix function for Windows. See HDFFV-8839
  Fixed t_pread.c with a local implementation of the posix function dirname(). Fixes HDFFV=8839
2018-03-01 14:41:37 -06:00
Richard Warren
a6e81cf187 Remove unused variables that were commented out in t_pread.c 2018-03-01 15:38:03 -05:00
Allen Byrne
f1ee4825f9 Merge pull request #913 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '5a8ac1fb6c13e776bc17fa52c4cdf353c907907b':
  Fix test loop
  Correct if-endif block
  Remove option from list in doc
  Remove t_cache_image test on Windows
  Correct use of LIST var
2018-03-01 12:30:55 -06:00
Allen Byrne
6f1fb626ff Merge pull request #914 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '1599e835c626ec306ac9bb3941c4e851a92bdb17':
  Fix test loop
  Remove t_cache_image test
2018-03-01 12:30:35 -06:00
Richard Warren
ede609806c Removal of missing posix function for Windows. See HDFFV-8839 2018-03-01 13:04:49 -05:00
Richard Warren
f407347f27 Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_10 2018-03-01 10:13:03 -05:00
Allen Byrne
1599e835c6 Fix test loop 2018-03-01 08:33:45 -06:00
Allen Byrne
5a8ac1fb6c Fix test loop 2018-03-01 08:33:24 -06:00
Allen Byrne
cecb59f93f Correct if-endif block 2018-03-01 08:26:33 -06:00
Binh-Minh Ribler
f2ff00bd7a Added bounds_latest_latest.h5 2018-02-28 14:40:13 -06:00
Allen Byrne
81b96fb01a Remove option from list in doc 2018-02-28 11:47:17 -06:00
Allen Byrne
bfa3bf01f3 Remove t_cache_image test 2018-02-28 10:45:47 -06:00
Allen Byrne
d7a6fab281 Merge pull request #912 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'e0f872c13e5a21790533c46ad57699bd8f03e2ff':
  Correct use of list var
  Remove uncomitted test
  Incr CMake min, add missing test, rework test CMake script
2018-02-28 10:35:30 -06:00
Allen Byrne
bf9b73e877 Remove t_cache_image test on Windows 2018-02-28 09:26:11 -06:00
Allen Byrne
e0f872c13e Correct use of list var 2018-02-28 09:02:44 -06:00
Allen Byrne
23ceda33b3 Correct use of LIST var 2018-02-28 09:01:38 -06:00
Allen Byrne
3b518415f4 Remove uncomitted test 2018-02-28 08:24:52 -06:00
Binh-Minh Ribler
4899c9ab47 Misc improvement
Description:
    - Added test file for h5repack test VERIFY_INVALIDBOUNDS
    - Updated MANIFEST
    - Removed unnecessary header file in test
    - Update h5repack script to copy the new file to the test location
Platforms tested:
    Linux/64 (jelly)
    Darwin (osx1010test)
2018-02-27 18:04:29 -06:00
Allen Byrne
d4e7beb9ee Incr CMake min, add missing test, rework test CMake script 2018-02-27 16:39:10 -06:00
Allen Byrne
d29b78ba8f Merge pull request #909 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '032f680919cd67202c6b5817c327139c09dacb05':
  Add import
  Fix list var
  Fix IN_LIST usage
  Inc CMake min, Add new tests, rework test CMake files
  Update list
2018-02-27 16:36:22 -06:00
Allen Byrne
032f680919 Add import 2018-02-27 14:09:27 -06:00
Allen Byrne
93744615f9 Fix list var 2018-02-27 14:04:34 -06:00
Allen Byrne
90f01d5b16 Fix IN_LIST usage 2018-02-27 13:33:38 -06:00
Allen Byrne
b36bad53d9 Inc CMake min, Add new tests, rework test CMake files 2018-02-27 12:57:07 -06:00
Dana Robinson
ce005900d6 Fix for HDFFV-10357 (CVE-2017-17508). 2018-02-26 20:16:13 -08:00
Dana Robinson
302053f978 Fix for HDFFV-10355 (CVE-2017-17506). 2018-02-26 18:31:40 -08:00
Allen Byrne
a4f0666ecd Update list 2018-02-26 16:13:25 -06:00
Dana Robinson
1e5b67c1dc Fix for HDFFV-10354 (CVE-2017-17505). 2018-02-26 12:22:32 -08:00
Richard Warren
d08fef3b12 Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_10 2018-02-23 17:30:58 -05:00
Allen Byrne
6ad2ea374b Merge pull request #905 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'bb27f1441f40456213af7b86704182737812c314':
  HDFFV-10412 merge from develop
2018-02-22 14:59:02 -06:00
Allen Byrne
9ea358d971 Merge pull request #904 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '76a0003f96f8e1336062089380adc95f8b3dee56':
  HDFFV-10412 update test ref files
  HDFFV-10412 fix typo
  HDFFV-10412 moved check back into normal path
2018-02-22 11:59:48 -06:00
Allen Byrne
bb27f1441f HDFFV-10412 merge from develop 2018-02-22 11:36:41 -06:00
Allen Byrne
76a0003f96 HDFFV-10412 update test ref files 2018-02-22 10:18:17 -06:00
Allen Byrne
b996ee2972 HDFFV-10412 fix typo 2018-02-21 16:29:41 -06:00
Allen Byrne
0d912d4632 HDFFV-10412 moved check back into normal path 2018-02-21 16:23:07 -06:00
M. Scot Breitenfeld
ec361559b3 Merge branch 'develop' into avoid_trunc_beta 2018-02-20 14:12:51 -06:00
Richard Warren
83353dfe55 merge branch 'hdf5_1_10_merge' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_10 2018-02-20 11:11:58 -05:00
Richard Warren
b7809bade0 Fixed t_pread.c with a local implementation of the posix function dirname(). Fixes HDFFV=8839 2018-02-20 11:04:56 -05:00
Allen Byrne
6d50d98cda Merge pull request #900 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'de2ca6cf2d3d8361c70a6cefa30d28103d69cd4a':
  Fix indentation
  HDFFV-10384 and includes cleanup merged from devlop
2018-02-19 13:01:14 -06:00
Allen Byrne
9f2802f23c Merge pull request #899 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '30166fed18a9b0754d56b3454176e3a5111a1e21':
  Fix indentation
  HDFFV-10384 Add opt arg to help
  HDFFV-10384 Add optional arg to enable-error-stack
2018-02-19 13:00:51 -06:00
Allen Byrne
de2ca6cf2d Fix indentation 2018-02-19 08:33:54 -06:00
Allen Byrne
30166fed18 Fix indentation 2018-02-19 08:32:15 -06:00
Vailin Choi
a4cb96a34f Merge pull request #902 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit '2fb0b8c3538df641deca73a8a694996bb5e61cdd':
  Fix for daily test failure for test/fheap.c The failure occurs when HDF5TestExpress is set to 0. The check for file size check fails due to persisting free-space when creating the file. The fix is to set libver bounds (v18, latest) when creating the test file.
  Fixed daily test failure Description:     Added missing H5Pclose that caused daily test failure. Platforms tested:     Linux/64 (jelly)     Linux/64 (moohan)     Darwin (osx1010test)
2018-02-18 22:38:05 -06:00
Vailin Choi
2fb0b8c353 Fix for daily test failure for test/fheap.c
The failure occurs when HDF5TestExpress is set to 0.
The check for file size check fails due to persisting free-space when creating the file.
The fix is to set libver bounds (v18, latest) when creating the test file.
2018-02-18 20:24:15 -06:00
Binh-Minh Ribler
c9885a51d8 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/version_bounds_bmr into develop 2018-02-17 16:23:06 -06:00
Binh-Minh Ribler
39e3da7563 Improving tests
Description:
    - Added test for version bounds with nested datatypes
    - Added script for additional version bound test in h5repack
    - Cleaned up tests for consistency
    - Removed extra included header files
Platforms tested:
    Linux/64 (jelly)
    Linux/64 (moohan)
    Darwin (osx1010test)
2018-02-17 16:18:37 -06:00
Binh-Minh Ribler
90f9596c3a Merge pull request #7 in ~VCHOI/my_hdf5_fork from ~BMRIBLER/version_bounds_bmr:develop to develop
Fixed daily test failure.

* commit 'b65ec9d05b9301ec639fac03b26c6ec06e463888':
  Fixed daily test failure Description:     Added missing H5Pclose that caused daily test failure. Platforms tested:     Linux/64 (jelly)     Linux/64 (moohan)     Darwin (osx1010test)
2018-02-16 23:03:19 -06:00
Binh-Minh Ribler
b65ec9d05b Fixed daily test failure
Description:
    Added missing H5Pclose that caused daily test failure.
Platforms tested:
    Linux/64 (jelly)
    Linux/64 (moohan)
    Darwin (osx1010test)
2018-02-16 22:55:42 -06:00
Allen Byrne
fc875eb5b7 HDFFV-10384 and includes cleanup merged from devlop 2018-02-16 09:25:51 -06:00
Allen Byrne
ebb3bb0cfc HDFFV-10384 Add opt arg to help 2018-02-15 16:58:51 -06:00
Allen Byrne
84fdfb6863 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'db60f70286910498ca40291841a55114cf0ea3f7':
  Fix for daily test failure Fix for test/testhdf5.sh for configuration with --enable-using-memchecker.
2018-02-15 09:57:54 -06:00
Vailin Choi
db60f70286 Merge pull request #898 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit 'ea2fb549245ac33baf7062c7e87c390bf0261677':
  Fix for daily test failure Fix for test/testhdf5.sh for configuration with --enable-using-memchecker.
2018-02-14 17:36:32 -06:00
Vailin Choi
ea2fb54924 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into develop 2018-02-14 16:15:29 -06:00
Allen Byrne
a77a08b02f HDFFV-10384 Add optional arg to enable-error-stack 2018-02-14 16:14:48 -06:00
Vailin Choi
76d70073c6 Fix for daily test failure
Fix for test/testhdf5.sh for configuration with --enable-using-memchecker.
2018-02-14 16:11:12 -06:00
Vailin Choi
9adb74e41b Merge pull request #897 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit 'cdf75a2f2be48c5e13271e20978a785865e139ff':
  Fix for daily test failures Move the declarations for the three arrays of versions from H5Opkg.h: (1) H5O_layout_vers_bounds to H5Dpkg.h (2) H5O_dtype_ver_bounds to H5Tpkg.h (3) H5O_sdspace_ver_bounds to H5Spkg.h This is to fix Windows' complaint for unresolved symbols.
2018-02-14 15:52:17 -06:00
Vailin Choi
cdf75a2f2b Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into develop 2018-02-14 14:37:32 -06:00
Vailin Choi
e277d537d2 Fix for daily test failures
Move the declarations for the three arrays of versions from H5Opkg.h:
(1) H5O_layout_vers_bounds to H5Dpkg.h
(2) H5O_dtype_ver_bounds to H5Tpkg.h
(3) H5O_sdspace_ver_bounds to H5Spkg.h
This is to fix Windows' complaint for unresolved symbols.
2018-02-14 14:30:51 -06:00
Allen Byrne
8ad35726ea Merge pull request #895 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'e09ccc4a2168e79b9f7500b8ec68ed5f829c8604':
  More includes cleanup
  Cleanup overuse of include files
2018-02-14 14:23:31 -06:00
Vailin Choi
23cf3a4298 Merge pull request #896 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit 'f5c5eba7837f33a44e521ea1c9aca479f1dc1bba':
  Fix for daily test failure for configuration with --disable-deprecated-symbols
2018-02-14 13:08:23 -06:00
Allen Byrne
e09ccc4a21 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '0b98ddd12324e5dae17dd8135bf72094d66e5d17':
  Fixed DT failure Description:     Added a missing return statement to a non-void function. Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
2018-02-14 12:35:29 -06:00
Binh-Minh Ribler
0b98ddd123 Merge pull request #894 in HDFFV/hdf5 from ~BMRIBLER/version_bounds_bmr:bugfix/version_bounds to develop
* commit '2ad0ddaa3e62b35d454dfb61db06d8ad90c2e7a8':
  Fixed DT failure Description:     Added a missing return statement to a non-void function. Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
2018-02-14 12:13:37 -06:00
Vailin Choi
f5c5eba783 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into develop 2018-02-14 12:04:59 -06:00
Vailin Choi
2ee6908b6a Fix for daily test failure for configuration with --disable-deprecated-symbols 2018-02-14 12:03:32 -06:00
Allen Byrne
41d541f1c2 More includes cleanup 2018-02-14 11:14:26 -06:00
Allen Byrne
205d33f332 Cleanup overuse of include files 2018-02-14 10:08:09 -06:00
Binh-Minh Ribler
e562ffc03f Merge pull request #6 in ~VCHOI/my_hdf5_fork from ~BMRIBLER/version_bounds_bmr:bugfix/version_bounds to develop
Fixed daily test failure

* commit '2ad0ddaa3e62b35d454dfb61db06d8ad90c2e7a8':
  Fixed DT failure Description:     Added a missing return statement to a non-void function. Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
2018-02-14 09:54:43 -06:00
Binh-Minh Ribler
2ad0ddaa3e Merge branch 'bugfix/version_bounds' of https://bitbucket.hdfgroup.org/scm/~bmribler/version_bounds_bmr into bugfix/version_bounds 2018-02-14 09:42:55 -06:00
Binh-Minh Ribler
300b219d43 Fixed DT failure
Description:
    Added a missing return statement to a non-void function.
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-02-14 09:40:39 -06:00
Vailin Choi
66ea3b8fb9 Merge pull request #876 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:bugfix/version_bounds to develop
* commit 'b4294d8d3e5937527e9814f23d04df412ebbe770':
  Added comment for clarification about latest as 1.10. Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)
  Fixed typos Platforms tested:     Linux/32 (jam)
  Additional tests Description:     - Revised and add more variety to version bound tests per review     - Revised gen_bounds.c per review Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
  Added gen_bounds
  Cleaned up per comments in PR# 876
  Modifications made based on comments from pull request.
  Added gen_bounds.c
  Added gen_bounds.c
  Fix bounds check for the generation of cache image.
  Modify usage description for -j and -k options so that it is more informative.
  Modify h5repack usage so that it is more descriptive.
  Changes made based on code reviews.
  Further improvement
  Fixed comment.
  Adding data file generator Description:     Added gen_bounds.c to generate the following files:     - bounds_earliest_latest.h5     - bounds_earliest_v18.h5     - bounds_latest_latest.h5     - bounds_v18_latest.h5     - bounds_v18_v18.h5     for testing the version bounds fix in 1.8 and 1.6.
  Initial checkin for library version bounds Code changes to provide versioning support when adding to the enumerated defines for H5F_libver_t.
2018-02-13 19:15:40 -06:00
Binh-Minh Ribler
b4294d8d3e Merge pull request #5 in ~VCHOI/my_hdf5_fork from ~BMRIBLER/version_bounds_bmr:bugfix/version_bounds to bugfix/version_bounds
* commit 'c9475f57e580ed7dc9efea3390623ee48cba2507':
  Added comment for clarification about latest as 1.10. Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)
2018-02-13 16:03:12 -06:00
Binh-Minh Ribler
c9475f57e5 Merge branch 'bugfix/version_bounds' of https://bitbucket.hdfgroup.org/scm/~bmribler/version_bounds_bmr into bugfix/version_bounds 2018-02-13 15:26:02 -06:00
Binh-Minh Ribler
9a480c34e5 Added comment for clarification about latest as 1.10.
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
2018-02-13 15:24:41 -06:00
Binh-Minh Ribler
e62c1ca9be Merge pull request #4 in ~VCHOI/my_hdf5_fork from ~BMRIBLER/version_bounds_bmr:bugfix/version_bounds to bugfix/version_bounds
Revised and additional tests for version bounds.

* commit '551e58e683e76af4aca68998aa718e7e03d8f4f1':
  Fixed typos Platforms tested:     Linux/32 (jam)
  Additional tests Description:     - Revised and add more variety to version bound tests per review     - Revised gen_bounds.c per review Platforms tested:     Linux/64 (jelly)     Linux/32 (jam)     Darwin (osx1010test)
2018-02-13 13:18:32 -06:00
Binh-Minh Ribler
551e58e683 Fixed typos
Platforms tested:
    Linux/32 (jam)
2018-02-13 12:29:51 -06:00
Binh-Minh Ribler
4c119d2959 Merge branch 'bugfix/version_bounds' of https://bitbucket.hdfgroup.org/scm/~bmribler/version_bounds_bmr into bugfix/version_bounds 2018-02-13 11:05:55 -06:00
Binh-Minh Ribler
0a61befddc Additional tests
Description:
    - Revised and add more variety to version bound tests per review
    - Revised gen_bounds.c per review
Platforms tested:
    Linux/64 (jelly)
    Linux/32 (jam)
    Darwin (osx1010test)
2018-02-13 11:05:08 -06:00
hdftest
4644bd295a Merge pull request #893 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
* commit 'fa3a845d49fed1a73fc7e8462d9b81d487124dc8':
  Snapshot version 1.10 release 2 (snap9)
2018-02-11 23:00:06 -06:00
hdftest
fa3a845d49 Snapshot version 1.10 release 2 (snap9) 2018-02-11 15:54:22 -06:00
Allen Byrne
3918d48e72 Merge pull request #891 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '5b4c5b92d893760acc9b038ca441dcac5e03a816':
  HDFFV-10403 fix soname
2018-02-09 09:04:36 -06:00
Allen Byrne
20332fac0e Merge pull request #890 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '83211cf8f6051be2ea8dfd84637c195b2b0213c1':
  HDFFV-10403 Fix soname setting
2018-02-08 16:11:56 -06:00
Allen Byrne
5b4c5b92d8 HDFFV-10403 fix soname 2018-02-08 15:50:38 -06:00
Allen Byrne
83211cf8f6 HDFFV-10403 Fix soname setting 2018-02-08 15:46:13 -06:00
Binh-Minh Ribler
b498220b32 Merge pull request #3 in ~VCHOI/my_hdf5_fork from ~BMRIBLER/version_bounds_bmr:bugfix/version_bounds to bugfix/version_bounds
* commit '96c656ae3fa02721cddf5f570d7372f38b886d76':
  Added gen_bounds
2018-02-08 14:37:45 -06:00
Binh-Minh Ribler
96c656ae3f Merge branch 'bugfix/version_bounds' of https://bitbucket.hdfgroup.org/scm/~bmribler/version_bounds_bmr into bugfix/version_bounds 2018-02-08 13:01:00 -06:00
Binh-Minh Ribler
ae2577ff5e Added gen_bounds 2018-02-08 12:59:23 -06:00
Binh-Minh Ribler
9879f5dc43 Merge pull request #2 in ~VCHOI/my_hdf5_fork from ~BMRIBLER/version_bounds_bmr:bugfix/version_bounds to bugfix/version_bounds
* commit '74f74f60bb92cc614616d8ae3d91ecc2921aade1':
  Cleaned up per comments in PR# 876
  Added gen_bounds.c
  Added gen_bounds.c
2018-02-07 11:38:33 -06:00
Binh-Minh Ribler
74f74f60bb Cleaned up per comments in PR# 876
Platforms tested:
    Linux/64 (jelly)
    Darwin (osx1010test)
2018-02-07 11:33:31 -06:00
Vailin Choi
2fbdfcc457 Modifications made based on comments from pull request. 2018-02-06 21:42:02 -06:00
Allen Byrne
833b8de87a Merge pull request #888 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'f1cffac626e3e1ecbee0f55d7a970643b9c6b397':
  Remove old dependency construct
  HDFFV-10345 splelling and whitespace corrections
  HDFFV-10398 add sanitize attribute
2018-02-06 16:04:03 -06:00
Allen Byrne
ca89ab6631 Merge pull request #887 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'fbaa2192f8171ddb5af175d7f750c19dcad3ae4f':
  Remove old dependency construct
  HDFFV-10345 whitespace corrections
  HDFFV-10345 spelling errors
2018-02-06 16:03:48 -06:00
Allen Byrne
f1cffac626 Remove old dependency construct 2018-02-05 16:14:52 -06:00
Allen Byrne
fbaa2192f8 Remove old dependency construct 2018-02-05 16:14:00 -06:00
Allen Byrne
20ee50c5b9 HDFFV-10345 splelling and whitespace corrections 2018-02-05 12:48:01 -06:00
Allen Byrne
d08f56e027 HDFFV-10345 whitespace corrections 2018-02-05 12:47:31 -06:00
Allen Byrne
f325002db9 HDFFV-10345 spelling errors 2018-02-05 12:38:20 -06:00
Allen Byrne
36ddc71735 HDFFV-10398 add sanitize attribute 2018-02-05 08:51:46 -06:00
Allen Byrne
785b4ad2d4 Merge pull request #885 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'ad89b8325555ffd7ea27baef61c506a81dc80a96':
  Add note for HDFFV-10398
  HDFFV-10398 merge from develop improve CMake code
2018-02-02 14:12:21 -06:00
Allen Byrne
ffa2dec25d Merge pull request #884 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b57c5490e0901c451a77a356ceb1f6071dc89123':
  JHDFFV-10398 add note
  HDFFV-10398 fix detection of repeat checks
  HDFFV-10398 add support for Emscriptem build system
  HDFFV-10398 avoid sanitizer failures
  HDFFV-10398 - avoid ubsan crashes
  HDFFV-10398 msvc: use /W0 rather than /w
  HDFFV-10398 Suppress VS 2015 assertion failure popup during try_run
  HDFFV-10398 use the target name for custom commands
  HDFFV-10398 use the simpler add_subdirectory signature
  HDFFV-10398 Honor CMAKE_MODULE_PATH when including check modules
2018-02-02 14:12:12 -06:00
Binh-Minh Ribler
a32b998b82 Added gen_bounds.c 2018-02-01 10:08:34 -06:00
Binh-Minh Ribler
66e5f283c5 Merge branch 'bugfix/version_bounds' of https://bitbucket.hdfgroup.org/scm/~bmribler/version_bounds_bmr into bugfix/version_bounds 2018-02-01 10:06:06 -06:00
Binh-Minh Ribler
4c0440e61f Added gen_bounds.c 2018-02-01 09:49:50 -06:00
Allen Byrne
ad89b83255 Add note for HDFFV-10398 2018-02-01 09:42:35 -06:00
Allen Byrne
b57c5490e0 JHDFFV-10398 add note 2018-02-01 09:42:14 -06:00
Larry Knox
116c40450c Merge pull request #883 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '1bc7dc396a818d3f13624ab9386999db0c56aa71':
  Correct AM_MAINTAINER_MODE default to 'enable'.
2018-01-31 14:32:16 -06:00
Scot Breitenfeld
45aabcc951 Merge pull request #882 in HDFFV/hdf5 from hdf5_1_10_merge to hdf5_1_10
* commit '99c4d23c6c37a05c51100202ace50451fc13f1a8': (43 commits)
  fixed develop to 1.10 issues
  Increase maximum number of retries to 30 for h5watch tests.
  Update reference files for CMake options
  Fix windows compile errors abstract out common settings
  Fix case of command
  Fix missing ext libs references
  HDFFV-10396 typo fix
  HDFFV-10396 Add note
  HDFFV-10396 Eliminate overuse of h5tools_simple_prefix function
  HDFFV-10385 some platforms need this var
  HDFFV-10385 test OUTPUT_NAME var for mac
  HDFFV-10385 Correct name of var
  HDFFV-10385 rename vars and macros
  HDFFV-10385 Refactor out CMAKE_BUILD_TYPE usage
  HDFFV-10393 fix incorrect search for name in h5repack object table
  HDFFV-10392 change size of local array to 16 chars
  HDFFV-10385 rework java names
  HDFFV-10385 Use OUTPUT_NAME property instead of CMAKE_BUILD_TYPE
  Revert CMAKE_BUILD_TYPE for matches - need to redesign
  Fix fortran cmake variable usage
  ...
2018-01-31 14:30:02 -06:00
lrknox
1bc7dc396a Correct AM_MAINTAINER_MODE default to 'enable'. 2018-01-31 14:20:41 -06:00
M. Scot Breitenfeld
99c4d23c6c fixed develop to 1.10 issues 2018-01-31 14:12:26 -06:00
M. Scot Breitenfeld
afafd79e79 Merge branch 'develop' into hdf5_1_10 2018-01-31 13:06:30 -06:00
Allen Byrne
16e649fa0d HDFFV-10398 merge from develop improve CMake code 2018-01-30 16:30:17 -06:00
Allen Byrne
b005c5653e HDFFV-10398 fix detection of repeat checks 2018-01-30 16:22:18 -06:00
Allen Byrne
435fd5afa5 HDFFV-10398 add support for Emscriptem build system 2018-01-30 16:03:03 -06:00
Allen Byrne
1711c3727e HDFFV-10398 avoid sanitizer failures 2018-01-30 15:21:07 -06:00
Allen Byrne
dc384f474d HDFFV-10398 - avoid ubsan crashes 2018-01-30 14:47:43 -06:00
Allen Byrne
6aee1578c3 HDFFV-10398 msvc: use /W0 rather than /w 2018-01-30 12:46:23 -06:00
Allen Byrne
98f8fd9603 HDFFV-10398 Suppress VS 2015 assertion failure popup during try_run 2018-01-30 12:43:01 -06:00
Allen Byrne
0866bc0bb8 HDFFV-10398 use the target name for custom commands 2018-01-30 12:29:51 -06:00
Allen Byrne
2f18da435e HDFFV-10398 use the simpler add_subdirectory signature 2018-01-30 12:21:01 -06:00
Allen Byrne
bd7bc909ed HDFFV-10398 Honor CMAKE_MODULE_PATH when including check modules 2018-01-30 12:05:30 -06:00
Larry Knox
88e44cb93c Merge pull request #880 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '77ed9e9645dcfc0d277472f2ac7b011f44b423ff':
  Increase maximum number of retries to 30 for h5watch tests.
2018-01-30 11:39:22 -06:00
Allen Byrne
edb6fd0cf9 Merge pull request #878 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'd40f2039e7d675ac8f1c48aa5bbd71d7d1332650':
  Update CMake usage
  Update refences to CMake usage
  Merge windows compile fix from develop
2018-01-30 11:33:07 -06:00
Allen Byrne
723fe9191b Merge pull request #877 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f837afc8758c7c0394e2f40d636a8e6319b6b668':
  Update reference files for CMake options
  Fix windows compile errors abstract out common settings
  Fix case of command
2018-01-30 11:32:54 -06:00
Larry Knox
4eb22ec1c4 Merge pull request #881 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '26969c528105a89b3ff31b941b4f4d176e268187':
  Increase maximum number of retries to 30 for h5watch tests.
2018-01-30 11:31:49 -06:00
lrknox
26969c5281 Increase maximum number of retries to 30 for h5watch tests. 2018-01-30 09:58:42 -06:00
lrknox
77ed9e9645 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop 2018-01-30 09:57:04 -06:00
lrknox
6cc86417d5 Increase maximum number of retries to 30 for h5watch tests. 2018-01-30 09:56:21 -06:00
Allen Byrne
d40f2039e7 Update CMake usage 2018-01-29 12:52:20 -06:00
Allen Byrne
2e387d1bf6 Update refences to CMake usage 2018-01-29 12:43:54 -06:00
Allen Byrne
f837afc875 Update reference files for CMake options 2018-01-29 12:40:52 -06:00
Allen Byrne
8b658fb747 Merge windows compile fix from develop 2018-01-29 10:31:12 -06:00
Allen Byrne
468fbc36f1 Fix windows compile errors abstract out common settings 2018-01-29 10:27:32 -06:00
Vailin Choi
b86cc6ea84 Merge branch 'trunk_merge' into bugfix/version_bounds
Keep it up-to-date with develop.
2018-01-28 17:01:53 -06:00
Allen Byrne
707de0b92e Fix case of command 2018-01-26 15:41:13 -06:00
Allen Byrne
74e6675556 Merge pull request #872 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '79f2f733796429bd5b5bf691b2f469fe9318c4b6':
  Fix ext lib references
2018-01-26 09:35:51 -06:00
Allen Byrne
32c652cbc2 Merge pull request #871 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '3ab1a073688453991b78df300067009cd0c5f610':
  Fix missing ext libs references
2018-01-26 09:35:40 -06:00
Allen Byrne
79f2f73379 Fix ext lib references 2018-01-25 16:58:36 -06:00
Allen Byrne
3ab1a07368 Fix missing ext libs references 2018-01-25 16:54:28 -06:00
Allen Byrne
e07d198c47 Merge pull request #869 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '81adc76db6df60c9ebe8b5177fdc996d9039719e':
  Fix typo
  HDFFV-10396 Reduce use of h5tools_simple_prefix function
2018-01-25 11:22:09 -06:00
Allen Byrne
81adc76db6 Fix typo 2018-01-25 11:19:03 -06:00
Allen Byrne
88f8d1fc9f Merge pull request #868 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'fbcaec3555b6fce1a6be92b019972f51b6a51439':
  HDFFV-10396 typo fix
  HDFFV-10396 Add note
  HDFFV-10396 Eliminate overuse of h5tools_simple_prefix function
2018-01-25 11:17:12 -06:00
Allen Byrne
fbcaec3555 HDFFV-10396 typo fix 2018-01-25 11:16:04 -06:00
Allen Byrne
c9309e0bdc HDFFV-10396 Reduce use of h5tools_simple_prefix function 2018-01-25 10:36:02 -06:00
Allen Byrne
ad4514ebee HDFFV-10396 Add note 2018-01-25 10:32:23 -06:00
Allen Byrne
b692e9fdce Merge pull request #865 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '233afe3b6f77a487baed555569ee0524ca7a4d24':
  HDFFV-10385,10392,10393 merge from develop
2018-01-25 09:59:32 -06:00
Allen Byrne
f0b0c35afb HDFFV-10396 Eliminate overuse of h5tools_simple_prefix function 2018-01-25 09:58:24 -06:00
Allen Byrne
d7aeffc201 Merge pull request #864 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f22d8726707e26b97df38962b404754119e8abd7':
  HDFFV-10385 some platforms need this var
  HDFFV-10385 test OUTPUT_NAME var for mac
  HDFFV-10385 Correct name of var
2018-01-25 08:19:47 -06:00
Vailin Choi
be77e59353 Merge branch 'develop' into bugfix/version_bounds
Keep the branch up-to-date.
2018-01-23 16:00:31 -06:00
Vailin Choi
8427eefafe Fix bounds check for the generation of cache image. 2018-01-22 17:40:44 -06:00
M. Scot Breitenfeld
65c670d39c Merge branch 'develop' into avoid_trunc_beta 2018-01-22 11:34:43 -06:00
Allen Byrne
233afe3b6f HDFFV-10385,10392,10393 merge from develop 2018-01-22 11:22:27 -06:00
Allen Byrne
f22d872670 HDFFV-10385 some platforms need this var 2018-01-22 11:09:58 -06:00
Allen Byrne
7e33ee85b8 HDFFV-10385 test OUTPUT_NAME var for mac 2018-01-22 08:55:30 -06:00
Allen Byrne
a87cf25f2d HDFFV-10385 Correct name of var 2018-01-22 07:59:12 -06:00
Allen Byrne
c5e3118974 Merge pull request #863 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '608a71200d4f70708c141790ec33f88e2e1a9993':
  HDFFV-10385 rename vars and macros
  HDFFV-10385 Refactor out CMAKE_BUILD_TYPE usage
2018-01-19 14:07:10 -06:00
Allen Byrne
608a71200d HDFFV-10385 rename vars and macros 2018-01-19 10:49:17 -06:00
Allen Byrne
0f5ada2e08 HDFFV-10385 Refactor out CMAKE_BUILD_TYPE usage 2018-01-18 16:55:01 -06:00
Allen Byrne
a2fbe6c7d8 Merge pull request #862 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '3374818d14c11e9177370fe940c966240de34052':
  HDFFV-10393 fix incorrect search for name in h5repack object table
2018-01-18 16:38:22 -06:00
Vailin Choi
f122d6f27f Modify usage description for -j and -k options so that it is more informative. 2018-01-18 14:26:13 -06:00
Allen Byrne
3374818d14 HDFFV-10393 fix incorrect search for name in h5repack object table 2018-01-18 14:22:12 -06:00
Allen Byrne
6a9b816bde Merge pull request #861 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '601ae0ebbc2b766ebf2662315b3143b0f903d76b':
  HDFFV-10392 change size of local array to 16 chars
  HDFFV-10385 rework java names
  HDFFV-10385 Use OUTPUT_NAME property instead of CMAKE_BUILD_TYPE
  Revert CMAKE_BUILD_TYPE for matches - need to redesign
2018-01-18 08:57:22 -06:00
Allen Byrne
601ae0ebbc HDFFV-10392 change size of local array to 16 chars 2018-01-17 11:56:42 -06:00
Allen Byrne
6ca95c512a HDFFV-10385 rework java names 2018-01-17 10:27:00 -06:00
Vailin Choi
d202b3cfa1 Modify h5repack usage so that it is more descriptive. 2018-01-16 17:35:29 -06:00
Allen Byrne
0291c09075 HDFFV-10385 Use OUTPUT_NAME property instead of CMAKE_BUILD_TYPE 2018-01-16 16:08:52 -06:00
Allen Byrne
a3afda29f5 Merge pull request #857 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '2fa4b8bc6772df3b0b89ef4af216d75726d854a6':
  HDFFV-9724 merge vds duplicate code
2018-01-16 09:54:20 -06:00
Vailin Choi
120d02657b Merge branch develop into bugfix/version_bounds 2018-01-12 17:51:42 -06:00
Vailin Choi
37318f109a Changes made based on code reviews. 2018-01-12 14:36:03 -06:00
Allen Byrne
19c18e44ed Revert CMAKE_BUILD_TYPE for matches - need to redesign 2018-01-12 14:17:04 -06:00
Allen Byrne
aef900c674 Merge pull request #859 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'a2f2e1f4cf44f305a12c674a37c120d26ce3362b':
  Fix fortran cmake variable usage
2018-01-11 11:35:02 -06:00
Allen Byrne
a2f2e1f4cf Fix fortran cmake variable usage 2018-01-11 10:48:14 -06:00
Allen Byrne
2fa4b8bc67 HDFFV-9724 merge vds duplicate code 2018-01-11 09:11:45 -06:00
Allen Byrne
f18d8a68bf Merge pull request #855 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'c7e8a0788c68c2fe05b6b70591a499ad277c8fa5':
  Correct whitespace
  HDFFV-10385 multi-config builders need folder set
  HDFFV-10385 fix packaging
  Fix typo
  HDFFV-8745 remove obsolete files
  HDFFV-10385 includes cleanup
  HDFFV-10385 - add release note
  HDFFV-10385 fix fortran references
  Correct folder typo
  HDFFV-8745 fix minor defects
  HDFFV-10385 fix platform errors
  HDFFV-10385 refactor CMAKE_BUILD_TYPE usage
2018-01-11 09:09:18 -06:00
Allen Byrne
854906d86d Merge pull request #856 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '9b5bd45740320693be9749a4db0ae96af50c3374':
  HDFFV-10385 mult-config builders need a folder
2018-01-11 09:08:59 -06:00
Allen Byrne
9b5bd45740 HDFFV-10385 mult-config builders need a folder 2018-01-10 14:39:48 -06:00
Allen Byrne
c7e8a0788c Correct whitespace 2018-01-10 14:36:25 -06:00
Allen Byrne
9956b151e0 HDFFV-10385 multi-config builders need folder set 2018-01-10 14:35:00 -06:00
Allen Byrne
681047269b HDFFV-10385 fix packaging 2018-01-10 13:31:47 -06:00
Allen Byrne
5b4b465832 Fix typo 2018-01-10 13:04:06 -06:00
Allen Byrne
bdde53eb3e HDFFV-8745 remove obsolete files 2018-01-10 11:49:09 -06:00
Allen Byrne
2637bf680d Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '88574bf85618adc96142bebf865ac2caf82c8f09':
  HDFFV-10361 Correct signatures
  HDFFV-10361 Update release note for vds prefix
  HDDFV-10361 combine duplicated prefix utility functions
2018-01-10 09:58:05 -06:00
Allen Byrne
9cabaf09a8 Merge pull request #853 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'dc8a70bf282639ab912b992a6feab7883ebb2886':
  HDFFV-10385 includes cleanup
  HDFFV-8745 remove obolete files
  HDFFV-10385 merge corrections from develop
  HDFFV-10385 correct folder typo
  HDFFV-10385 correct platform issues
  HDFFV-8745 fix minor defects
  HDFFV-8745 merge from develop
  HDFFV-10385 Refactor use of CMAKE_BUILD_TYPE
2018-01-10 09:57:50 -06:00
Allen Byrne
dc8a70bf28 HDFFV-10385 includes cleanup 2018-01-10 09:53:42 -06:00
Allen Byrne
82709178aa HDFFV-10385 includes cleanup 2018-01-10 09:52:06 -06:00
Allen Byrne
88574bf856 Merge pull request #852 in HDFFV/hdf5 from ~BYRN/hdf5_adb:bugfix/HDFFV-10361-hdffv-9724-fix-has-duplicated to develop
* commit '9c2a9cec1f708039dbc625bcc6827ab64282e065':
  HDFFV-10361 Correct signatures
  HDFFV-10361 Update release note for vds prefix
  HDDFV-10361 combine duplicated prefix utility functions
2018-01-10 09:40:38 -06:00
Allen Byrne
3ca7b82e5a HDFFV-8745 remove obolete files 2018-01-10 08:51:13 -06:00
Allen Byrne
aec8543888 HDFFV-10385 merge corrections from develop 2018-01-10 08:41:28 -06:00
Allen Byrne
850ec7a30a HDFFV-10385 - add release note 2018-01-10 08:39:50 -06:00
Allen Byrne
6bf125c7b3 HDFFV-10385 fix fortran references 2018-01-10 08:31:44 -06:00
Allen Byrne
87e8fa7d04 HDFFV-10385 correct folder typo 2018-01-09 16:56:11 -06:00
Allen Byrne
16e0a6b858 Correct folder typo 2018-01-09 16:55:29 -06:00
Allen Byrne
fa2e3b4554 HDFFV-10385 correct platform issues 2018-01-09 16:38:54 -06:00
Allen Byrne
a5789f6c9a HDFFV-8745 fix minor defects 2018-01-09 16:26:25 -06:00
Allen Byrne
3e0c6530dc HDFFV-10385 fix platform errors 2018-01-09 16:26:12 -06:00
Allen Byrne
969fe0373e HDFFV-8745 fix minor defects 2018-01-09 16:22:08 -06:00
Allen Byrne
9c2a9cec1f HDFFV-10361 Correct signatures 2018-01-09 14:35:59 -06:00
Allen Byrne
be42e04791 HDFFV-10385 refactor CMAKE_BUILD_TYPE usage 2018-01-09 09:56:28 -06:00
Allen Byrne
f548e878b0 HDFFV-8745 merge from develop 2018-01-09 09:20:25 -06:00
Allen Byrne
823755ace8 Merge pull request #842 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '4c004acf1d8c13f3390a81f456f28b771c776483':
  HDFFV-8745 fix typos
  HDFFV-8745 update release note
  HDFFV-9745 Create test and files to verify fixes
  HDFFV-8745 cleanup vl resource usage
  HDFFV-8745 remove files from test scripts
  HDFFV-8745 remove obsolete files
  HDFFV-8745 - fix implementation of 8625
2018-01-09 08:46:45 -06:00
Allen Byrne
49479589d3 HDFFV-10385 Refactor use of CMAKE_BUILD_TYPE 2018-01-08 16:04:46 -06:00
Allen Byrne
4c004acf1d Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '92324bacae5ac697dbdf8e6cf8b3d709f189849a':
  Snapshot version 1.11 release 2
2018-01-08 16:01:40 -06:00
Allen Byrne
ca327ba1c4 Merge pull request #848 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '58a475d3fabba89a9fed2a22d3f0851c9933f650':
  Fix link_libs and static CRT fortran
2018-01-08 12:57:33 -06:00
hdftest
6d3231b9cd Merge pull request #851 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
* commit '9b059d7b280662b7b62427ba772f1114aa8db438':
  Snapshot version 1.10 release 2 (snap8)
2018-01-08 08:15:33 -06:00
hdftest
9b059d7b28 Snapshot version 1.10 release 2 (snap8) 2018-01-07 22:34:20 -06:00
hdftest
9c07ff0a03 Merge pull request #850 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
* commit '7efa31d45e4dc03f17f28f0e8a21aeeabd213e86':
  Snapshot version 1.10 release 2 (snap7)
  Snapshot version 1.10 release 2 (snap6)
2018-01-06 17:00:00 -06:00
hdftest
7efa31d45e Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit 'efa2a470c9d8cf2d584f6b22f5b80cd6687887d0': (36 commits)
  Merge fix
  HDFFV-9724 1_10 branch has a different number
  HDFFV-9724 Merge vds prefix from develop
  reverted changes from sync
  Snapshot version 1.11 release 1
  Fix valgrind issues
  HDFFV-9724 init var to null
  HDFFV-9724 add valgrind ENV
  Fix memory leak due to addition of FORMAT check loop
  HDFFV-9724 prefix of 0 length should be null value
  HDFFV-9724 Corrected files and verified tests
  Add library INTERFACE and MPI to tools
  Increase maximum number of retries for h5watch tests.
  Revert "Merge pull request #826 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop"
  Fix library interface commands, add missing JNI
  Add HD prefix
  HDFFV-9724 Remove VDS file cache functionality
  Removed incorrect MPI text
  Par example needs to link with mpi libs
  Because of MPI requirements in library ALWAYS add include path
  ...
2018-01-06 16:56:57 -06:00
Allen Byrne
58a475d3fa Fix link_libs and static CRT fortran 2018-01-05 14:30:11 -06:00
Allen Byrne
804d89f596 HDFFV-10361 Update release note for vds prefix 2018-01-05 13:58:23 -06:00
hdftest
92324bacae Merge pull request #846 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:develop to develop
* commit '1a78dd46a8ef4b8c6061e87578a81a569dab42f9':
  Snapshot version 1.11 release 2
2018-01-05 13:41:10 -06:00
Allen Byrne
efa2a470c9 Merge pull request #847 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '988c8d9bcc80f36a7cba37994e8899df1f19c433':
  Merge fix
  HDFFV-9724 1_10 branch has a different number
  HDFFV-9724 Merge vds prefix from develop
2018-01-05 12:26:25 -06:00
Allen Byrne
988c8d9bcc Merge fix 2018-01-05 12:10:01 -06:00
Allen Byrne
6fecfbb51a HDFFV-9724 1_10 branch has a different number 2018-01-05 12:01:54 -06:00
Allen Byrne
6ff2efb37b HDFFV-9724 Merge vds prefix from develop 2018-01-05 12:01:54 -06:00
Allen Byrne
2a1a2c5993 HDDFV-10361 combine duplicated prefix utility functions 2018-01-05 11:45:44 -06:00
Scot Breitenfeld
beaca3dc2a Merge pull request #845 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_10 to hdf5_1_10
* commit 'c971c366a95361cfb53e61f58f02c4caa58cd1f8': (32 commits)
  reverted changes from sync
  Snapshot version 1.11 release 1
  Fix valgrind issues
  HDFFV-9724 init var to null
  HDFFV-9724 add valgrind ENV
  Fix memory leak due to addition of FORMAT check loop
  HDFFV-9724 prefix of 0 length should be null value
  HDFFV-9724 Corrected files and verified tests
  Add library INTERFACE and MPI to tools
  Increase maximum number of retries for h5watch tests.
  Revert "Merge pull request #826 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop"
  Add HD prefix
  HDFFV-9724 Remove VDS file cache functionality
  Removed incorrect MPI text
  Par example needs to link with mpi libs
  Because of MPI requirements in library ALWAYS add include path
  Cleanup comments and if() in TRY blocks
  Fix -- HDFFV-10363 Fortran compilation fails for xlf and cmake builds
  Skip test if 1.6 API
  HDFFV-9724 Add ENV VAR to vds test
  ...
2018-01-05 10:49:43 -06:00
Allen Byrne
a30a41bc32 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '994611a2d4320358dc5a1c0c721633670ad4833c':
  Snapshot version 1.11 release 1
2018-01-05 10:49:03 -06:00
M. Scot Breitenfeld
c971c366a9 reverted changes from sync 2018-01-05 10:17:34 -06:00
hdftest
1a78dd46a8 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~hdftest/hdf5_hft into develop 2018-01-05 10:10:06 -06:00
hdftest
bee148a995 Snapshot version 1.11 release 2 2018-01-05 10:09:10 -06:00
M. Scot Breitenfeld
8712f3e231 synced with develop 2018-01-05 09:57:48 -06:00
hdftest
994611a2d4 Merge pull request #844 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:develop to develop
* commit 'd01ad2a94ae5643090e9443dfb0ee69657d894c2':
  Snapshot version 1.11 release 1
2018-01-05 08:58:41 -06:00
hdftest
d01ad2a94a Snapshot version 1.11 release 1 2018-01-05 08:50:10 -06:00
Allen Byrne
db918c06b5 HDFFV-8745 fix typos 2018-01-04 10:44:02 -06:00
Allen Byrne
db1add7e22 HDFFV-8745 update release note 2018-01-04 10:19:21 -06:00
Allen Byrne
7d13e53294 HDFFV-9745 Create test and files to verify fixes 2018-01-04 10:09:03 -06:00
Allen Byrne
f8e84c5509 HDFFV-8745 cleanup vl resource usage 2018-01-02 16:25:03 -06:00
Allen Byrne
0ec1e5eeee HDFFV-8745 remove files from test scripts 2018-01-02 15:08:43 -06:00
Allen Byrne
ccf044135c HDFFV-8745 remove obsolete files 2018-01-02 14:43:28 -06:00
Allen Byrne
5f4676f3c8 HDFFV-8745 - fix implementation of 8625 2018-01-02 14:39:45 -06:00
Allen Byrne
d31b45766f Merge pull request #840 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '17b8f0bb936633f01bf6deba247e37bcadbc6b82':
  Fix valgrind issues
  HDFFV-9724 init var to null
  HDFFV-9724 add valgrind ENV
  Fix memory leak due to addition of FORMAT check loop
  HDFFV-9724 prefix of 0 length should be null value
  HDFFV-9724 Corrected files and verified tests
  Add library INTERFACE and MPI to tools
2018-01-02 14:37:25 -06:00
Allen Byrne
17b8f0bb93 Fix valgrind issues 2018-01-02 09:39:09 -06:00
hdftest
2f7e94c9c0 Snapshot version 1.10 release 2 (snap7) 2017-12-31 10:42:57 -06:00
Allen Byrne
fa1ae9f312 HDFFV-9724 init var to null 2017-12-29 13:42:16 -06:00
Allen Byrne
9a477bef3a HDFFV-9724 add valgrind ENV 2017-12-29 13:13:30 -06:00
Allen Byrne
6d3f7dea86 Fix memory leak due to addition of FORMAT check loop 2017-12-29 11:53:11 -06:00
Allen Byrne
f5f2c36d98 HDFFV-9724 prefix of 0 length should be null value 2017-12-29 09:05:30 -06:00
Allen Byrne
bd34c9e455 HDFFV-9724 Corrected files and verified tests 2017-12-28 16:49:50 -06:00
Allen Byrne
732074d47e Add library INTERFACE and MPI to tools 2017-12-28 16:30:51 -06:00
Allen Byrne
3b02f2d03f Merge pull request #835 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '8b7a93735f89ff81d8c2b83ac4ca1513ec49c48c':
  Fix library interface commands, add missing JNI
2017-12-28 16:27:18 -06:00
Allen Byrne
8b7a93735f Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '8630fb4b6ee53d4ef58bdbadc57c2cd53eadaa43':
  Increase maximum number of retries for h5watch tests.
2017-12-28 13:43:33 -06:00
hdftest
98bf60f722 Snapshot version 1.10 release 2 (snap6) 2017-12-24 15:28:56 -06:00
Larry Knox
8630fb4b6e Merge pull request #839 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '409dc6ab09abe70cd5e070b17fb473a9537e111a':
  Increase maximum number of retries for h5watch tests.
2017-12-23 21:30:18 -06:00
Larry Knox
08f7c97077 Merge pull request #838 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '718006f8606f784ab7795ce5e50281fe318abadc':
  Increase maximum number of retries for h5watch tests.
2017-12-23 21:29:57 -06:00
lrknox
409dc6ab09 Increase maximum number of retries for h5watch tests. 2017-12-23 21:17:16 -06:00
lrknox
718006f860 Increase maximum number of retries for h5watch tests. 2017-12-23 20:46:01 -06:00
Larry Knox
a971176d8e Merge pull request #836 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '86d8a4c267eccbc66d6ee6120c9099788853c40f':
  Revert "Merge pull request #826 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop"
2017-12-22 13:58:00 -06:00
lrknox
86d8a4c267 Revert "Merge pull request #826 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop"
This reverts commit b1223dd653, reversing
changes made to b25f123f5f.
2017-12-22 12:28:24 -06:00
Allen Byrne
1efe978ae0 Fix library interface commands, add missing JNI 2017-12-21 13:48:49 -06:00
Vailin Choi
7cddfb09db Merge pull request #832 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit '2d330e96b8998c4ae6139b671e1cd39fdb3e7fd2':
  Modify description in RELEASE.txt for HDFFV-9947 H5Sencode.
  Add description to RELEASE.txt for HDFFV-9947 H5Sencode fix for 1.10.
2017-12-21 13:31:14 -06:00
Vailin Choi
2d330e96b8 Modify description in RELEASE.txt for HDFFV-9947 H5Sencode. 2017-12-21 12:57:10 -06:00
Binh-Minh Ribler
ace714c36a Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_cpp3 into develop 2017-12-20 23:16:14 -06:00
Binh-Minh Ribler
82d092a499 Update for new support website
Description:
    - Replaced external links with text including the C API name
    - Removed links of copyright at the bottom of each page
    - Removed logo at top
    - Removed document name and version number
Platforms tested:
    Linux/32 2.6 (jam) - only documentation
2017-12-20 23:11:58 -06:00
Vailin Choi
877d980ee4 Add description to RELEASE.txt for HDFFV-9947 H5Sencode fix for 1.10. 2017-12-20 17:17:10 -06:00
Allen Byrne
b1223dd653 Merge pull request #826 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'e94ed99c5bf7c4ae5df56f75606ef1b486e16bb2':
  Add HD prefix
  HDFFV-9724 Remove VDS file cache functionality
  Removed incorrect MPI text
  Par example needs to link with mpi libs
  Because of MPI requirements in library ALWAYS add include path
  Cleanup comments and if() in TRY blocks
  Skip test if 1.6 API
  HDFFV-9724 Add ENV VAR to vds test
  HDFFV-9724 Copy efc_open search from Lextern_traverse
  Add prefix dir to the clear command
  HDFFV-9724 Add H5LS prefix test with ${ORIGIN}
  Add h5dump VDS prefix tests
  HDFFV-9724 combine efc and vds into one function
  Correct var name
  Fix VDS file cache var names
  Remove return from void functions
  Added java wrappers and tests
  HDFFV-9724 Initial changes and test
  Changed reference from dl to CMake variable
  H5detect and H5make_libsettings need include folder
2017-12-20 15:11:17 -06:00
Allen Byrne
e94ed99c5b Add HD prefix 2017-12-20 14:24:57 -06:00
Allen Byrne
4ecf02f6f6 HDFFV-9724 Remove VDS file cache functionality 2017-12-20 14:23:19 -06:00
Allen Byrne
f0dc7368d4 Merge pull request #829 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'a17349a872f1c5b3457a8777e8f67a00587769e2':
  Reworked MPI includes to be used as default with parallel
  Update MPI commands
  Fix fortran includes
  HDFFV-10307 Add HD prefix
  HDFFV-10307
  HDFFV-10307 Add toupper function
  Change reference from dl to CMake variable
  H5detect and H5make_libsettings need include folder
2017-12-20 14:02:46 -06:00
Allen Byrne
a17349a872 Reworked MPI includes to be used as default with parallel 2017-12-20 13:42:23 -06:00
Allen Byrne
d989a0b1cb Removed incorrect MPI text 2017-12-20 13:41:06 -06:00
Allen Byrne
50238cb285 Par example needs to link with mpi libs 2017-12-20 13:33:57 -06:00
Allen Byrne
925f3c9b54 Because of MPI requirements in library ALWAYS add include path 2017-12-20 13:10:34 -06:00
Allen Byrne
bbcf9f31c6 Update MPI commands 2017-12-20 12:35:29 -06:00
Allen Byrne
21aadab493 Fix fortran includes 2017-12-20 12:29:35 -06:00
Allen Byrne
94b8a212bf Cleanup comments and if() in TRY blocks 2017-12-20 10:57:41 -06:00
Allen Byrne
c50cd597ad HDFFV-10307 Add HD prefix 2017-12-20 10:29:00 -06:00
Allen Byrne
a211b4945b Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '405ca39066fedf967f41e149d6a7f585c733e0e0':
  Snapshot version 1.10 release 2 (snap5)
2017-12-20 10:24:28 -06:00
Allen Byrne
d5b435c8b5 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'b25f123f5f5e25c1447a6a02861cb7c7265c12f2':
  Fix -- HDFFV-10363 Fortran compilation fails for xlf and cmake builds
2017-12-20 10:24:22 -06:00
Scot Breitenfeld
b25f123f5f Merge pull request #830 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit '0065fd4b6d5edf61b21cd352c74268de13fd516a':
  Fix -- HDFFV-10363 Fortran compilation fails for xlf and cmake builds
2017-12-19 16:56:53 -06:00
M. Scot Breitenfeld
0065fd4b6d Fix -- HDFFV-10363 Fortran compilation fails for xlf and cmake builds 2017-12-19 16:47:31 -06:00
Allen Byrne
6cbb336ca7 Skip test if 1.6 API 2017-12-19 15:47:05 -06:00
Allen Byrne
8444f018ca HDFFV-9724 Add ENV VAR to vds test 2017-12-19 14:58:17 -06:00
M. Scot Breitenfeld
8aa5205844 Optimized version of avoid truncate patch. 2017-12-18 13:42:09 -06:00
Allen Byrne
884d075355 HDFFV-10307 2017-12-18 10:54:02 -06:00
Allen Byrne
cb01a66991 HDFFV-10307 Add toupper function 2017-12-18 10:45:48 -06:00
hdftest
405ca39066 Merge pull request #828 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
* commit '36b9818ecce43f4078548fa10538ace33850739f':
  Snapshot version 1.10 release 2 (snap5)
2017-12-18 08:48:52 -06:00
hdftest
36b9818ecc Snapshot version 1.10 release 2 (snap5) 2017-12-17 15:33:36 -06:00
Allen Byrne
ac8274c350 HDFFV-9724 Copy efc_open search from Lextern_traverse 2017-12-15 15:32:27 -06:00
Allen Byrne
65e09afd6c Add prefix dir to the clear command 2017-12-13 15:17:02 -06:00
Allen Byrne
ba714e6820 HDFFV-9724 Add H5LS prefix test with ${ORIGIN} 2017-12-13 15:08:04 -06:00
Allen Byrne
4da73f893a Add h5dump VDS prefix tests 2017-12-13 14:29:22 -06:00
Allen Byrne
386be69a30 HDFFV-9724 combine efc and vds into one function 2017-12-13 11:51:09 -06:00
Allen Byrne
9eab6b3d1a Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '758b9667b3e07a7562107f19f7dabee027e5bd53': (41 commits)
  HDFFV-10223 Shared libraries fail test on OSX with fortran enabled with cmake
  removed duplicate exports of DS subroutines
  removed duplicate exports of DS subroutines
  Normalization with VOL integration branch.
  clean-up
  moved dll export to Module
  Fixed typo.
  removed parameters
  added missing parameter
  added missing parameter
  removed duplicate exports of DS subroutines
  removed fortran comments
  Various code cleanup Description:     - Replaced H5Location::exists with H5Location::nameExists and marked       H5Location::exists as deprecated.     - Miscellaneous test cleanup for consistency. Platforms tested:     Linux/32 2.6 (jam)     Linux/64 (jelly)     Darwin (osx1010test)
  exported global variables for windows
  export var.
  initialized integer constants
  Update macros
  Changed casts to const void *
  Casted pointers to void to quiet warnings on Linux.
  Added CHECK_PTR_EQ macro to testhdf5 to quiet cast warnings on Windows.
  ...
2017-12-13 11:15:11 -06:00
Allen Byrne
8b24653c1f Correct var name 2017-12-13 11:14:49 -06:00
Allen Byrne
405ac7c6e5 Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '23003990cc034b3ace8c1452aaa1fb1cadbddf51': (49 commits)
  Snapshot version 1.10 release 2 (snap4)
  Fix for daily test failures.
  HDFFV-10223 Shared libraries fail test on OSX with fortran enabled with cmake
  removed duplicate exports of DS subroutines
  removed duplicate exports of DS subroutines
  Normalization with VOL integration branch.
  clean-up
  moved dll export to Module
  Resolve conflicts from previous merge.
  Fixed typo.
  removed parameters
  added missing parameter
  added missing parameter
  removed duplicate exports of DS subroutines
  removed fortran comments
  Various code cleanup Description:     - Replaced H5Location::exists with H5Location::nameExists and marked       H5Location::exists as deprecated.     - Miscellaneous test cleanup for consistency. Platforms tested:     Linux/32 2.6 (jam)     Linux/64 (jelly)     Darwin (osx1010test)
  exported global variables for windows
  Updated RELEASE.txt to include note on bug fix for HDFFV-10272, LBNL-ECP(10334)
  Fixed an incorrect FUNC_ENTER macro.
  Normalization with VOL integration branch.
  ...
2017-12-13 11:05:29 -06:00
Allen Byrne
8561bd327b Fix VDS file cache var names 2017-12-13 11:04:29 -06:00
Allen Byrne
b475a809d8 Remove return from void functions 2017-12-13 10:31:30 -06:00
Scot Breitenfeld
23003990cc Merge pull request #824 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_10 to hdf5_1_10
* commit '4f37d8e538a95a1081649b3d257b185455bad8c0': (44 commits)
  HDFFV-10223 Shared libraries fail test on OSX with fortran enabled with cmake
  removed duplicate exports of DS subroutines
  removed duplicate exports of DS subroutines
  Normalization with VOL integration branch.
  clean-up
  moved dll export to Module
  Fixed typo.
  removed parameters
  added missing parameter
  added missing parameter
  removed duplicate exports of DS subroutines
  removed fortran comments
  Various code cleanup Description:     - Replaced H5Location::exists with H5Location::nameExists and marked       H5Location::exists as deprecated.     - Miscellaneous test cleanup for consistency. Platforms tested:     Linux/32 2.6 (jam)     Linux/64 (jelly)     Darwin (osx1010test)
  exported global variables for windows
  Fixed an incorrect FUNC_ENTER macro.
  Normalization with VOL integration branch.
  Normalization with VOL integration branch.
  export var.
  initialized integer constants
  Update macros
  ...
2017-12-13 08:41:41 -06:00
M. Scot Breitenfeld
4f37d8e538 Merge branch 'develop' into hdf5_1_10 2017-12-12 16:09:19 -06:00
Allen Byrne
690cb84f10 Added java wrappers and tests 2017-12-12 13:10:46 -06:00
Allen Byrne
95e96246a6 HDFFV-9724 Initial changes and test 2017-12-11 14:44:30 -06:00
hdftest
27c8aafd4f Merge pull request #821 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
* commit 'ad85e417cf5bd91d6a77623cb1e5035bb9f60192':
  Snapshot version 1.10 release 2 (snap4)
2017-12-11 09:14:32 -06:00
hdftest
ad85e417cf Snapshot version 1.10 release 2 (snap4) 2017-12-11 08:58:41 -06:00
Vailin Choi
7af4786a9b Merge branch 'develop' into bugfix/version_bounds
Merge from develop.
2017-12-08 15:37:00 -06:00
Vailin Choi
03cd1e85f0 Merge pull request #819 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit '4f0e4975cb8673db26d2861ddec8e5d5337940f9':
  Fix for daily test failures.
2017-12-08 12:56:48 -06:00
Vailin Choi
4f0e4975cb Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into hdf5_1_10
Merge from hdf5_1_10.
2017-12-07 17:07:07 -06:00
Vailin Choi
f3715a69d5 Fix for daily test failures. 2017-12-07 17:05:25 -06:00
Scot Breitenfeld
758b9667b3 Merge pull request #817 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
HDFFV-10223

* commit '6eab04894e88f7dcc0e684271328efc409a98662':
  HDFFV-10223 Shared libraries fail test on OSX with fortran enabled with cmake
2017-12-07 11:48:11 -06:00
M. Scot Breitenfeld
6eab04894e HDFFV-10223 Shared libraries fail test on OSX with fortran enabled with cmake
This is now fixed via the HDFFV-10325 fix.
2017-12-07 08:56:04 -06:00
Dana Robinson
b391e160b0 Merge pull request #815 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_normalize to develop
* commit 'ec1e00a55f7b005fa9d87f92e58bc312286d0b8a':
  Normalization with VOL integration branch.
2017-12-06 18:49:38 -06:00
Scot Breitenfeld
fd21843b38 Merge pull request #807 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:noF77 to develop
* commit 'fbe6c69097c03cfe3f37d9ab114c0ad438fd434e': (37 commits)
  removed duplicate exports of DS subroutines
  removed duplicate exports of DS subroutines
  clean-up
  moved dll export to Module
  removed parameters
  added missing parameter
  added missing parameter
  removed duplicate exports of DS subroutines
  removed fortran comments
  exported global variables for windows
  export var.
  initialized integer constants
  Update macros
  Changed casts to const void *
  Casted pointers to void to quiet warnings on Linux.
  Added CHECK_PTR_EQ macro to testhdf5 to quiet cast warnings on Windows.
  Fixed misc Warnings flagged by VS2017.
  Made a dcpl layout struct in H5Z.c dynamic to quiet a stack size warning.
  Fixed an uninitialized filter callback struct in H5Dchunk.c and unified the naming and initialization of said struct throughout the library. This was causing a crash on VS2015 in debug mode when the debug heap complained. Fixes HDFFV-10330.
  Fixed Windows code in H5PLpath.c
  ...
2017-12-06 13:51:31 -06:00
M. Scot Breitenfeld
fbe6c69097 Merge branch 'noF77' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into noF77 2017-12-06 13:49:09 -06:00
M. Scot Breitenfeld
701029876e removed duplicate exports of DS subroutines 2017-12-06 13:48:29 -06:00
M. Scot Breitenfeld
be799b36d1 Merge branch 'noF77' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into noF77 2017-12-06 12:11:52 -06:00
M. Scot Breitenfeld
19507b91d5 removed duplicate exports of DS subroutines
added missing parameter

added missing parameter

removed parameters

moved dll export to Module

clean-up
2017-12-06 12:11:03 -06:00
M. Scot Breitenfeld
d025ece9a3 Merge branch 'develop' into noF77
exported global variables for windows

removed fortran comments
2017-12-06 12:10:38 -06:00
Dana Robinson
ec1e00a55f Normalization with VOL integration branch. 2017-12-05 10:41:54 -08:00
M. Scot Breitenfeld
23cec838a4 clean-up 2017-12-05 10:29:53 -06:00
M. Scot Breitenfeld
bd49f6460c moved dll export to Module 2017-12-05 10:03:49 -06:00
Richard Warren
f3d123b5b2 Merge pull request #810 in HDFFV/hdf5 from hdf5_1_10_release_txt_update to hdf5_1_10
* commit '2e11a4f5ae4aafeebaaa17455c567a41711efdc8':
  Updated RELEASE.txt to include note on bug fix for HDFFV-10272, LBNL-ECP(10334)
2017-12-05 06:01:27 -06:00
Vailin Choi
bf690168c6 Merge pull request #804 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit '02d6a8b3ab923b386fd56816a18c6bf5640c4feb':
  Resolve conflicts from previous merge.
  Fix for HDFFV-9947 H5Sencode Modifications to fix H5Sencode bug when num points selected is > 2^32.
2017-12-05 01:19:13 -06:00
Vailin Choi
02d6a8b3ab Resolve conflicts from previous merge. 2017-12-05 00:30:42 -06:00
Binh-Minh Ribler
853ae26333 Merge pull request #814 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp3:develop to develop
Renamed H5Location::exists to H5Location::nameExists and misc. cleanup

* commit '17d148434fff055a2e22c6ac715c7ecff536a5c3':
  Fixed typo.
  Various code cleanup Description:     - Replaced H5Location::exists with H5Location::nameExists and marked       H5Location::exists as deprecated.     - Miscellaneous test cleanup for consistency. Platforms tested:     Linux/32 2.6 (jam)     Linux/64 (jelly)     Darwin (osx1010test)
2017-12-04 23:05:47 -06:00
Vailin Choi
ad6581194d Merge branch changes from hdf5_1_10. 2017-12-04 20:10:00 -06:00
Binh-Minh Ribler
17d148434f Fixed typo. 2017-12-04 16:57:37 -06:00
M. Scot Breitenfeld
30807e1d80 removed parameters 2017-12-04 16:35:13 -06:00
M. Scot Breitenfeld
1f3eb82bce added missing parameter 2017-12-04 15:55:51 -06:00
M. Scot Breitenfeld
fc089499ad added missing parameter 2017-12-04 15:38:38 -06:00
M. Scot Breitenfeld
6d658a946c removed duplicate exports of DS subroutines 2017-12-04 15:26:19 -06:00
Allen Byrne
f09bfdb490 Change reference from dl to CMake variable 2017-12-04 13:07:01 -06:00
Allen Byrne
9deb5267ca Changed reference from dl to CMake variable 2017-12-04 13:05:53 -06:00
M. Scot Breitenfeld
9e39def205 removed fortran comments 2017-12-04 12:53:20 -06:00
Binh-Minh Ribler
8105ca7f96 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_cpp3 into develop 2017-12-04 12:25:54 -06:00
Binh-Minh Ribler
e33d677636 Various code cleanup
Description:
    - Replaced H5Location::exists with H5Location::nameExists and marked
      H5Location::exists as deprecated.
    - Miscellaneous test cleanup for consistency.
Platforms tested:
    Linux/32 2.6 (jam)
    Linux/64 (jelly)
    Darwin (osx1010test)
2017-12-04 12:21:12 -06:00
M. Scot Breitenfeld
e416d37493 exported global variables for windows 2017-12-04 12:18:13 -06:00
Allen Byrne
4a15b32a42 H5detect and H5make_libsettings need include folder 2017-12-04 11:36:29 -06:00
M. Scot Breitenfeld
1feb23cd36 Merge branch 'develop' into noF77 2017-12-04 08:57:59 -06:00
Allen Byrne
e0eb3d0296 H5detect and H5make_libsettings need include folder 2017-12-01 13:37:08 -06:00
Dana Robinson
930a0b5d7c Merge pull request #809 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_normalize to develop
* commit '2e80fbbfcc5a15c296c16e4a4295ce77a9af6587':
  Fixed an incorrect FUNC_ENTER macro.
  Normalization with VOL integration branch.
2017-12-01 10:08:04 -06:00
Richard Warren
2e11a4f5ae Updated RELEASE.txt to include note on bug fix for HDFFV-10272, LBNL-ECP(10334) 2017-12-01 08:38:10 -05:00
Dana Robinson
2e80fbbfcc Fixed an incorrect FUNC_ENTER macro. 2017-11-30 17:25:39 -08:00
Dana Robinson
bbb512bb55 Normalization with VOL integration branch. 2017-11-30 17:12:37 -08:00
Dana Robinson
20171a92a5 Merge pull request #808 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_normalize to develop
* commit 'c0021b348d01e4c87645224fc308697e39c95029':
  Normalization with VOL integration branch.
2017-11-30 18:03:47 -06:00
Dana Robinson
c0021b348d Normalization with VOL integration branch. 2017-11-30 09:56:43 -08:00
M. Scot Breitenfeld
d37c9b1cb0 export var. 2017-11-29 16:34:20 -06:00
M. Scot Breitenfeld
d60ec508bc initialized integer constants 2017-11-29 15:24:27 -06:00
M. Scot Breitenfeld
5c7f7a7bfa Merge branch 'noF77' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into noF77 2017-11-29 10:28:39 -06:00
Allen Byrne
04f22540e2 Update macros 2017-11-29 10:27:00 -06:00
Dana Robinson
796cc17f41 Changed casts to const void * 2017-11-29 10:27:00 -06:00
Dana Robinson
eeb1802055 Casted pointers to void to quiet warnings on Linux. 2017-11-29 10:27:00 -06:00
Dana Robinson
fd5531e302 Added CHECK_PTR_EQ macro to testhdf5 to quiet cast warnings on Windows. 2017-11-29 10:27:00 -06:00
Dana Robinson
abd2ab411a Fixed misc Warnings flagged by VS2017. 2017-11-29 10:27:00 -06:00
Dana Robinson
e432a23f8b Made a dcpl layout struct in H5Z.c dynamic to quiet a stack size warning. 2017-11-29 10:27:00 -06:00
Dana Robinson
2b7f23a333 Fixed an uninitialized filter callback struct in H5Dchunk.c and
unified the naming and initialization of said struct throughout
the library. This was causing a crash on VS2015 in debug mode
when the debug heap complained. Fixes HDFFV-10330.
2017-11-29 10:27:00 -06:00
Dana Robinson
5c472f5d7b Fixed Windows code in H5PLpath.c 2017-11-29 10:27:00 -06:00
Dana Robinson
d5b70b549e Brings H5Z and H5PL packages in sync with VOL integration branch. 2017-11-29 10:27:00 -06:00
Allen Byrne
459e214ed5 HDFFV-10328 - fix typos 2017-11-29 10:27:00 -06:00
Allen Byrne
7aad737c96 HDFFV-10328 remove allocation note 2017-11-29 10:27:00 -06:00
Allen Byrne
6019c126c4 HDFFV-10328 - remove allocation changes 2017-11-29 10:27:00 -06:00
Allen Byrne
fbae544330 Fix typo 2017-11-29 10:27:00 -06:00
Allen Byrne
f4f94e1bf8 HDFFV-10328 merge allocation changes from 1.8 2017-11-29 10:27:00 -06:00
Allen Byrne
3098356df0 Fix some of the whitespace 2017-11-29 10:26:59 -06:00
Allen Byrne
bbc0c85ab2 Add note for plugins 2017-11-29 10:26:59 -06:00
Allen Byrne
b162b94998 Correct linkage of filters and other libs 2017-11-29 10:26:59 -06:00
M. Scot Breitenfeld
858e6c3c9c HDFFV-10325: removed the COMMON/EQUIV statements. 2017-11-29 10:25:47 -06:00
M. Scot Breitenfeld
4f7af1390b misc. clean-up 2017-11-29 10:08:10 -06:00
M. Scot Breitenfeld
caaca121bd Merge branch 'develop' into noF77 2017-11-29 09:59:47 -06:00
M. Scot Breitenfeld
4db7461569 intialized h5open_f arrays 2017-11-29 09:52:37 -06:00
Scot Breitenfeld
585cf69c56 Merge pull request #805 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_10 to hdf5_1_10
* commit '8d462d5102295359090297c707a20eaaf76ec965': (34 commits)
  Update macros
  Changed casts to const void *
  Casted pointers to void to quiet warnings on Linux.
  Added CHECK_PTR_EQ macro to testhdf5 to quiet cast warnings on Windows.
  Fixed misc Warnings flagged by VS2017.
  Made a dcpl layout struct in H5Z.c dynamic to quiet a stack size warning.
  Fixed an uninitialized filter callback struct in H5Dchunk.c and unified the naming and initialization of said struct throughout the library. This was causing a crash on VS2015 in debug mode when the debug heap complained. Fixes HDFFV-10330.
  Fixed Windows code in H5PLpath.c
  Brings H5Z and H5PL packages in sync with VOL integration branch.
  HDFFV-10328 - fix typos
  HDFFV-10328 remove allocation note
  HDFFV-10328 - remove allocation changes
  Fix typo
  HDFFV-10328 merge allocation changes from 1.8
  Fix some of the whitespace
  Add note for plugins
  Correct linkage of filters and other libs
  Changed ar to always use -cr instead of the autotools default of cru.
  Minor warning fixes
  Moved code from H5O.c to H5Oint.c
  ...
2017-11-28 16:15:38 -06:00
M. Scot Breitenfeld
8d462d5102 Merge branch 'develop' into hdf5_1_10 2017-11-28 11:42:45 -06:00
Vailin Choi
3d84163ad3 Fix for HDFFV-9947 H5Sencode
Modifications to fix H5Sencode bug when num points selected is > 2^32.
2017-11-28 11:11:27 -06:00
Binh-Minh Ribler
599ee2f4c6 Merge pull request #1 in ~VCHOI/my_hdf5_fork from ~BMRIBLER/version_bounds_bmr:bugfix/version_bounds to bugfix/version_bounds
Added gen_bounds.c to generate data files for version bounds testing in 1.8 and 1.6.

* commit 'daa0eb801561dc1831065e4c8c06d6cd68330200':
  Further improvement
  Fixed comment.
  Adding data file generator Description:     Added gen_bounds.c to generate the following files:     - bounds_earliest_latest.h5     - bounds_earliest_v18.h5     - bounds_latest_latest.h5     - bounds_v18_latest.h5     - bounds_v18_v18.h5     for testing the version bounds fix in 1.8 and 1.6.
2017-11-28 10:52:06 -06:00
Allen Byrne
e1dd55be85 Merge pull request #802 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'b4b30418390e01eb94961dd9fc2e0edca6a58fe4':
  Update macro
2017-11-27 16:56:42 -06:00
Allen Byrne
4d4eb4cd5c Merge pull request #800 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'c3249ecd79735fd8d32f0527db40493cbe89b502':
  Update macros
2017-11-27 16:56:25 -06:00
Binh-Minh Ribler
daa0eb8015 Further improvement 2017-11-27 15:09:15 -06:00
Dana Robinson
4dfffe1c78 Merge pull request #798 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:misc_windows_warnings to develop
* commit '9fdd984cdea6fce8b5fdd16a7ccc3cc9bbca6fed':
  Changed casts to const void *
  Casted pointers to void to quiet warnings on Linux.
  Added CHECK_PTR_EQ macro to testhdf5 to quiet cast warnings on Windows.
  Fixed misc Warnings flagged by VS2017.
2017-11-27 14:35:36 -06:00
Vailin Choi
14ced87d62 Merge branch 'develop' into bugfix/version_bounds
Merge from develop to keeep the branch up-to-date.
2017-11-27 14:20:36 -06:00
Binh-Minh Ribler
742798b84e Fixed comment. 2017-11-27 13:41:44 -06:00
Allen Byrne
b4b3041839 Update macro 2017-11-27 13:08:07 -06:00
Allen Byrne
c3249ecd79 Update macros 2017-11-27 13:06:10 -06:00
Binh-Minh Ribler
a6970e204c Merge branch 'bugfix/version_bounds' of https://bitbucket.hdfgroup.org/scm/~bmribler/version_bounds_bmr into bugfix/version_bounds 2017-11-27 12:46:04 -06:00
Binh-Minh Ribler
ea4f752ace Adding data file generator
Description:
    Added gen_bounds.c to generate the following files:
    - bounds_earliest_latest.h5
    - bounds_earliest_v18.h5
    - bounds_latest_latest.h5
    - bounds_v18_latest.h5
    - bounds_v18_v18.h5
    for testing the version bounds fix in 1.8 and 1.6.
2017-11-27 12:44:23 -06:00
Dana Robinson
9fdd984cde Changed casts to const void * 2017-11-27 09:15:45 -08:00
Dana Robinson
8d8dc867a4 Casted pointers to void to quiet warnings on Linux. 2017-11-27 09:11:53 -08:00
Dana Robinson
856e475c47 Added CHECK_PTR_EQ macro to testhdf5 to quiet cast warnings on Windows. 2017-11-27 08:57:26 -08:00
Dana Robinson
8cb4529211 Fixed misc Warnings flagged by VS2017. 2017-11-26 18:13:18 -08:00
Vailin Choi
96784c9873 (1) Merge branch 'develop' into bugfix/version_bounds
(2) Add two new options to h5repack for low and high bounds as in H5Pset_libver_bounds.
(3) Modify message pre_copy callbacks so that H5Ocopy can handle version bounds check.
(4) Add version bounds check for cache image feature.
2017-11-25 02:22:24 -06:00
Dana Robinson
f116545ce4 Merge pull request #794 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:uninit_cb_struct to develop
* commit '22e58124ec26da5ffe2833f53c8d73ee9edf0570':
  Made a dcpl layout struct in H5Z.c dynamic to quiet a stack size warning.
2017-11-21 16:54:16 -06:00
Dana Robinson
22e58124ec Made a dcpl layout struct in H5Z.c dynamic to quiet a stack size warning. 2017-11-21 13:20:33 -08:00
Dana Robinson
5cc29c26a8 Merge pull request #793 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:uninit_cb_struct to develop
* commit '20bb11b52640befc4a0073520b23d9e49bf3e96c':
  Fixed an uninitialized filter callback struct in H5Dchunk.c and unified the naming and initialization of said struct throughout the library. This was causing a crash on VS2015 in debug mode when the debug heap complained. Fixes HDFFV-10330.
2017-11-21 14:02:22 -06:00
Dana Robinson
20bb11b526 Fixed an uninitialized filter callback struct in H5Dchunk.c and
unified the naming and initialization of said struct throughout
the library. This was causing a crash on VS2015 in debug mode
when the debug heap complained. Fixes HDFFV-10330.
2017-11-21 10:38:15 -08:00
Dana Robinson
4d2e7ea666 Merge pull request #792 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:H5Z_H5PL_normalize to develop
* commit 'cd72e02a336369ee25a26d4ad63d4c498e613f70':
  Fixed Windows code in H5PLpath.c
2017-11-21 09:51:27 -06:00
Dana Robinson
cd72e02a33 Fixed Windows code in H5PLpath.c 2017-11-21 01:22:21 -08:00
M. Scot Breitenfeld
bdd2d3a1be misc clean-up 2017-11-20 21:01:43 -07:00
M. Scot Breitenfeld
51bb1d431a added public, private 2017-11-20 20:39:35 -07:00
Dana Robinson
fe417b3025 Merge pull request #788 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:H5Z_H5PL_normalize to develop
* commit '3b1728736840e25d5cd1b048f09025e7c0f22123':
  Brings H5Z and H5PL packages in sync with VOL integration branch.
2017-11-20 13:32:17 -06:00
Larry Knox
9224e9a189 Merge pull request #789 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
* commit '9dd1abc0d8d88a919f67e7b13d120feb458437f0':
  Snapshot version 1.10 release 2 (snap3)
2017-11-20 13:20:10 -06:00
M. Scot Breitenfeld
a0d40002a3 misc. code clean-up 2017-11-20 11:11:35 -07:00
hdftest
9dd1abc0d8 Snapshot version 1.10 release 2 (snap3) 2017-11-20 10:40:33 -06:00
Dana Robinson
3b17287368 Brings H5Z and H5PL packages in sync with VOL integration branch. 2017-11-17 15:21:49 -08:00
M. Scot Breitenfeld
c9b78a6714 misc. clean-up 2017-11-17 14:23:01 -07:00
Allen Byrne
db8b5ca2ca Merge pull request #784 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '2e3f1b1600b47ac9b89fa41ec7e2a98a78c8a6b7':
  replace deleted note
  HDFFV-10328 fix typos
  HDFFV-10328 - remove plugin allocation changes
  HDFFV-10328, HDFFV-10329 Merge from develop
  Fix snprintf to HDsnprintf usage - breaks windows
  HDFFV-10329 - add new jira issue.
  Fix linking of libs
2017-11-17 14:55:56 -06:00
Allen Byrne
f3fd3f293f Merge pull request #783 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'bb3fb6f13461d724baa635e464585cb49d8848d2':
  HDFFV-10328 - fix typos
  HDFFV-10328 remove allocation note
  HDFFV-10328 - remove allocation changes
  Fix typo
  HDFFV-10328 merge allocation changes from 1.8
  Fix some of the whitespace
  Add note for plugins
  Correct linkage of filters and other libs
2017-11-17 14:51:25 -06:00
Allen Byrne
2e3f1b1600 replace deleted note 2017-11-17 14:43:12 -06:00
M. Scot Breitenfeld
5683be3427 HDFFV-10325: removed the COMMON/EQUIV statements. 2017-11-17 13:29:04 -07:00
Allen Byrne
be4641777f HDFFV-10328 fix typos 2017-11-17 14:21:26 -06:00
Allen Byrne
bb3fb6f134 HDFFV-10328 - fix typos 2017-11-17 14:20:14 -06:00
Allen Byrne
f318eed72f HDFFV-10328 - remove plugin allocation changes 2017-11-17 14:10:39 -06:00
Allen Byrne
bd28c0b42d HDFFV-10328 remove allocation note 2017-11-17 14:02:07 -06:00
Allen Byrne
9599e55176 HDFFV-10328 - remove allocation changes 2017-11-17 13:59:57 -06:00
Allen Byrne
dfaeaa35cd Fix typo 2017-11-16 15:00:13 -06:00
Allen Byrne
9f1cd84c15 HDFFV-10328 merge allocation changes from 1.8 2017-11-16 11:45:36 -06:00
Allen Byrne
30ef3de22d HDFFV-10328, HDFFV-10329 Merge from develop 2017-11-16 09:40:48 -06:00
Allen Byrne
4829ed6833 Fix snprintf to HDsnprintf usage - breaks windows 2017-11-16 09:30:12 -06:00
Allen Byrne
8e193705c5 Fix some of the whitespace 2017-11-16 09:28:58 -06:00
Allen Byrne
0e547213a3 Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '2e05d657549d1287ce0d9a7ee5364e609046adb8':
  Add RELEASE.txt note for HDFFV-10274. (cherry picked from commit f7a7d0a006)
  Initialize hid_t variables in test_Attr_bug9.
  Fix HDFFV-10274.  When deleting all (or almost all) of the messages in an object header chunk, where the total amount deleted was greater than 64K, an error would occur due to an off by one error in the code that handled that case.  Fixed this and added a test case.
2017-11-16 09:14:39 -06:00
Allen Byrne
fea722ec67 Add note for plugins 2017-11-16 09:04:51 -06:00
Allen Byrne
637a8f7562 Correct linkage of filters and other libs 2017-11-16 09:04:51 -06:00
Dana Robinson
dc487ebad8 Merge pull request #782 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:ar_fix to develop
* commit 'cb235453a9276c371085e40ea1c87d9b641e511e':
  Changed ar to always use -cr instead of the autotools default of cru.
2017-11-15 16:46:53 -06:00
Dana Robinson
cb235453a9 Changed ar to always use -cr instead of the autotools default
of cru.
2017-11-15 14:24:59 -08:00
Neil Fortner
2e05d65754 Merge pull request #781 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:hdf5_1_10 to hdf5_1_10
* commit '837dc4bb51e3d3e823235228a33f6ffeae166b52':
  Add RELEASE.txt note for HDFFV-10274. (cherry picked from commit f7a7d0a006)
  Initialize hid_t variables in test_Attr_bug9.
  Fix HDFFV-10274.  When deleting all (or almost all) of the messages in an object header chunk, where the total amount deleted was greater than 64K, an error would occur due to an off by one error in the code that handled that case.  Fixed this and added a test case.
2017-11-15 14:40:21 -06:00
Dana Robinson
bdb4d56532 Merge pull request #780 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:minor_dev_warnings to develop
* commit '5ce8dd5e946c85522edd76f3288e7052bde86b8a':
  Minor warning fixes
2017-11-15 14:28:27 -06:00
Neil Fortner
837dc4bb51 Add RELEASE.txt note for HDFFV-10274.
(cherry picked from commit f7a7d0a006)
2017-11-15 11:06:29 -06:00
Neil Fortner
e6224c7d8f Initialize hid_t variables in test_Attr_bug9. 2017-11-15 11:04:28 -06:00
Neil Fortner
c03f326f31 Fix HDFFV-10274. When deleting all (or almost all) of the messages in
an object header chunk, where the total amount deleted was greater than
64K, an error would occur due to an off by one error in the code that
handled that case.  Fixed this and added a test case.
2017-11-15 11:04:28 -06:00
Dana Robinson
5ce8dd5e94 Minor warning fixes 2017-11-15 02:58:16 -08:00
Dana Robinson
14beb8be8c Merge pull request #778 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5o_schism_work to develop
* commit 'fcfc5f116d08642de962919ac26092c74b924644':
  Moved code from H5O.c to H5Oint.c
  Added H5Oint.c file.
2017-11-15 02:32:20 -06:00
Allen Byrne
2ccfce9327 Merge pull request #777 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '7fbc3df3fa1b5250f13ef7ce7bbf9fc85eb76e0a':
  HDFFV-10329 - Note new JIRA issue
  Correct link lines of libraries
2017-11-14 16:50:06 -06:00
Dana Robinson
fcfc5f116d Moved code from H5O.c to H5Oint.c 2017-11-14 13:40:30 -08:00
Allen Byrne
34068c3341 HDFFV-10329 - add new jira issue. 2017-11-14 15:34:11 -06:00
Allen Byrne
7fbc3df3fa HDFFV-10329 - Note new JIRA issue 2017-11-14 15:32:08 -06:00
Allen Byrne
b00b6b4892 Fix linking of libs 2017-11-14 15:15:47 -06:00
Allen Byrne
addde7dcb8 Correct link lines of libraries 2017-11-14 15:07:26 -06:00
Dana Robinson
45b561f2f2 Added H5Oint.c file. 2017-11-14 12:34:31 -08:00
Dana Robinson
1ddb1a08f1 Merge pull request #772 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:ar_warning_fix to develop
* commit 'a25366cc980695cebe40c2d471bfe5166dcb28a2':
  Fixed that annoying ar warning about -u being ignored.
2017-11-14 13:05:25 -06:00
Larry Knox
b315a659a2 Merge pull request #776 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '10a9fb5319ab0dcd0e14e40a8ab5c38e8211f764':
  Remove extra '&'s that cause syntax errors on Macs.
2017-11-14 11:14:18 -06:00
Allen Byrne
f8bf6c3a1e Merge pull request #775 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '00e640368e71eac1adeb9f630c6de15261b26083':
  Fix Windows link error
2017-11-14 11:10:18 -06:00
lrknox
10a9fb5319 Remove extra '&'s that cause syntax errors on Macs. 2017-11-14 09:52:47 -06:00
Allen Byrne
00e640368e Fix Windows link error 2017-11-14 09:47:04 -06:00
Larry Knox
751855f4d5 Merge pull request #760 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'b11de4ebc42bf1b7d5dd733654a5ce78410518ba':
  Add check for realtimeOutput environment variable set containing characters to indicate test output should be piped through tee to chklog files in order to send output to stdout as tests run instead of waiting to cat chklog file to stdout when each set of tests is completed.  This should stop buildbot from timing out when a test set doesn't complete in less than 20 minutes.
2017-11-13 21:34:57 -06:00
Neil Fortner
df45abd0f6 Merge pull request #770 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:develop to develop
* commit 'bca20b40b4966552a844051c3d912d6aec50592f':
  Initialize hid_t variables in test_Attr_bug9.
  Fix HDFFV-10274.  When deleting all (or almost all) of the messages in an object header chunk, where the total amount deleted was greater than 64K, an error would occur due to an off by one error in the code that handled that case.  Fixed this and added a test case.
2017-11-13 16:54:35 -06:00
Neil Fortner
bca20b40b4 Initialize hid_t variables in test_Attr_bug9. 2017-11-13 13:43:32 -06:00
Dana Robinson
c592c7b423 Merge pull request #771 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:plugin_path_fix to develop
* commit '3a5e15819163e6e7c3de72a9ed8517ff200b02a7':
  Fixed the problems with LDFLAGS and AM_LDFLAGS in filter plugins.
2017-11-13 10:19:21 -06:00
Dana Robinson
a25366cc98 Fixed that annoying ar warning about -u being ignored. 2017-11-12 23:22:39 -08:00
Dana Robinson
3a5e158191 Fixed the problems with LDFLAGS and AM_LDFLAGS in filter plugins. 2017-11-12 21:14:01 -08:00
Dana Robinson
d4a0e3d293 Merge pull request #767 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:zero_allocation_fix_develop to develop
* commit '3e4f6138b60d8363c377e453d63f875775ec907a':
  Removed asserts from H5MM calls that conflict with stated behavior and added a test to ensure that this doesn't happen in the future.
2017-11-10 23:15:50 -06:00
Neil Fortner
04bb800f7c Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~nfortne2/hdf5_naf into develop 2017-11-10 16:40:17 -06:00
Neil Fortner
576b9c5f5f Fix HDFFV-10274. When deleting all (or almost all) of the messages in
an object header chunk, where the total amount deleted was greater than
64K, an error would occur due to an off by one error in the code that
handled that case.  Fixed this and added a test case.
2017-11-10 16:37:40 -06:00
Dana Robinson
6663efbf66 Merge pull request #768 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:misc_warnings_develop to develop
* commit '0b846cee58af147e92a3ba7db45497fd9eaa09b4':
  Cleaned up misc warnings in src and test.
2017-11-10 11:09:34 -06:00
Dana Robinson
0b846cee58 Cleaned up misc warnings in src and test. 2017-11-09 20:04:12 -08:00
Dana Robinson
fb5c4f68fc Merge pull request #762 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5r_cleanup to develop
* commit 'd0e32b545c41dcc36a69ab146b54b55e7ac9dc07':
  Split internal H5R functionality into H5Rint.c.
2017-11-09 17:23:11 -06:00
Dana Robinson
e4451b89cd Merge pull request #766 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:plugin_rework_develop_merge to develop
* commit '00ade113c5fe7d48571a36091970328dcca68f50':
  Plugin test rework Cleanup of plugin test code. Renames many files. Prep for VOL branch merge.
2017-11-09 16:56:05 -06:00
Dana Robinson
3e4f6138b6 Removed asserts from H5MM calls that conflict with stated behavior
and added a test to ensure that this doesn't happen in the future.
2017-11-09 13:56:58 -08:00
Allen Byrne
0a6ca48a7b Merge pull request #764 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '5b711224f3f03c16bb5b63bb8e6dbbc651ef51ef':
  Remove tabs
  Remove tabs
  Remove tabs
  Remove tabs
  Remove tabs
  Correct issue number
  HDFFV-10322
2017-11-09 08:42:36 -06:00
Dana Robinson
00ade113c5 Plugin test rework
Cleanup of plugin test code. Renames many files. Prep for VOL branch merge.
2017-11-08 17:52:44 -08:00
Scot Breitenfeld
3237f6e4e2 Merge pull request #765 in HDFFV/hdf5 from bigio_test_refactoring to hdf5_1_10
* commit 'b829979c7047070bb92d67e5a5374c093319bab3':
  Follow up on editing suggestions by Scot
  Refactored testpar/t_bigio.c and then added a basic description of these test changes into RELEASE.txt (HDFFV-10301)
2017-11-08 17:10:06 -06:00
Richard.Warren
b829979c70 Follow up on editing suggestions by Scot 2017-11-08 16:27:12 -06:00
Richard.Warren
51a5ef118c Refactored testpar/t_bigio.c and then added a basic description of these test changes into RELEASE.txt (HDFFV-10301) 2017-11-08 15:31:03 -06:00
Allen Byrne
5b711224f3 Merge pull request #12 in ~BYRN/hdf5_adb from develop to hdf5_1_10
* commit '51b80a8d8585b9ccb471966d235cd99379c3bcf3':
  Remove tabs
  Remove tabs
  Remove tabs
  Remove tabs
  Remove tabs
  Correct issue number
  HDFFV-10322
2017-11-08 12:19:16 -06:00
Allen Byrne
51b80a8d85 Merge pull request #763 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '62124efa7e805bf34b54911e142f488a59867dd2':
  Remove tabs
  Remove tabs
  Remove tabs
  Remove tabs
  Remove tabs
2017-11-08 12:07:36 -06:00
Allen Byrne
62124efa7e Remove tabs 2017-11-08 11:25:09 -06:00
Allen Byrne
5717239a98 Remove tabs 2017-11-08 11:11:22 -06:00
Allen Byrne
480fc373a0 Remove tabs 2017-11-08 09:59:58 -06:00
Allen Byrne
218845c603 Remove tabs 2017-11-08 09:57:15 -06:00
Allen Byrne
de0076b5ba Remove tabs 2017-11-08 09:09:29 -06:00
Dana Robinson
d0e32b545c Split internal H5R functionality into H5Rint.c. 2017-11-07 17:56:27 -08:00
lrknox
b11de4ebc4 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop 2017-11-06 16:32:29 -06:00
lrknox
e8239b2de5 Add check for realtimeOutput environment variable set containing
characters to indicate test output should be piped through tee to chklog
files in order to send output to stdout as tests run instead of waiting
to cat chklog file to stdout when each set of tests is completed.  This
should stop buildbot from timing out when a test set doesn't complete in
less than 20 minutes.
2017-11-06 16:26:03 -06:00
Richard Warren
2184928e8b Merge pull request #758 in HDFFV/hdf5 from release_txt_update to hdf5_1_10
* commit 'e496d0853f9361a40945e0d2690e312b1a00301c':
  Update the release.txt file with a description of the fix for bug HDFFV-10318
2017-11-06 14:35:39 -06:00
Richard Warren
e496d0853f Update the release.txt file with a description of the fix for bug HDFFV-10318 2017-11-06 12:30:40 -05:00
Larry Knox
6fc78dc7e6 Merge pull request #755 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '84dd98014a66037cda8edab5a35c32c52be1d35d':
  Correct issue number
2017-11-06 10:48:36 -06:00
Larry Knox
86650b977c Merge pull request #754 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '275fabe6319783b672b6d6e54c1cf68796012224':
  Correct issue number
2017-11-06 10:48:24 -06:00
Allen Byrne
84dd98014a Correct issue number 2017-11-06 09:28:57 -06:00
Allen Byrne
275fabe631 Correct issue number 2017-11-06 09:28:28 -06:00
Scot Breitenfeld
e0d5972dee Merge pull request #752 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_10 to hdf5_1_10
* commit 'cea5751e53228eb1ebd05d8fe86e071517bf809b': (28 commits)
  Fix for Intel 18 Fortran compilation error.
  Make a fix to allow CMake testing which does not use relative directories.
  Add missing dir reference
  New cmake MPI files
  HDFFV-10321 Correct fortran link var
  HDFFV-10321 change note added.
  Correct path
  Correct path
  Change to local path
  Add back Find module and add support files
  Remove incorrect link var
  Remove duplicated module
  Correct usage of MPI vars
  Convert to use MPI:: for link
  Correct command usage
  Change MPI target properties for library
  Update H5Zfilter_avail note
  New requirement for test
  Add a missing declaration for testing
  Revert "Fix for HDFFFV-10308.  Initialize hid_ts in function check_objects and"
  ...
2017-11-03 12:17:36 -05:00
Scot Breitenfeld
69af11fb2a Merge pull request #753 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'df03ecb01d721863f79c86969c56c77d3a846ab2':
  HDFFV-10322
2017-11-03 12:17:21 -05:00
Richard Warren
54b4c41c7f Merge pull request #751 in HDFFV/hdf5 from optimized_superblock_1_10 to hdf5_1_10
* commit 'e78651f0db850dc68c2595b185b0ecc4e9fe9cb3':
  Fix the H5WATCH_SOURCES definition
  Add the modifications for Cmake testing to a 1_10 based branch: HDFFV-10318
2017-11-03 11:32:05 -05:00
M. Scot Breitenfeld
df03ecb01d HDFFV-10322 2017-11-03 09:10:26 -05:00
M. Scot Breitenfeld
cea5751e53 Merge branch 'develop' into hdf5_1_10 2017-11-03 09:03:55 -05:00
Richard Warren
e78651f0db Fix the H5WATCH_SOURCES definition 2017-11-02 21:32:51 -04:00
Richard Warren
3e01676fa4 Add the modifications for Cmake testing to a 1_10 based branch: HDFFV-10318 2017-11-02 21:24:38 -04:00
Scot Breitenfeld
1f8c369817 Merge pull request #749 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'b8cbd11dfb229e79b8a9b22ce45dac3e9a735590':
  Fix for Intel 18 Fortran compilation error.
2017-11-02 14:38:48 -05:00
M. Scot Breitenfeld
b8cbd11dfb Fix for Intel 18 Fortran compilation error.
HDFFV-10322
2017-11-02 14:26:44 -05:00
Richard Warren
9d2ee5646d Merge pull request #747 in HDFFV/hdf5 from optimize_superblock_read to develop
* commit '0d2fd7ae0cd19c2eb040a4ad733b50c7652639cc':
  Make a fix to allow CMake testing which does not use relative directories.
2017-11-02 13:03:18 -05:00
Allen Byrne
62749cd371 Merge pull request #745 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '4c1d3a9126ef86ad3785377fbbc98e7d505c71c6':
  Add missing fortran dir reference
  HDFFV-10321 Merge changes from develop
  HDFFV-10321 merge from develop
2017-11-02 12:16:18 -05:00
Allen Byrne
c071af4eb1 Merge pull request #744 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '47f4db394bc488d4311a6e1bf833c90abf3247b9':
  Add missing dir reference
  New cmake MPI files
  HDFFV-10321 Correct fortran link var
  HDFFV-10321 change note added.
2017-11-02 11:56:06 -05:00
Richard Warren
0d2fd7ae0c Make a fix to allow CMake testing which does not use relative directories. 2017-11-02 12:33:08 -04:00
Allen Byrne
4c1d3a9126 Add missing fortran dir reference 2017-11-02 10:55:29 -05:00
Allen Byrne
47f4db394b Add missing dir reference 2017-11-02 10:54:43 -05:00
Allen Byrne
b18aeed09a HDFFV-10321 Merge changes from develop 2017-11-02 10:35:38 -05:00
Allen Byrne
ede110390a New cmake MPI files 2017-11-02 10:34:40 -05:00
Richard Warren
ef1f2f61e2 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into optimize_superblock_read 2017-11-02 11:25:44 -04:00
Allen Byrne
0fe3dc9b27 HDFFV-10321 Correct fortran link var 2017-11-02 10:25:22 -05:00
Allen Byrne
c1edb4ad89 HDFFV-10321 merge from develop 2017-11-02 10:14:14 -05:00
Allen Byrne
03be126719 HDFFV-10321 change note added. 2017-11-02 10:07:58 -05:00
Allen Byrne
337cf6a29d Merge pull request #743 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'a862d195c35730bdef924a776531e2879678a7a6':
  Correct path
  Correct path
  Change to local path
  Add back Find module and add support files
  Remove incorrect link var
  Remove duplicated module
  Correct usage of MPI vars
  Convert to use MPI:: for link
  Correct command usage
  Change MPI target properties for library
2017-11-02 09:55:43 -05:00
Allen Byrne
a862d195c3 Correct path 2017-11-01 16:11:03 -05:00
Allen Byrne
3de5fa2662 Correct path 2017-11-01 15:24:35 -05:00
Allen Byrne
7222e5f6a3 Change to local path 2017-11-01 15:16:37 -05:00
Allen Byrne
21874ce5c2 Add back Find module and add support files 2017-11-01 15:06:46 -05:00
Allen Byrne
f190509675 Remove incorrect link var 2017-11-01 13:50:13 -05:00
Allen Byrne
9aa8e01e5c Remove duplicated module 2017-11-01 13:45:44 -05:00
Allen Byrne
f8fd6d0b41 Correct usage of MPI vars 2017-11-01 13:41:44 -05:00
Allen Byrne
930cfc402d Convert to use MPI:: for link 2017-11-01 12:29:53 -05:00
Allen Byrne
765d964562 Correct command usage 2017-11-01 11:28:11 -05:00
Allen Byrne
80c96bb047 Change MPI target properties for library 2017-11-01 11:12:47 -05:00
Allen Byrne
031075bcce Merge pull request #739 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '54187f92f4bd30388f8df9a4f2b54b189d779947':
  Update H5Zfilter_avail note
  New test requirement
2017-10-31 11:30:49 -05:00
Allen Byrne
54187f92f4 Update H5Zfilter_avail note 2017-10-31 11:24:24 -05:00
Allen Byrne
3acacea954 New test requirement 2017-10-30 11:45:11 -05:00
Scot Breitenfeld
ce3f272ae0 Merge pull request #732 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_10 to hdf5_1_10
* commit 'a3e40025729fd8c3b2f0488d6745f579eb29c5db':
  manual fix from merge with develop
2017-10-26 15:34:30 -05:00
M. Scot Breitenfeld
a3e4002572 manual fix from merge with develop 2017-10-26 15:23:48 -05:00
Scot Breitenfeld
85531beb2a Merge pull request #730 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_10 to hdf5_1_10
* commit '2074cbd516d3dcc6aa6a3f8aa2978017baf8c5cc': (397 commits)
  fixed merge with develop issues
  HDFFV-10037: fixed wrong C link flags
  Correct typo
  fix typo
  Fix typos
  HDFFV-10297 Free buffer inside loop
  HDFFV-10297 Cleanup, Initialize variables
  Moved the SWMR + cache image check up before the root group is constructed to avoid the special case close.
  HDFFV-10297 Windows issues fixed
  Windows cannot share files easily
  Moved the 'cache image + SWMR' check from H5Fcreate/open to H5F_open. Prep for the VOL merge.
  Avoid double free
  Windows had issues - revert code changes for get_option
  Remove extra command line
  Correct name of file
  Add Mask test to script
  Add new output files to clear test
  Correct name of err file
  Fix name of output files
  Fix format convert error mask test
  ...
2017-10-26 14:29:27 -05:00
M. Scot Breitenfeld
2074cbd516 Merge remote-tracking branch 'upstream/hdf5_1_10' into hdf5_1_10 2017-10-26 10:57:26 -05:00
Allen Byrne
c222f391c4 Merge pull request #729 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '4e5fb959edfd9ddcd77fb91e672d36809151dc44':
  Fix char type
  HDFFV-10297 fix grammar
  HDFFV-10297 - clarify note.
  HDFFV-10297 Update release note and test platforms
  Fix test DEPENDS
2017-10-26 10:48:52 -05:00
Allen Byrne
4e5fb959ed Fix char type 2017-10-26 10:47:50 -05:00
M. Scot Breitenfeld
e80027ab89 fixed merge with develop issues 2017-10-26 10:36:52 -05:00
M. Scot Breitenfeld
59e7c7703e Merge branch 'develop' into hdf5_1_10 2017-10-26 10:13:33 -05:00
Allen Byrne
ebc3684109 HDFFV-10297 fix grammar 2017-10-25 15:50:27 -05:00
Allen Byrne
c899351124 HDFFV-10297 - clarify note. 2017-10-25 15:10:52 -05:00
Allen Byrne
4384aaf869 HDFFV-10297 Update release note and test platforms 2017-10-25 14:09:04 -05:00
Allen Byrne
e9411e7d89 Fix test DEPENDS 2017-10-25 09:06:18 -05:00
Allen Byrne
c3aa3978b2 Merge pull request #723 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '8e2bf9521c4f18e19cb9f27483c2d4335f12535d':
  Fix typo
2017-10-24 14:56:57 -05:00
Allen Byrne
8e2bf9521c Fix typo 2017-10-24 14:18:47 -05:00
Allen Byrne
62633db9c2 Merge pull request #718 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'cb3eb13da469b8df90ed29a974f41e3999ac411d':
  Fix typos
  HDFFv-10297 Free buffer inside loop
  HDFFV-10297 - Cleanup, initialize variables
2017-10-24 11:43:48 -05:00
Allen Byrne
cb3eb13da4 Fix typos 2017-10-24 11:05:15 -05:00
Allen Byrne
4c68000a23 HDFFv-10297 Free buffer inside loop 2017-10-23 12:43:27 -05:00
Allen Byrne
b96af18222 HDFFV-10297 - Cleanup, initialize variables 2017-10-23 09:32:29 -05:00
Allen Byrne
7b96a75dd1 Merge pull request #707 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '9a8a1282c57f95fa826b19c5948cc27c376113d0':
  HDFFV-10297 Merge from develop
  Merge from develop
  Avoid double free
  Merge from develop
  Fix name of reference file
  HDFFV-10297 Merge from develop
  Fix test step
  HDFFV-10297 correct reference file for 1.10
  HDFFV-10297 merge from develop
  Undo commit
  HDFFV-10297 - Changes to code makes old failure moot
2017-10-20 14:45:08 -05:00
Allen Byrne
9a8a1282c5 HDFFV-10297 Merge from develop 2017-10-20 09:38:26 -05:00
Allen Byrne
7fbed4481c Merge from develop 2017-10-20 08:34:08 -05:00
Allen Byrne
2b7ee7e362 Avoid double free 2017-10-19 16:55:33 -05:00
Allen Byrne
f183ecd3f9 Merge from develop 2017-10-19 12:50:28 -05:00
Allen Byrne
a1a1840d6e Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '6d353f8ccc908d494a4ea8e1a56c9fb8e973e908':
  Snapshot version 1.10 release 2 (snap2)
  Merge pull request #703 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
2017-10-19 12:32:15 -05:00
Allen Byrne
bd56b17c2f Fix name of reference file 2017-10-19 12:20:17 -05:00
Allen Byrne
0b3b55f791 HDFFV-10297 Merge from develop 2017-10-18 16:37:49 -05:00
Richard Warren
8f4d69dcf5 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into optimize_superblock_read 2017-10-17 16:20:12 -04:00
Vailin Choi
a7ba8af0d1 Merge branch 'develop' into bugfix/version_bounds 2017-10-17 11:50:46 -05:00
hdftest
6d353f8ccc Merge pull request #710 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
* commit '260dcebc092ef3c00a1cc1f115b5764d1d34fc1c':
  Snapshot version 1.10 release 2 (snap2)
2017-10-16 17:00:46 -05:00
HDF Tester
260dcebc09 Merge branch 'hdf5_1_10' of ssh://bitbucket.hdfgroup.org:7999/~hdftest/hdf5_hft into hdf5_1_10 2017-10-16 16:58:07 -05:00
HDF Tester
b80fe75b7f Snapshot version 1.10 release 2 (snap2) 2017-10-16 16:50:31 -05:00
Larry Knox
5b2128b647 Merge pull request #709 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'a6fdf1bb0e344e8f5a1870926f6077239de3ce6d':
  Merge pull request #703 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
2017-10-16 16:11:14 -05:00
Larry Knox
a6fdf1bb0e Merge pull request #703 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '4a3998ac308c2bf24201e470c0b23f7f83f063e1':
  Correct indentation in h5diff/Makefile.am.
  Add "-rpath /nowhere" to *_la_LDFLAGS for plugin test libraries. This allows them to be successfully linked but not installed.  The change was added for the HDF5 1.8.20 release, but is also needed for all other HDF5 branches.
2017-10-16 15:45:14 -05:00
Allen Byrne
6029b679a3 Fix test step 2017-10-11 10:25:01 -05:00
Allen Byrne
137c4a9878 HDFFV-10297 correct reference file for 1.10 2017-10-11 10:05:53 -05:00
Allen Byrne
f92ccce1f9 HDFFV-10297 merge from develop 2017-10-10 14:46:59 -05:00
Allen Byrne
bd6de98d17 Undo commit 2017-10-09 13:21:43 -05:00
Allen Byrne
3490160ad8 HDFFV-10297 - Changes to code makes old failure moot 2017-10-09 13:21:43 -05:00
Larry Knox
8d59b5fd43 Merge pull request #698 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '34a31e7e132e60d188c613454153a686528c5d3d':
  Merge pull request #686 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
2017-10-06 09:31:31 -05:00
Richard Warren
cb09092d9a Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into optimize_superblock_read 2017-10-06 09:13:09 -04:00
Larry Knox
34a31e7e13 Merge pull request #686 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'fded10f0815f593301ac88d08d05343c8077746a':
  Add note to bin/release script with hint for situations where files generated by autogen.sh are missing, causing chkmanifest to fail.
2017-10-05 16:47:46 -05:00
Allen Byrne
79618af13e Merge pull request #696 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '49031748302822467887923c59d02d01e857d25b':
  Fix other test name typos
  Fix cmake test name for valgrind
2017-10-05 16:18:42 -05:00
Allen Byrne
4903174830 Fix other test name typos 2017-10-05 08:56:52 -05:00
Allen Byrne
ca685d0dc2 Fix cmake test name for valgrind 2017-10-05 08:53:36 -05:00
Richard Warren
bccbe8e53e Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into optimize_superblock_read 2017-10-04 16:35:46 -04:00
Allen Byrne
4a501ecfe4 Merge pull request #691 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '76d90e4d9d24157734fda253fd1e472eb886f8fc':
  HDFFV-10297 merge tools changes from develop
2017-10-04 08:53:06 -05:00
Vailin Choi
fe70476a22 Initial checkin for library version bounds
Code changes to provide versioning support when adding to the enumerated defines for H5F_libver_t.
2017-10-03 14:57:36 -05:00
Allen Byrne
76d90e4d9d HDFFV-10297 merge tools changes from develop 2017-10-03 14:40:24 -05:00
Allen Byrne
f0d3d20b24 Merge pull request #683 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'da75ed371fda7e01dc74d92575b44e1ce9bd921c':
  Update configure
  Rename java example scripts for test results table
  Merge fix for VS2013
  Fix VS2013 build error
  Merge java autotools script chkexe and chklog changes
2017-09-20 16:44:12 -05:00
Allen Byrne
da75ed371f Update configure 2017-09-20 14:39:08 -05:00
Allen Byrne
ab56177332 Rename java example scripts for test results table 2017-09-20 14:35:06 -05:00
Richard Warren
772d2e8ae6 Merge pull request #681 in HDFFV/hdf5 from bigio_1_10_merge to hdf5_1_10
Integrating the >2GB MPIO support previously added to 'develop' into the 'hdf5_1_10' branch

* commit 'e082c984f1ed2902e789666ad36b7834ae723830':
  Added t_bigio.c into the manifest and also added the issue description into RELEASE.txt
  Added the missing test code
  Merge candidate for the 1_10 branch
2017-09-20 13:07:56 -05:00
Allen Byrne
d75400082e Merge fix for VS2013 2017-09-20 11:55:51 -05:00
Richard Warren
e082c984f1 Added t_bigio.c into the manifest and also added the issue description into RELEASE.txt 2017-09-20 12:10:38 -04:00
Allen Byrne
2713d84ed3 Fix VS2013 build error 2017-09-20 10:49:27 -05:00
Allen Byrne
f25e3bd91f Merge java autotools script chkexe and chklog changes 2017-09-20 10:43:30 -05:00
Richard Warren
80e99b73f9 Added the missing test code 2017-09-20 11:02:28 -04:00
Richard Warren
2822d9c9fb Merge candidate for the 1_10 branch 2017-09-20 10:54:47 -04:00
Allen Byrne
1fb339af6e Merge pull request #677 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'b8039b3e00c7da44c746a683b7f357a578670aa8':
  Fix find package process
2017-09-20 09:10:21 -05:00
Allen Byrne
b8039b3e00 Fix find package process 2017-09-19 12:39:27 -05:00
Allen Byrne
ea715aac25 Merge pull request #669 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '478db1140635fd6250380c23d90cd4063dcad585':
  Restore previous
  restore GEN HDRS and remove cache sets for defoult options
  Generators need to be ON for development work
  Test program generation should default off
  Generate headers for 1.10 should default off
  Generate headers for 1.10 should default off
2017-09-19 12:38:33 -05:00
Allen Byrne
478db11406 Restore previous 2017-09-19 11:42:38 -05:00
Allen Byrne
e59038e391 restore GEN HDRS and remove cache sets for defoult options 2017-09-13 15:03:52 -05:00
Allen Byrne
163cd4cf00 Generators need to be ON for development work 2017-09-12 10:35:35 -05:00
Allen Byrne
2c8092705c Test program generation should default off 2017-09-12 09:24:27 -05:00
Allen Byrne
3a4d573f03 Generate headers for 1.10 should default off 2017-09-12 09:20:23 -05:00
Allen Byrne
3719ce7c5b Generate headers for 1.10 should default off 2017-09-12 08:46:49 -05:00
Allen Byrne
e194946458 Merge pull request #667 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '3495502a778d84ab3d40da94995229d106fd54bb':
  Fix merge typos
2017-09-11 13:17:37 -05:00
Allen Byrne
3495502a77 Fix merge typos 2017-09-11 12:46:07 -05:00
Allen Byrne
c148550450 Merge pull request #665 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '884d926a3e6e4cda60586cacaa9c7decdb0aa0eb':
  HDFFV-9774 Fix code merge whitespace
2017-09-08 17:09:34 -05:00
Allen Byrne
884d926a3e HDFFV-9774 Fix code merge whitespace 2017-09-08 16:56:43 -05:00
Allen Byrne
8f07727c69 Merge pull request #662 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '10676247a825627feea046d025170b4c6849cc83':
  HDFFV-10276 Remove whitespace
  HDFFV-10276 Add UD flag option to h5repack
2017-09-08 10:00:43 -05:00
Allen Byrne
10676247a8 HDFFV-10276 Remove whitespace 2017-09-08 09:31:04 -05:00
Allen Byrne
c3fcd62ea6 HDFFV-10276 Add UD flag option to h5repack 2017-09-07 13:29:43 -05:00
Allen Byrne
9cfd7cd48a Merge pull request #658 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'a8dd6f697319f332ffede33e7585a7071976db7b':
  HDFFV-9774 - add enable-error-stack, Merge from develop
2017-09-07 13:27:29 -05:00
Allen Byrne
a8dd6f6973 HDFFV-9774 - add enable-error-stack, Merge from develop 2017-09-07 09:55:53 -05:00
Allen Byrne
741f02d704 Merge pull request #657 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '5584938600b0237b90eb2870e93905b4e3365917':
  HDFFV-9988 Merge from develop
  Correct VS2017 references
2017-09-07 08:44:14 -05:00
Allen Byrne
5584938600 HDFFV-9988 Merge from develop 2017-09-06 11:44:03 -05:00
Vailin Choi
f58bbba95a Merge pull request #645 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit '359d31df9b28a6ea4c4e8aa7c5241757331bc6fa':
  Update RELEASE.txt Add info for HDFFV-10216 to release notes.
  Fix for daily test failure Fix for the compilation error from the PGI compiler.
  Modifications based on comments from pull request review (1) Remove unnecessary asserts (2) Add code to insert bad offset values to the test file in gen_bad_offset.c
  Fix for HDFFV-10216 segfault in H5G_node_cmp3 with corrupt h5 file Fix H5HL_offset_into() to return error when offset exceeds heap data block size. Also fix other places that call this routine to detect error return.
2017-09-05 13:40:03 -05:00
Allen Byrne
c1afe1c21a Correct VS2017 references 2017-09-05 13:29:59 -05:00
Allen Byrne
43a90946ef Merge pull request #647 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'f4bc89003916b013cf90ef84726aa68864b15a9d':
  HDFFV-10284 Add VS2017 merged from develop
  Fix function call args
  HDFFV-10282 merge from develop
2017-09-05 13:22:38 -05:00
Allen Byrne
f4bc890039 HDFFV-10284 Add VS2017 merged from develop 2017-08-31 15:20:34 -05:00
Allen Byrne
fcf3b93518 Fix function call args 2017-08-31 09:02:48 -05:00
Vailin Choi
359d31df9b Update RELEASE.txt
Add info for HDFFV-10216 to release notes.
2017-08-30 18:15:04 -05:00
Vailin Choi
c038988663 Fix for daily test failure
Fix for the compilation error from the PGI compiler.
2017-08-30 10:27:36 -05:00
Vailin Choi
b9f294a944 Modifications based on comments from pull request review
(1) Remove unnecessary asserts
(2) Add code to insert bad offset values to the test file in gen_bad_offset.c
2017-08-30 10:27:03 -05:00
Vailin Choi
f6c94f3ba6 Fix for HDFFV-10216 segfault in H5G_node_cmp3 with corrupt h5 file
Fix H5HL_offset_into() to return error when offset exceeds heap data block size.
Also fix other places that call this routine to detect error return.
2017-08-30 10:26:19 -05:00
Allen Byrne
8e71bbec75 HDFFV-10282 merge from develop 2017-08-28 10:27:21 -05:00
Allen Byrne
56f532b1c6 Merge pull request #638 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '65209ee5d526b89e0f21ef797acedb062e4941b0':
  HDFFV-10188 Force non-native type description
  HDFFV-10188 merge typo fix
  HDFFV-10188 add copy of test files
  HDFFV-10188 merge fix and tests from develop
2017-08-23 14:45:15 -05:00
Allen Byrne
65209ee5d5 HDFFV-10188 Force non-native type description 2017-08-23 10:26:26 -05:00
Allen Byrne
6e193a03f6 HDFFV-10188 merge typo fix 2017-08-21 13:07:44 -05:00
Allen Byrne
bd6bf373db HDFFV-10188 add copy of test files 2017-08-21 12:28:12 -05:00
Allen Byrne
00d66e3cb8 HDFFV-10188 merge fix and tests from develop 2017-08-21 12:11:24 -05:00
hdftest
8599fdd237 Merge pull request #634 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
* commit '1015828c1fbfbce16d6e75656dadeea123775ef1':
  Snapshot version 1.10 release 2 (snap1)
2017-08-08 23:47:17 -05:00
hdftest
1015828c1f Snapshot version 1.10 release 2 (snap1) 2017-08-08 23:31:21 -05:00
hdftest
d615e46b18 Merge pull request #633 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to hdf5_1_10
* commit 'd3b803713786b83afb96961ae920733f5429abb0':
  Snapshot 1.10.2-snap1
2017-08-05 08:55:17 -05:00
hdftest
d3b8037137 Snapshot 1.10.2-snap1
(Committed 8/1/2017 but not pushed from fork)
2017-08-04 15:49:04 -05:00
Allen Byrne
1099bf023a Merge pull request #632 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '04d72b2c4200c68e9bdaf09b015c62a00c6a12d4':
  HDFFV-10219 and HDFFV-10256 merge from develop
2017-08-04 15:26:24 -05:00
Allen Byrne
04d72b2c42 HDFFV-10219 and HDFFV-10256 merge from develop 2017-08-04 11:20:10 -05:00
Vailin Choi
c2ba92875e Merge pull request #629 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit '98d4addcf7cbec71600663e7023b6b7e0b5b5f35':
  Add h5repack tests for paged aggregation
  Update release notes 1) Fixes for paged aggregation 2) Fix for HDFFV-10217 3) Fix for HDFFV-7853
  Add h5repack tests for paged aggregation Add tests to h5repack.sh.in to verify options added for paged aggregation work as expected.
  Skip test in test/fheap.c when: a) multi/split drivers and b) persisting free-space or using paged aggregation strategy because the library will fail file creation (temporary) for the above conditions.
  Changes made based on RFC review comments Test the changes in a branch via daily testing.
2017-08-03 15:57:24 -05:00
Allen Byrne
98d4addcf7 Add h5repack tests for paged aggregation 2017-08-03 15:55:52 -05:00
Vailin Choi
bda86da40b Update release notes
1) Fixes for paged aggregation
2) Fix for HDFFV-10217
3) Fix for HDFFV-7853
2017-08-02 23:36:35 -05:00
Vailin Choi
aa0ad22a94 Add h5repack tests for paged aggregation
Add tests to h5repack.sh.in to verify options added for paged aggregation work as expected.
2017-08-02 17:05:57 -05:00
Vailin Choi
d4e75f6a50 Skip test in test/fheap.c when:
a) multi/split drivers and
b) persisting free-space or using paged aggregation strategy
because the library will fail file creation (temporary) for the above conditions.
2017-08-02 17:04:15 -05:00
Vailin Choi
d7bfd458c4 Changes made based on RFC review comments
Test the changes in a branch via daily testing.
2017-08-02 17:00:13 -05:00
Vailin Choi
8eaef34ef0 Merge pull request #608 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit 'fc76c7785251482a26f31efabb10d38725facb6a':
  Fix for HDFFV-10217 infinite loop in H5VM_power2up(). The function H5VM_power2up() returns the next power of 2 for n. When n exceeds 2^63, it overflows and becomes 0 causing the infinite looping. The fix ensures that the function checks for n >= 2^63 and returns 0.
2017-07-27 17:38:18 -05:00
Allen Byrne
91542d4ef7 Merge pull request #614 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'fe0ca45e13960fca175c4cea75b6239bf79161a6':
  Parallel needs copy of file in PAR folder
  Insure zip_perf program does not run concurrently
  Add check for plugin initialize
  HDFFV-10246 Fix vl string compare in h5diff
2017-07-27 15:28:30 -05:00
Allen Byrne
fe0ca45e13 Parallel needs copy of file in PAR folder 2017-07-27 11:21:20 -05:00
Allen Byrne
8551126dcf Insure zip_perf program does not run concurrently 2017-07-26 11:04:36 -05:00
Allen Byrne
fab0a6e6f1 Add check for plugin initialize 2017-07-26 10:48:15 -05:00
Allen Byrne
9dd678856e HDFFV-10246 Fix vl string compare in h5diff 2017-07-26 09:59:43 -05:00
Allen Byrne
c12e407a8f Merge pull request #611 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '7bb2e5dfef2a94d281ea8e6a937ede6ad7289601':
  Correct case of var
2017-07-26 09:12:30 -05:00
Allen Byrne
7bb2e5dfef Correct case of var 2017-07-25 16:36:36 -05:00
Dana Robinson
48dceb22c7 Merge pull request #609 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to hdf5_1_10
* commit '4b7013194cd545b73b1cf70874470dc6abfcb3bd':
  Cherry pick of some minor tools fixes from develop:
2017-07-25 10:43:10 -05:00
Dana Robinson
4b7013194c Cherry pick of some minor tools fixes from develop:
ee7816bbfb
ffc9b1d917
ec7450c4b4
2017-07-24 11:02:15 -07:00
Vailin Choi
fc76c77852 Fix for HDFFV-10217 infinite loop in H5VM_power2up().
The function H5VM_power2up() returns the next power of 2 for n.
When n exceeds 2^63, it overflows and becomes 0 causing the infinite looping.
The fix ensures that the function checks for n >= 2^63 and returns 0.
2017-07-19 18:03:18 -05:00
Vailin Choi
45724d8082 Merge pull request #605 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit '201af70c24ccdd84e8fba376dab9b2024bf21dc4':
  Fix for HDFFV-7853 H5Ocopy doesn't work with open identifiers Changes made so that raw data for dataset objects are copied from cached info when possible instead of flushing objects to file and read them back in again.
2017-07-19 13:18:30 -05:00
Vailin Choi
201af70c24 Fix for HDFFV-7853 H5Ocopy doesn't work with open identifiers
Changes made so that raw data for dataset objects are copied from cached info when possible instead of flushing objects to file and read them back in again.
2017-07-18 01:21:54 -05:00
Allen Byrne
d2b5cd08ff Merge pull request #602 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '863c9b2ea557838006bfb320a3cef56e3e34be3d':
  HDFFV-10254 fix spelling
  HDFFV-10254 release note for change to use macro for copy files
  HDFF-10254 - Copy test files with macro to avoid POST_BUILD failure
  Correct name of VAR
  Synch with CMake master
2017-07-17 08:31:41 -05:00
Allen Byrne
863c9b2ea5 HDFFV-10254 fix spelling 2017-07-13 14:19:31 -05:00
Allen Byrne
4c34ec0668 HDFFV-10254 release note for change to use macro for copy files 2017-07-12 15:45:40 -05:00
Allen Byrne
00c5a9fc4f HDFF-10254 - Copy test files with macro to avoid POST_BUILD failure 2017-07-12 15:43:10 -05:00
Allen Byrne
82bf61e397 Correct name of VAR 2017-07-12 15:43:10 -05:00
Allen Byrne
d4896f7c30 Synch with CMake master 2017-07-12 15:43:10 -05:00
Dana Robinson
0c34b0bdf7 Merge pull request #595 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to hdf5_1_10
* commit '5bf108432ba9b49ee545af3947b7fb2e2b6e8514':
  Updated RELEASE.txt
  Marked H5I_REFERENCE as deprecated in H5Ipublic.h.
  Merge of recent develop work to 1.10 branch.
2017-07-06 10:10:15 -05:00
Dana Robinson
5bf108432b Updated RELEASE.txt 2017-07-05 14:37:11 -07:00
Dana Robinson
dc048e96f3 Marked H5I_REFERENCE as deprecated in H5Ipublic.h. 2017-07-05 11:49:20 -07:00
Dana Robinson
63647cd363 Merge of recent develop work to 1.10 branch.
Fixes for:
* HDFFV-10247 (autotools Fortran long double bug)
* HDFFV-10248 (autotools deprecated debug/production tweak)
* HDFFV-10250 (-fno-omit-frame-pointer w/ symbols)
* Disabled missing parameter warnings in Java constant code
* Added H5I_VFL ID checks to tmisc.c
* Added 'get a dummy VFD' call to h5test library
2017-07-05 11:35:03 -07:00
Dana Robinson
7e9d5c2c37 Merge pull request #554 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to hdf5_1_10
* commit 'fb5c13d59c8f17dca9bbe0e35e00920be2690af3':
  Merge of recent develop work to 1.10 branch: * H5FD_FEAT_DEFAULT_VFD_COMPATIBLE VFD feature flag (HDFFV-10214) * H5FDdriver_query() API call (HDFFV-10215) * Fix to skip SWMR tests that when the current VFD is not compatible   with the default VFD (HDFFV-10197) * Removed obsolete compiler versions from config/gnu-flags (HDFFV-9937) * Many warning fixes
2017-06-08 14:23:06 -05:00
Allen Byrne
a92867f77f Merge pull request #561 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '0563edffa18320e8d09e13073930390624ab3368':
  Add toolset option
  Synchronize cmake files with develop
  Updated note based on guidelines
  Note HDFFV-8611 change
2017-06-02 12:47:12 -05:00
Allen Byrne
0563edffa1 Add toolset option 2017-06-02 11:52:55 -05:00
Dana Robinson
fb5c13d59c Merge of recent develop work to 1.10 branch:
* H5FD_FEAT_DEFAULT_VFD_COMPATIBLE VFD feature flag (HDFFV-10214)
* H5FDdriver_query() API call (HDFFV-10215)
* Fix to skip SWMR tests that when the current VFD is not compatible
  with the default VFD (HDFFV-10197)
* Removed obsolete compiler versions from config/gnu-flags (HDFFV-9937)
* Many warning fixes
2017-05-31 17:45:41 -04:00
Allen Byrne
bb9c9f2834 Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit 'ef60bcd50e5cd3f66b7cd91a6b816a59c36922e2':
  Test split tbitfields.h5.xml into big and little endian files.  tbitfields.h5.xml was removed from MANIFEST but the file still needs to be removed, as it was in the develop branch.
2017-05-30 11:53:35 -05:00
Allen Byrne
91855efe6e Synchronize cmake files with develop 2017-05-30 11:50:29 -05:00
Larry Knox
ef60bcd50e Merge pull request #549 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '938dc838b8ad1e815ea6eda820411cb22dfe56c6':
  Test split tbitfields.h5.xml into big and little endian files.  tbitfields.h5.xml was removed from MANIFEST but the file still needs to be removed, as it was in the develop branch.
2017-05-27 11:34:56 -05:00
lrknox
938dc838b8 Test split tbitfields.h5.xml into big and little endian files. tbitfields.h5.xml was removed from MANIFEST but the file still needs to be removed, as it was in the develop branch. 2017-05-27 11:01:48 -05:00
Allen Byrne
1a0551aa37 Updated note based on guidelines 2017-05-26 13:07:47 -05:00
Allen Byrne
4f17cdd5d2 Note HDFFV-8611 change 2017-05-26 11:17:44 -05:00
Allen Byrne
972b82a557 Merge pull request #542 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '9a66e4cd38a63a811949f9753d193ddc9ea9bc63':
  Reduce warnings
2017-05-26 10:21:55 -05:00
Allen Byrne
9a66e4cd38 Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '7153648ada1d346f8d98c395fb4cdd74a909437b':
  Added missing casts for the return value of H5I_object_verify().
2017-05-26 09:07:32 -05:00
Dana Robinson
7153648ada Merge pull request #539 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to hdf5_1_10
* commit 'b3a1d66c09b8bd0c9bd663665a564c47159f4504':
  Added missing casts for the return value of H5I_object_verify().
2017-05-26 03:47:41 -05:00
Allen Byrne
618a6adb64 Reduce warnings 2017-05-25 15:55:55 -05:00
Dana Robinson
b3a1d66c09 Added missing casts for the return value of H5I_object_verify().
(cherry picked from commit 8807f918b9)
2017-05-25 13:41:57 -04:00
Allen Byrne
3261491a47 Merge pull request #536 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '635e8c5377ded6201061e1dc819526cd205f06ed':
  merge from develop and apply HDFFV-8611
  HDFFV-8611 add autotools test
  Remove obsolete function
  HDFFV-8611 change h5repack to save the root group creation order Added test and new arguments to control the the input file parsing.
2017-05-25 09:22:29 -05:00
Allen Byrne
635e8c5377 merge from develop and apply HDFFV-8611 2017-05-24 15:00:51 -05:00
Allen Byrne
206c4a43e8 HDFFV-8611 add autotools test 2017-05-24 14:35:39 -05:00
Allen Byrne
52f5c1b14f Remove obsolete function 2017-05-24 14:35:24 -05:00
Allen Byrne
40b51136a2 HDFFV-8611 change h5repack to save the root group creation order
Added test and new arguments to control the the input file parsing.
2017-05-24 14:34:28 -05:00
Allen Byrne
c9eedcb825 Merge pull request #528 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'a4a1a93e56d282611a800319cef8487a3449ab56':
  HDFFV-9055 Correct file generator
  Added note about 9055 and 10128, 9995 not needed
2017-05-19 13:39:20 -05:00
Allen Byrne
a4a1a93e56 HDFFV-9055 Correct file generator 2017-05-18 15:35:05 -05:00
Allen Byrne
b81767d620 Added note about 9055 and 10128, 9995 not needed 2017-05-18 09:15:27 -05:00
Allen Byrne
303067fe0b Merge pull request #522 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '8dd40ba371f3a299ed98ab8e7e7f34f967e91d55':
  Move declaration before executable statement
  HDFFV-9055 regenerate file for 1.10
  HDFFV-9055 add test files
  HDFFV-9055 Handle H5T_ARRAY types Create variables just for diff_array function Whitespace updates
  HDFFV-10128 Fixed string length with no null fixed
  HDFFV-9995 Clarify help text
2017-05-17 16:16:33 -05:00
Allen Byrne
8dd40ba371 Move declaration before executable statement 2017-05-17 16:00:54 -05:00
Allen Byrne
11edb1efd0 HDFFV-9055 regenerate file for 1.10 2017-05-17 10:30:05 -05:00
Allen Byrne
68ec8c4f6c HDFFV-9055 add test files 2017-05-17 10:20:01 -05:00
Allen Byrne
4d53a7100c HDFFV-9055 Handle H5T_ARRAY types
Create variables just for diff_array function
Whitespace updates
2017-05-17 10:17:29 -05:00
Allen Byrne
2e1b6a2a4d HDFFV-10128 Fixed string length with no null fixed 2017-05-17 10:14:53 -05:00
Allen Byrne
f3c235b0a5 HDFFV-9995 Clarify help text 2017-05-17 10:09:02 -05:00
Vailin Choi
93aa716f40 Merge pull request #520 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit '6403b313d46ec6db46fcff2aaa4a9238f8265d85':
  Incorporate additional code changes for the H5DOread_chunk patch from GE Heathcare (HDFFV-9934) This is the similar set of changes that was checked in to 1.8 branch: Incorporate the code changes that were missing from the original patch: (1) Additional tests in hl/test/test_dset_opt.c (2) Fix in src/H5Dchunk.c for direct access when an entry is in chunk cache but not dirty Tested on platypus, ostrich, kituo, mayll, osx1010test, moohan, quail, emu.
2017-05-16 13:46:19 -05:00
Vailin Choi
6403b313d4 Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into hdf5_1_10 2017-05-16 13:43:45 -05:00
Dana Robinson
6e09fa2cb2 Merge pull request #517 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to hdf5_1_10
* commit 'b74b1cd250755cbbe6ec337dc34634eb8b74b64a':
  Added a RELEASE.txt message for HDFFV-10187.
2017-05-16 12:00:52 -05:00
Vailin Choi
55e2bcedc1 Incorporate additional code changes for the H5DOread_chunk patch from GE Heathcare (HDFFV-9934)
This is the similar set of changes that was checked in to 1.8 branch:
Incorporate the code changes that were missing from the original patch:
(1) Additional tests in hl/test/test_dset_opt.c
(2) Fix in src/H5Dchunk.c for direct access when an entry is in chunk cache but not dirty
Tested on platypus, ostrich, kituo, mayll, osx1010test, moohan, quail, emu.
2017-05-16 09:44:11 -05:00
Dana Robinson
b74b1cd250 Added a RELEASE.txt message for HDFFV-10187. 2017-05-15 14:58:13 -04:00
Dana Robinson
0adad72813 Merge pull request #511 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5do_overwrite_1_10 to hdf5_1_10
* commit '1d786206df53942a3a3dbd538b369c94a632050d':
  Removed redundant assignement.
  Fixes the chunk overwrite bug (HDFFV-10187) and adds a new H5DO HL test.
2017-05-11 21:39:23 -05:00
Dana Robinson
1d786206df Removed redundant assignement. 2017-05-11 20:49:37 -04:00
Vailin Choi
5e203972a9 Merge pull request #509 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit '228939e7315cc9644e158fc246f4908301d77a35':
  Call to H5Dopen has H5dopen2 arguments at line 12704 of test/dsets.c - changed to H5Dopen2 to fix failure with --with-default-api-version=v16 configure option.
2017-05-11 13:18:13 -05:00
lrknox
228939e731 Call to H5Dopen has H5dopen2 arguments at line 12704 of test/dsets.c -
changed to H5Dopen2 to fix failure with --with-default-api-version=v16
configure option.
2017-05-11 12:11:20 -05:00
Dana Robinson
a45f5f8f53 Merge pull request #499 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to hdf5_1_10
* commit '1a4bda1bd824df2da1e8c3441881fb7fca6a4413':
  Set the HDF5_GENERATE_HEADERS CMake option to default to ON and removed the option from the CMake cache init files.
2017-05-10 09:34:57 -05:00
Vailin Choi
bbca1b6fc6 Merge pull request #500 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit 'd94405ded4451831e4fc90ceff70acbc1e6a8f9c':
  Fix for HDFFV-10051 Fix missing declaration for H5D__layout_compact_dirty_test(). Tested on mayll and osx1010test.
  Fix for the two issues reported in HDFFV-10051 Modifications made based on the review comments from pull request #494 Tested on moohan, mayll, kituo, platypus, ostrich, osx1010test, quail, emu.
  Fix for the two issues reported in HDFFV-10051: (1) Repeated open/close of a compact dataset fails due to the increment of ndims in the dataset structure for every open. --This is done only for chunked dataset via H5D__chunk_set_sizes(). (2) layout "dirty" flag for a compact dataset is not reset properly after flushing the data at dataset close. --Reset the "dirty" flag before flushing the message to the object header via H5O_msg_write(). Tested on moohan, kituo, platypus, ostrich, osx1010test, quail, emu.
2017-05-10 03:28:03 -05:00
Vailin Choi
d94405ded4 Fix for HDFFV-10051
Fix missing declaration for H5D__layout_compact_dirty_test().
Tested on mayll and osx1010test.
2017-05-10 01:04:48 -05:00
Vailin Choi
10a3bbe680 Fix for the two issues reported in HDFFV-10051
Modifications made based on the review comments from pull request #494
Tested on moohan, mayll, kituo, platypus, ostrich, osx1010test, quail, emu.
2017-05-10 01:04:03 -05:00
Vailin Choi
f1c9163c91 Fix for the two issues reported in HDFFV-10051:
(1) Repeated open/close of a compact dataset fails due to the
increment of ndims in the dataset structure for every open.
--This is done only for chunked dataset via H5D__chunk_set_sizes().
(2) layout "dirty" flag for a compact dataset is not reset
properly after flushing the data at dataset close.
--Reset the "dirty" flag before flushing the message to the object header
via H5O_msg_write().
Tested on moohan, kituo, platypus, ostrich, osx1010test, quail, emu.
2017-05-10 01:03:23 -05:00
Dana Robinson
3d8416251d Fixes the chunk overwrite bug (HDFFV-10187) and adds a new H5DO HL test. 2017-05-09 19:29:44 -04:00
Larry Knox
b8d68f3160 Merge pull request #492 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '2c1e727b803203f2188c2d2854501c5a5b8efb23':
  Update one missed version string.
2017-05-05 13:48:59 -05:00
lrknox
2c1e727b80 Update one missed version string. 2017-05-05 10:50:27 -05:00
Larry Knox
9c169ec1c8 Merge pull request #489 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '5cde315a061d789ea9539265f96ec65454454983':
  Update release_docs/HISTORY-1_10.txt and RELEASE.txt after HDF5 1.10.1 release.
2017-05-05 10:29:39 -05:00
lrknox
5cde315a06 Update release_docs/HISTORY-1_10.txt and RELEASE.txt after HDF5 1.10.1
release.
2017-05-04 17:14:38 -05:00
Dana Robinson
1a4bda1bd8 Set the HDF5_GENERATE_HEADERS CMake option to default to ON and removed
the option from the CMake cache init files.

Fixes HDFFV-10184
2017-04-27 16:10:52 -04:00
Larry Knox
500fe19d36 Merge pull request #479 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '4fb75982b1c1f896d5d42798fb5a253ffe008166':
  Change position of declaration to top of block
2017-04-27 08:56:33 -05:00
Allen Byrne
4fb75982b1 Change position of declaration to top of block 2017-04-27 08:53:57 -05:00
Vailin Choi
cb12277b5f Merge pull request #477 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit 'ae05b0c726f565a13aed9a8edeefb39299c1ca6d':
  Modifications based on pull request review. Made couple changes based on the review comments.
  Incorporate patch from GE Healthcare (HDFFV-9934) This is the same patch that had already been integrated to 1.8 branch (pull request #387). Tested on moohan, ostrich, platypus, emu, osx1010test, quail, kituo, mayll.
2017-04-26 15:49:34 -05:00
Vailin Choi
ae05b0c726 Modifications based on pull request review.
Made couple changes based on the review comments.
2017-04-26 14:49:45 -05:00
Vailin Choi
14e9856778 Incorporate patch from GE Healthcare (HDFFV-9934)
This is the same patch that had already been integrated to 1.8 branch (pull request #387).
Tested on moohan, ostrich, platypus, emu, osx1010test, quail, kituo, mayll.
2017-04-26 14:48:17 -05:00
Dana Robinson
8f049c8736 Merge pull request #469 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to hdf5_1_10
* commit '14bc39bcb59ce36d1d2fd156afeaf3aa7bb5ad84':
  Updated bin/trace to emit errors and reordered autogen.sh processing so that script failures leave the library in a non-compilable state, making it harder to ignore errors.
2017-04-25 16:28:17 -05:00
Dana Robinson
14bc39bcb5 Updated bin/trace to emit errors and reordered autogen.sh processing
so that script failures leave the library in a non-compilable state,
making it harder to ignore errors.
2017-04-25 17:10:11 -04:00
Larry Knox
b962c7ad42 Merge pull request #467 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'b3fb91a932546724344205529a37226aaa34367e':
  HDFFV-10173 revert and add dynlib flags
2017-04-25 15:49:23 -05:00
Allen Byrne
b3fb91a932 HDFFV-10173 revert and add dynlib flags 2017-04-25 15:46:03 -05:00
Allen Byrne
c9779df05a Merge pull request #465 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '545fa4028aabec0e683351762f42eb4ffa5a5b7e':
  Merge cmake h5clear test changes
  Correct name of native function
  Change signature of H5PLget_size
2017-04-25 14:32:07 -05:00
Allen Byrne
545fa4028a Merge cmake h5clear test changes 2017-04-25 09:57:21 -05:00
Allen Byrne
539f252fc8 Correct name of native function 2017-04-25 09:40:55 -05:00
Allen Byrne
2599c23164 Change signature of H5PLget_size 2017-04-25 09:40:54 -05:00
Vailin Choi
61d979c1e9 Merge pull request #461 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit '6449f650e65a212f73b8ec551b699dd9991c6dde':
  Fix for HDFFV-10166 h5watch tests fail randomly to match expected output files (1) Re-structure tests to do one "extend" action at a time (2) Re-try test till max limit before final failure
2017-04-24 18:20:09 -05:00
Vailin Choi
6449f650e6 Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into hdf5_1_10 2017-04-24 18:17:29 -05:00
Vailin Choi
c40edf8c24 Fix for HDFFV-10166 h5watch tests fail randomly to match expected output files
(1) Re-structure tests to do one "extend" action at a time
(2) Re-try test till max limit before final failure
2017-04-24 18:12:50 -05:00
Vailin Choi
772bfce6ce Merge pull request #460 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit 'ddd8cf0e1c0c1450de1c37ba866afad469cf63b3':
  Modifications based on review comments from pull request. Made changes according to review comments and discussion with Allen.
  Fix for DAILYTEST-259 h5clear test failure Deposit the test files in test/misc/testfiles for testh5clear.sh to use instead of depending on h5clear_gentest. Tested on kituo, osx1010test, quail, platypus and ostrich.
2017-04-24 17:48:54 -05:00
Vailin Choi
ddd8cf0e1c Modifications based on review comments from pull request.
Made changes according to review comments and discussion with Allen.
2017-04-24 17:16:26 -05:00
Vailin Choi
22d54edf90 Fix for DAILYTEST-259 h5clear test failure
Deposit the test files in test/misc/testfiles for testh5clear.sh to use instead of depending on h5clear_gentest.
Tested on kituo, osx1010test, quail, platypus and ostrich.
2017-04-24 17:12:34 -05:00
Dana Robinson
21850aa363 Merge pull request #456 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to hdf5_1_10
* commit '87ceb783920c63cf374c08f17d7d601923481459':
  Fixed problems that prevent bin/trace from marking up some functions.
2017-04-24 16:06:26 -05:00
Dana Robinson
87ceb78392 Fixed problems that prevent bin/trace from marking up some functions. 2017-04-24 15:48:47 -04:00
Larry Knox
c0a8eb362c Merge pull request #450 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to hdf5_1_10
* commit '15f85df5405eb2caf6ee4d3bc5f558344d4bb16a':
  bin/trace updates in H5PL.c
  The cache_image test shows a skipped message about EoC in parallel.
  Added code to disable the evict-on-close feature in the parallel library.
2017-04-21 16:05:44 -05:00
Dana Robinson
15f85df540 bin/trace updates in H5PL.c 2017-04-20 18:14:44 -04:00
Dana Robinson
cbab16c8f2 The cache_image test shows a skipped message about EoC in parallel. 2017-04-20 16:59:05 -04:00
Dana Robinson
2b936c79e2 Added code to disable the evict-on-close feature in
the parallel library.
2017-04-20 16:58:34 -04:00
Allen Byrne
7037520281 Merge pull request #445 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '6126528f115757afe0b5aeb8f0a934b6a51946f4':
  Correct typo of file name
2017-04-20 13:44:00 -05:00
Allen Byrne
6126528f11 Correct typo of file name 2017-04-20 12:25:27 -05:00
Scot Breitenfeld
2b7a833c2d Merge pull request #439 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_10 to hdf5_1_10
* commit '1f5ea1a71ac1a859fee9cad0b4672ea6f603981d':
  added point to build script repo.
2017-04-18 17:00:54 -05:00
M. Scot Breitenfeld
1f5ea1a71a added point to build script repo. 2017-04-18 16:24:07 -05:00
Allen Byrne
be67b32c90 Merge pull request #437 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '19762419ce30429667e9def628c785b78b961b68':
  Update tool dyn lib
  LDFLAGS module forces .so lib to be built on osx instead of .dylib
  java jni lib also needs to avoid the version-info
  HDFFV-10170 undo patch
  Add plugin options for libs
  Reformat char * args
  HDFFV-10170 add missing endif
2017-04-18 15:22:28 -05:00
Allen Byrne
19762419ce Update tool dyn lib 2017-04-18 14:24:22 -05:00
Allen Byrne
db4dd5be86 LDFLAGS module forces .so lib to be built on osx instead of .dylib 2017-04-18 14:14:20 -05:00
Allen Byrne
1c782f1ae1 java jni lib also needs to avoid the version-info 2017-04-18 14:14:09 -05:00
Allen Byrne
0bab6fb76c HDFFV-10170 undo patch 2017-04-18 14:13:56 -05:00
Allen Byrne
d5da45e168 Add plugin options for libs 2017-04-18 14:13:22 -05:00
Allen Byrne
ed9ffe7249 Reformat char * args 2017-04-18 09:34:10 -05:00
Allen Byrne
d39a79fa4c HDFFV-10170 add missing endif 2017-04-18 09:30:11 -05:00
Larry Knox
dcd18f8684 Merge pull request #431 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'b67e626ba9095f35dd9a8f9e8ca906320f85914c':
  HDFFV-10173 remove hook for noinst libs
  HDFFV-10170 fix noinst for test libs
  HDFFV-10173 fix compile on VS2008
  Due to HDFVIEW-19 add read VL as string function
2017-04-17 16:28:25 -05:00
Allen Byrne
b67e626ba9 HDFFV-10173 remove hook for noinst libs 2017-04-17 16:25:34 -05:00
Larry Knox
f696926be1 Merge pull request #426 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '54957d37f5aa73912763dbb6e308555e863c43f4':
  Commit copyright header change for src/H5PLpkg.c which was added after running script to make changes.
  Add new files in release_docs to MANIFEST. Cimmit changes to Makefile.in(s) and H5PL.c that resulted from running autogen.sh.
  Merge pull request #407 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_1 to hdf5_1_10_1
  Change copyright headers to replace url referring to file to be removed and replace it with new url for COPYING file.
2017-04-17 14:32:16 -05:00
Allen Byrne
a447dd64cc HDFFV-10170 fix noinst for test libs 2017-04-17 13:58:14 -05:00
Allen Byrne
5f313c0172 HDFFV-10173 fix compile on VS2008 2017-04-17 12:40:00 -05:00
lrknox
54957d37f5 Commit copyright header change for src/H5PLpkg.c which was added after running script to make changes. 2017-04-15 12:50:10 -05:00
lrknox
49cded79ce Add new files in release_docs to MANIFEST.
Cimmit changes to Makefile.in(s) and H5PL.c that resulted from running
autogen.sh.

Conflicts:
	README.txt
	c++/src/Makefile.in
	fortran/src/Makefile.in
	hl/c++/src/Makefile.in
	hl/fortran/src/Makefile.in
	hl/src/Makefile.in
	java/src/jni/Makefile.in
	release_docs/RELEASE.txt
	src/Makefile.in
2017-04-15 08:17:10 -05:00
lrknox
b9a27fddaa Merge pull request #407 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_1 to hdf5_1_10_1
* commit '0d05cb607e5951f3a28a101be56ca194022a7fa1':
  Reverted addition of The HDF Group copyright headers to 3rd party CMake files for Java.
  Add Copyright headers to 90 files (mostly .cmake files) without Copyright headers.
  Add "Copyright by The HDF Group."" to copyright header.
2017-04-14 16:40:52 -05:00
lrknox
25ec07450a Change copyright headers to replace url referring to file to be removed
and replace it with new url for COPYING file.

Fix 2 lines in java error test expected output file where messages
include line numbers changed by reducing the copyright header by 2
lines.
2017-04-14 11:54:16 -05:00
Allen Byrne
a4391c1243 Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit 'b77e601996ea89c8a25f0ce12e3a6a0058fac63e':
  Skip tests for page buffering in test/fheap.c for parallel build Skip the two tests for page buffering in test/fheap.c because this feature is disabled in parallel. Activate full testing when this feature is re-enabled in the future for parallel build.
  Due to HDFVIEW-19 add read VL as string function
  Fix URL name
  updated with README changes
  DAILYTEST-250 change test props to reduce timeout
  Combined the README_DEVEL and README, and removed out-dated README material
  Fix for H5Dset_extent test failure with extensive array indexing (HDFFV-9771) 1) Calculate chunk index for extensive array index based on swizzled max chunks when unlim_dim > 0 2) Minor fixes to test/fheap.c that somehow were missed from last check in.  See pull request #396 review comments.
2017-04-14 08:43:11 -05:00
Larry Knox
b77e601996 Merge pull request #425 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'b03e41146a3e15c7a287ab98f1963bf7944719a8':
  Skip tests for page buffering in test/fheap.c for parallel build Skip the two tests for page buffering in test/fheap.c because this feature is disabled in parallel. Activate full testing when this feature is re-enabled in the future for parallel build.
  Due to HDFVIEW-19 add read VL as string function
  Fix URL name
  updated with README changes
  DAILYTEST-250 change test props to reduce timeout
  Combined the README_DEVEL and README, and removed out-dated README material
  Fix for H5Dset_extent test failure with extensive array indexing (HDFFV-9771) 1) Calculate chunk index for extensive array index based on swizzled max chunks when unlim_dim > 0 2) Minor fixes to test/fheap.c that somehow were missed from last check in.  See pull request #396 review comments.
2017-04-13 16:40:56 -05:00
lrknox
b03e41146a Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into hdf5_1_10 2017-04-13 16:28:03 -05:00
Allen Byrne
53132d8864 Due to HDFVIEW-19 add read VL as string function 2017-04-13 10:02:15 -05:00
Vailin Choi
f6920ad11c Merge pull request #416 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit 'f75379d780dc6d2a262d0b613e588a8c0629c848':
  Fix for H5Dset_extent test failure with extensive array indexing (HDFFV-9771) 1) Calculate chunk index for extensive array index based on swizzled max chunks when unlim_dim > 0 2) Minor fixes to test/fheap.c that somehow were missed from last check in.  See pull request #396 review comments.
2017-04-12 03:23:57 -05:00
Vailin Choi
f75379d780 Fix for H5Dset_extent test failure with extensive array indexing (HDFFV-9771)
1) Calculate chunk index for extensive array index based on swizzled max chunks when unlim_dim > 0
2) Minor fixes to test/fheap.c that somehow were missed from last check in.  See pull request #396 review comments.
2017-04-11 23:48:51 -05:00
Allen Byrne
4a37934b5d Merge pull request #413 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'e76d9217f49a300501cff55ded22e4c8107d2582':
  Fix URL name
  DAILYTEST-250 change test props to reduce timeout
2017-04-11 16:57:27 -05:00
Allen Byrne
e76d9217f4 Fix URL name 2017-04-11 15:12:27 -05:00
Allen Byrne
6efdeb7630 DAILYTEST-250 change test props to reduce timeout 2017-04-11 15:12:03 -05:00
Quincey Koziol
da4b690977 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_hyperslab_updates 2017-04-11 08:40:00 -07:00
Larry Knox
725b443f1f Merge pull request #408 in HDFFV/hdf5 from develop to hdf5_1_10
* commit 'ccb4e9ed9a5e0af27db9f1504a628e35d7f4cf92': (27 commits)
  Removed commeted out code from H5C_dump_coll_write_list()
  Checkin of fix for CGNS bug (https://jira.hdfgroup.org/browse/HDFFV-10055).
  HDFFV-10143 add missing javadoc param
  Add missing test status
  Fix CMake regex commands
  Modify test/fheap.c to run with various file space strategies and/or page buffering Modify test/fheap.c to run with different combinations of file space strategies and page buffering only when ExpressMode is 0 (HDF5TestExpress is 0). Tested on ostrich, platypus, mayll, emu, osx1010test, quail, kite, kituo.
  Updated the H5L.c error message after additional thought. Fix for HDFFV-10141.
  Updated an error message in H5L.c to be more helpful. Fixes HDFFV-10141.
  Re-enabled fixed array index testing in the test_random_rank4_vl() test in test/set_extent. This was fixed some time ago, but the test was never re-enabled for that index type.
  Fix typo deletion
  HDFFV-10143 Update new feature section.
  HDFFV-10143 clean up format and function return
  HDFFV-10143 Add plugin APIs to Java interface
  Update with checks for index bounds
  Update tools issues
  HDFFV-10143 fix use before set
  HDFFV-10143 surround will fail with try block
  HDFFV-10143 typo cleanup
  HDFFV-10143 typo removed
  Fix code error and use H5PL_MAX_PATH_NUM in test
  ...
2017-04-11 09:24:47 -05:00
Allen Byrne
3140697e40 Merge pull request #403 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '38b1b534c986696dcf146352e7314c2919affbf5':
  HDFFV-10143 add missing javadoc param
  Add missing test status
2017-04-07 08:07:56 -05:00
Allen Byrne
38b1b534c9 HDFFV-10143 add missing javadoc param 2017-04-06 15:01:30 -05:00
Allen Byrne
388051ba2d Add missing test status 2017-04-06 14:33:09 -05:00
Larry Knox
fdcde1834d Merge pull request #398 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '75d6ac058e71b3f46333e7f6c7566e4214ccd091':
  Fix CMake regex commands
2017-04-06 12:01:21 -05:00
Allen Byrne
75d6ac058e Fix CMake regex commands 2017-04-06 11:30:56 -05:00
Allen Byrne
5806dd2711 Merge pull request #378 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit 'a4038aed6e895b9d1e686073c135f8aaacc9adab': (21 commits)
  Fix typo deletion
  HDFFV-10143 Update new feature section.
  HDFFV-10143 clean up format and function return
  HDFFV-10143 Add plugin APIs to Java interface
  Update with checks for index bounds
  HDFFV-10143 fix use before set
  HDFFV-10143 surround will fail with try block
  HDFFV-10143 typo cleanup
  HDFFV-10143 typo removed
  Fix code error and use H5PL_MAX_PATH_NUM in test
  HDFFV-10143 Cleanup due to comments
  HDFFV-10143 remove debugging output
  HDFFV-10143 change h5PLget to use buffer like H5Iget_name
  HDFFV-10143 change put to replace and add const
  HDFFV-10143 Use Windows A version of ExpandEnvironmentStrings
  Remove redundant code
  HDFFV-10143 Fix initial issues from review
  HDFFV-10143 add APIs to manipulate plugin path table
  Remove duplicated paths, add new paths
  HDFFV-10143 add APIs to manipulate plugin path table
  ...
2017-04-06 11:28:33 -05:00
Allen Byrne
a4038aed6e Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit 'd6ea49f5cbcaa852cd0caf34278ec61108667bc3':
  Switch to using flag in signal handler, to trigger dropping out of main loop and shutdown cleanly, instead of calling leave() from the signal handler.
  Fix HDFFV-8089 Description:     Some code within an "ifdef H5D_CHUNK_DEBUG" block was using outdated     data structure but not caught because the case of H5D_CHUNK_DEBUG being     defined was never tested.  It was commented out.     I defined H5D_CHUNK_DEBUG, tested, and commented out again. Platforms tested:     Linux/32 2.6 (jam)     Linux/64 (platypus)     Darwin (osx1010test)
2017-04-04 12:15:32 -05:00
Allen Byrne
db9eeb9f6a Fix typo deletion 2017-04-04 10:16:30 -05:00
Allen Byrne
f17ce1b06e HDFFV-10143 Update new feature section. 2017-04-04 10:09:13 -05:00
Allen Byrne
ed98dc0419 HDFFV-10143 clean up format and function return 2017-04-04 09:54:23 -05:00
Larry Knox
d6ea49f5cb Merge pull request #390 in HDFFV/hdf5 from develop to hdf5_1_10
* commit 'd522632b9e1f1d88db2117e89f3caba0dc4cf38b':
  Switch to using flag in signal handler, to trigger dropping out of main loop and shutdown cleanly, instead of calling leave() from the signal handler.
  Fix HDFFV-8089 Description:     Some code within an "ifdef H5D_CHUNK_DEBUG" block was using outdated     data structure but not caught because the case of H5D_CHUNK_DEBUG being     defined was never tested.  It was commented out.     I defined H5D_CHUNK_DEBUG, tested, and commented out again. Platforms tested:     Linux/32 2.6 (jam)     Linux/64 (platypus)     Darwin (osx1010test)
2017-04-03 18:48:51 -05:00
Allen Byrne
f9199536d0 HDFFV-10143 Add plugin APIs to Java interface 2017-04-03 14:12:54 -05:00
Allen Byrne
399060c17a Update with checks for index bounds 2017-04-03 12:35:38 -05:00
Allen Byrne
dd2749d1be Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '6387f7099d22c66dab415c57f9fd547eb86e4ad5':
  Small corrections to DOPYING file.
  Add new file COPYING_LBNL_HDF5.
  Revert "Clear hdf5 1.10 entries from RELEASE.txt in the develop branch.  Entries"
  Add LBNL license file and modify COPYING file accordingly.
  Omnibus checkin for several relatively minor modifications:
2017-04-03 09:23:33 -05:00
Larry Knox
6387f7099d Merge pull request #385 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '194f604ad04ec976a1d761090aa892f9f28514c3':
  Small corrections to DOPYING file.
  Add new file COPYING_LBNL_HDF5.
  Revert "Clear hdf5 1.10 entries from RELEASE.txt in the develop branch.  Entries"
  Add LBNL license file and modify COPYING file accordingly.
  Omnibus checkin for several relatively minor modifications:
2017-03-31 14:07:38 -05:00
lrknox
194f604ad0 Small corrections to DOPYING file. 2017-03-31 12:17:50 -05:00
lrknox
f4b64cd845 Merge branch 'develop' into hdf5_1_10 2017-03-31 11:59:20 -05:00
Allen Byrne
c99679337a HDFFV-10143 fix use before set 2017-03-30 17:41:35 -05:00
Allen Byrne
f1e64c512a HDFFV-10143 surround will fail with try block 2017-03-30 17:13:28 -05:00
Allen Byrne
037e7a4a72 HDFFV-10143 typo cleanup 2017-03-30 17:13:21 -05:00
Allen Byrne
fb6acd82a0 HDFFV-10143 typo removed 2017-03-30 17:13:12 -05:00
Allen Byrne
0f9e09a65d Fix code error and use H5PL_MAX_PATH_NUM in test 2017-03-30 17:12:53 -05:00
Allen Byrne
33ad855c6b HDFFV-10143 Cleanup due to comments 2017-03-30 15:03:56 -05:00
Allen Byrne
e245544ef2 HDFFV-10143 remove debugging output 2017-03-30 14:48:11 -05:00
Allen Byrne
09e76f7782 HDFFV-10143 change h5PLget to use buffer like H5Iget_name 2017-03-30 14:40:52 -05:00
Allen Byrne
cb222dded2 HDFFV-10143 change put to replace and add const 2017-03-30 14:40:44 -05:00
Allen Byrne
c25651fc5c HDFFV-10143 Use Windows A version of ExpandEnvironmentStrings 2017-03-30 13:04:19 -05:00
Allen Byrne
db3638b791 Remove redundant code 2017-03-30 12:37:05 -05:00
Allen Byrne
10ef22fcd6 HDFFV-10143 Fix initial issues from review 2017-03-30 12:20:59 -05:00
Allen Byrne
ebc0a62517 Merge branch 'develop' into hdf5_1_10 2017-03-29 09:14:42 -05:00
Allen Byrne
ac40086b72 Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '3dbfc568d7717d0252a4c91c9883d02a5574b3c1':
  Resolve conflict missed in merge.
  Clear hdf5 1.10 entries from RELEASE.txt in the develop branch.  Entries in this branch version of RELEASE.txt should be intended for the future 1.12.0 release.
  Update with extra checks for reference
  Update cdash max test output and VS version matching
  Stop skipping h5watch tests.
  Add H5_DLL to H5AC_get_mdc_image_info() prototype
  Update RELEASE.txt based on review comments from pull request.
  Description:     Removed notes about the C++ API in develop.  Only keep in 1.10 branch.
  Add prototype for H5AC_get_mdc_image_info
  Minor style cleanups
  Revert "Switch h5clear for cache images to use existing H5Pget_cache_image_config()"
  Update RELEASE.txt to reflect changes for new features and bug fixes since 1.10.0-patch1.
  Run all scripts using signal files between processes in their own directories to avoid accidental deletion of the signal files.
  Remove extra space added by h5vers to version string in H5.java, which then failed to match the pattern after the first run.
  Remove incorrect " marks added to java files by bin/h5vers. Pull version from configure for version test in h5repack_plugin.sh.in
  Description:     Fixed typos and missing items in function headers, that were revealed     by Doxygen, and revised various comments. Platforms tested:     Linux/32 2.6 (jam)     Linux/64 (platypus)     Darwin (osx1010test)
  Description:     Updated the C++ API sections.
  Extend h5vers to update version strings in java files and h5repack version test expected output file.
  Run swmr tests in their own subdirectory of test to avoid signal file deletion by other tests.
2017-03-29 09:08:06 -05:00
Larry Knox
3dbfc568d7 Merge pull request #377 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'a1dc1a5f28b99d30b7870f764c288995cabc7ad0':
  Resolve conflict missed in merge.
  Clear hdf5 1.10 entries from RELEASE.txt in the develop branch.  Entries in this branch version of RELEASE.txt should be intended for the future 1.12.0 release.
  Update with extra checks for reference
  Update cdash max test output and VS version matching
  Stop skipping h5watch tests.
  Add H5_DLL to H5AC_get_mdc_image_info() prototype
  Update RELEASE.txt based on review comments from pull request.
  Description:     Removed notes about the C++ API in develop.  Only keep in 1.10 branch.
  Add prototype for H5AC_get_mdc_image_info
  Minor style cleanups
  Revert "Switch h5clear for cache images to use existing H5Pget_cache_image_config()"
  Update RELEASE.txt to reflect changes for new features and bug fixes since 1.10.0-patch1.
  Run all scripts using signal files between processes in their own directories to avoid accidental deletion of the signal files.
  Remove extra space added by h5vers to version string in H5.java, which then failed to match the pattern after the first run.
  Remove incorrect " marks added to java files by bin/h5vers. Pull version from configure for version test in h5repack_plugin.sh.in
  Description:     Fixed typos and missing items in function headers, that were revealed     by Doxygen, and revised various comments. Platforms tested:     Linux/32 2.6 (jam)     Linux/64 (platypus)     Darwin (osx1010test)
  Description:     Updated the C++ API sections.
  Extend h5vers to update version strings in java files and h5repack version test expected output file.
  Run swmr tests in their own subdirectory of test to avoid signal file deletion by other tests.
2017-03-28 16:55:26 -05:00
lrknox
a1dc1a5f28 Resolve conflict missed in merge. 2017-03-28 16:36:30 -05:00
lrknox
c7f3365015 Merge branch 'develop' into hdf5_1_10 2017-03-28 16:29:11 -05:00
Allen Byrne
77e1f1e491 HDFFV-10143 add APIs to manipulate plugin path table 2017-03-28 14:15:13 -05:00
Quincey Koziol
a77bf61074 Further minor cleanups 2017-03-27 22:48:41 -07:00
Quincey Koziol
37de3f30e4 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_hyperslab_updates 2017-03-27 20:29:44 -07:00
Quincey Koziol
8859a5a270 Checkpoint normalization against incoming hyperslab / selection / dataspace
improvements.
2017-03-27 20:25:06 -07:00
Allen Byrne
9b59aeadf0 Update macros to match master and fix VS matches 2017-03-27 12:57:31 -05:00
Larry Knox
78f488b0b4 Merge pull request #368 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '00a19eebf00f17736ca01d2375ebdb05e5f817d8':
  Update RELEASE.txt Remove "currently under development" from h5vers for HDF5Config.cmake that causes cmake not to find HDF5.
  Merge bin/h5vers changes from develop. Pull version from configure for version test in h5repack_plugin.sh.in Update version to 1.10.2-snap0 for hdf5_1_10 branch.
2017-03-24 13:44:36 -05:00
lrknox
00a19eebf0 Update RELEASE.txt Remove "currently under development" from h5vers for
HDF5Config.cmake that causes cmake not to find HDF5.
2017-03-24 13:42:30 -05:00
lrknox
972344e231 Merge bin/h5vers changes from develop.
Pull version from configure for version test in h5repack_plugin.sh.in
Update version to 1.10.2-snap0 for hdf5_1_10 branch.
2017-03-23 20:03:27 -05:00
Larry Knox
87dceab9de Merge pull request #366 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '84b6746c734fe2be7e9c7ffc2db25a0f0deeceaf':
  Merge pull request #359 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
  Set shared object version numbers (for lib.so files) to appropriate numbers for HDF5 1.10.1 release according to the interface compatibility report with respect to HDF5 1.10.0-patch1.
2017-03-23 17:34:51 -05:00
Vailin Choi
84b6746c73 Merge pull request #359 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit '436bfedcbd1152e9aa47d50f9d8ad78817488ce1':
  Update RELEASE.txt based on review comments from pull request.
  Update RELEASE.txt to reflect changes for new features and bug fixes since 1.10.0-patch1.
2017-03-23 17:31:22 -05:00
lrknox
28136f6082 Set shared object version numbers (for lib.so files) to appropriate
numbers for HDF5 1.10.1 release according to the interface compatibility
report with respect to HDF5 1.10.0-patch1.
2017-03-23 17:21:20 -05:00
Larry Knox
7ba3ec057e Merge pull request #364 in HDFFV/hdf5 from ~BMRIBLER/hdf5_1_10_bmr:hdf5_1_10 to hdf5_1_10
* commit 'f8d954c0b0a79e2d8d513e180358866e5269229b':
  Added more notes to the C++ API sections.
  Description:     Added more notes and made some improvements in the C++ API sections.
2017-03-23 16:28:19 -05:00
Binh-Minh Ribler
f8d954c0b0 Added more notes to the C++ API sections. 2017-03-23 11:42:15 -05:00
Larry Knox
d339292774 Merge pull request #365 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'd0b1c6f6edab9b80e74c5bf80e15f8952915ac34':
  Add H5_DLL to function prototype.
  Merge pull request #361 in HDFFV/hdf5 from merge_h5clear_revert to develop
  Add prototype for H5AC_get_mdc_image_info
  Moved Centos 6 from Supported Platforms to Other Tested Platforms and removed Centos 6 entries from the Tested Configuration Features Summary.
2017-03-23 00:14:09 -05:00
lrknox
d0b1c6f6ed Add H5_DLL to function prototype. 2017-03-23 00:05:51 -05:00
Quincey Koziol
9ab96feda6 Merge pull request #361 in HDFFV/hdf5 from merge_h5clear_revert to develop
* commit '46c9ab600de491657520897322b75659c3bdfb5f':
  Minor style cleanups
  Revert "Switch h5clear for cache images to use existing H5Pget_cache_image_config()"
2017-03-23 00:04:49 -05:00
Quincey Koziol
a533dba4d1 Add prototype for H5AC_get_mdc_image_info 2017-03-23 00:01:04 -05:00
Binh-Minh Ribler
6c9bf4b47a Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_1_10_bmr into hdf5_1_10 2017-03-22 22:28:33 -05:00
Binh-Minh Ribler
a3d7c4703b Description:
Added more notes and made some improvements in the C++ API sections.
2017-03-22 22:26:33 -05:00
lrknox
7f53978593 Moved Centos 6 from Supported Platforms to Other Tested Platforms and
removed Centos 6 entries from the Tested Configuration Features Summary.
2017-03-22 16:45:06 -05:00
Larry Knox
489409b3e4 Merge pull request #360 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'd37561605bda978ef8e5de03997dca4e493e213b':
  Merge pull request #358 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
2017-03-22 13:59:51 -05:00
lrknox
d37561605b Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into hdf5_1_10 2017-03-22 12:01:22 -05:00
Larry Knox
36a30ecfd2 Merge pull request #358 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '82183c7cdc50f9dc41ef8238c6a2bef6f1c7fcde':
  Run all scripts using signal files between processes in their own directories to avoid accidental deletion of the signal files.
2017-03-22 12:00:52 -05:00
Binh-Minh Ribler
d605ce46b3 Merge pull request #357 in HDFFV/hdf5 from ~BMRIBLER/hdf5_1_10_bmr:hdf5_1_10 to hdf5_1_10
* commit '7a799387e100138f1300c29810e9032f66436fcf':
  Description:     Fixed typos and missing items in function headers, that were revealed     by Doxygen, and revised various comments. Platforms tested:     Linux/32 2.6 (jam)     Linux/64 (platypus)     Darwin (osx1010test)
  Description:     Updated the C++ API sections.
2017-03-21 14:40:18 -05:00
Binh-Minh Ribler
7a799387e1 Description:
Fixed typos and missing items in function headers, that were revealed
    by Doxygen, and revised various comments.
Platforms tested:
    Linux/32 2.6 (jam)
    Linux/64 (platypus)
    Darwin (osx1010test)
2017-03-21 14:36:28 -05:00
Binh-Minh Ribler
17f14945b8 Description:
Updated the C++ API sections.
2017-03-21 14:22:20 -05:00
lrknox
41a54b4fab Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_10 2017-03-20 16:45:10 -05:00
Larry Knox
4a2f5b6470 Merge pull request #347 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'd60ca826c00533d72f94e38c1b2cf790e1b3f190':
  Change version for h5repack_plugin.sh.in and expected output ddl file for plugin_version_test.
2017-03-18 22:14:02 -05:00
lrknox
d60ca826c0 Change version for h5repack_plugin.sh.in and expected output ddl file for plugin_version_test. 2017-03-18 22:06:32 -05:00
Larry Knox
1a40bfd941 Merge pull request #345 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '72eddf198d6a7c1b103356f9141a2b4fb8c79abf':
  CTestConfig.cmake:     Report results to HDF5110 in buildbot and CDash.
2017-03-17 21:31:05 -05:00
lrknox
72eddf198d Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into hdf5_1_10 2017-03-17 16:56:22 -05:00
lrknox
764bac98c2 CTestConfig.cmake:
Report results to HDF5110 in buildbot and CDash.

testswmr.sh.in:
    Run swmr tests in their own subdirectory of test to avoid signal
    file deletion by other tests.
2017-03-17 16:53:16 -05:00
Larry Knox
7ebd91fbdb Merge pull request #343 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '9187d41af616b6c8064ab0af5c85d4dd93cff50d':
  Update version numbers in HDF5config.cmake and 2 java files.  h5vers script missed them, will need updating.
  set initial version for HDF5 1.10.1.
2017-03-17 13:25:24 -05:00
lrknox
9187d41af6 Update version numbers in HDF5config.cmake and 2 java files. h5vers
script missed them, will need updating.
2017-03-17 13:14:08 -05:00
lrknox
12425a62a6 set initial version for HDF5 1.10.1. 2017-03-17 12:43:50 -05:00
958 changed files with 107464 additions and 97133 deletions

8
.gitattributes vendored
View File

@@ -192,12 +192,12 @@ java/examples/testfiles/examples.intro.H5_CreateGroup.txt -text
java/examples/testfiles/examples.intro.H5_CreateGroupAbsoluteRelative.txt -text
java/examples/testfiles/examples.intro.H5_CreateGroupDataset.txt -text
java/examples/testfiles/examples.intro.H5_ReadWrite.txt -text
java/lib/ext/slf4j-nop-1.7.5.jar -text svneol=unset#application/zip
java/lib/ext/slf4j-simple-1.7.5.jar -text svneol=unset#application/zip
java/lib/ext/slf4j-nop-1.7.25.jar -text svneol=unset#application/zip
java/lib/ext/slf4j-simple-1.7.25.jar -text svneol=unset#application/zip
java/lib/hamcrest-core.jar -text svneol=unset#application/java-archive
java/lib/junit.jar -text svneol=unset#application/java-archive
java/lib/simplelogger.properties -text
java/lib/slf4j-api-1.7.5.jar -text svneol=unset#application/zip
java/lib/slf4j-api-1.7.25.jar -text svneol=unset#application/zip
java/src/CMakeLists.txt -text
java/src/Makefile.am -text
java/src/hdf/CMakeLists.txt -text
@@ -321,6 +321,7 @@ java/test/TestH5Dparams.java -text
java/test/TestH5Dplist.java -text
java/test/TestH5E.java -text
java/test/TestH5Edefault.java -text
java/test/TestH5Eparams.java -text
java/test/TestH5Eregister.java -text
java/test/TestH5F.java -text
java/test/TestH5Fbasic.java -text
@@ -347,6 +348,7 @@ java/test/TestH5Sbasic.java -text
java/test/TestH5T.java -text
java/test/TestH5Tbasic.java -text
java/test/TestH5Tparams.java -text
java/test/TestUnit.java -text
java/test/TestH5Z.java -text
java/test/h5ex_g_iterate.orig -text svneol=unset#application/x-hdf
java/test/junit.sh.in -text

View File

@@ -45,8 +45,8 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
if (NOT ZLIB_FOUND)
find_package (ZLIB) # Legacy find
if (ZLIB_FOUND)
set (LINK_LIBS ${LINK_LIBS} ${ZLIB_LIBRARIES})
set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${ZLIB_LIBRARIES})
set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES})
set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${ZLIB_LIBRARIES})
endif ()
endif ()
endif ()
@@ -78,9 +78,9 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT)
set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} DEFLATE")
endif ()
if (BUILD_SHARED_LIBS)
set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${ZLIB_SHARED_LIBRARY})
set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${ZLIB_SHARED_LIBRARY})
endif ()
set (LINK_LIBS ${LINK_LIBS} ${ZLIB_STATIC_LIBRARY})
set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_STATIC_LIBRARY})
INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS})
message (STATUS "Filter ZLIB is ON")
endif ()
@@ -96,8 +96,8 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
if (NOT SZIP_FOUND)
find_package (SZIP) # Legacy find
if (SZIP_FOUND)
set (LINK_LIBS ${LINK_LIBS} ${SZIP_LIBRARIES})
set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${SZIP_LIBRARIES})
set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${SZIP_LIBRARIES})
endif ()
endif ()
endif ()
@@ -119,9 +119,9 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
endif ()
endif ()
if (BUILD_SHARED_LIBS)
set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${SZIP_SHARED_LIBRARY})
set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${SZIP_SHARED_LIBRARY})
endif ()
set (LINK_LIBS ${LINK_LIBS} ${SZIP_STATIC_LIBRARY})
set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_STATIC_LIBRARY})
INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS})
message (STATUS "Filter SZIP is ON")
if (H5_HAVE_FILTER_SZIP)

View File

@@ -23,16 +23,6 @@ if (WIN32)
find_program (WIX_EXECUTABLE candle PATHS "${CPACK_WIX_ROOT}/bin")
endif ()
#-----------------------------------------------------------------------------
# Add file(s) to CMake Install
#-----------------------------------------------------------------------------
if (NOT HDF5_INSTALL_NO_DEVELOPMENT)
install (
FILES ${PROJECT_BINARY_DIR}/H5pubconf.h
DESTINATION ${HDF5_INSTALL_INCLUDE_DIR}
COMPONENT headers
)
endif ()
#-----------------------------------------------------------------------------
# Add Target(s) to CMake Install for import into other projects
@@ -41,7 +31,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
if (HDF5_EXPORTED_TARGETS)
install (
EXPORT ${HDF5_EXPORTED_TARGETS}
DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/hdf5
FILE ${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-targets.cmake
NAMESPACE ${HDF5_PACKAGE}::
COMPONENT configinstall
@@ -84,7 +74,7 @@ set (CURRENT_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}" )
configure_package_config_file (
${HDF_RESOURCES_DIR}/hdf5-config.cmake.in
"${HDF5_BINARY_DIR}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake"
INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}"
INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}/hdf5"
PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR
INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}"
)
@@ -98,14 +88,14 @@ set (CURRENT_BUILD_DIR "${CMAKE_INSTALL_PREFIX}" )
configure_package_config_file (
${HDF_RESOURCES_DIR}/hdf5-config.cmake.in
"${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake"
INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}"
INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}/hdf5"
PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR
)
if (NOT HDF5_EXTERNALLY_CONFIGURED)
install (
FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake
DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/hdf5
COMPONENT configinstall
)
endif ()
@@ -120,7 +110,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
)
install (
FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake
DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/hdf5
COMPONENT configinstall
)
endif ()
@@ -143,24 +133,6 @@ install (
COMPONENT libraries
)
#-----------------------------------------------------------------------------
# Create pkgconfig files
#-----------------------------------------------------------------------------
#foreach (libs ${LINK_LIBS})
# set (LIBS "${LIBS} -l${libs}")
#endforeach ()
#foreach (libs ${HDF5_LIBRARIES_TO_EXPORT})
# set (HDF5LIBS "${HDF5LIBS} -l${libs}")
#endforeach ()
#configure_file (
# ${HDF_RESOURCES_DIR}/libhdf5.pc.in
# ${HDF5_BINARY_DIR}/CMakeFiles/libhdf5.pc @ONLY
#)
#install (
# FILES ${HDF5_BINARY_DIR}/CMakeFiles/libhdf5.pc
# DESTINATION ${HDF5_INSTALL_LIB_DIR}/pkgconfig
#)
#-----------------------------------------------------------------------------
# Configure the HDF518_Examples.cmake file and the examples
#-----------------------------------------------------------------------------
@@ -243,6 +215,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
if (HDF5_PACK_INSTALL_DOCS)
set (release_files
${release_files}
${HDF5_SOURCE_DIR}/release_docs/INSTALL_Warnings.txt
${HDF5_SOURCE_DIR}/release_docs/INSTALL_CMake.txt
${HDF5_SOURCE_DIR}/release_docs/HISTORY-1_8.txt
${HDF5_SOURCE_DIR}/release_docs/INSTALL

View File

@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 3.2.2)
PROJECT (HDF5 C CXX)
cmake_minimum_required (VERSION 3.10)
project (HDF5 C)
#-----------------------------------------------------------------------------
# Instructions for use : Normal Build
@@ -195,54 +195,9 @@ set (HDF5_JAVA_JNI_SRC_DIR ${HDF5_SOURCE_DIR}/java/src/jni)
set (HDF5_JAVA_HDF5_SRC_DIR ${HDF5_SOURCE_DIR}/java/src/hdf)
set (HDF5_JAVA_TEST_SRC_DIR ${HDF5_SOURCE_DIR}/java/test)
set (HDF5_JAVA_LIB_DIR ${HDF5_SOURCE_DIR}/java/lib)
set (HDF5_JAVA_LOGGING_JAR ${HDF5_SOURCE_DIR}/java/lib/slf4j-api-1.7.5.jar)
set (HDF5_JAVA_LOGGING_NOP_JAR ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-nop-1.7.5.jar)
set (HDF5_JAVA_LOGGING_SIMPLE_JAR ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-simple-1.7.5.jar)
if (APPLE)
option (HDF5_BUILD_FRAMEWORKS "TRUE to build as frameworks libraries, FALSE to build according to BUILD_SHARED_LIBS" FALSE)
endif ()
if (NOT HDF5_INSTALL_BIN_DIR)
set (HDF5_INSTALL_BIN_DIR bin)
endif ()
if (NOT HDF5_INSTALL_LIB_DIR)
if (APPLE)
if (HDF5_BUILD_FRAMEWORKS)
set (HDF5_INSTALL_JAR_DIR ../Java)
else ()
set (HDF5_INSTALL_JAR_DIR lib)
endif ()
set (HDF5_INSTALL_FMWK_DIR ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
else ()
set (HDF5_INSTALL_JAR_DIR lib)
endif ()
set (HDF5_INSTALL_LIB_DIR lib)
endif ()
if (NOT HDF5_INSTALL_INCLUDE_DIR)
set (HDF5_INSTALL_INCLUDE_DIR include)
endif ()
if (NOT HDF5_INSTALL_DATA_DIR)
if (NOT WIN32)
if (APPLE)
if (HDF5_BUILD_FRAMEWORKS)
set (HDF5_INSTALL_EXTRA_DIR ../SharedSupport)
else ()
set (HDF5_INSTALL_EXTRA_DIR share)
endif ()
set (HDF5_INSTALL_FWRK_DIR ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
endif ()
set (HDF5_INSTALL_DATA_DIR share)
set (HDF5_INSTALL_CMAKE_DIR share/cmake)
else ()
set (HDF5_INSTALL_DATA_DIR ".")
set (HDF5_INSTALL_CMAKE_DIR cmake)
endif ()
endif ()
if (DEFINED ADDITIONAL_CMAKE_PREFIX_PATH AND EXISTS "${ADDITIONAL_CMAKE_PREFIX_PATH}")
set (CMAKE_PREFIX_PATH ${ADDITIONAL_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH})
endif ()
set (HDF5_JAVA_LOGGING_JAR ${HDF5_SOURCE_DIR}/java/lib/slf4j-api-1.7.25.jar)
set (HDF5_JAVA_LOGGING_NOP_JAR ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-nop-1.7.25.jar)
set (HDF5_JAVA_LOGGING_SIMPLE_JAR ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-simple-1.7.25.jar)
#-----------------------------------------------------------------------------
# parse the full version number from H5public.h and include in H5_VERS_INFO
@@ -263,13 +218,13 @@ string (REGEX REPLACE ".*#define[ \t]+H5_VERS_SUBRELEASE[ \t]+\"([0-9A-Za-z._]*)
#-----------------------------------------------------------------------------
file (READ ${HDF5_SOURCE_DIR}/config/lt_vers.am _lt_vers_am_contents)
string (REGEX REPLACE ".*LT_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
"\\1" H5_SOVERS_INTERFACE ${_lt_vers_am_contents})
"\\1" H5_LIB_SOVERS_INTERFACE ${_lt_vers_am_contents})
string (REGEX REPLACE ".*LT_VERS_REVISION[ \t]+=[ \t]+([0-9]*).*$"
"\\1" H5_SOVERS_MINOR ${_lt_vers_am_contents})
"\\1" H5_LIB_SOVERS_MINOR ${_lt_vers_am_contents})
string (REGEX REPLACE ".*LT_VERS_AGE[ \t]+=[ \t]+([0-9]*).*$"
"\\1" H5_SOVERS_RELEASE ${_lt_vers_am_contents})
math (EXPR H5_SOVERS_MAJOR ${H5_SOVERS_INTERFACE}-${H5_SOVERS_RELEASE})
message (STATUS "SOVERSION: ${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_MINOR}")
"\\1" H5_LIB_SOVERS_RELEASE ${_lt_vers_am_contents})
math (EXPR H5_LIB_SOVERS_MAJOR ${H5_LIB_SOVERS_INTERFACE}-${H5_LIB_SOVERS_RELEASE})
message (STATUS "SOVERSION: ${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
string (REGEX MATCH ".*LT_TOOLS_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$" H5_TOOLS_SOVERS_EXISTS ${_lt_vers_am_contents})
if (H5_TOOLS_SOVERS_EXISTS)
string (REGEX REPLACE ".*LT_TOOLS_VERS_INTERFACE[ \t]+=[ \t]+([0-9]*).*$"
@@ -361,41 +316,56 @@ if (NOT "${H5_VERS_SUBRELEASE}" STREQUAL "")
else ()
set (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}")
endif ()
set (HDF5_PACKAGE_SOVERSION "${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_MINOR}")
set (HDF5_LIB_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
set (HDF5_LIB_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
if (H5_TOOLS_SOVERS_EXISTS)
set (HDF5_TOOLS_PACKAGE_SOVERSION "${H5_TOOLS_SOVERS_MAJOR}.${H5_TOOLS_SOVERS_RELEASE}.${H5_TOOLS_SOVERS_MINOR}")
set (HDF5_TOOLS_PACKAGE_SOVERSION_MAJOR "${H5_TOOLS_SOVERS_MAJOR}")
else ()
set (HDF5_TOOLS_PACKAGE_SOVERSION "${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_MINOR}")
set (HDF5_TOOLS_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
set (HDF5_TOOLS_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
endif ()
if (H5_CXX_SOVERS_EXISTS)
set (HDF5_CXX_PACKAGE_SOVERSION "${H5_CXX_SOVERS_MAJOR}.${H5_CXX_SOVERS_RELEASE}.${H5_CXX_SOVERS_MINOR}")
set (HDF5_CXX_PACKAGE_SOVERSION_MAJOR "${H5_CXX_SOVERS_MAJOR}")
else ()
set (HDF5_CXX_PACKAGE_SOVERSION "${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_MINOR}")
set (HDF5_CXX_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
set (HDF5_CXX_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
endif ()
if (H5_F_SOVERS_EXISTS)
set (HDF5_F_PACKAGE_SOVERSION "${H5_F_SOVERS_MAJOR}.${H5_F_SOVERS_RELEASE}.${H5_F_SOVERS_MINOR}")
set (HDF5_F_PACKAGE_SOVERSION_MAJOR "${H5_F_SOVERS_MAJOR}")
else ()
set (HDF5_F_PACKAGE_SOVERSION "${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_MINOR}")
set (HDF5_F_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
set (HDF5_F_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
endif ()
if (H5_HL_SOVERS_EXISTS)
set (HDF5_HL_PACKAGE_SOVERSION "${H5_HL_SOVERS_MAJOR}.${H5_HL_SOVERS_RELEASE}.${H5_HL_SOVERS_MINOR}")
set (HDF5_HL_PACKAGE_SOVERSION_MAJOR "${H5_HL_SOVERS_MAJOR}")
else ()
set (HDF5_HL_PACKAGE_SOVERSION "${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_MINOR}")
set (HDF5_HL_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
set (HDF5_HL_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
endif ()
if (H5_HL_F_SOVERS_EXISTS)
set (HDF5_HL_CXX_PACKAGE_SOVERSION "${H5_HL_CXX_SOVERS_MAJOR}.${H5_HL_CXX_SOVERS_RELEASE}.${H5_HL_CXX_SOVERS_MINOR}")
set (HDF5_HL_CXX_PACKAGE_SOVERSION_MAJOR "${H5_HL_CXX_SOVERS_MAJOR}")
else ()
set (HDF5_HL_CXX_PACKAGE_SOVERSION "${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_MINOR}")
set (HDF5_HL_CXX_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
set (HDF5_HL_CXX_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
endif ()
if (H5_HL_F_SOVERS_EXISTS)
set (HDF5_HL_F_PACKAGE_SOVERSION "${H5_HL_F_SOVERS_MAJOR}.${H5_HL_F_SOVERS_RELEASE}.${H5_HL_F_SOVERS_MINOR}")
set (HDF5_HL_F_PACKAGE_SOVERSION_MAJOR "${H5_HL_F_SOVERS_MAJOR}")
else ()
set (HDF5_HL_F_PACKAGE_SOVERSION "${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_MINOR}")
set (HDF5_HL_F_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
set (HDF5_HL_F_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
endif ()
if (H5_JAVA_SOVERS_EXISTS)
set (HDF5_PACKAGE_SOVERSION "${H5_JAVA_SOVERS_MAJOR}.${H5_JAVA_SOVERS_RELEASE}.${H5_JAVA_SOVERS_MINOR}")
set (HDF5_JAVA_PACKAGE_SOVERSION "${H5_JAVA_SOVERS_MAJOR}.${H5_JAVA_SOVERS_RELEASE}.${H5_JAVA_SOVERS_MINOR}")
set (HDF5_JAVA_PACKAGE_SOVERSION_MAJOR "${H5_JAVA_SOVERS_MAJOR}")
else ()
set (HDF5_JAVA_PACKAGE_SOVERSION "${H5_SOVERS_MAJOR}.${H5_SOVERS_RELEASE}.${H5_SOVERS_MINOR}")
set (HDF5_JAVA_PACKAGE_SOVERSION "${H5_LIB_SOVERS_MAJOR}.${H5_LIB_SOVERS_RELEASE}.${H5_LIB_SOVERS_MINOR}")
set (HDF5_JAVA_PACKAGE_SOVERSION_MAJOR "${H5_LIB_SOVERS_MAJOR}")
endif ()
set (HDF5_PACKAGE_STRING "${HDF5_PACKAGE_NAME} ${HDF5_PACKAGE_VERSION_STRING}")
set (HDF5_PACKAGE_TARNAME "${HDF5_PACKAGE}${HDF_PACKAGE_EXT}")
@@ -406,44 +376,15 @@ set (HDF5_PACKAGE_BUGREPORT "help@hdfgroup.org")
# Include some macros for reusable code
#-----------------------------------------------------------------------------
include (${HDF_RESOURCES_EXT_DIR}/HDFMacros.cmake)
HDF_DIR_PATHS(${HDF5_PACKAGE_NAME})
include (${HDF_RESOURCES_EXT_DIR}/HDFLibMacros.cmake)
include (${HDF_RESOURCES_DIR}/HDF5Macros.cmake)
#-----------------------------------------------------------------------------
# Setup output Directories
#-----------------------------------------------------------------------------
if (NOT HDF5_EXTERNALLY_CONFIGURED)
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables."
)
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries"
)
set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries."
)
set (CMAKE_Fortran_MODULE_DIRECTORY
${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all fortran modules."
)
if (WIN32)
set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE})
set (CMAKE_PDB_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all pdb files."
)
else ()
set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
endif ()
else ()
# if we are externally configured, but the project uses old cmake scripts
# this may not be set and utilities like H5detect will fail
if (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
endif ()
endif ()
#-----------------------------------------------------------------------------
# Targets built within this project are exported at Install time for use
# by other projects using FindHDF5.
# by other projects.
#-----------------------------------------------------------------------------
if (NOT HDF5_EXPORTED_TARGETS)
set (HDF5_EXPORTED_TARGETS "hdf5-targets")
@@ -482,7 +423,6 @@ option (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
set (H5_ENABLE_SHARED_LIB NO)
if (BUILD_SHARED_LIBS)
set (H5_ENABLE_SHARED_LIB YES)
set (LINK_SHARED_LIBS ${LINK_LIBS})
endif ()
set (H5_ENABLE_STATIC_LIB YES)
set (CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -490,7 +430,7 @@ set (CMAKE_POSITION_INDEPENDENT_CODE ON)
#-----------------------------------------------------------------------------
# Option to Build Static executables
#-----------------------------------------------------------------------------
option (BUILD_STATIC_EXECS "Build Static Executabless" OFF)
option (BUILD_STATIC_EXECS "Build Static Executables" OFF)
if (BUILD_STATIC_EXECS)
if (NOT WIN32)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static")
@@ -503,9 +443,14 @@ endif ()
#-----------------------------------------------------------------------------
option (HDF5_ENABLE_COVERAGE "Enable code coverage for Libraries and Programs" OFF)
if (HDF5_ENABLE_COVERAGE)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
set (LDFLAGS "${LDFLAGS} -fprofile-arcs -ftest-coverage")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 --coverage -fprofile-arcs -ftest-coverage")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g --coverage -O0 -fprofile-arcs -ftest-coverage")
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
set (LDFLAGS "${LDFLAGS} -fprofile-arcs -ftest-coverage")
link_libraries (gcov)
else ()
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
endif ()
endif ()
#-----------------------------------------------------------------------------
@@ -552,11 +497,9 @@ endif ()
set (EXE_EXT "")
if (WIN32)
set (EXE_EXT ".exe")
if (NOT CYGWIN)
add_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1)
add_definitions (-D_CRT_SECURE_NO_WARNINGS)
add_definitions (-D_CONSOLE)
endif ()
add_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1)
add_definitions (-D_CRT_SECURE_NO_WARNINGS)
add_definitions (-D_CONSOLE)
endif ()
if (MSVC)
@@ -583,65 +526,73 @@ option (HDF5_BUILD_GENERATORS "Build Test Generators" OFF)
#-----------------------------------------------------------------------------
option (HDF5_ENABLE_TRACE "Enable API tracing capability" OFF)
mark_as_advanced (HDF5_ENABLE_TRACE)
if (CMAKE_BUILD_TYPE MATCHES Debug)
add_definitions (-DDEBUG)
# Enable tracing of the API
if (HDF5_ENABLE_TRACE)
add_definitions (-DH5_DEBUG_API )
endif ()
if (${HDF_CFG_NAME} MATCHES "Debug")
# Enable instrumenting of the library's internal operations
option (HDF5_ENABLE_INSTRUMENT "Instrument The library" OFF)
if (HDF5_ENABLE_INSTRUMENT)
set (H5_HAVE_INSTRUMENTED_LIBRARY 1)
endif ()
mark_as_advanced (HDF5_ENABLE_INSTRUMENT)
else ()
add_definitions (-DNDEBUG)
if (HDF5_ENABLE_TRACE)
add_definitions (-DH5_DEBUG_API )
endif ()
endif ()
#-----------------------------------------------------------------------------
# Option to embed library info into executables
#-----------------------------------------------------------------------------
option (HDF5_ENABLE_EMBEDDED_LIBINFO "embed library info into executables" ON)
if (HDF5_ENABLE_EMBEDDED_LIBINFO)
set (H5_HAVE_EMBEDDED_LIBINFO 1)
if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
set (H5_HAVE_EMBEDDED_LIBINFO 0)
else ()
option (HDF5_ENABLE_EMBEDDED_LIBINFO "embed library info into executables" ON)
if (HDF5_ENABLE_EMBEDDED_LIBINFO)
set (H5_HAVE_EMBEDDED_LIBINFO 1)
endif ()
endif ()
include (${HDF_RESOURCES_DIR}/HDFCompilerFlags.cmake)
#-----------------------------------------------------------------------------
# All libs/tests/examples need the main include directories
#-----------------------------------------------------------------------------
INCLUDE_DIRECTORIES (${HDF5_BINARY_DIR} ${HDF5_SRC_DIR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
set (CMAKE_MODULE_PATH ${HDF_RESOURCES_DIR} ${HDF_RESOURCES_EXT_DIR} ${CMAKE_MODULE_PATH})
#-----------------------------------------------------------------------------
# Option to Enable MPI Parallel
#-----------------------------------------------------------------------------
set (CMAKE_MODULE_PATH ${HDF_RESOURCES_DIR} ${HDF_RESOURCES_EXT_DIR} ${CMAKE_MODULE_PATH})
option (HDF5_ENABLE_PARALLEL "Enable parallel build (requires MPI)" OFF)
if (HDF5_ENABLE_PARALLEL)
include (FindMPI)
INCLUDE_DIRECTORIES (${MPI_C_INCLUDE_PATH})
find_package(MPI REQUIRED)
if (MPI_C_FOUND)
set (H5_HAVE_PARALLEL 1)
# MPI checks, only do these if MPI_C_FOUND is true, otherwise they always fail
# and once set, they are cached as false and not regenerated
set (CMAKE_REQUIRED_LIBRARIES "${MPI_C_LIBRARIES}" )
set (CMAKE_REQUIRED_LIBRARIES "${MPI_C_LIBRARIES}")
set (CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_DIRS}")
# Used by Fortran + MPI
CHECK_SYMBOL_EXISTS (MPI_Comm_c2f "${MPI_C_INCLUDE_PATH}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Comm)
CHECK_SYMBOL_EXISTS (MPI_Info_c2f "${MPI_C_INCLUDE_PATH}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Info)
CHECK_SYMBOL_EXISTS (MPI_Comm_c2f "mpi.h" H5_HAVE_MPI_MULTI_LANG_Comm)
CHECK_SYMBOL_EXISTS (MPI_Info_c2f "mpi.h" H5_HAVE_MPI_MULTI_LANG_Info)
# Used by Parallel Compression feature
set (PARALLEL_FILTERED_WRITES ON)
CHECK_SYMBOL_EXISTS (MPI_Mprobe "mpi.h" H5_HAVE_MPI_Mprobe)
CHECK_SYMBOL_EXISTS (MPI_Imrecv "mpi.h" H5_HAVE_MPI_Imrecv)
if (NOT H5_HAVE_MPI_Mprobe OR NOT H5_HAVE_MPI_Imrecv)
message (WARNING "The MPI_Mprobe and/or MPI_Imrecv functions could not be located.
Parallel writes of filtered data will be disabled.")
set (PARALLEL_FILTERED_WRITES OFF)
endif ()
# Used by big I/O feature
set (LARGE_PARALLEL_IO ON)
CHECK_SYMBOL_EXISTS (MPI_Get_elements_x "mpi.h" H5_HAVE_MPI_Get_elements_x)
CHECK_SYMBOL_EXISTS (MPI_Type_size_x "mpi.h" H5_HAVE_MPI_Type_size_x)
if (NOT H5_HAVE_MPI_Get_elements_x OR NOT H5_HAVE_MPI_Type_size_x)
message (WARNING "The MPI_Get_elements_x and/or MPI_Type_size_x functions could not be located.
Reading/Writing >2GB of data in a single parallel I/O operation will be disabled.")
set (LARGE_PARALLEL_IO OFF)
endif ()
else ()
message (STATUS "Parallel libraries not found")
message (FATAL_ERROR "Parallel libraries not found")
endif ()
endif ()
# Parallel IO usage requires MPI to be Linked and Included
if (H5_HAVE_PARALLEL)
set (LINK_LIBS ${LINK_LIBS} ${MPI_C_LIBRARIES})
set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${MPI_C_LIBRARIES})
if (MPI_C_LINK_FLAGS)
set (CMAKE_EXE_LINKER_FLAGS "${MPI_C_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
endif ()
@@ -668,6 +619,16 @@ if (HDF5_USE_18_API_DEFAULT)
set (DEFAULT_API_VERSION "v18")
endif ()
#-----------------------------------------------------------------------------
# Option to use 1.10.x API
#-----------------------------------------------------------------------------
option (HDF5_USE_110_API_DEFAULT "Use the HDF5 1.10.x API by default" ON)
set (H5_USE_110_API_DEFAULT 0)
if (HDF5_USE_110_API_DEFAULT)
set (H5_USE_110_API_DEFAULT 1)
set (DEFAULT_API_VERSION "v110")
endif ()
#-----------------------------------------------------------------------------
# Include user macros
#-----------------------------------------------------------------------------
@@ -745,26 +706,20 @@ if (HDF5_ENABLE_THREADSAFE)
endif ()
endif ()
# -----------------------------------------------------------------------
# wrapper script variables
#
#set (CFLAGS "${C_DEFINES}")
#set (CXXFLAGS "${CXX_DEFINES}")
#-----------------------------------------------------------------------------
# Add the HDF5 Library Target to the build
#-----------------------------------------------------------------------------
add_subdirectory (${HDF5_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src)
add_subdirectory (src)
if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
if (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
ADD_DEPENDENCIES (${HDF5_LIB_TARGET} ZLIB)
add_dependencies (${HDF5_LIB_TARGET} ZLIB)
if (BUILD_SHARED_LIBS)
add_dependencies (${HDF5_LIBSH_TARGET} ZLIB)
endif ()
endif ()
if (SZIP_FOUND AND SZIP_USE_EXTERNAL)
ADD_DEPENDENCIES (${HDF5_LIB_TARGET} SZIP)
add_dependencies (${HDF5_LIB_TARGET} SZIP)
if (BUILD_SHARED_LIBS)
add_dependencies (${HDF5_LIBSH_TARGET} SZIP)
endif ()
@@ -799,12 +754,11 @@ if (BUILD_TESTING)
if (NOT HDF5_EXTERNALLY_CONFIGURED)
if (EXISTS "${HDF5_SOURCE_DIR}/test" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/test")
add_subdirectory (${HDF5_SOURCE_DIR}/tools/lib ${PROJECT_BINARY_DIR}/tools/lib)
add_subdirectory (${HDF5_SOURCE_DIR}/test ${PROJECT_BINARY_DIR}/test)
add_subdirectory (test)
endif ()
if (H5_HAVE_PARALLEL)
if (EXISTS "${HDF5_SOURCE_DIR}/testpar" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/testpar")
add_subdirectory (${HDF5_SOURCE_DIR}/testpar ${PROJECT_BINARY_DIR}/testpar)
add_subdirectory (testpar)
endif ()
endif ()
endif ()
@@ -816,7 +770,7 @@ endif ()
if (EXISTS "${HDF5_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/tools")
option (HDF5_BUILD_TOOLS "Build HDF5 Tools" ON)
if (HDF5_BUILD_TOOLS)
add_subdirectory (${HDF5_SOURCE_DIR}/tools ${PROJECT_BINARY_DIR}/tools)
add_subdirectory (tools)
endif ()
endif ()
@@ -826,7 +780,7 @@ endif ()
if (EXISTS "${HDF5_SOURCE_DIR}/examples" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/examples")
option (HDF5_BUILD_EXAMPLES "Build HDF5 Library Examples" ON)
if (HDF5_BUILD_EXAMPLES)
add_subdirectory (${HDF5_SOURCE_DIR}/examples ${PROJECT_BINARY_DIR}/examples)
add_subdirectory (examples)
endif ()
endif ()
@@ -837,7 +791,7 @@ if (EXISTS "${HDF5_SOURCE_DIR}/hl" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl")
option (HDF5_BUILD_HL_LIB "Build HIGH Level HDF5 Library" ON)
if (HDF5_BUILD_HL_LIB)
set (H5_INCLUDE_HL 1)
add_subdirectory (${HDF5_SOURCE_DIR}/hl ${PROJECT_BINARY_DIR}/hl)
add_subdirectory (hl)
endif ()
endif ()
@@ -851,21 +805,8 @@ set (H5_FC_FUNC "H5_FC_FUNC(name,NAME) name ## _")
set (H5_FC_FUNC_ "H5_FC_FUNC_(name,NAME) name ## _")
if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/fortran")
option (HDF5_BUILD_FORTRAN "Build FORTRAN support" OFF)
option (SKIP_HDF5_FORTRAN_SHARED "Do not build the fortran shared libraries" OFF)
if (HDF5_BUILD_FORTRAN)
if (BUILD_SHARED_LIBS AND APPLE)
# Tell cmake to do the right thing with COMMON symbols, this fixes
# corrupt values with COMMON and EQUIVALENCE when building shared
# Fortran libraries on OSX with gnu and Intel compilers (HDFFV-2772).
# *** NOTE: Fix does not work with Cmake. ***
# set (HDF5_LINKER_FLAGS "-Wl,-commons,use_dylibs")
if (NOT ALLOW_UNSUPPORTED)
message (STATUS " **** Shared FORTRAN libraries are unsupported **** ")
set (SKIP_HDF5_FORTRAN_SHARED ON)
else ()
message (STATUS " **** Allowing unsupported Fortran shared libraries **** ")
endif ()
endif ()
option (HDF5_ENABLE_F2003 "Enable FORTRAN 2003 Standard" ON)
include (${HDF_RESOURCES_EXT_DIR}/HDFUseFortran.cmake)
@@ -878,6 +819,7 @@ if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/for
endif ()
include (${HDF_RESOURCES_DIR}/HDF5UseFortran.cmake)
set (LINK_Fortran_LIBS ${LINK_LIBS})
if (HDF5_ENABLE_F2003)
if (NOT FORTRAN_HAVE_ISO_C_BINDING)
@@ -887,23 +829,17 @@ if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/for
# Parallel IO usage requires MPI to be Linked and Included
if (H5_HAVE_PARALLEL)
set (LINK_Fortran_LIBS ${LINK_LIBS} ${MPI_Fortran_LIBRARIES})
set (LINK_Fortran_SHARED_LIBS ${LINK_SHARED_LIBS} ${MPI_Fortran_LIBRARIES})
set (LINK_Fortran_LIBS ${LINK_Fortran_LIBS} ${MPI_Fortran_LIBRARIES})
if (MPI_Fortran_LINK_FLAGS)
set (CMAKE_Fortran_EXE_LINKER_FLAGS "${MPI_Fortran_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
endif ()
endif ()
# -----------------------------------------------------------------------
# wrapper script variables
#
# set (FCFLAGS "${Fortran_DEFINES}")
add_subdirectory (${HDF5_SOURCE_DIR}/fortran ${PROJECT_BINARY_DIR}/fortran)
add_subdirectory (fortran)
if (HDF5_BUILD_HL_LIB)
if (EXISTS "${HDF5_SOURCE_DIR}/hl/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl/fortran")
#-- Build the High Level Fortran source codes
add_subdirectory (${HDF5_SOURCE_DIR}/hl/fortran ${PROJECT_BINARY_DIR}/hl/fortran)
add_subdirectory (hl/fortran)
endif ()
endif ()
endif ()
@@ -923,14 +859,17 @@ if (EXISTS "${HDF5_SOURCE_DIR}/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/c++")
message (STATUS " **** Allowing unsupported Parallel and C++ options **** ")
endif ()
endif ()
include (${HDF_RESOURCES_EXT_DIR}/HDFUseCXX.cmake)
if (CMAKE_NO_STD_NAMESPACE)
set (H5_NO_STD 1)
endif ()
add_subdirectory (${HDF5_SOURCE_DIR}/c++ ${PROJECT_BINARY_DIR}/c++)
add_subdirectory (c++)
if (HDF5_BUILD_HL_LIB)
if (EXISTS "${HDF5_SOURCE_DIR}/hl/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl/c++")
#-- Build the High Level Fortran source codes
add_subdirectory (${HDF5_SOURCE_DIR}/hl/c++ ${PROJECT_BINARY_DIR}/hl/c++)
add_subdirectory (hl/c++)
endif ()
endif ()
endif ()
@@ -941,7 +880,7 @@ endif ()
# being built then configure should fail due to bug HDFFV-889.
#-----------------------------------------------------------------------------
if (HDF5_BUILD_FORTRAN AND HDF5_BUILD_HL_LIB)
if (NOT FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
if (NOT H5_FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
message (FATAL_ERROR " **** Fortran high-level routines are not supported when the default REAL is DOUBLE PRECISION, use HDF5_BUILD_HL_LIB:BOOL=OFF **** ")
endif ()
endif ()
@@ -952,7 +891,7 @@ endif ()
if (EXISTS "${HDF5_SOURCE_DIR}/java" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/java")
option (HDF5_BUILD_JAVA "Build Java HDF5 Library" OFF)
if (HDF5_BUILD_JAVA)
add_subdirectory (${HDF5_SOURCE_DIR}/java ${PROJECT_BINARY_DIR}/java)
add_subdirectory (java)
endif ()
endif ()

29
COPYING
View File

@@ -3,7 +3,7 @@ HDF5 (Hierarchical Data Format 5) Software Library and Utilities
-----------------------------------------------------------------------------
HDF5 (Hierarchical Data Format 5) Software Library and Utilities
Copyright (c) 2006, The HDF Group.
Copyright (c) 2006-2018, The HDF Group.
NCSA HDF5 (Hierarchical Data Format 5) Software Library and Utilities
Copyright (c) 1998-2006, The Board of Trustees of the University of Illinois.
@@ -21,27 +21,16 @@ provided that the following conditions are met:
this list of conditions, and the following disclaimer in the documentation
and/or materials provided with the distribution.
3. In addition, redistributions of modified forms of the source or binary
code must carry prominent notices stating that the original code was
changed and the date of the change.
4. All publications or advertising materials mentioning features or use of
this software are asked, but not required, to acknowledge that it was
developed by The HDF Group and by the National Center for Supercomputing
Applications at the University of Illinois at Urbana-Champaign and
credit the contributors.
5. Neither the name of The HDF Group, the name of the University, nor the
3. Neither the name of The HDF Group, the name of the University, nor the
name of any Contributor may be used to endorse or promote products derived
from this software without specific prior written permission from
The HDF Group, the University, or the Contributor, respectively.
DISCLAIMER:
THIS SOFTWARE IS PROVIDED BY THE HDF GROUP AND THE CONTRIBUTORS
"AS IS" WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. In no
event shall The HDF Group or the Contributors be liable for any damages
suffered by the users arising out of the use of this software, even if
advised of the possibility of such damage.
"AS IS" WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. IN NO EVENT SHALL THE HDF GROUP OR THE CONTRIBUTORS BE LIABLE FOR ANY DAMAGES SUFFERED BY THE USERS ARISING OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You are under no obligation whatsoever to provide any bug fixes, patches, or upgrades to the features, functionality or performance of the source code ("Enhancements") to anyone; however, if you choose to make your Enhancements available either publicly, or directly to The HDF Group, without imposing a separate written license agreement for such Enhancements, then you hereby grant the following license: a non-exclusive, royalty-free perpetual license to install, use, modify, prepare derivative works, incorporate into other computer software, distribute, and sublicense such enhancements or derivative works thereof, in binary and source code form.
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
@@ -55,9 +44,7 @@ http://support.hdfgroup.org/ftp/HDF5/releases/COPYING_LBNL_HDF5.
-----------------------------------------------------------------------------
Contributors: National Center for Supercomputing Applications (NCSA) at
the University of Illinois, Fortner Software, Unidata Program Center (netCDF),
The Independent JPEG Group (JPEG), Jean-loup Gailly and Mark Adler (gzip),
and Digital Equipment Corporation (DEC).
the University of Illinois, Fortner Software, Unidata Program Center (netCDF), The Independent JPEG Group (JPEG), Jean-loup Gailly and Mark Adler (gzip), and Digital Equipment Corporation (DEC).
-----------------------------------------------------------------------------
@@ -98,8 +85,8 @@ and/or accompanying materials:
-----------------------------------------------------------------------------
HDF5 is available with the SZIP compression library but SZIP is not part
of HDF5 and has separate copyright and license terms. See “Szip Compression
in HDF Products (www.hdfgroup.org/doc_resource/SZIP/) for further details.
of HDF5 and has separate copyright and license terms. See SZIP Compression
in HDF Products (www.hdfgroup.org/doc_resource/SZIP/) for further details.
-----------------------------------------------------------------------------

View File

@@ -19,12 +19,23 @@ set (CTEST_PROJECT_NAME "HDF5")
set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
set (CTEST_DROP_METHOD "http")
if (CDASH_LOCAL)
set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5Trunk")
if (CTEST_DROP_SITE_INIT)
set (CTEST_DROP_SITE "${CTEST_DROP_SITE_INIT}")
else ()
set (CTEST_DROP_SITE "cdash.hdfgroup.org")
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5+Trunk")
if (CDASH_LOCAL)
set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
else ()
set (CTEST_DROP_SITE "cdash.hdfgroup.org")
endif ()
endif ()
if (CTEST_DROP_LOCATION_INIT)
set (CTEST_DROP_LOCATION "${CTEST_DROP_LOCATION_INIT}")
else ()
if (CDASH_LOCAL)
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5110")
else ()
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5")
endif ()
endif ()
set (CTEST_DROP_SITE_CDASH TRUE)

134
MANIFEST
View File

@@ -85,6 +85,7 @@
./bin/release
./bin/restore.sh
./bin/runtest _DO_NOT_DISTRIBUTE_
./bin/runbkgprog _DO_NOT_DISTRIBUTE_
./bin/snapshot
./bin/snapshot_version _DO_NOT_DISTRIBUTE_
./bin/switch_maint_mode _DO_NOT_DISTRIBUTE_
@@ -234,6 +235,7 @@
./fortran/src/H5Zff.F90
./fortran/src/H5config_f.inc.cmake
./fortran/src/H5config_f.inc.in
./fortran/src/H5fort_type_defines.h.cmake
./fortran/src/H5fort_type_defines.h.in
./fortran/src/H5f90.h
./fortran/src/H5f90global.F90
@@ -349,6 +351,8 @@
./c++/src/H5DataSpace.h
./c++/src/H5DataType.cpp
./c++/src/H5DataType.h
./c++/src/H5DaccProp.cpp
./c++/src/H5DaccProp.h
./c++/src/H5DcreatProp.cpp
./c++/src/H5DcreatProp.h
./c++/src/H5DxferProp.cpp
@@ -374,6 +378,8 @@
./c++/src/H5IntType.h
./c++/src/H5LaccProp.cpp
./c++/src/H5LaccProp.h
./c++/src/H5LcreatProp.cpp
./c++/src/H5LcreatProp.h
./c++/src/H5Library.cpp
./c++/src/H5Library.h
./c++/src/H5Location.cpp
@@ -392,7 +398,7 @@
./c++/src/H5VarLenType.h
./c++/src/Makefile.am
./c++/src/RM_stylesheet.css
./c++/src/C2Cppfunction_map.mht
./c++/src/C2Cppfunction_map.htm
./c++/src/cpp_doc_config
./c++/src/h5c++.in
./c++/src/footer.html
@@ -439,6 +445,7 @@
./release_docs/INSTALL_CMake.txt
./release_docs/INSTALL_Cygwin.txt
./release_docs/INSTALL_parallel
./release_docs/INSTALL_Warnings.txt
./release_docs/INSTALL_Windows.txt
./release_docs/RELEASE.txt
./release_docs/USING_HDF5_CMake.txt
@@ -518,6 +525,9 @@
./src/H5Ctest.c
./src/H5CS.c
./src/H5CSprivate.h
./src/H5CX.c
./src/H5CXprivate.h
./src/H5CXmodule.h
./src/H5D.c
./src/H5Dbtree.c
./src/H5Dbtree2.c
@@ -746,6 +756,7 @@
./src/H5Ocont.c
./src/H5Ocopy.c
./src/H5Odbg.c
./src/H5Odeprec.c
./src/H5Odrvinfo.c
./src/H5Odtype.c
./src/H5Oefl.c
@@ -753,6 +764,7 @@
./src/H5Oflush.c
./src/H5Ofsinfo.c
./src/H5Oginfo.c
./src/H5Oint.c
./src/H5Olayout.c
./src/H5Olinfo.c
./src/H5Olink.c
@@ -810,6 +822,7 @@
./src/H5PLextern.h
./src/H5R.c
./src/H5Rdeprec.c
./src/H5Rint.c
./src/H5Rmodule.h
./src/H5Rpkg.h
./src/H5Rprivate.h
@@ -932,14 +945,11 @@
./test/cross_read.c
./test/dangle.c
./test/deflate.h5
./test/direct_chunk.c
./test/dsets.c
./test/dt_arith.c
./test/dtypes.c
./test/dtransform.c
./test/dynlib1.c
./test/dynlib2.c
./test/dynlib3.c
./test/dynlib4.c
./test/earray.c
./test/efc.c
./test/enc_dec_plist.c
@@ -967,6 +977,11 @@
./test/fill_old.h5
./test/fillval.c
./test/filter_fail.c
./test/filter_plugin.c
./test/filter_plugin1_dsets.c
./test/filter_plugin2_dsets.c
./test/filter_plugin3_dsets.c
./test/filter_plugin4_groups.c
./test/flush1.c
./test/flush2.c
./test/flushrefresh.c
@@ -978,6 +993,7 @@
./test/gen_bad_ohdr.c
./test/gen_bad_compound.c
./test/gen_bogus.c
./test/gen_bounds.c
./test/gen_cross.c
./test/gen_deflate.c
./test/gen_file_image.c
@@ -1030,7 +1046,6 @@
./test/page_buffer.c
./test/paged_nopersist.h5
./test/paged_persist.h5
./test/plugin.c
./test/reserved.c
./test/pool.c
./test/set_extent.c
@@ -1065,12 +1080,12 @@
./test/testerror.sh.in
./test/testlinks_env.sh.in
./test/test_filenotclosed.sh.in
./test/test_filter_plugin.sh.in
./test/testflushrefresh.sh.in
./test/testframe.c
./test/testhdf5.c
./test/testhdf5.h
./test/testlibinfo.sh.in
./test/test_plugin.sh.in
./test/test_usecases.sh.in
./test/testmeta.c
./test/testswmr.sh.in
@@ -1233,6 +1248,7 @@
./testpar/t_cache_image.c
./testpar/t_chunk_alloc.c
./testpar/t_coll_chunk.c
./testpar/t_coll_md_read.c
./testpar/t_dset.c
./testpar/t_file.c
./testpar/t_file_image.c
@@ -1428,6 +1444,12 @@
./tools/test/h5ls/h5ls_plugin.sh.in
./tools/test/h5ls/testh5ls.sh.in
./tools/test/h5ls/testh5lsvds.sh.in
./tools/test/h5ls/vds_prefix/tvds-1.ls
./tools/test/h5ls/vds_prefix/tvds-2.ls
./tools/test/h5ls/vds_prefix/tvds-3_1.ls
./tools/test/h5ls/vds_prefix/tvds-3_2.ls
./tools/test/h5ls/vds_prefix/tvds-4.ls
./tools/test/h5ls/vds_prefix/tvds-5.ls
# h5copy sources
./tools/src/h5copy/Makefile.am
@@ -1477,15 +1499,38 @@
./tools/test/misc/testh5mkgrp.sh.in
./tools/test/misc/testh5repart.sh.in
./tools/test/misc/talign.c
./tools/test/misc/testfiles/h5clear_equal_after_size.ddl
./tools/test/misc/testfiles/h5clear_equal_before_size.ddl
./tools/test/misc/testfiles/h5clear_greater_after_size.ddl
./tools/test/misc/testfiles/h5clear_greater_before_size.ddl
./tools/test/misc/testfiles/h5clear_less_after_size.ddl
./tools/test/misc/testfiles/h5clear_less_before_size.ddl
./tools/test/misc/testfiles/h5clear_missing_file.ddl
./tools/test/misc/testfiles/h5clear_noclose_after_size.ddl
./tools/test/misc/testfiles/h5clear_noclose_before_size.ddl
./tools/test/misc/testfiles/h5clear_no_mdc_image.ddl
./tools/test/misc/testfiles/h5clear_open_fail.ddl
./tools/test/misc/testfiles/h5clear_status_noclose_after_size.ddl
./tools/test/misc/testfiles/h5clear_usage.ddl
./tools/test/misc/testfiles/h5clear_user_equal_after_size.ddl
./tools/test/misc/testfiles/h5clear_user_equal_before_size.ddl
./tools/test/misc/testfiles/h5clear_user_greater_after_size.ddl
./tools/test/misc/testfiles/h5clear_user_greater_before_size.ddl
./tools/test/misc/testfiles/h5clear_user_less_after_size.ddl
./tools/test/misc/testfiles/h5clear_user_less_before_size.ddl
./tools/test/misc/testfiles/h5clear_fsm_persist_equal.h5
./tools/test/misc/testfiles/h5clear_fsm_persist_greater.h5
./tools/test/misc/testfiles/h5clear_fsm_persist_less.h5
./tools/test/misc/testfiles/h5clear_fsm_persist_noclose.h5
./tools/test/misc/testfiles/h5clear_fsm_persist_user_equal.h5
./tools/test/misc/testfiles/h5clear_fsm_persist_user_greater.h5
./tools/test/misc/testfiles/h5clear_fsm_persist_user_less.h5
./tools/test/misc/testfiles/h5clear_log_v3.h5
./tools/test/misc/testfiles/h5clear_mdc_image.h5
./tools/test/misc/testfiles/h5clear_sec2_v0.h5
./tools/test/misc/testfiles/h5clear_sec2_v2.h5
./tools/test/misc/testfiles/h5clear_sec2_v3.h5
./tools/test/misc/testfiles/h5clear_status_noclose.h5
./tools/test/misc/testfiles/latest_h5clear_log_v3.h5
./tools/test/misc/testfiles/latest_h5clear_sec2_v3.h5
./tools/test/misc/testfiles/mod_h5clear_mdc_image.h5
@@ -1522,6 +1567,12 @@
./tools/test/h5stat/testfiles/h5stat_err1_links.ddl
./tools/test/h5stat/testfiles/h5stat_err1_numattrs.ddl
./tools/test/h5stat/testfiles/h5stat_err2_numattrs.ddl
./tools/test/h5stat/testfiles/h5stat_err_old_fill.h5
./tools/test/h5stat/testfiles/h5stat_err_old_fill.ddl
./tools/test/h5stat/testfiles/h5stat_err_old_layout.h5
./tools/test/h5stat/testfiles/h5stat_err_old_layout.ddl
./tools/test/h5stat/testfiles/h5stat_err_refcount.h5
./tools/test/h5stat/testfiles/h5stat_err_refcount.ddl
./tools/test/h5stat/testfiles/h5stat_filters.ddl
./tools/test/h5stat/testfiles/h5stat_filters-d.ddl
./tools/test/h5stat/testfiles/h5stat_filters-dT.ddl
@@ -1746,6 +1797,8 @@
./tools/testfiles/tints4dims.h5
./tools/testfiles/tintsattrs.ddl
./tools/testfiles/tintsattrs.h5
./tools/testfiles/tintsnodata.ddl
./tools/testfiles/tintsnodata.h5
./tools/testfiles/tlarge_objname.ddl
./tools/testfiles/tlarge_objname.h5
./tools/testfiles/tldouble.h5
@@ -2374,6 +2427,7 @@
./tools/test/h5diff/testfiles/h5diff_attr1.h5
./tools/test/h5diff/testfiles/h5diff_attr2.h5
./tools/test/h5diff/testfiles/h5diff_attr3.h5
./tools/test/h5diff/testfiles/h5diff_attr_v_level1.h5
./tools/test/h5diff/testfiles/h5diff_attr_v_level2.h5
./tools/test/h5diff/testfiles/h5diff_basic1.h5
@@ -2415,12 +2469,8 @@
./tools/test/h5diff/testfiles/compounds_array_vlen2.h5
./tools/test/h5diff/testfiles/non_comparables1.h5
./tools/test/h5diff/testfiles/non_comparables2.h5
./tools/test/h5diff/testfiles/tmptest2.he5
./tools/test/h5diff/testfiles/tmpSingleSiteBethe.reference.h5
./tools/test/h5diff/testfiles/h5diff_tmp1.txt
./tools/test/h5diff/testfiles/tmptest.he5
./tools/test/h5diff/testfiles/h5diff_tmp2.txt
./tools/test/h5diff/testfiles/tmpSingleSiteBethe.output.h5
./tools/test/h5diff/testfiles/h5diff_8625.txt
./tools/test/h5diff/testfiles/h5diff_8639.txt
./tools/test/h5diff/testfiles/tudfilter.h5
./tools/test/h5diff/testfiles/tudfilter2.h5
./tools/test/h5diff/testfiles/h5diff_ud.txt
@@ -2435,6 +2485,7 @@
#test files for h5repack
./tools/test/h5repack/testfiles/README
./tools/test/h5repack/testfiles/bounds_latest_latest.h5
./tools/test/h5repack/testfiles/h5repack_aggr.h5
./tools/test/h5repack/testfiles/h5repack_attr.h5
./tools/test/h5repack/testfiles/h5repack_attr_refs.h5
@@ -2552,6 +2603,7 @@
./tools/test/perform/build_h5perf_alone.sh
./tools/test/perform/build_h5perf_serial_alone.sh
./tools/test/perform/chunk.c
./tools/test/perform/direct_write_perf.c
./tools/test/perform/gen_report.pl
./tools/test/perform/iopipe.c
./tools/test/perform/overhead.c
@@ -2629,7 +2681,6 @@
./hl/test/COPYING
./hl/test/H5srcdir_str.h.in
./hl/test/Makefile.am
./hl/test/dectris_hl_perf.c
./hl/test/dsdata.txt
./hl/test/dslat.txt
./hl/test/dslon.txt
@@ -2648,8 +2699,8 @@
./hl/test/test_ds_be.h5
./hl/test/test_ds_le.h5
./hl/test/test_dset_append.c
./hl/test/test_dset_opt.c
./hl/test/test_file_image.c
./hl/test/test_h5do_compat.c
./hl/test/test_image.c
./hl/test/test_ld.c
./hl/test/test_ld.h5
@@ -3012,8 +3063,42 @@
./java/test/Makefile.am
./java/test/CMakeLists.txt
./java/test/junit.sh.in
./java/test/JUnit-interface.txt
./java/test/JUnit-interface.ert
./java/test/testfiles/JUnit-TestH5.txt
./java/test/testfiles/JUnit-TestH5A.txt
./java/test/testfiles/JUnit-TestH5Dparams.txt
./java/test/testfiles/JUnit-TestH5D.txt
./java/test/testfiles/JUnit-TestH5Dplist.txt
./java/test/testfiles/JUnit-TestH5E.txt
./java/test/testfiles/JUnit-TestH5Edefault.txt
./java/test/testfiles/JUnit-TestH5Eparams.txt
./java/test/testfiles/JUnit-TestH5Eregister.txt
./java/test/testfiles/JUnit-TestH5Fparams.txt
./java/test/testfiles/JUnit-TestH5Fbasic.txt
./java/test/testfiles/JUnit-TestH5F.txt
./java/test/testfiles/JUnit-TestH5Fswmr.txt
./java/test/testfiles/JUnit-TestH5Gbasic.txt
./java/test/testfiles/JUnit-TestH5G.txt
./java/test/testfiles/JUnit-TestH5Giterate.txt
./java/test/testfiles/JUnit-TestH5Lparams.txt
./java/test/testfiles/JUnit-TestH5Lbasic.txt
./java/test/testfiles/JUnit-TestH5Lcreate.txt
./java/test/testfiles/JUnit-TestH5Oparams.txt
./java/test/testfiles/JUnit-TestH5Obasic.txt
./java/test/testfiles/JUnit-TestH5Ocreate.txt
./java/test/testfiles/JUnit-TestH5Ocopy.txt
./java/test/testfiles/JUnit-TestH5P.txt
./java/test/testfiles/JUnit-TestH5PData.txt
./java/test/testfiles/JUnit-TestH5Pfapl.txt
./java/test/testfiles/JUnit-TestH5Plist.txt
./java/test/testfiles/JUnit-TestH5Pvirtual.txt
./java/test/testfiles/JUnit-TestH5PL.txt
./java/test/testfiles/JUnit-TestH5R.txt
./java/test/testfiles/JUnit-TestH5Sbasic.txt
./java/test/testfiles/JUnit-TestH5S.txt
./java/test/testfiles/JUnit-TestH5Tparams.txt
./java/test/testfiles/JUnit-TestH5Tbasic.txt
./java/test/testfiles/JUnit-TestH5T.txt
./java/test/testfiles/JUnit-TestH5Z.txt
./java/test/h5ex_g_iterate.orig
./java/test/TestH5.java
./java/test/TestH5A.java
@@ -3022,6 +3107,7 @@
./java/test/TestH5Dplist.java
./java/test/TestH5E.java
./java/test/TestH5Edefault.java
./java/test/TestH5Eparams.java
./java/test/TestH5Eregister.java
./java/test/TestH5Fparams.java
./java/test/TestH5Fbasic.java
@@ -3055,9 +3141,9 @@
./java/lib/hamcrest-core.jar
./java/lib/junit.jar
./java/lib/simplelogger.properties
./java/lib/slf4j-api-1.7.5.jar
./java/lib/ext/slf4j-nop-1.7.5.jar
./java/lib/ext/slf4j-simple-1.7.5.jar
./java/lib/slf4j-api-1.7.25.jar
./java/lib/ext/slf4j-nop-1.7.25.jar
./java/lib/ext/slf4j-simple-1.7.25.jar
# CMake-specific Files
./config/cmake/cacheinit.cmake
@@ -3077,6 +3163,8 @@
./config/cmake/HDF5Macros.cmake
./config/cmake/HDF5UseFortran.cmake
./config/cmake/jrunTest.cmake
./config/cmake/libh5cc.in
./config/cmake/libhdf5.pc.in
./config/cmake/libhdf5.settings.cmake.in
./config/cmake/mccacheinit.cmake
./config/cmake/patch.xml
@@ -3088,10 +3176,8 @@
./config/cmake/userblockTest.cmake
./config/cmake/vfdTest.cmake
./config/cmake_ext_mod/CheckTypeSize.cmake
./config/cmake_ext_mod/ConfigureChecks.cmake
./config/cmake_ext_mod/CTestCustom.cmake
./config/cmake_ext_mod/FindMPI.cmake
./config/cmake_ext_mod/FindSZIP.cmake
./config/cmake_ext_mod/GetTimeOfDayTest.cpp
./config/cmake_ext_mod/grepTest.cmake
@@ -3102,6 +3188,7 @@
./config/cmake_ext_mod/HDFLibMacros.cmake
./config/cmake_ext_mod/HDFMacros.cmake
./config/cmake_ext_mod/HDFTests.c
./config/cmake_ext_mod/HDFUseCXX.cmake
./config/cmake_ext_mod/HDFUseFortran.cmake
./config/cmake_ext_mod/NSIS.InstallOptions.ini.in
./config/cmake_ext_mod/NSIS.template.in
@@ -3165,6 +3252,9 @@
./src/CMakeLists.txt
./test/CMakeLists.txt
./test/CMakeTests.cmake
./test/CMakeVFDTests.cmake
./test/flushrefreshTest.cmake
./test/ShellTests.cmake
./testpar/CMakeLists.txt
./testpar/CMakeTests.cmake
./tools/CMakeLists.txt

View File

@@ -1,38 +1,80 @@
HDF5 version 1.11.0 currently under development
HDF5 version 1.10.4-snap0 currently under development
------------------------------------------------------------------------------
Please refer to the release_docs/INSTALL file for installation instructions.
------------------------------------------------------------------------------
THE HDF GROUP
---------------
The HDF Group is the developer of HDF5®, a high-performance software library and
data format that has been adopted across multiple industries and has become a
de facto standard in scientific and research communities.
More information about The HDF Group, the HDF5 Community and the HDF5 software
project, tools and services can be found at the Group's website.
https://www.hdfgroup.org/
DOCUMENTATION
-------------
This release is fully functional for the API described in the documentation.
See the RELEASE.txt file in the release_docs/ directory for information
specific to this release of the library. Several INSTALL* files can also be
found in the release_docs/ directory: INSTALL contains instructions for
compiling and installing the library; INSTALL_parallel contains instructions
for installing the parallel version of the library; similarly-named files
contain instructions for several environments on MS Windows systems.
https://portal.hdfgroup.org/display/HDF5/The+HDF5+API
Documentation for this release can be found at the following URL:
http://www.hdfgroup.org/HDF5/doc/.
Full Documentation and Programming Resources for this release can be found at
https://portal.hdfgroup.org/display/HDF5
The following mailing lists are currently set up for HDF5 Library users:
See the RELEASE.txt file in the release_docs/ directory for information specific
to the features and updates included in this release of the library.
news - For announcements of HDF5 related developments,
not a discussion list.
Several more files are located within the release_docs/ directory with specific
details for several common platforms and configurations.
hdf-forum - For general discussion of the HDF5 library with
other users.
INSTALL - Start Here. General instructions for compiling and installing the library
INSTALL_CMAKE - instructions for building with CMake (Kitware.com)
INSTALL_parallel - instructions for building and configuring Parallel HDF5
INSTALL_Windows and INSTALL_Cygwin - MS Windows installations.
To subscribe to a list, send mail to "<list>-subscribe@lists.hdfgroup.org".
where <list> is the name of the list. For example, send a request
to subscribe to the 'news' mail list to the following address:
news-subscribe@lists.hdfgroup.org
Messages sent to the list should be addressed to "<list>@lists.hdfgroup.org".
Periodic code snapshots are provided at the following URL:
ftp://ftp.hdfgroup.uiuc.edu/pub/outgoing/hdf5/snapshots
Please read the README.txt file in that directory before working with a
library snapshot.
HELP AND SUPPORT
----------------
Information regarding Help Desk and Support services is available at
The HDF5 website is located at http://hdfgroup.org/HDF5/
https://portal.hdfgroup.org/display/support/The+HDF+Help+Desk
FORUM and NEWS
--------------
The following public forums are provided for public announcements and discussions
of interest to the general HDF5 Community.
Homepage of the Forum
https://forum.hdfgroup.org
News and Announcement
https://forum.hdfgroup.org/c/news-and-announcements-from-the-hdf-group
HDF5 and HDF4 Topics
https://forum.hdfgroup.org/c/hdf5
These forums are provided as an open and public service for searching and reading.
Posting requires completing a simple registration and allows one to join in the
conversation. Please read the following instructions pertaining to the Forum's
use and configuration
https://forum.hdfgroup.org/t/quickstart-guide-welcome-to-the-new-hdf-forum
SNAPSHOTS, PREVIOUS RELEASES AND SOURCE CODE
--------------------------------------------
Periodically development code snapshots are provided at the following URL:
https://gamma.hdfgroup.org/ftp/pub/outgoing/hdf5/snapshots/
Source packages for current and previous releases are located at:
https://portal.hdfgroup.org/display/support/Downloads
Development code is available at our BitBucket Server:
https://bitbucket.hdfgroup.org/projects/HDFFV/repos/hdf5/browse
Bugs should be reported to help@hdfgroup.org.

View File

@@ -12,7 +12,7 @@
#
# A script to reconfigure autotools for HDF5, and to recreate other
# generated files specifc to HDF5.
# generated files specific to HDF5.
#
# IMPORTANT OS X NOTE
#

View File

@@ -46,8 +46,9 @@ cacheinit=$srcdir/config/cmake/cacheinit.cmake
build_cpp_lib=-DHDF5_BUILD_CPP_LIB:BOOL=OFF # C++ interface default off
build_fortran=-DHDF5_BUILD_FORTRAN:BOOL=OFF # Fortran interface default off
build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=ON # High Level interface default on
build_threadsafe=-DHDF5_ENABLE_THREADSAFE:BOOL=OFF # Threadsafe feature default off
build_threadsafe=-DHDF5_ENABLE_THREADSAFE:BOOL=OFF # Threadsafe feature default off
build_testing=-DBUILD_TESTING:BOOL=ON # Build tests default on
build_test_shell=-DTEST_SHELL_SCRIPTS:BOOL=ON # Run shell script tests default on
build_tools=-DHDF5_BUILD_TOOLS:BOOL=ON # Build tools default on
with_zlib=-DHDF5_ENABLE_Z_LIB_SUPPORT=ON # enable zlib filter default on
with_szlib=-DHDF5_ENABLE_SZIP_SUPPORT=OFF # enables szip filter default off
@@ -256,6 +257,12 @@ while [ $# -gt 0 ]; do
--disable-testing)
build_testing=-DBUILD_TESTING:BOOL=OFF
;;
--enable-shell-testing)
build_test_shell=-DTEST_SHELL_SCRIPTS:BOOL=ON
;;
--disable-shell-testing)
build_test_shell=-DTEST_SHELL_SCRIPTS:BOOL=OFF
;;
--with-zlib)
with_zlib=-DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON
;;
@@ -342,6 +349,7 @@ STEP "Configure..." \
$build_threadsafe \
$shared_lib \
$build_testing \
$build_test_shell \
$build_tools \
$with_zlib \
$with_szlib \

View File

@@ -7,8 +7,8 @@ require 5.003;
# is added (like support for 1.4, etc), the min_sup_idx parameter will
# need to be decremented. - QAK)
# Max. library "index" (0 = v1.0, 1 = 1.2, etc)
$max_idx = 5;
# Max. library "index" (0 = v1.0, 1 = 1.2, 2 = 1.4, 3 = 1.6, 4 = 1.8, 5 = 1.10, 6 = 1.12, etc)
$max_idx = 6;
# Min. supported previous library version "index" (0 = v1.0, 1 = 1.2, etc)
$min_sup_idx = 3;
@@ -478,7 +478,7 @@ for $file (@ARGV) {
}
}
close SOURCE;
# Create header files
print "Generating '", $prefix, "H5version.h'\n";
create_public($prefix);

View File

@@ -188,45 +188,47 @@ tar2zip()
# Returns 0 if successful; 1 otherwise
#
# need function to create another temporary directory, extract the
# $tmpdir/$HDF5_VERS.tar into it, add (create) build-unix.sh,
# CTestScript.cmake, HDF5config.cmake, SZIP.tar.gz and ZLib.tar.gz,
# and then tar.gz it.
# $tmpdir/$HDF5_VERS.tar into it, create build-VS*.bat files,
# add CTestScript.cmake, HDF5config.cmake, SZIP.tar.gz
# ZLib.tar.gz, HDF5 examples, and then zip it.
tar2cmakezip()
{
if [ $# -ne 3 ]; then
echo "usage: tar2cmakezip <tarfilename> <tgzfilename>"
echo "usage: tar2cmakezip <tarfilename> <zipfilename>"
return 1
fi
cmziptmpdir=/tmp/cmziptmpdir$$
mkdir -p $cmziptmpdir
cmziptmpsubdir=$cmziptmpdir/CMake-$HDF5_VERS
mkdir -p $cmziptmpsubdir
version=$1
tarfile=$2
zipfile=$3
# step 1: untar tarball in cmgztmpdir
(cd $cmziptmpdir; tar xf -) < $tarfile
(cd $cmziptmpsubdir; tar xf -) < $tarfile
# sanity check
if [ ! -d $cmziptmpdir/$version ]; then
echo "untar did not create $cmziptmpdir/$version source dir"
if [ ! -d $cmziptmpsubdir/$version ]; then
echo "untar did not create $cmziptmpsubdir/$version source dir"
# cleanup
rm -rf $cmziptmpdir
return 1
fi
# step 2: add batch file for building CMake on window
cp /mnt/scr1/pre-release/hdf5/CMake/build-VS2013-32.bat $cmziptmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/build-VS2013-64.bat $cmziptmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/build-VS2015-32.bat $cmziptmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/build-VS2015-64.bat $cmziptmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/build-VS2017-32.bat $cmziptmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/build-VS2017-64.bat $cmziptmpdir
(cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2013 -C Release -V -O hdf5.log" > build-VS2013-32.bat; chmod 755 build-VS2013-32.bat)
(cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201364 -C Release -V -O hdf5.log" > build-VS2013-64.bat; chmod 755 build-VS2013-64.bat)
(cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2015 -C Release -V -O hdf5.log" > build-VS2015-32.bat; chmod 755 build-VS2015-32.bat)
(cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201564 -C Release -V -O hdf5.log" > build-VS2015-64.bat; chmod 755 build-VS2015-64.bat)
(cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2017 -C Release -V -O hdf5.log" > build-VS2017-32.bat; chmod 755 build-VS2017-32.bat)
(cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201764 -C Release -V -O hdf5.log" > build-VS2017-64.bat; chmod 755 build-VS2017-64.bat)
# step 3: add SZIP.tar.gz, ZLib.tar.gz and cmake files
cp /mnt/scr1/pre-release/hdf5/CMake/SZip.tar.gz $cmziptmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmziptmpdir
cp $cmziptmpdir/$version/config/cmake/scripts/CTestScript.cmake $cmziptmpdir
cp $cmziptmpdir/$version/config/cmake/scripts/HDF5config.cmake $cmziptmpdir
cp $cmziptmpdir/$version/config/cmake/scripts/HDF5options.cmake $cmziptmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/SZip.tar.gz $cmziptmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmziptmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.8-Source.tar.gz $cmziptmpsubdir
cp $cmziptmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmziptmpsubdir
cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmziptmpsubdir
cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmziptmpsubdir
# step 4: convert text files
# There maybe a simpler way to do this.
@@ -234,12 +236,13 @@ tar2cmakezip()
# -k Keep the date stamp
# -q quiet mode
# grep redirect output to /dev/null because -q or -s are not portable.
find $cmziptmpdir/$version | \
find $cmziptmpsubdir/$version | \
while read inf; do \
if file $inf | grep "$inf\: .*text" > /dev/null 2>&1 ; then \
unix2dos -q -k $inf; \
fi\
done
# step 3: make zipball
# -9 maximum compression
# -y Store symbolic links as such in the zip archive
@@ -284,9 +287,9 @@ tar2cmakezip()
# Returns 0 if successful; 1 otherwise
#
# need function to create another temporary directory, extract the
# $tmpdir/$HDF5_VERS.tar into it, add (create) build-unix.sh,
# CTestScript.cmake, HDF5config.cmake, SZIP.tar.gz and ZLib.tar.gz,
# and then tar.gz it.
# $tmpdir/$HDF5_VERS.tar into it, create build-unix.sh,
# add CTestScript.cmake, HDF5config.cmake, SZIP.tar.gz
# ZLib.tar.gz, HDF5 examples, and then tar.gz it.
tar2cmaketgz()
{
if [ $# -ne 3 ]; then
@@ -294,16 +297,17 @@ tar2cmaketgz()
return 1
fi
cmgztmpdir=/tmp/cmgztmpdir$$
mkdir -p $cmgztmpdir
cmgztmpsubdir=$cmgztmpdir/CMake-$HDF5_VERS
mkdir -p $cmgztmpsubdir
version=$1
tarfile=$2
tgzfile=$3
# step 1: untar tarball in cmgztmpdir
(cd $cmgztmpdir; tar xf -) < $tarfile
(cd $cmgztmpsubdir; tar xf -) < $tarfile
# sanity check
if [ ! -d $cmgztmpdir/$version ]; then
echo "untar did not create $cmgztmpdir/$version source dir"
if [ ! -d $cmgztmpsubdir/$version ]; then
echo "untar did not create $cmgztmpsubdir/$version source dir"
# cleanup
rm -rf $cmgztmpdir
return 1
@@ -311,14 +315,15 @@ tar2cmaketgz()
# step 2: add build-unix.sh script
(cd $cmgztmpdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -V -O hdf5.log" > build-unix.sh; chmod 755 build-unix.sh)
(cd $cmgztmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -V -O hdf5.log" > build-unix.sh; chmod 755 build-unix.sh)
# step 3: add SZIP.tar.gz, ZLib.tar.gz and cmake files
cp /mnt/scr1/pre-release/hdf5/CMake/SZip.tar.gz $cmgztmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpdir
cp $cmgztmpdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpdir
cp $cmgztmpdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpdir
cp $cmgztmpdir/$version/config/cmake/scripts/HDF5options.cmake $cmgztmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/SZip.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.8-Source.tar.gz $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmgztmpsubdir
tar czf $DEST/CMake-$HDF5_VERS.tar.gz -C $cmgztmpdir . || exit 1
# cleanup

87
bin/runbkgprog Normal file
View File

@@ -0,0 +1,87 @@
#!/usr/bin/perl -w
require 5.003;
$indent=4;
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
# terms governing use, modification, and redistribution, is contained in
# the COPYING file, which can be found at the root of the source code
# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
# If you do not have access to either file, you may request a copy from
# help@hdfgroup.org.
#
# Run program in background
#
use warnings;
use strict;
use Carp;
use Time::HiRes;
use POSIX 'setsid';
my $child_pid;
my $child_proc;
my $cmd = $ARGV[0];
my $debug = 1;
print "\nStart child process\n";
start_child();
print "\nStarted child process\n";
sub start_child {
die "cannot execute cmd: $cmd" unless -x $cmd;
if ($^O eq 'MSWin32') { # Windows
require Win32::Process;
Win32::Process::Create($child_proc, $cmd, $cmd, 0, 0, ".") || confess "Could not spawn child: $!";
$child_pid = $child_proc->GetProcessID();
}
else { # Unix
$SIG{CHLD} = 'IGNORE';
$child_pid = fork();
unless (defined $child_pid) {
confess "Could not spawn child (Unix): $!";
}
if ($child_pid == 0) { # child
unless ($debug) {
open STDIN, "<", "/dev/null" or die "Can't read /dev/null: $!";
open STDOUT, ">", "/dev/null" or die "Can't write /dev/null: $!";
}
setsid or warn "setsid cannot start a new session: $!";
unless ($debug) {
open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
}
local $| = 1;
unless (exec($cmd)) {
confess "Could not start child: $cmd: $!";
CORE::exit(0);
}
}
# parent
$SIG{CHLD} = 'DEFAULT';
}
# catch early child exit, e.g. if program path is incorrect
sleep(1.0);
POSIX::waitpid(-1, POSIX::WNOHANG()); # clean up any defunct child process
if (kill(0,$child_pid)) {
print "\nStarted child process id $child_pid\n";
}
else {
warn "Child process exited quickly: $cmd: process $child_pid";
}
}
sub stop_child
{
if ($^O eq 'MSWin32') { # Windows
Win32::Process::KillProcess($child_pid,0);
}
else { # Unix
kill 9, $child_pid || warn "could not kill process $child_pid: $!";
}
print "Stopped child process id $child_pid\n";
}

View File

@@ -1,44 +1,18 @@
cmake_minimum_required (VERSION 3.2.2)
PROJECT (HDF5_CPP)
cmake_minimum_required (VERSION 3.10)
project (HDF5_CPP CXX)
#-----------------------------------------------------------------------------
# Apply Definitions to compiler in this directory and below
#-----------------------------------------------------------------------------
add_definitions (${HDF_EXTRA_C_FLAGS})
#-----------------------------------------------------------------------------
# Generate configure file
#-----------------------------------------------------------------------------
configure_file (${HDF_RESOURCES_DIR}/H5cxx_config.h.in
${HDF5_BINARY_DIR}/H5cxx_pubconf.h
)
#-----------------------------------------------------------------------------
# Setup Include directories
#-----------------------------------------------------------------------------
INCLUDE_DIRECTORIES (${HDF5_CPP_SOURCE_DIR}/src)
INCLUDE_DIRECTORIES (${HDF5_BINARY_DIR})
#-----------------------------------------------------------------------------
# Parallel/MPI, prevent spurious cpp/cxx warnings
#-----------------------------------------------------------------------------
if (H5_HAVE_PARALLEL)
add_definitions ("-DMPICH_SKIP_MPICXX")
add_definitions ("-DMPICH_IGNORE_CXX_SEEK")
endif ()
add_subdirectory (${HDF5_CPP_SOURCE_DIR}/src ${HDF5_CPP_BINARY_DIR}/src)
add_subdirectory (src)
#-----------------------------------------------------------------------------
# Build the CPP Examples
#-----------------------------------------------------------------------------
if (HDF5_BUILD_EXAMPLES)
add_subdirectory (${HDF5_CPP_SOURCE_DIR}/examples ${HDF5_CPP_BINARY_DIR}/examples)
add_subdirectory (examples)
endif ()
#-----------------------------------------------------------------------------
# Build the CPP unit tests
#-----------------------------------------------------------------------------
if (BUILD_TESTING)
add_subdirectory (${HDF5_CPP_SOURCE_DIR}/test ${HDF5_CPP_BINARY_DIR}/test)
add_subdirectory (test)
endif ()

View File

@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 3.2.2)
PROJECT (HDF5_CPP_EXAMPLES)
cmake_minimum_required (VERSION 3.10)
project (HDF5_CPP_EXAMPLES CXX)
# --------------------------------------------------------------------
# Notes: When creating examples they should be prefixed
@@ -34,17 +34,17 @@ set (tutr_examples
foreach (example ${examples})
add_executable (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp)
TARGET_NAMING (cpp_ex_${example} STATIC)
TARGET_C_PROPERTIES (cpp_ex_${example} STATIC " " " ")
target_link_libraries (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
target_include_directories(cpp_ex_${example} PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
TARGET_C_PROPERTIES (cpp_ex_${example} STATIC)
target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
set_target_properties (cpp_ex_${example} PROPERTIES FOLDER examples/cpp)
endforeach ()
foreach (example ${tutr_examples})
add_executable (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp)
TARGET_NAMING (cpp_ex_${example} STATIC)
TARGET_C_PROPERTIES (cpp_ex_${example} STATIC " " " ")
target_link_libraries (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
target_include_directories(cpp_ex_${example} PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
TARGET_C_PROPERTIES (cpp_ex_${example} STATIC)
target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
set_target_properties (cpp_ex_${example} PROPERTIES FOLDER examples/cpp)
endforeach ()

View File

@@ -51,7 +51,7 @@
endif ()
set (last_test "CPP_ex_${example}")
endforeach ()
#the following dependicies are handled by the order of the files
#the following dependencies are handled by the order of the files
# SET_TESTS_PROPERTIES(CPP_ex_readdata PROPERTIES DEPENDS CPP_ex_create)
# SET_TESTS_PROPERTIES(CPP_ex_chunks PROPERTIES DEPENDS CPP_ex_extend_ds)
@@ -91,7 +91,7 @@
endif ()
set (last_test "CPP_ex_${example}")
endforeach ()
#the following dependicies are handled by the order of the files
#the following dependencies are handled by the order of the files
# SET_TESTS_PROPERTIES(CPP_ex_h5tutr_crtatt PROPERTIES DEPENDS CPP_ex_h5tutr_crtdat)
# SET_TESTS_PROPERTIES(CPP_ex_h5tutr_rdwt PROPERTIES DEPENDS CPP_ex_h5tutr_crtdat)
# SET_TESTS_PROPERTIES(CPP_ex_h5tutr_crtgrpd PROPERTIES DEPENDS CPP_ex_h5tutr_crtgrpar)

View File

@@ -32,7 +32,7 @@ EXIT_FAILURE=1
# Where the tool is installed.
# default is relative path to installed location of the tools
prefix="${prefix:-@prefix@}"
prefix="${prefix:-../../..}"
AR="@AR@"
RANLIB="@RANLIB@"
H5TOOL="h5c++" # The tool name

View File

@@ -56,7 +56,7 @@ applib=libapp${H5TOOL}.a
# short hands
# Caution: if some *.h5 files must be cleaned here, list them by names.
# Don't use the wildcard form of *.h5 as it will wipe out even *.h5 generated
# by otehr test programs. This will cause a racing condition error when
# by other test programs. This will cause a racing condition error when
# parallel make (e.g., gmake -j 4) is used.
temp_SRC="$hdf5main $appmain $prog1 $prog2"
temp_OBJ=`echo $temp_SRC | sed -e "s/\.${suffix}/.o/g"`

24268
c++/src/C2Cppfunction_map.htm Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 3.2.2)
PROJECT (HDF5_CPP_SRC)
cmake_minimum_required (VERSION 3.10)
project (HDF5_CPP_SRC CXX)
#-----------------------------------------------------------------------------
# Generate configure file
@@ -21,6 +21,7 @@ set (CPP_SOURCES
${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSet.cpp
${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSpace.cpp
${HDF5_CPP_SRC_SOURCE_DIR}/H5DataType.cpp
${HDF5_CPP_SRC_SOURCE_DIR}/H5DaccProp.cpp
${HDF5_CPP_SRC_SOURCE_DIR}/H5DcreatProp.cpp
${HDF5_CPP_SRC_SOURCE_DIR}/H5DxferProp.cpp
${HDF5_CPP_SRC_SOURCE_DIR}/H5EnumType.cpp
@@ -33,6 +34,7 @@ set (CPP_SOURCES
${HDF5_CPP_SRC_SOURCE_DIR}/H5IdComponent.cpp
${HDF5_CPP_SRC_SOURCE_DIR}/H5IntType.cpp
${HDF5_CPP_SRC_SOURCE_DIR}/H5LaccProp.cpp
${HDF5_CPP_SRC_SOURCE_DIR}/H5LcreatProp.cpp
${HDF5_CPP_SRC_SOURCE_DIR}/H5Library.cpp
${HDF5_CPP_SRC_SOURCE_DIR}/H5Location.cpp
${HDF5_CPP_SRC_SOURCE_DIR}/H5Object.cpp
@@ -57,6 +59,7 @@ set (CPP_HDRS
${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSet.h
${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSpace.h
${HDF5_CPP_SRC_SOURCE_DIR}/H5DataType.h
${HDF5_CPP_SRC_SOURCE_DIR}/H5DaccProp.h
${HDF5_CPP_SRC_SOURCE_DIR}/H5DcreatProp.h
${HDF5_CPP_SRC_SOURCE_DIR}/H5DxferProp.h
${HDF5_CPP_SRC_SOURCE_DIR}/H5EnumType.h
@@ -70,6 +73,7 @@ set (CPP_HDRS
${HDF5_CPP_SRC_SOURCE_DIR}/H5Include.h
${HDF5_CPP_SRC_SOURCE_DIR}/H5IntType.h
${HDF5_CPP_SRC_SOURCE_DIR}/H5LaccProp.h
${HDF5_CPP_SRC_SOURCE_DIR}/H5LcreatProp.h
${HDF5_CPP_SRC_SOURCE_DIR}/H5Library.h
${HDF5_CPP_SRC_SOURCE_DIR}/H5Location.h
${HDF5_CPP_SRC_SOURCE_DIR}/H5Object.h
@@ -81,28 +85,35 @@ set (CPP_HDRS
)
add_library (${HDF5_CPP_LIB_TARGET} STATIC ${CPP_SOURCES} ${CPP_HDRS})
TARGET_C_PROPERTIES (${HDF5_CPP_LIB_TARGET} STATIC " " " ")
target_link_libraries (${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_TARGET}")
H5_SET_LIB_OPTIONS (${HDF5_CPP_LIB_TARGET} ${HDF5_CPP_LIB_NAME} STATIC)
set_target_properties (${HDF5_CPP_LIB_TARGET} PROPERTIES
FOLDER libraries/cpp
INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
target_include_directories(${HDF5_CPP_LIB_TARGET}
PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
target_compile_definitions(${HDF5_CPP_LIB_TARGET}
PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings
)
TARGET_C_PROPERTIES (${HDF5_CPP_LIB_TARGET} STATIC)
target_link_libraries (${HDF5_CPP_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_TARGET}")
H5_SET_LIB_OPTIONS (${HDF5_CPP_LIB_TARGET} ${HDF5_CPP_LIB_NAME} STATIC 0)
set_target_properties (${HDF5_CPP_LIB_TARGET} PROPERTIES FOLDER libraries/cpp)
set (install_targets ${HDF5_CPP_LIB_TARGET})
if (BUILD_SHARED_LIBS)
add_library (${HDF5_CPP_LIBSH_TARGET} SHARED ${CPP_SOURCES} ${CPP_HDRS})
TARGET_C_PROPERTIES (${HDF5_CPP_LIBSH_TARGET} SHARED " " " ")
target_link_libraries (${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIBSH_TARGET}")
H5_SET_LIB_OPTIONS (${HDF5_CPP_LIBSH_TARGET} ${HDF5_CPP_LIB_NAME} SHARED ${HDF5_CXX_PACKAGE_SOVERSION})
set_target_properties (${HDF5_CPP_LIBSH_TARGET} PROPERTIES
FOLDER libraries/cpp
COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB"
INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_DYNAMIC_LIB=1
target_include_directories(${HDF5_CPP_LIBSH_TARGET}
PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
target_compile_definitions(${HDF5_CPP_LIBSH_TARGET}
PUBLIC "H5_BUILT_AS_DYNAMIC_LIB"
PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings
)
TARGET_C_PROPERTIES (${HDF5_CPP_LIBSH_TARGET} SHARED)
target_link_libraries (${HDF5_CPP_LIBSH_TARGET} PUBLIC ${HDF5_LIBSH_TARGET})
set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIBSH_TARGET}")
H5_SET_LIB_OPTIONS (${HDF5_CPP_LIBSH_TARGET} ${HDF5_CPP_LIB_NAME} SHARED "CXX")
set_target_properties (${HDF5_CPP_LIBSH_TARGET} PROPERTIES FOLDER libraries/cpp)
set (install_targets ${install_targets} ${HDF5_CPP_LIBSH_TARGET})
endif ()
@@ -139,3 +150,50 @@ if (HDF5_EXPORTED_TARGETS)
INCLUDES DESTINATION include
)
endif ()
#-----------------------------------------------------------------------------
# Create pkgconfig files
#-----------------------------------------------------------------------------
set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
set (_PKG_CONFIG_LIBNAME "${HDF5_CPP_LIB_CORENAME}")
set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
set (_PKG_CONFIG_LIBS_PRIVATE)
set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_CPP_LIB_CORENAME}")
if (BUILD_SHARED_LIBS)
set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}")
endif ()
set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}")
set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}")
configure_file (
${HDF_RESOURCES_DIR}/libhdf5.pc.in
${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_CPP_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}.pc
@ONLY
)
install (
FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_CPP_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}.pc
DESTINATION ${HDF5_INSTALL_LIB_DIR}/pkgconfig
COMPONENT cpplibraries
)
if (NOT WIN32)
set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
configure_file (
${HDF_RESOURCES_DIR}/libh5cc.in
${HDF5_BINARY_DIR}/CMakeFiles/h5c++
@ONLY
)
install (
FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5c++
DESTINATION ${HDF5_INSTALL_BIN_DIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
COMPONENT cpplibraries
)
endif ()

View File

@@ -22,7 +22,9 @@
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataSpace.h"

View File

@@ -74,18 +74,6 @@ class H5_DLLCPP AbstractDs {
// Default constructor
AbstractDs();
// *** Deprecation warning ***
// The following two constructors are no longer appropriate after the
// data member "id" had been moved to the sub-classes.
// The copy constructor is a noop and is removed in 1.8.15 and the
// other will be removed from 1.10 release, and then from 1.8 if its
// removal does not raise any problems in two 1.10 releases.
// Mar 2016 -BMR, AbstractDs(const hid_t h5_id);
// Copy constructor
// AbstractDs( const AbstractDs& original );
private:
// This member function is implemented by DataSet and Attribute - pure virtual.
virtual hid_t p_get_type() const = 0;

View File

@@ -19,7 +19,9 @@
#include "H5PropList.h"
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -45,7 +47,7 @@ ArrayType::ArrayType(const hid_t existing_id) : DataType(existing_id) {}
//--------------------------------------------------------------------------
// Function: ArrayType copy constructor
///\brief Copy constructor: makes a copy of the original ArrayType object.
///\brief Copy constructor: same HDF5 object as \a original
// Programmer Binh-Minh Ribler - May 2004
//--------------------------------------------------------------------------
ArrayType::ArrayType(const ArrayType& original) : DataType(original) {}
@@ -119,7 +121,6 @@ ArrayType::ArrayType(const H5Location& loc, const H5std_string& dtype_name) : Da
// Closes the id on the lhs object first with setId, then copies
// each data member from the rhs object. (Issue HDFFV-9562)
// Programmer Binh-Minh Ribler - Mar 2016
// Modification
//--------------------------------------------------------------------------
ArrayType& ArrayType::operator=(const ArrayType& rhs)
{
@@ -142,6 +143,7 @@ ArrayType& ArrayType::operator=(const ArrayType& rhs)
// Function: ArrayType::decode
///\brief Returns an ArrayType object via DataType* by decoding the
/// binary object description of this type.
///
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - Aug 2017
//--------------------------------------------------------------------------
@@ -165,9 +167,6 @@ DataType* ArrayType::decode() const
///\return Number of dimensions
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - May 2004
// Modification
// Apr, 2016
// Became const.
//--------------------------------------------------------------------------
int ArrayType::getArrayNDims() const
{
@@ -188,9 +187,6 @@ int ArrayType::getArrayNDims() const
///\return Number of dimensions
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - May 2004
// Modification
// Apr, 2016
// Became const.
//--------------------------------------------------------------------------
int ArrayType::getArrayDims(hsize_t* dims) const
{

View File

@@ -50,7 +50,7 @@ class H5_DLLCPP ArrayType : public DataType {
///\brief Returns this class name.
virtual H5std_string fromClass () const { return("ArrayType"); }
// Copy constructor: makes copy of the original object.
// Copy constructor: same as the original ArrayType.
ArrayType(const ArrayType& original);
// Constructor that takes an existing id

View File

@@ -19,7 +19,9 @@
#include "H5PropList.h"
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -46,7 +48,7 @@ AtomType::AtomType(const hid_t existing_id) : DataType(existing_id) {}
//--------------------------------------------------------------------------
// Function: AtomType copy constructor
///\brief Copy constructor: makes a copy of the original AtomType object.
///\brief Copy constructor: same HDF5 object as \a original
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
AtomType::AtomType(const AtomType& original) : DataType(original) {}
@@ -175,8 +177,8 @@ size_t AtomType::getPrecision() const
///\param precision - IN: Number of bits of precision
///\exception H5::DataTypeIException
///\par Description
/// For information, please see C layer Reference Manuat at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5T.html#Datatype-SetPrecision
/// For information, please refer to the H5Tset_precision API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void AtomType::setPrecision(size_t precision) const
@@ -195,8 +197,8 @@ void AtomType::setPrecision(size_t precision) const
///\return Offset value
///\exception H5::DataTypeIException
///\par Description
/// For information, please see C layer Reference Manuat at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5T.html#Datatype-GetOffset
/// For information, please refer to the H5Tget_offset API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
// Modification
// 12/05/00: due to C API change
@@ -222,8 +224,8 @@ int AtomType::getOffset() const
///\param offset - IN: Offset of first significant bit
///\exception H5::DataTypeIException
///\par Description
/// For information, please see C layer Reference Manuat at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5T.html#Datatype-SetOffset
/// For information, please refer to the H5Tset_offset API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void AtomType::setOffset(size_t offset) const

View File

@@ -60,7 +60,7 @@ class H5_DLLCPP AtomType : public DataType {
virtual H5std_string fromClass () const { return("AtomType"); }
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// Copy constructor - makes copy of the original object
// Copy constructor: same as the original AtomType.
AtomType(const AtomType& original);
// Noop destructor

View File

@@ -27,7 +27,9 @@
#include "H5FcreatProp.h"
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5AbstractDs.h"
@@ -50,7 +52,7 @@ Attribute::Attribute() : AbstractDs(), H5Location(), id(H5I_INVALID_HID) {}
//--------------------------------------------------------------------------
// Function: Attribute copy constructor
///\brief Copy constructor: makes a copy of the original Attribute object.
///\brief Copy constructor: same HDF5 object as \a original
///\param original - IN: Original Attribute object to copy
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------

View File

@@ -29,7 +29,7 @@ namespace H5 {
class H5_DLLCPP Attribute : public AbstractDs, public H5Location {
public:
// Copy constructor: makes a copy of an existing Attribute object.
// Copy constructor: same as the original Attribute.
Attribute(const Attribute& original);
// Default constructor

View File

@@ -22,7 +22,9 @@
#include "H5DxferProp.h"
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5Alltypes.h"

View File

@@ -20,7 +20,9 @@
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5Alltypes.h"
@@ -39,7 +41,7 @@ CompType::CompType() : DataType() {}
//--------------------------------------------------------------------------
// Function: CompType copy constructor
///\brief Copy constructor: makes copy of the original CompType object
///\brief Copy constructor: same HDF5 object as \a original
///\param original - IN: Original CompType instance
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
@@ -127,6 +129,7 @@ CompType::CompType(const H5Location& loc, const H5std_string& dtype_name) : Data
// Function: CompType::decode
///\brief Returns a CompType object via DataType* by decoding the
/// binary object description of this datatype.
///
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - Aug 2017
//--------------------------------------------------------------------------
@@ -303,7 +306,7 @@ DataType CompType::getMemberDataType(unsigned member_num) const
ArrayType CompType::getMemberArrayType(unsigned member_num) const
{
try {
ArrayType arraytype(p_get_member_type(member_num));
ArrayType arraytype;
f_DataType_setId(&arraytype, p_get_member_type(member_num));
return(arraytype);
}
@@ -323,10 +326,10 @@ ArrayType CompType::getMemberArrayType(unsigned member_num) const
//--------------------------------------------------------------------------
CompType CompType::getMemberCompType(unsigned member_num) const
{
try {
CompType comptype(p_get_member_type(member_num));
try {
CompType comptype;
f_DataType_setId(&comptype, p_get_member_type(member_num));
return(comptype);
return(comptype);
}
catch (DataTypeIException& E) {
throw DataTypeIException("CompType::getMemberCompType", E.getDetailMsg());
@@ -344,10 +347,10 @@ CompType CompType::getMemberCompType(unsigned member_num) const
//--------------------------------------------------------------------------
EnumType CompType::getMemberEnumType(unsigned member_num) const
{
try {
EnumType enumtype(p_get_member_type(member_num));
try {
EnumType enumtype;
f_DataType_setId(&enumtype, p_get_member_type(member_num));
return(enumtype);
return(enumtype);
}
catch (DataTypeIException& E) {
throw DataTypeIException("CompType::getMemberEnumType", E.getDetailMsg());
@@ -365,10 +368,10 @@ EnumType CompType::getMemberEnumType(unsigned member_num) const
//--------------------------------------------------------------------------
IntType CompType::getMemberIntType(unsigned member_num) const
{
try {
IntType inttype(p_get_member_type(member_num));
try {
IntType inttype;
f_DataType_setId(&inttype, p_get_member_type(member_num));
return(inttype);
return(inttype);
}
catch (DataTypeIException& E) {
throw DataTypeIException("CompType::getMemberIntType", E.getDetailMsg());
@@ -386,10 +389,10 @@ IntType CompType::getMemberIntType(unsigned member_num) const
//--------------------------------------------------------------------------
FloatType CompType::getMemberFloatType(unsigned member_num) const
{
try {
FloatType floatype(p_get_member_type(member_num));
try {
FloatType floatype;
f_DataType_setId(&floatype, p_get_member_type(member_num));
return(floatype);
return(floatype);
}
catch (DataTypeIException& E) {
throw DataTypeIException("CompType::getMemberFloatType", E.getDetailMsg());
@@ -407,10 +410,10 @@ FloatType CompType::getMemberFloatType(unsigned member_num) const
//--------------------------------------------------------------------------
StrType CompType::getMemberStrType(unsigned member_num) const
{
try {
StrType strtype(p_get_member_type(member_num));
try {
StrType strtype;
f_DataType_setId(&strtype, p_get_member_type(member_num));
return(strtype);
return(strtype);
}
catch (DataTypeIException& E) {
throw DataTypeIException("CompType::getMemberStrType", E.getDetailMsg());
@@ -428,10 +431,10 @@ StrType CompType::getMemberStrType(unsigned member_num) const
//--------------------------------------------------------------------------
VarLenType CompType::getMemberVarLenType(unsigned member_num) const
{
try {
VarLenType varlentype(p_get_member_type(member_num));
try {
VarLenType varlentype;
f_DataType_setId(&varlentype, p_get_member_type(member_num));
return(varlentype);
return(varlentype);
}
catch (DataTypeIException& E) {
throw DataTypeIException("CompType::getMemberVarLenType", E.getDetailMsg());

View File

@@ -36,7 +36,7 @@ class H5_DLLCPP CompType : public DataType {
// Gets the compound datatype of the specified dataset
CompType(const DataSet& dataset); // H5Dget_type
// Copy constructor - makes a copy of original object
// Copy constructor - same as the original CompType.
CompType(const CompType& original);
// Constructors that open a compound datatype, given a location.

View File

@@ -25,7 +25,9 @@
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5AbstractDs.h"

View File

@@ -26,12 +26,9 @@
*
* The C++ API provides C++ wrappers for the HDF5 C Library.
*
* It is assumed that the user has knowledge of the
* <a href="https://support.hdfgroup.org/HDF5/doc/H5.format.html">
* HDF5 file format</a> and its components.
* For more information on the HDF5 C Library, see the
* <a href="https://support.hdfgroup.org/HDF5/doc/index.html">
* HDF5 Software Documentation</a> page.
* It is assumed that the user has knowledge of the HDF5 file format and its
* components. For more information on the HDF5 C Library, please refer to
* the HDF5 Software Documentation page.
*
* Because the HDF5 C Library maps very well to
* the object oriented design approach, classes in the C++ API can
@@ -51,15 +48,13 @@
Datatype Interface (H5T) DataType and subclasses
\endverbatim
*
* This <a href="https://support.hdfgroup.org/HDF5/doc/cpplus_RM/C2Cppfunction_map.mht">
* This <a href="./C2Cppfunction_map.htm">
* table </a> provides a map from the C APIs to the C++ member functions.
* <br />
* \section install_sec Installation
*
* The HDF5 C++ API is included with the HDF5 source code and can
* be obtained from
* <a href="https://support.hdfgroup.org/HDF5/release/obtainsrc.html">
* https://support.hdfgroup.org/HDF5/release/obtainsrc.html</a>.
*
* Please refer to the release_docs/INSTALL file under the top directory
* of the HDF5 source code for information about installing, building,

162
c++/src/H5DaccProp.cpp Normal file
View File

@@ -0,0 +1,162 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the COPYING file, which can be found at the root of the source code *
* distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. *
* If you do not have access to either file, you may request a copy from *
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include <string>
#include "H5Include.h"
#include "H5Exception.h"
#include "H5IdComponent.h"
#include "H5DataSpace.h"
#include "H5PropList.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
namespace H5 {
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control
// the order of creation and deletion of the global constants. See Design Notes
// in "H5PredType.cpp" for information.
// Initialize a pointer for the constant
DSetAccPropList* DSetAccPropList::DEFAULT_ = 0;
//--------------------------------------------------------------------------
// Function: DSetAccPropList::getConstant
// Purpose: Creates a DSetAccPropList object representing the HDF5
// constant H5P_DATASET_ACCESS, pointed to by
// DSetAccPropList::DEFAULT_
// exception H5::PropListIException
// Description
// If DSetAccPropList::DEFAULT_ already points to an allocated
// object, throw a PropListIException. This scenario should
// not happen.
// Programmer Binh-Minh Ribler - 2015
//--------------------------------------------------------------------------
DSetAccPropList* DSetAccPropList::getConstant()
{
// Tell the C library not to clean up, H5Library::termH5cpp will call
// H5close - more dependency if use H5Library::dontAtExit()
if (!IdComponent::H5dontAtexit_called)
{
(void) H5dont_atexit();
IdComponent::H5dontAtexit_called = true;
}
// If the constant pointer is not allocated, allocate it. Otherwise,
// throw because it shouldn't be.
if (DEFAULT_ == 0)
DEFAULT_ = new DSetAccPropList(H5P_DATASET_ACCESS);
else
throw PropListIException("DSetAccPropList::getConstant", "DSetAccPropList::getConstant is being invoked on an allocated DEFAULT_");
return(DEFAULT_);
}
//--------------------------------------------------------------------------
// Function: DSetAccPropList::deleteConstants
// Purpose: Deletes the constant object that DSetAccPropList::DEFAULT_
// points to.
// Programmer Binh-Minh Ribler - 2015
//--------------------------------------------------------------------------
void DSetAccPropList::deleteConstants()
{
if (DEFAULT_ != 0)
delete DEFAULT_;
}
//--------------------------------------------------------------------------
// Purpose Constant for dataset creation default property
//--------------------------------------------------------------------------
const DSetAccPropList& DSetAccPropList::DEFAULT = *getConstant();
#endif // DOXYGEN_SHOULD_SKIP_THIS
//--------------------------------------------------------------------------
// Function: DSetAccPropList default constructor
///\brief Default constructor: creates a stub dataset creation property list
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
DSetAccPropList::DSetAccPropList() : LinkAccPropList(H5P_DATASET_ACCESS) {}
//--------------------------------------------------------------------------
// Function: DSetAccPropList copy constructor
///\brief Copy constructor: same HDF5 object as \a original
/// DSetAccPropList object
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
DSetAccPropList::DSetAccPropList(const DSetAccPropList& orig) : LinkAccPropList(orig) {}
//--------------------------------------------------------------------------
// Function: DSetAccPropList overloaded constructor
///\brief Creates a DSetAccPropList object using the id of an
/// existing dataset creation property list.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
DSetAccPropList::DSetAccPropList(const hid_t plist_id) : LinkAccPropList(plist_id) {}
//--------------------------------------------------------------------------
// Function: DSetAccPropList::setChunkCache
///\brief Sets the raw data chunk cache parameters.
///\param rdcc_nslots - IN: Number of chunk slots in the raw data chunk cache
///\param rdcc_nbytes - IN: Total size of the raw data chunk cache
///\param rdcc_w0 - IN: The chunk preemption policy for this dataset
///\exception H5::PropListIException
///\par Description
/// The raw data chunk cache parameters includes the number of
/// objects in the meta data cache and the maximum number of
/// chunks and bytes in the raw data chunk cache. Once set,
/// these values will override the values in the file access
/// property list.
///
/// For information, please refer to the H5Pset_chunk_cache API in
/// the HDF5 C Reference Manual.
// July 2018
//--------------------------------------------------------------------------
void DSetAccPropList::setChunkCache(size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0) const
{
herr_t ret_value = H5Pset_chunk_cache(id, rdcc_nslots, rdcc_nbytes, rdcc_w0);
if (ret_value < 0)
{
throw PropListIException("DSetAccPropList::setChunkCache", "H5Pset_chunk_cache failed");
}
}
//--------------------------------------------------------------------------
// Function: DSetAccPropList::getChunkCache
///\brief Retrieves the raw data chunk cache parameters.
///\param rdcc_nslots - OUT: Number of chunk slots in the raw data chunk cache
///\param rdcc_nbytes - OUT: Total size of the raw data chunk cache
///\param rdcc_w0 - OUT: The chunk preemption policy for this dataset
///\exception H5::PropListIException
///\par Description
/// For information, please refer to the H5Pget_chunk_cache API in
/// the HDF5 C Reference Manual.
// July 2018
//--------------------------------------------------------------------------
void DSetAccPropList::getChunkCache(size_t &rdcc_nslots, size_t &rdcc_nbytes, double &rdcc_w0) const
{
herr_t ret_value = H5Pget_chunk_cache(id, &rdcc_nslots, &rdcc_nbytes, &rdcc_w0);
if (ret_value < 0)
{
throw PropListIException("DSetAccPropList::getChunkCache", "H5Pget_chunk_cache failed");
}
}
//--------------------------------------------------------------------------
// Function: DSetAccPropList destructor
///\brief Noop destructor.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
DSetAccPropList::~DSetAccPropList() {}
} // end namespace

68
c++/src/H5DaccProp.h Normal file
View File

@@ -0,0 +1,68 @@
// C++ informative line for the emacs editor: -*- C++ -*-
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the COPYING file, which can be found at the root of the source code *
* distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. *
* If you do not have access to either file, you may request a copy from *
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef __H5DSetAccPropList_H
#define __H5DSetAccPropList_H
namespace H5 {
/*! \class DSetAccPropList
\brief Class DSetAccPropList inherits from LinkAccPropList and provides
wrappers for the HDF5 dataset access property functions.
*/
// Inheritance: LinkAccPropList -> PropList -> IdComponent
class H5_DLLCPP DSetAccPropList : public LinkAccPropList {
public:
///\brief Default dataset creation property list.
static const DSetAccPropList& DEFAULT;
// Creates a dataset creation property list.
DSetAccPropList();
// Sets the raw data chunk cache parameters.
void setChunkCache(size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0) const;
// Retrieves the raw data chunk cache parameters.
void getChunkCache(size_t &rdcc_nslots, size_t &rdcc_nbytes, double &rdcc_w0) const;
///\brief Returns this class name.
virtual H5std_string fromClass () const { return("DSetAccPropList"); }
// Copy constructor - same as the original DSetAccPropList.
DSetAccPropList(const DSetAccPropList& orig);
// Creates a copy of an existing dataset creation property list
// using the property list id.
DSetAccPropList(const hid_t plist_id);
// Noop destructor.
virtual ~DSetAccPropList();
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// Deletes the global constant, should only be used by the library
static void deleteConstants();
private:
static DSetAccPropList* DEFAULT_;
// Creates the global constant, should only be used by the library
static DSetAccPropList* getConstant();
#endif // DOXYGEN_SHOULD_SKIP_THIS
}; // end of DSetAccPropList
} // namespace H5
#endif // __H5DSetAccPropList_H

View File

@@ -28,7 +28,9 @@
#include "H5OcreatProp.h"
#include "H5DxferProp.h"
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -67,7 +69,7 @@ DataSet::DataSet(const hid_t existing_id) : H5Object(), AbstractDs(), id(existin
//--------------------------------------------------------------------------
// Function: DataSet copy constructor
///\brief Copy constructor: makes a copy of the original DataSet object.
///\brief Copy constructor: same HDF5 object as \a original
///\param original - IN: DataSet instance to copy
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
@@ -90,9 +92,6 @@ DataSet::DataSet(const DataSet& original) : H5Object(), AbstractDs(), id(origina
/// \c loc can be DataSet, Group, H5File, or named DataType, that
/// is a datatype that has been named by DataType::commit.
// Programmer Binh-Minh Ribler - Oct, 2006
// Modification
// Jul, 2008
// Added for application convenience.
//--------------------------------------------------------------------------
DataSet::DataSet(const H5Location& loc, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), AbstractDs(), id(H5I_INVALID_HID)
{
@@ -109,9 +108,6 @@ DataSet::DataSet(const H5Location& loc, const void* ref, H5R_type_t ref_type, co
///\param plist - IN: Property list - default to PropList::DEFAULT
///\exception H5::ReferenceException
// Programmer Binh-Minh Ribler - Oct, 2006
// Modification
// Jul, 2008
// Added for application convenience.
//--------------------------------------------------------------------------
DataSet::DataSet(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), AbstractDs(), id(H5I_INVALID_HID)
{
@@ -176,6 +172,27 @@ DSetCreatPropList DataSet::getCreatePlist() const
return(create_plist);
}
//--------------------------------------------------------------------------
// Function: DataSet::getAccessPlist
///\brief Gets the dataset access property list.
///\return DSetAccPropList instance
///\exception H5::DataSetIException
// July 2018
//--------------------------------------------------------------------------
DSetAccPropList DataSet::getAccessPlist() const
{
hid_t access_plist_id = H5Dget_access_plist(id);
if (access_plist_id < 0)
{
throw DataSetIException("DataSet::getAccessPlist", "H5Dget_access_plist failed");
}
// create and return the DSetCreatPropList object
DSetAccPropList access_plist;
f_PropList_setId(&access_plist, access_plist_id);
return(access_plist);
}
//--------------------------------------------------------------------------
// Function: DataSet::getStorageSize
///\brief Returns the amount of storage required for a dataset.
@@ -577,10 +594,8 @@ int DataSet::iterateElems(void* buf, const DataType& type, const DataSpace& spac
///\param size - IN: Array containing the new magnitude of each dimension
///\exception H5::DataSetIException
///\par Description
/// For more information, please see the Description section in
/// C layer Reference Manual at:
///\par
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5D.html#Dataset-Extend
/// For information, please refer to the H5Dset_extent API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void DataSet::extend(const hsize_t* size) const
@@ -600,7 +615,6 @@ void DataSet::extend(const hsize_t* size) const
///\param space - IN: Dataspace describing memory buffer & containing selection to use
///\exception H5::DataSetIException
// Programmer Binh-Minh Ribler - 2014
// Modification
//--------------------------------------------------------------------------
void DataSet::fillMemBuf(const void *fill, const DataType& fill_type, void *buf, const DataType& buf_type, const DataSpace& space) const
{

View File

@@ -45,6 +45,9 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
// Gets the creation property list of this dataset.
DSetCreatPropList getCreatePlist() const;
// Gets the access property list of this dataset.
DSetAccPropList getAccessPlist() const;
// Returns the address of this dataset in the file.
haddr_t getOffset() const;
@@ -93,7 +96,7 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
// Default constructor.
DataSet();
// Copy constructor.
// Copy constructor - same as the original DataSet.
DataSet(const DataSet& original);
// Creates a copy of an existing DataSet using its id.

View File

@@ -133,7 +133,7 @@ DataSpace::DataSpace(const hid_t existing_id) : IdComponent(), id(existing_id)
//--------------------------------------------------------------------------
// Function: DataSpace copy constructor
///\brief Copy constructor: makes a copy of the original DataSpace object.
///\brief Copy constructor: same HDF5 object as \a original
///\param original - IN: DataSpace object to copy
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
@@ -466,9 +466,8 @@ hssize_t DataSpace::getSelectElemNpoints () const
///\param buf - IN: List of element points selected
///\exception H5::DataSpaceIException
///\par Description
/// For more information, please refer to the C layer Reference
/// Manual at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5S.html#Dataspace-SelectElemPointList
/// For information, please refer to the C API
/// H5Sget_select_elem_pointlist in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void DataSpace::getSelectElemPointlist (hsize_t startpoint, hsize_t numpoints, hsize_t *buf) const
@@ -490,9 +489,8 @@ void DataSpace::getSelectElemPointlist (hsize_t startpoint, hsize_t numpoints, h
/// the coordinates of the diagonally opposite corner
///\exception H5::DataSpaceIException
///\par Description
/// For more information, please refer to the C layer Reference
/// Manual at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5S.html#Dataspace-SelectBounds
/// For information, please refer to the H5Sget_select_bounds API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void DataSpace::getSelectBounds (hsize_t* start, hsize_t* end) const
@@ -516,9 +514,8 @@ void DataSpace::getSelectBounds (hsize_t* start, hsize_t* end) const
/// specifying the coordinates of the elements being selected
///\exception H5::DataSpaceIException
///\par Description
/// For more information, please refer to the C layer Reference
/// Manual at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5S.html#Dataspace-SelectElements
/// For information, please refer to the H5Sselect_elements API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void DataSpace::selectElements (H5S_seloper_t op, const size_t num_elements, const hsize_t *coord) const
@@ -598,9 +595,8 @@ bool DataSpace::selectValid () const
///\param block - IN: Size of block in the hyperslab - default to \c NULL
///\exception H5::DataSpaceIException
///\par Description
/// For more information, please refer to the C layer Reference
/// Manual at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5S.html#Dataspace-SelectHyperslab
/// For information, please refer to the H5Sselect_hyperslab API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void DataSpace::selectHyperslab(H5S_seloper_t op, const hsize_t *count, const hsize_t *start, const hsize_t *stride, const hsize_t *block) const

View File

@@ -36,7 +36,7 @@ class H5_DLLCPP DataSpace : public IdComponent {
// Creates a DataSpace object using an existing dataspace id.
DataSpace(const hid_t space_id);
// Copy constructor: makes a copy of the original DataSpace object.
// Copy constructor - same as the original DataSpace.
DataSpace(const DataSpace& original);
// Assignment operator

View File

@@ -28,7 +28,9 @@
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -96,9 +98,6 @@ DataType::DataType(const H5T_class_t type_class, size_t size) : H5Object(), enco
///\param plist - IN: Property list - default to PropList::DEFAULT
///\exception H5::ReferenceException
// Programmer Binh-Minh Ribler - Oct, 2006
// Modification
// Jul, 2008
// Added for application convenience.
//--------------------------------------------------------------------------
DataType::DataType(const H5Location& loc, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), encoded_buf(NULL), buf_size(0)
{
@@ -127,7 +126,7 @@ DataType::DataType(const H5Location& loc, const void* ref, H5R_type_t ref_type,
//--------------------------------------------------------------------------
// Function: DataType copy constructor
///\brief Copy constructor: makes a copy of the original DataType object
///\brief Copy constructor: same HDF5 object as \a original
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
DataType::DataType(const DataType& original) : H5Object(), id(original.id), encoded_buf(NULL), buf_size(0)
@@ -247,6 +246,7 @@ void DataType::copy(const DataSet& dset)
throw DataTypeIException(inMemFunc("copy"), "H5Tcopy failed");
}
#ifndef DOXYGEN_SHOULD_SKIP_THIS
//--------------------------------------------------------------------------
// Function: DataType::p_decode
// Purpose Returns an id of a type by decoding the binary object
@@ -275,11 +275,13 @@ hid_t DataType::p_decode() const
return(encoded_dtype_id);
}
}
#endif // DOXYGEN_SHOULD_SKIP_THIS
//--------------------------------------------------------------------------
// Function: DataType::decode
///\brief Returns a DataType instance by decoding the binary object
/// description of this datatype.
///
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - Aug 2017
//--------------------------------------------------------------------------
@@ -300,6 +302,7 @@ DataType* DataType::decode() const
//--------------------------------------------------------------------------
// Function: DataType::encode
///\brief Creates a binary object description of this datatype.
///
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - Aug 2017
//--------------------------------------------------------------------------
@@ -332,6 +335,7 @@ void DataType::encode()
// Function: DataType::hasBinaryDesc
///\brief Determines whether this datatype has a binary object
/// description.
///
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - Aug 2017
//--------------------------------------------------------------------------
@@ -395,6 +399,20 @@ bool DataType::operator==(const DataType& compared_type) const
}
}
//--------------------------------------------------------------------------
// Function: DataType::operator!=
///\brief Compares this DataType against the given one to determines
/// whether the two objects refer to different actual datatypes.
///\param compared_type - IN: Reference to the datatype to compare
///\return true if the datatypes are not equal, and false, otherwise.
///\exception H5::DataTypeIException
// July, 2018
//--------------------------------------------------------------------------
bool DataType::operator!=(const DataType& compared_type) const
{
return !operator==(compared_type);
}
//--------------------------------------------------------------------------
// Function: DataType::p_commit (private)
//\brief Commits a transient datatype to a file, creating a new
@@ -532,7 +550,7 @@ H5T_conv_t DataType::find(const DataType& dest, H5T_cdata_t **pcdata) const
///\param nelmts - IN: Size of array \a buf
///\param buf - IN/OUT: Array containing pre- and post-conversion
/// values
///\param background - IN: Optional backgroud buffer
///\param background - IN: Optional background buffer
///\param plist - IN: Property list - default to PropList::DEFAULT
///\return Pointer to a suitable conversion function
///\exception H5::DataTypeIException
@@ -558,7 +576,7 @@ void DataType::convert(const DataType& dest, size_t nelmts, void *buf, void *bac
///\brief Locks a datatype, making it read-only and non-destructible.
///
///\exception H5::DataTypeIException
///\par Descrition
///\par Description
/// This is normally done by the library for predefined data
/// types so the application doesn't inadvertently change or
/// delete a predefined type.
@@ -653,8 +671,8 @@ DataType DataType::getSuper() const
/// destination datatypes.
///\exception H5::DataTypeIException
///\par Description
/// For more information, please see:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5T.html#Datatype-Register
/// For information, please refer to the H5Tregister API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void DataType::registerFunc(H5T_pers_t pers, const char* name, const DataType& dest, H5T_conv_t func) const
@@ -899,7 +917,7 @@ hid_t DataType::p_opentype(const H5Location& loc, const char *dtype_name) const
// Call C function to open the named datatype at this location
hid_t ret_value = H5Topen2(loc.getId(), dtype_name, H5P_DEFAULT);
if (ret_value < 0)
throw DataTypeIException("DataType constructor", "H5Topen2 failed");
throw DataTypeIException(inMemFunc("constructor"), "H5Topen2 failed");
return(ret_value);
}

View File

@@ -30,12 +30,16 @@ class H5_DLLCPP DataType : public H5Object {
// Creates a datatype given its class and size
DataType(const H5T_class_t type_class, size_t size);
// Copy constructor: makes a copy of the original object
// Copy constructor - same as the original DataType.
DataType(const DataType& original);
// Creates a copy of a predefined type
DataType(const PredType& pred_type);
// Constructors to open a generic named datatype at a given location.
DataType(const H5Location& loc, const char* name);
DataType(const H5Location& loc, const H5std_string& name);
// Creates a datatype by way of dereference.
DataType(const H5Location& loc, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
// DataType(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
@@ -86,6 +90,9 @@ class H5_DLLCPP DataType : public H5Object {
// Determines whether two datatypes are the same.
bool operator==(const DataType& compared_type) const;
// Determines whether two datatypes are not the same.
bool operator!=(const DataType& compared_type) const;
// Locks a datatype.
void lock() const;
@@ -124,13 +131,6 @@ class H5_DLLCPP DataType : public H5Object {
///\brief Returns this class name.
virtual H5std_string fromClass () const { return("DataType"); }
// From CommonFG then H5Location
// Constructors to open a generic named datatype at a given location.
DataType(const H5Location& loc, const char* name);
DataType(const H5Location& loc, const H5std_string& name);
// End of From CommonFG then H5Location
// Creates a copy of an existing DataType using its id
DataType(const hid_t type_id);

View File

@@ -20,7 +20,9 @@
#include "H5PropList.h"
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -94,7 +96,7 @@ DSetCreatPropList::DSetCreatPropList() : ObjCreatPropList(H5P_DATASET_CREATE) {}
//--------------------------------------------------------------------------
// Function: DSetCreatPropList copy constructor
///\brief Copy constructor: makes a copy of the original
///\brief Copy constructor: same HDF5 object as \a original
/// DSetCreatPropList object
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
@@ -158,8 +160,8 @@ int DSetCreatPropList::getChunk(int max_ndims, hsize_t* dim) const
///\param layout - IN: Type of storage layout for raw data
///\exception H5::PropListIException
///\par Description
/// For information on valid layout types, please refer to
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetLayout
/// For information, please refer to the H5Pset_layout API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void DSetCreatPropList::setLayout(H5D_layout_t layout) const
@@ -233,9 +235,8 @@ void DSetCreatPropList::setDeflate(int level) const
///\par Description
/// The associate C function sets an SZIP compression filter,
/// H5Z_FILTER_SZIP, for a dataset. For more information about
/// SZIP and usage, please refer to the C layer Reference
/// Manual at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetSzip
/// SZIP and usage, please refer to the H5Pset_szip API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - Jan, 2007
//--------------------------------------------------------------------------
void DSetCreatPropList::setSzip(unsigned int options_mask, unsigned int pixels_per_block) const
@@ -252,12 +253,12 @@ void DSetCreatPropList::setSzip(unsigned int options_mask, unsigned int pixels_p
// Function: DSetCreatPropList::setNbit
///\brief Sets up for the use of the Nbit compression filter.
///\exception H5::PropListIException
///
///\par Description
/// The associate C function sets an Nbit compression filter,
/// H5Z_FILTER_NBIT, for a dataset. For more information about
/// Nbit compression, please refer to the C layer Reference
/// Manual at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-setNbit
/// Nbit compression, please refer to the H5Pset_nbit API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - Apr, 2016
//--------------------------------------------------------------------------
void DSetCreatPropList::setNbit() const
@@ -284,8 +285,7 @@ void DSetCreatPropList::setNbit() const
/// according to the actual dataset datatype.
///\par
/// For information on setting fill value, please refer to the
/// C layer Reference Manual at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetFillValue
/// H5Pset_fill_value API in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void DSetCreatPropList::setFillValue(const DataType& fvalue_type, const void* value) const
@@ -534,9 +534,8 @@ bool DSetCreatPropList::allFiltersAvail() const
///
///\exception H5::PropListIException
///\par Description
/// Please refer to the Reference Manual of \c H5Pset_shuffle for
/// details.
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetShuffle
/// For information, please refer to the H5Pset_shuffle API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void DSetCreatPropList::setShuffle() const
@@ -669,7 +668,7 @@ void DSetCreatPropList::setFletcher32() const
///\param size - IN: Number of bytes reserved in the file for the data
///\exception H5::PropListIException
///\par Description
/// If a dataset is splitted across multiple files then the files
/// If a dataset is split across multiple files then the files
/// should be defined in order. The total size of the dataset is
/// the sum of the \a size arguments for all the external files. If
/// the total size is larger than the size of a dataset then the
@@ -752,7 +751,8 @@ void DSetCreatPropList::getExternal(unsigned idx, size_t name_size, char* name,
/// an unlimited selection
///\exception H5::PropListIException
///\par Description
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetVirtual
/// For information, please refer to the H5Pset_virtual API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - Mar, 2017
//--------------------------------------------------------------------------
void DSetCreatPropList::setVirtual(const DataSpace& vspace, const char *src_fname, const char *src_dsname, const DataSpace& sspace) const
@@ -779,7 +779,8 @@ void DSetCreatPropList::setVirtual(const DataSpace& vspace, const char *src_fnam
/// an unlimited selection
///\exception H5::PropListIException
///\par Description
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetVirtual
/// For information, please refer to the H5Pset_virtual API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - Mar, 2017
//--------------------------------------------------------------------------
void DSetCreatPropList::setVirtual(const DataSpace& vspace, const H5std_string src_fname, const H5std_string src_dsname, const DataSpace& sspace) const

View File

@@ -122,7 +122,7 @@ class H5_DLLCPP DSetCreatPropList : public ObjCreatPropList {
///\brief Returns this class name.
virtual H5std_string fromClass () const { return("DSetCreatPropList"); }
// Copy constructor: creates a copy of a DSetCreatPropList object.
// Copy constructor - same as the original DSetCreatPropList.
DSetCreatPropList(const DSetCreatPropList& orig);
// Creates a copy of an existing dataset creation property list

View File

@@ -101,7 +101,7 @@ DSetMemXferPropList::DSetMemXferPropList(const char* exp) : PropList(H5P_DATASET
//--------------------------------------------------------------------------
// Function DSetMemXferPropList copy constructor
///\brief Copy constructor: makes a copy of the original
///\brief Copy constructor: same HDF5 object as \a original
/// DSetMemXferPropList object
///\param original - IN: Original dataset memory and transfer property
/// list object to copy
@@ -299,6 +299,7 @@ ssize_t DSetMemXferPropList::getDataTransform(char* exp, size_t buf_size) const
// Function: DSetMemXferPropList::getDataTransform
///\brief This is an overloaded member function, provided for convenience.
/// It takes no parameter and returns a \c H5std_string for the expression.
///
///\exception H5::PropListIException
// Programmer Binh-Minh Ribler - Mar, 2014
//--------------------------------------------------------------------------
@@ -434,8 +435,8 @@ void DSetMemXferPropList::getVlenMemManager(H5MM_allocate_t& alloc_func, void**
///\param size - IN: Maximum size, in bytes, of the small data block.
///\exception H5::PropListIException
///\par Description
/// For detail, please refer to the C layer Reference Manual at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetSmallData
/// For detail, please refer to the H5Pset_small_data_block_size
/// API in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - April, 2004
//--------------------------------------------------------------------------
void DSetMemXferPropList::setSmallDataBlockSize(hsize_t size) const
@@ -473,9 +474,8 @@ hsize_t DSetMemXferPropList::getSmallDataBlockSize() const
///
///\exception H5::PropListIException
///\par Description
/// For information, please refer to the C layer Reference
/// Manual at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetHyperVectorSize
/// For detail, please refer to the H5Pset_hyper_vector_size
/// API in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - April, 2004
//--------------------------------------------------------------------------
void DSetMemXferPropList::setHyperVectorSize(size_t vector_size) const

View File

@@ -102,7 +102,7 @@ class H5_DLLCPP DSetMemXferPropList : public PropList {
///\brief Returns this class name.
virtual H5std_string fromClass () const { return("DSetMemXferPropList"); }
// Copy constructor: makes a copy of a DSetMemXferPropList object.
// Copy constructor - same as the original DSetMemXferPropList.
DSetMemXferPropList(const DSetMemXferPropList& orig);
// Creates a copy of an existing dataset memory and transfer

View File

@@ -22,7 +22,9 @@
#include "H5DcreatProp.h"
#include "H5DxferProp.h"
#include "H5DataSpace.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5AbstractDs.h"
@@ -52,7 +54,7 @@ EnumType::EnumType(const hid_t existing_id) : DataType( existing_id ) {}
//--------------------------------------------------------------------------
// Function: EnumType copy constructor
///\brief Copy constructor: makes a copy of the original EnumType object.
///\brief Copy constructor: same HDF5 object as \a original
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
EnumType::EnumType(const EnumType& original) : DataType( original ) {}
@@ -149,6 +151,7 @@ EnumType::EnumType(const H5Location& loc, const H5std_string& dtype_name) : Data
// Function: EnumType::decode
///\brief Returns an EnumType object via DataType* by decoding the
/// binary object description of this type.
///
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - Aug 2017
//--------------------------------------------------------------------------

View File

@@ -75,7 +75,7 @@ class H5_DLLCPP EnumType : public DataType {
// Creates an enumeration datatype using an existing id
EnumType(const hid_t existing_id);
// Copy constructor: makes a copy of the original EnumType object.
// Copy constructor: same as the original EnumType.
EnumType(const EnumType& original);
virtual ~EnumType();

View File

@@ -39,7 +39,7 @@ Exception::Exception(const H5std_string& func, const H5std_string& message) : de
//--------------------------------------------------------------------------
// Function: Exception copy constructor
///\brief Copy constructor: makes a copy of the original Exception object.
///\brief Copy constructor: same HDF5 object as \a original
///\param orig - IN: Exception instance to copy
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------

View File

@@ -11,8 +11,18 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifdef OLD_HEADER_FILENAME
#include <iostream.h>
#else
#include <iostream>
#endif
#include <string>
using std::cerr;
using std::endl;
//#include <string>
#include "H5Include.h"
#include "H5Exception.h"
#include "H5IdComponent.h"
@@ -88,7 +98,7 @@ FileAccPropList::FileAccPropList() : PropList(H5P_FILE_ACCESS) {}
//--------------------------------------------------------------------------
// Function: FileAccPropList copy constructor
///\brief Copy Constructor: makes a copy of the original
///\brief Copy constructor: same HDF5 object as \a original
///\param original - IN: FileAccPropList instance to copy
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
@@ -124,8 +134,8 @@ void FileAccPropList::setStdio() const
///\return A low-level driver ID which is the same ID used when the
/// driver was set for the property list. The driver ID is
/// only valid as long as the file driver remains registered.
/// Valid driver identifiers can be found at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-GetDriver
/// For detail on valid driver identifiers, please refer to the
/// H5Pget_driver API in the HDF5 C Reference Manual.
///\exception H5::PropListIException
// Programmer Binh-Minh Ribler - April, 2004
//--------------------------------------------------------------------------
@@ -146,9 +156,8 @@ hid_t FileAccPropList::getDriver() const
///\param new_driver_info - IN: Struct containing the driver-specific properites
///\exception H5::PropListIException
///\par Description
/// For a list of valid driver identifiers, please see the C
/// layer Reference Manual at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetDriver
/// For information, please refer to the H5Pset_driver API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - April, 2004
//--------------------------------------------------------------------------
void FileAccPropList::setDriver(hid_t new_driver_id, const void *new_driver_info) const
@@ -205,8 +214,7 @@ hsize_t FileAccPropList::getFamilyOffset() const
///\exception H5::PropListIException
///\par Description
/// For more details on the use of \c H5FD_CORE driver, please
/// refer to
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetFaplCore
/// refer to the H5Pset_fapl_core API in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - April, 2004
//--------------------------------------------------------------------------
void FileAccPropList::setCore (size_t increment, hbool_t backing_store) const
@@ -309,8 +317,8 @@ FileAccPropList FileAccPropList::getFamily(hsize_t& memb_size) const
///\param raw_ext - IN: Raw data filename extension as \c char*
///\exception H5::PropListIException
///\par Description
/// Temporary - For information, please refer to:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetFaplSplit
/// For information, please refer to the H5Pset_fapl_split API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - April, 2004
//--------------------------------------------------------------------------
void FileAccPropList::setSplit(const FileAccPropList& meta_plist, const FileAccPropList& raw_plist, const char* meta_ext, const char* raw_ext) const
@@ -369,8 +377,8 @@ size_t FileAccPropList::getSieveBufSize() const
///\param bufsize - IN: Maximum size, in bytes, of data sieve buffer
///\exception H5::PropListIException
///\par Description
/// For detail on data sieving, please refer to
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetSieveBufSize
/// For more detail, please refer to the H5Pset_sieve_buf_size
/// API in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - April, 2004
//--------------------------------------------------------------------------
void FileAccPropList::setSieveBufSize(size_t bufsize) const
@@ -389,8 +397,8 @@ void FileAccPropList::setSieveBufSize(size_t bufsize) const
/// block allocations
///\exception H5::PropListIException
///\par Description
/// For more detail, please see the C layer Reference Manual at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetMetaBlockSize
/// For information, please refer to the H5Pset_meta_block_size
/// API in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - April, 2004
//--------------------------------------------------------------------------
void FileAccPropList::setMetaBlockSize(hsize_t &block_size) const
@@ -429,8 +437,8 @@ hsize_t FileAccPropList::getMetaBlockSize() const
///\param buf_size - IN: Size of the logging buffer
///\exception H5::PropListIException
///\par Description
/// For detail on \a flags, please refer to
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetFaplLog
/// For information, please refer to the H5Pset_fapl_log API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - April, 2004
//--------------------------------------------------------------------------
void FileAccPropList::setLog(const char *logfile, unsigned flags, size_t buf_size) const
@@ -486,8 +494,8 @@ void FileAccPropList::setSec2() const
/// effect of a special case, forcing everything to be aligned.
/// The parameter \a alignment must have a positive value.
///
/// For detail on \a setting alignment, please refer to
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetAlignment
/// For more detail, please refer to the H5Pset_alignment API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void FileAccPropList::setAlignment(hsize_t threshold, hsize_t alignment) const
@@ -523,8 +531,8 @@ void FileAccPropList::getAlignment(hsize_t &threshold, hsize_t &alignment) const
///\param dtype - IN: Type of data
///\exception H5::PropListIException
///\par Description
/// More details and valid values for \a dtype can be found at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetMultiType
/// For information, please refer to the H5Pset_multi_type API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - April, 2004
//--------------------------------------------------------------------------
void FileAccPropList::setMultiType(H5FD_mem_t dtype) const
@@ -542,8 +550,8 @@ void FileAccPropList::setMultiType(H5FD_mem_t dtype) const
///\return The data type property
///\exception H5::PropListIException
///\par Description
/// More details and possible returned values can be found at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-GetMultiType
/// For information, please refer to the H5Pget_multi_type API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - April, 2004
//--------------------------------------------------------------------------
H5FD_mem_t FileAccPropList::getMultiType() const
@@ -643,8 +651,8 @@ H5F_close_degree_t FileAccPropList::getFcloseDegree() const
/// on (1) or off (0).
///\exception H5::PropListIException
///\par Description
/// For detail on \a fapl, please refer to
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetGCReferences
/// For information, please refer to the H5Pset_gc_references API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void FileAccPropList::setGcReferences(unsigned gc_ref) const
@@ -694,8 +702,8 @@ unsigned FileAccPropList::getGcReferences() const
/// \li \c H5F_LIBVER_18
/// \li \c H5F_LIBVER_LATEST (Default)
///
/// For more details, please refer to
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetLibverBounds
/// For more detail, please refer to the H5Pset_libver_bounds API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - March, 2015
//--------------------------------------------------------------------------
void FileAccPropList::setLibverBounds(H5F_libver_t libver_low, H5F_libver_t libver_high) const

View File

@@ -136,7 +136,7 @@ class H5_DLLCPP FileAccPropList : public PropList {
///\brief Returns this class name.
virtual H5std_string fromClass () const { return("FileAccPropList"); }
// Copy constructor: creates a copy of a FileAccPropList object.
// Copy constructor: same as the original FileAccPropList.
FileAccPropList(const FileAccPropList& original);
// Creates a copy of an existing file access property list

View File

@@ -86,7 +86,7 @@ FileCreatPropList::FileCreatPropList() : PropList(H5P_FILE_CREATE) {}
//--------------------------------------------------------------------------
// Function: FileCreatPropList copy constructor
///\brief Copy constructor: makes a copy of the original
///\brief Copy constructor: same HDF5 object as \a original
/// FileCreatPropList object.
///\param original - IN: FileCreatPropList instance to copy
// Programmer Binh-Minh Ribler - 2000
@@ -173,9 +173,8 @@ hsize_t FileCreatPropList::getUserblock() const
///\param sizeof_size - IN: Size of an object length in bytes.
///\exception H5::PropListIException
///\par Description
/// For information on setting sizes, please refer to the
/// C layer Reference Manual at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetSizes
/// For information, please refer to the H5Pset_sizes API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void FileCreatPropList::setSizes(size_t sizeof_addr, size_t sizeof_size) const
@@ -214,8 +213,8 @@ void FileCreatPropList::getSizes(size_t& sizeof_addr, size_t& sizeof_size) const
///\param lk - IN: Symbol table node size
///\exception H5::PropListIException
///\par Description
/// For information, please see the C layer Reference Manual at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetSymK
/// For information, please refer to the H5Pset_sym_k API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void FileCreatPropList::setSymk(unsigned ik, unsigned lk) const
@@ -235,8 +234,8 @@ void FileCreatPropList::setSymk(unsigned ik, unsigned lk) const
///
///\exception H5::PropListIException
///\par Description
/// For information, please see
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-GetSymK
/// For information, please refer to the H5Pget_sym_k API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void FileCreatPropList::getSymk(unsigned& ik, unsigned& lk) const
@@ -256,8 +255,8 @@ void FileCreatPropList::getSymk(unsigned& ik, unsigned& lk) const
///\param ik - IN: 1/2 rank of chunked storage B-tree
///\exception H5::PropListIException
///\par Description
/// For information, please see the C layer Reference Manual at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetIstoreK
/// For information, please refer to the H5Pset_istore_k API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void FileCreatPropList::setIstorek(unsigned ik) const
@@ -276,8 +275,8 @@ void FileCreatPropList::setIstorek(unsigned ik) const
///\return 1/2 rank of chunked storage B-tree
///\exception H5::PropListIException
///\par Description
/// For information, please see
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-GetIstoreK
/// For information, please refer to the H5Pget_istore_k API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
unsigned FileCreatPropList::getIstorek() const
@@ -306,8 +305,8 @@ unsigned FileCreatPropList::getIstorek() const
/// changed and the existing strategy will be retained.
/// If the given threshold value is zero, the property will not be
/// changed and the existing threshold will be retained.
/// For information, please see the C layer Reference Manual at:
/// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetFileSpace
/// For information, please refer to the H5Pset_file_space_strategy
/// API in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - Feb, 2017
//--------------------------------------------------------------------------
void FileCreatPropList::setFileSpaceStrategy(H5F_fspace_strategy_t strategy, hbool_t persist, hsize_t threshold) const

View File

@@ -79,7 +79,7 @@ class H5_DLLCPP FileCreatPropList : public PropList {
///\brief Returns this class name.
virtual H5std_string fromClass() const { return("FileCreatPropList"); }
// Copy constructor: creates a copy of a FileCreatPropList object.
// Copy constructor: same as the original FileCreatPropList.
FileCreatPropList(const FileCreatPropList& orig);
// Creates a copy of an existing file create property list

View File

@@ -27,7 +27,9 @@
#include "H5OcreatProp.h"
#include "H5DxferProp.h"
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5CommonFG.h"
@@ -45,7 +47,7 @@ namespace H5 {
//--------------------------------------------------------------------------
// Function H5File default constructor
///\brief Default constructor: creates a stub H5File object.
// Programmer Binh-Minh Ribler - 2000
// December 2000
//--------------------------------------------------------------------------
H5File::H5File() : Group(), id(H5I_INVALID_HID) {}
@@ -72,13 +74,12 @@ H5File::H5File() : Group(), id(H5I_INVALID_HID) {}
/// exists, and fail, otherwise
///\par
/// For info on file creation in the case of an already-open file,
/// please refer to the \b Special \b case section in the C layer
/// Reference Manual at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5F.html#File-Create
/// please refer to the \b Special \b case section of the H5Fcreate
/// API in the C Reference Manual.
// Notes With a PGI compiler (~2012-2013,) the exception thrown by
// p_get_file could not be caught in the applications. Added try
// block here to catch then re-throw it. -BMR 2013/03/21
// Programmer Binh-Minh Ribler - 2000
// December 2000
//--------------------------------------------------------------------------
H5File::H5File(const char* name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist) : Group(), id(H5I_INVALID_HID)
{
@@ -103,7 +104,7 @@ H5File::H5File(const char* name, unsigned int flags, const FileCreatPropList& cr
// Notes With a PGI compiler (~2012-2013,) the exception thrown by
// p_get_file could not be caught in the applications. Added try
// block here to catch then re-throw it. -BMR 2013/03/21
// Programmer Binh-Minh Ribler - 2000
// December 2000
//--------------------------------------------------------------------------
H5File::H5File(const H5std_string& name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist) : Group(), id(H5I_INVALID_HID)
{
@@ -118,7 +119,6 @@ H5File::H5File(const H5std_string& name, unsigned int flags, const FileCreatProp
//--------------------------------------------------------------------------
// This function is private and contains common code between the
// constructors taking a string or a char*
// Programmer Binh-Minh Ribler - 2000
// Modification
// - removed H5F_ACC_CREAT because H5Fcreate will fail with
// H5F_ACC_CREAT. - BMR, Sep 17, 2014
@@ -153,7 +153,6 @@ void H5File::p_get_file(const char* name, unsigned int flags, const FileCreatPro
// Function: H5File overloaded constructor
///\brief Creates an H5File object using an existing file id.
///\param existing_id - IN: Id of an existing file
// Programmer Binh-Minh Ribler - 2015
// Description
// Mar 29, 2015
// Added in responding to a request from user Jason Newton.
@@ -172,10 +171,10 @@ H5File::H5File(hid_t existing_id) : Group()
//--------------------------------------------------------------------------
// Function: H5File copy constructor
///\brief Copy constructor: makes a copy of the original
///\brief Copy constructor: same HDF5 object as \a original
/// H5File object.
///\param original - IN: H5File instance to copy
// Programmer Binh-Minh Ribler - 2000
// December 2000
//--------------------------------------------------------------------------
H5File::H5File(const H5File& original) : Group()
{
@@ -189,7 +188,7 @@ H5File::H5File(const H5File& original) : Group()
///\param name - IN: Name of the file
///\return true if the file is in HDF5 format, and false, otherwise
///\exception H5::FileIException
// Programmer Binh-Minh Ribler - 2000
// December 2000
//--------------------------------------------------------------------------
bool H5File::isHdf5(const char* name)
{
@@ -211,7 +210,7 @@ bool H5File::isHdf5(const char* name)
///\brief This is an overloaded member function, provided for convenience.
/// It takes an \c H5std_string for \a name. (Static)
///\param name - IN: Name of the file - \c H5std_string
// Programmer Binh-Minh Ribler - 2000
// December 2000
//--------------------------------------------------------------------------
bool H5File::isHdf5(const H5std_string& name)
{
@@ -234,7 +233,7 @@ bool H5File::isHdf5(const H5std_string& name)
///
/// H5F_ACC_RDONLY: Open with read only access. - default
///
// Programmer Binh-Minh Ribler - Oct, 2005
// October 2005
//--------------------------------------------------------------------------
void H5File::openFile(const char* name, unsigned int flags, const FileAccPropList& access_plist)
{
@@ -261,7 +260,7 @@ void H5File::openFile(const char* name, unsigned int flags, const FileAccPropLis
///\param flags - IN: File access flags
///\param access_plist - IN: File access property list. Default to
/// FileAccPropList::DEFAULT
// Programmer Binh-Minh Ribler - 2000
// December 2000
//--------------------------------------------------------------------------
void H5File::openFile(const H5std_string& name, unsigned int flags, const FileAccPropList& access_plist)
{
@@ -276,7 +275,6 @@ void H5File::openFile(const H5std_string& name, unsigned int flags, const FileAc
// Description
// If this object has represented another HDF5 file, the previous
// HDF5 file need to be closed first.
// Programmer Binh-Minh Ribler - 2000
// Note: This wrapper doesn't seem right regarding the 'id' and should
// be investigated. BMR - 2/20/2005
// Modification
@@ -303,10 +301,10 @@ void H5File::reOpen()
//--------------------------------------------------------------------------
// Function: H5File::getCreatePlist
///\brief Returns the creation property list of this file
///\brief Returns a copy of the creation property list of this file
///\return FileCreatPropList object
///\exception H5::FileIException
// Programmer Binh-Minh Ribler - 2000
// December 2000
//--------------------------------------------------------------------------
FileCreatPropList H5File::getCreatePlist() const
{
@@ -327,10 +325,10 @@ FileCreatPropList H5File::getCreatePlist() const
//--------------------------------------------------------------------------
// Function: H5File::getAccessPlist
///\brief Returns the access property list of this file
///\brief Returns a copy of the access property list of this file
///\return FileAccPropList object
///\exception H5::FileIException
// Programmer Binh-Minh Ribler - 2000
// December 2000
//--------------------------------------------------------------------------
FileAccPropList H5File::getAccessPlist() const
{
@@ -357,7 +355,7 @@ FileAccPropList H5File::getAccessPlist() const
///\par Description
/// The retrieved information may include information about
/// superblock extension, free space management, and shared object
// Programmer Binh-Minh Ribler - February 2017
// February 2017
//--------------------------------------------------------------------------
void H5File::getFileInfo(H5F_info2_t& file_info) const
{
@@ -373,7 +371,7 @@ void H5File::getFileInfo(H5F_info2_t& file_info) const
///\brief Returns the amount of free space in the file.
///\return Amount of free space
///\exception H5::FileIException
// Programmer Binh-Minh Ribler - May 2004
// May 2004
//--------------------------------------------------------------------------
hssize_t H5File::getFreeSpace() const
{
@@ -405,7 +403,7 @@ hssize_t H5File::getFreeSpace() const
/// | \c H5F_OBJ_DATATYPE | \c H5F_OBJ_ATTR
///\par
/// Multiple object types can be combined with the logical OR operator (|).
// Programmer Binh-Minh Ribler - May 2004
// May 2004
//--------------------------------------------------------------------------
ssize_t H5File::getObjCount(unsigned types) const
{
@@ -440,7 +438,7 @@ ssize_t H5File::getObjCount(unsigned types) const
/// Multiple object types can be combined with the logical OR operator (|).
//
// Notes: will do the overload for this one after hearing from Quincey???
// Programmer Binh-Minh Ribler - May 2004
// May 2004
//--------------------------------------------------------------------------
void H5File::getObjIDs(unsigned types, size_t max_objs, hid_t *oid_list) const
{
@@ -468,7 +466,7 @@ void H5File::getObjIDs(unsigned types, size_t max_objs, hid_t *oid_list) const
/// The obtained file handle is dynamic and is valid only while
/// the file remains open; it will be invalid if the file is
/// closed and reopened or opened during a subsequent session.
// Programmer Binh-Minh Ribler - May 2004
// May 2004
//--------------------------------------------------------------------------
void H5File::getVFDHandle(const FileAccPropList& fapl, void **file_handle) const
{
@@ -489,7 +487,7 @@ void H5File::getVFDHandle(const FileAccPropList& fapl, void **file_handle) const
// Param file_handle - Pointer to the file handle being used by
// the low-level virtual file driver
// Exception H5::FileIException
// Programmer Binh-Minh Ribler - May 2004
// May 2004
// Modification
// Planned for removal. -BMR, 2014/04/16
// Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0
@@ -508,7 +506,7 @@ void H5File::getVFDHandle(const FileAccPropList& fapl, void **file_handle) const
///\param file_handle - Pointer to the file handle being used by
/// the low-level virtual file driver
///\exception H5::FileIException
// Programmer Binh-Minh Ribler - May 2004
// May 2004
//--------------------------------------------------------------------------
void H5File::getVFDHandle(void **file_handle) const
{
@@ -550,7 +548,7 @@ hsize_t H5File::getFileSize() const
// AbstractDS and Attribute are moved out of H5Object. In
// addition, member IdComponent::id is moved into subclasses, and
// IdComponent::getId now becomes pure virtual function.
// Programmer Binh-Minh Ribler - May, 2008
// May, 2008
//--------------------------------------------------------------------------
hid_t H5File::getId() const
{
@@ -564,7 +562,7 @@ hid_t H5File::getId() const
// Exception H5::FileIException
// Description
// This function is replaced by the above function reOpen.
// Programmer Binh-Minh Ribler - 2000
// December 2000
//--------------------------------------------------------------------------
void H5File::reopen()
{
@@ -577,7 +575,7 @@ void H5File::reopen()
// Description
// This function is a redefinition of CommonFG::getLocId. It
// is used by CommonFG member functions to get the file id.
// Programmer Binh-Minh Ribler - 2000
// December 2000
// Deprecated:
// Aug 18, 2016 -BMR
// After HDFFV-9920, the Group's methods can use getId() and
@@ -598,7 +596,7 @@ hid_t H5File::getLocId() const
// The underlaying reference counting in the C library ensures
// that the current valid id of this object is properly closed.
// Then the object's id is reset to the new id.
// Programmer Binh-Minh Ribler - 2000
// December 2000
//--------------------------------------------------------------------------
void H5File::p_setId(const hid_t new_id)
{
@@ -619,7 +617,7 @@ void H5File::p_setId(const hid_t new_id)
///\brief Closes this HDF5 file.
///
///\exception H5::FileIException
// Programmer Binh-Minh Ribler - Mar 9, 2005
// March 2005
//--------------------------------------------------------------------------
void H5File::close()
{
@@ -646,7 +644,7 @@ void H5File::close()
// proper exception can be thrown for file or group. The
// "H5File::" will be inserted to indicate the function called is
// an implementation of H5File.
// Programmer Binh-Minh Ribler - 2000
// December 2000
//--------------------------------------------------------------------------
void H5File::throwException(const H5std_string& func_name, const H5std_string& msg) const
{
@@ -658,7 +656,7 @@ void H5File::throwException(const H5std_string& func_name, const H5std_string& m
//--------------------------------------------------------------------------
// Function: H5File destructor
///\brief Properly terminates access to this file.
// Programmer Binh-Minh Ribler - 2000
// December 2000
// Modification
// - Replaced resetIdComponent() with decRefCount() to use C
// library ID reference counting mechanism - BMR, Feb 20, 2005

View File

@@ -41,10 +41,10 @@ class H5_DLLCPP H5File : public Group {
// Close this file.
virtual void close();
// Gets the access property list of this file.
// Gets a copy of the access property list of this file.
FileAccPropList getAccessPlist() const;
// Gets the creation property list of this file.
// Gets a copy of the creation property list of this file.
FileCreatPropList getCreatePlist() const;
// Gets general information about this file.
@@ -97,7 +97,7 @@ class H5_DLLCPP H5File : public Group {
// Default constructor
H5File();
// Copy constructor: makes a copy of the original H5File object.
// Copy constructor: same as the original H5File.
H5File(const H5File& original);
// Gets the HDF5 file id.

View File

@@ -20,7 +20,9 @@
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -65,7 +67,7 @@ FloatType::FloatType(const hid_t existing_id) : AtomType( existing_id ) {}
//--------------------------------------------------------------------------
// Function: FloatType copy constructor
///\brief Copy constructor: makes a copy of the original FloatType object.
///\brief Copy constructor: same HDF5 object as \a original
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
FloatType::FloatType(const FloatType& original) : AtomType( original ){}
@@ -131,6 +133,7 @@ FloatType::FloatType(const H5Location& loc, const H5std_string& dtype_name) : At
// Function: FloatType::decode
///\brief Returns an FloatType object via DataType* by decoding the
/// binary object description of this type.
///
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - Aug 2017
//--------------------------------------------------------------------------

View File

@@ -71,7 +71,7 @@ class H5_DLLCPP FloatType : public AtomType {
// Creates a floating-point datatype using an existing id.
FloatType(const hid_t existing_id);
// Copy constructor: makes a copy of the original FloatType object.
// Copy constructor: same as the original FloatType.
FloatType(const FloatType& original);
// Noop destructor.

View File

@@ -27,7 +27,9 @@
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5AbstractDs.h"
@@ -52,7 +54,7 @@ Group::Group() : H5Object(), CommonFG(), id(H5I_INVALID_HID) {}
//--------------------------------------------------------------------------
// Function: Group copy constructor
///\brief Copy constructor: makes a copy of the original Group object.
///\brief Copy constructor: same HDF5 object as \a original
///\param original - IN: Original group to copy
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
@@ -64,6 +66,7 @@ Group::Group(const Group& original) : H5Object(), CommonFG(), id(original.id)
//--------------------------------------------------------------------------
// Function: Group::closeObjId
///\brief Closes an object, which was opened with Group::getObjId
///
///\exception H5::FileIException or H5::GroupIException
// Programmer Binh-Minh Ribler - March, 2017
//--------------------------------------------------------------------------
@@ -122,26 +125,6 @@ Group::Group(const H5Location& loc, const void* ref, H5R_type_t ref_type, const
id = H5Location::p_dereference(loc.getId(), ref, ref_type, plist, "constructor - by dereference");
}
//--------------------------------------------------------------------------
// Function: Group overload constructor - dereference
// brief Given a reference, ref, to an hdf5 group, creates a Group objec
// param attr - IN: Specifying location where the referenced object is i
// param ref - IN: Reference pointer
// param ref_type - IN: Reference type - default to H5R_OBJECT
// param plist - IN: Property list - default to PropList::DEFAULT
// exception H5::ReferenceException
// Programmer Binh-Minh Ribler - Oct, 2006
// Modification
// Mar, 2017
// Removed in 1.10.1 because H5Location is Attribute's baseclass
// now. -BMR
//--------------------------------------------------------------------------
/* Group::Group(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), id(H5I_INVALID_HID)
{
id = H5Location::p_dereference(attr.getId(), ref, ref_type, plist, "constructor - by dereference");
}
*/
//--------------------------------------------------------------------------
// Function: Group::getNumObjs
///\brief Returns the number of objects in this group.

View File

@@ -53,7 +53,7 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
// default constructor
Group();
// Copy constructor: makes a copy of the original object
// Copy constructor: same as the original Group.
Group(const Group& original);
// Gets the group id.

View File

@@ -322,7 +322,7 @@ IdComponent::~IdComponent() {}
//
// Implementation of protected functions for HDF5 Reference Interface
// and miscelaneous helpers.
// and miscellaneous helpers.
//
#ifndef DOXYGEN_SHOULD_SKIP_THIS

View File

@@ -60,21 +60,8 @@ class H5_DLLCPP IdComponent {
// Sets the identifier of this object to a new value.
void setId(const hid_t new_id);
// *** Deprecation warning ***
// The following two constructors are no longer appropriate after the
// data member "id" had been moved to the sub-classes.
// The copy constructor is a noop and is removed in 1.8.15 and the
// other will be removed from 1.10 release, and then from 1.8 if its
// removal does not raise any problems in two 1.10 releases.
// Creates an object to hold an HDF5 identifier.
// IdComponent(const hid_t h5_id); - removed from 1.10.1
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// Copy constructor: makes copy of the original IdComponent object.
// IdComponent(const IdComponent& original); - removed from 1.8.15
// Gets the identifier of this object.
virtual hid_t getId () const = 0;

View File

@@ -20,7 +20,9 @@
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -42,7 +44,7 @@ IntType::IntType() {}
//--------------------------------------------------------------------------
// Function: IntType copy constructor
///\brief Copy constructor: makes a copy of the original IntType object.
///\brief Copy constructor: same HDF5 object as \a original
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
IntType::IntType(const IntType& original) : AtomType( original ) {}
@@ -117,7 +119,7 @@ IntType::IntType(const H5Location& loc, const char *dtype_name) : AtomType()
// Programmer Binh-Minh Ribler - Dec 2016
// Description
// In 1.10.1, this constructor was introduced and may replace the
// existing function CommonFG::openArrayType(const H5std_string&)
// existing function CommonFG::openIntType(const H5std_string&)
// to improve usability.
// -BMR, Dec 2016
//--------------------------------------------------------------------------
@@ -130,6 +132,7 @@ IntType::IntType(const H5Location& loc, const H5std_string& dtype_name) : AtomTy
// Function: IntType::decode
///\brief Returns an IntType object via DataType* by decoding the
/// binary object description of this type.
///
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - Aug 2017
//--------------------------------------------------------------------------

View File

@@ -53,7 +53,7 @@ class H5_DLLCPP IntType : public AtomType {
// Creates a integer datatype using an existing id
IntType(const hid_t existing_id);
// Copy constructor: makes copy of IntType object
// Copy constructor: same as the original IntType.
IntType(const IntType& original);
// Noop destructor.

View File

@@ -88,7 +88,7 @@ LinkAccPropList::LinkAccPropList() : PropList(H5P_LINK_ACCESS) {}
//--------------------------------------------------------------------------
// Function: LinkAccPropList copy constructor
///\brief Copy Constructor: makes a copy of the original
///\brief Copy Constructor: same HDF5 object as \a original
///\param original - IN: LinkAccPropList instance to copy
// Programmer Binh-Minh Ribler - December, 2016
//--------------------------------------------------------------------------
@@ -107,6 +107,7 @@ LinkAccPropList::LinkAccPropList(const hid_t plist_id) : PropList(plist_id) {}
///\brief Set the number of soft or user-defined link traversals allowed
/// before the library assumes it has found a cycle and aborts the
/// traversal.
///
///\exception H5::PropListIException
// Programmer Binh-Minh Ribler - March 1, 2017
//--------------------------------------------------------------------------
@@ -124,6 +125,7 @@ void LinkAccPropList::setNumLinks(size_t nlinks) const
// Function: LinkAccPropList::getNumLinks
///\brief Gets the number of soft or user-defined links that can be
/// traversed before a failure occurs.
///
///\exception H5::PropListIException
// Programmer Binh-Minh Ribler - March 1, 2017
//--------------------------------------------------------------------------

View File

@@ -36,7 +36,7 @@ class H5_DLLCPP LinkAccPropList : public PropList {
///\brief Returns this class name.
virtual H5std_string fromClass () const { return("LinkAccPropList"); }
// Copy constructor: creates a copy of a LinkAccPropList object.
// Copy constructor: same as the original LinkAccPropList.
LinkAccPropList(const LinkAccPropList& original);
// Creates a copy of an existing file access property list

148
c++/src/H5LcreatProp.cpp Normal file
View File

@@ -0,0 +1,148 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the COPYING file, which can be found at the root of the source code *
* distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. *
* If you do not have access to either file, you may request a copy from *
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include <string>
#include "H5Include.h"
#include "H5Exception.h"
#include "H5IdComponent.h"
#include "H5PropList.h"
#include "H5LcreatProp.h"
namespace H5 {
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control
// the order of creation and deletion of the global constants. See Design Notes
// in "H5PredType.cpp" for information.
// Initialize a pointer for the constant
LinkCreatPropList* LinkCreatPropList::DEFAULT_ = 0;
//--------------------------------------------------------------------------
// Function: LinkCreatPropList::getConstant
// Creates a LinkCreatPropList object representing the HDF5 constant
// H5P_LINK_CREATE, pointed to by LinkCreatPropList::DEFAULT_
// exception H5::PropListIException
// Description
// If LinkCreatPropList::DEFAULT_ already points to an allocated
// object, throw a PropListIException. This scenario should not
// happen.
// December, 2016
//--------------------------------------------------------------------------
LinkCreatPropList* LinkCreatPropList::getConstant()
{
// Tell the C library not to clean up, H5Library::termH5cpp will call
// H5close - more dependency if use H5Library::dontAtExit()
if (!IdComponent::H5dontAtexit_called)
{
(void) H5dont_atexit();
IdComponent::H5dontAtexit_called = true;
}
// If the constant pointer is not allocated, allocate it. Otherwise,
// throw because it shouldn't be.
if (DEFAULT_ == 0)
DEFAULT_ = new LinkCreatPropList(H5P_LINK_CREATE);
else
throw PropListIException("LinkCreatPropList::getConstant", "LinkCreatPropList::getConstant is being invoked on an allocated DEFAULT_");
return(DEFAULT_);
}
//--------------------------------------------------------------------------
// Function: LinkCreatPropList::deleteConstants
// Purpose: Deletes the constant object that LinkCreatPropList::DEFAULT_
// points to.
// exception H5::PropListIException
// December, 2016
//--------------------------------------------------------------------------
void LinkCreatPropList::deleteConstants()
{
if (DEFAULT_ != 0)
delete DEFAULT_;
}
//--------------------------------------------------------------------------
// Purpose: Constant for default property
//--------------------------------------------------------------------------
const LinkCreatPropList& LinkCreatPropList::DEFAULT = *getConstant();
#endif // DOXYGEN_SHOULD_SKIP_THIS
//--------------------------------------------------------------------------
// Function: Default Constructor
///\brief Creates a file access property list
// December, 2016
//--------------------------------------------------------------------------
LinkCreatPropList::LinkCreatPropList() : PropList(H5P_LINK_CREATE) {}
//--------------------------------------------------------------------------
// Function: LinkCreatPropList copy constructor
///\brief Copy constructor: same HDF5 object as \a original
///\param original - IN: LinkCreatPropList instance to copy
// December, 2016
//--------------------------------------------------------------------------
LinkCreatPropList::LinkCreatPropList(const LinkCreatPropList& original) : PropList(original) {}
//--------------------------------------------------------------------------
// Function: LinkCreatPropList overloaded constructor
///\brief Creates a file access property list using the id of an
/// existing one.
// December, 2016
//--------------------------------------------------------------------------
LinkCreatPropList::LinkCreatPropList(const hid_t plist_id) : PropList(plist_id) {}
//--------------------------------------------------------------------------
// Function: LinkCreatPropList::setCharEncoding
///\brief Sets the character encoding of the string.
///
///\exception H5::PropListIException
// March, 2018
//--------------------------------------------------------------------------
void LinkCreatPropList::setCharEncoding(H5T_cset_t encoding) const
{
herr_t ret_value = H5Pset_char_encoding(id, encoding);
// Throw exception if H5Pset_char_encoding returns failure
if (ret_value < 0)
{
throw PropListIException("setCharEncoding", "H5Pset_char_encoding failed");
}
}
//--------------------------------------------------------------------------
// Function: LinkCreatPropList::getCharEncoding
///\brief Gets the character encoding of the string.
///\return The character encoding
///\exception H5::PropListIException
// March, 2018
//--------------------------------------------------------------------------
H5T_cset_t LinkCreatPropList::getCharEncoding() const
{
H5T_cset_t encoding;
herr_t ret_value = H5Pget_char_encoding(id, &encoding);
// Throw exception if H5Pget_char_encoding returns failure
if (ret_value < 0)
{
throw PropListIException("getCharEncoding", "H5Pget_char_encoding failed");
}
return(encoding);
}
//--------------------------------------------------------------------------
// Function: LinkCreatPropList destructor
///\brief Noop destructor
// December, 2016
//--------------------------------------------------------------------------
LinkCreatPropList::~LinkCreatPropList() {}
} // end namespace

71
c++/src/H5LcreatProp.h Normal file
View File

@@ -0,0 +1,71 @@
// C++ informative line for the emacs editor: -*- C++ -*-
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the COPYING file, which can be found at the root of the source code *
* distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. *
* If you do not have access to either file, you may request a copy from *
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
// Class LinkCreatPropList represents the HDF5 file access property list and
// inherits from DataType.
#ifndef __H5LinkCreatPropList_H
#define __H5LinkCreatPropList_H
namespace H5 {
/*! \class LinkCreatPropList
\brief Class LinkCreatPropList inherits from PropList and provides
wrappers for the HDF5 file access property list.
*/
// Inheritance: PropList -> IdComponent
class H5_DLLCPP LinkCreatPropList : public PropList {
public:
///\brief Default file access property list.
static const LinkCreatPropList& DEFAULT;
// Creates a file access property list.
LinkCreatPropList();
///\brief Returns this class name.
virtual H5std_string fromClass () const { return("LinkCreatPropList"); }
// Copy constructor: same as the original LinkCreatPropList.
LinkCreatPropList(const LinkCreatPropList& original);
// Creates a copy of an existing file access property list
// using the property list id.
LinkCreatPropList (const hid_t plist_id);
// Sets the character encoding of the string.
void setCharEncoding(H5T_cset_t encoding) const;
// Gets the character encoding of the string.
H5T_cset_t getCharEncoding() const;
// Noop destructor
virtual ~LinkCreatPropList();
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// Deletes the global constant, should only be used by the library
static void deleteConstants();
private:
static LinkCreatPropList* DEFAULT_;
// Creates the global constant, should only be used by the library
static LinkCreatPropList* getConstant();
#endif // DOXYGEN_SHOULD_SKIP_THIS
}; // end of LinkCreatPropList
} // namespace H5
#endif // __H5LinkCreatPropList_H

View File

@@ -24,7 +24,9 @@
#include "H5OcreatProp.h"
#include "H5DxferProp.h"
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -110,8 +112,7 @@ void H5Library::getLibVersion(unsigned& majnum, unsigned& minnum, unsigned& reln
///\exception H5::LibraryIException
///\par Description
/// For information about library version, please refer to
/// the C layer Reference Manual at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5.html#Library-VersCheck
/// the H5check_version API in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void H5Library::checkVersion(unsigned majnum, unsigned minnum, unsigned relnum)
@@ -174,43 +175,51 @@ void H5Library::initH5cpp()
int ret_value = 0;
ret_value = std::atexit(termH5cpp);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registrating termH5cpp failed");
throw LibraryIException("H5Library::initH5cpp", "Registering termH5cpp failed");
ret_value = std::atexit(PredType::deleteConstants);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registrating PredType::deleteConstants failed");
throw LibraryIException("H5Library::initH5cpp", "Registering PredType::deleteConstants failed");
ret_value = std::atexit(PropList::deleteConstants);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registrating PropList::deleteConstants failed");
throw LibraryIException("H5Library::initH5cpp", "Registering PropList::deleteConstants failed");
ret_value = std::atexit(DSetAccPropList::deleteConstants);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registering DSetAccPropList::deleteConstants failed");
ret_value = std::atexit(LinkAccPropList::deleteConstants);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registrating LinkAccPropList::deleteConstants failed");
throw LibraryIException("H5Library::initH5cpp", "Registering LinkAccPropList::deleteConstants failed");
ret_value = std::atexit(LinkCreatPropList::deleteConstants);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registering LinkCreatPropList::deleteConstants failed");
ret_value = std::atexit(FileAccPropList::deleteConstants);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registrating FileAccPropList::deleteConstants failed");
throw LibraryIException("H5Library::initH5cpp", "Registering FileAccPropList::deleteConstants failed");
ret_value = std::atexit(FileCreatPropList::deleteConstants);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registrating FileCreatPropList::deleteConstants failed");
throw LibraryIException("H5Library::initH5cpp", "Registering FileCreatPropList::deleteConstants failed");
ret_value = std::atexit(DSetMemXferPropList::deleteConstants);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registrating DSetMemXferPropList::deleteConstants failed");
throw LibraryIException("H5Library::initH5cpp", "Registering DSetMemXferPropList::deleteConstants failed");
ret_value = std::atexit(DSetCreatPropList::deleteConstants);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registrating DSetCreatPropList::deleteConstants failed");
throw LibraryIException("H5Library::initH5cpp", "Registering DSetCreatPropList::deleteConstants failed");
ret_value = std::atexit(ObjCreatPropList::deleteConstants);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registrating ObjCreatPropList::deleteConstants failed");
throw LibraryIException("H5Library::initH5cpp", "Registering ObjCreatPropList::deleteConstants failed");
ret_value = std::atexit(DataSpace::deleteConstants);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registrating DataSpace::deleteConstants failed");
throw LibraryIException("H5Library::initH5cpp", "Registering DataSpace::deleteConstants failed");
}
//--------------------------------------------------------------------------
@@ -240,9 +249,8 @@ void H5Library::termH5cpp()
///\exception H5::LibraryIException
///\par Description
/// Setting a value of -1 for a limit means no limit of that type.
/// For more information on free list limits, please refer to C
/// layer Reference Manual at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5.html#Library-SetFreeListLimits
/// For more information on free list limits, please refer to
/// the H5set_free_list_limits API in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - May, 2004
//--------------------------------------------------------------------------
void H5Library::setFreeListLimits(int reg_global_lim, int reg_list_lim,

View File

@@ -20,7 +20,7 @@ namespace H5 {
/*! \class H5Library
\brief Class H5Library operates the HDF5 library globably.
It is not neccessary to construct an instance of H5Library to use the
It is not necessary to construct an instance of H5Library to use the
methods.
*/
class H5_DLLCPP H5Library {

View File

@@ -12,6 +12,8 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include <string>
#include <iostream>
using namespace std;
#include "H5private.h" // for HDmemset
#include "H5Include.h"
@@ -24,7 +26,9 @@
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -76,15 +80,15 @@ H5Location::H5Location() : IdComponent() {}
#endif // DOXYGEN_SHOULD_SKIP_THIS
//--------------------------------------------------------------------------
// Function: H5Location::exists
// Function: H5Location::nameExists
///\brief Checks if a link of a given name exists in a location
///\param name - IN: Searched name
///\param lapl - IN: Link access property list
///\exception H5::LocationException
// Programmer Binh-Minh Ribler - Nov, 2016
// Modification
// Renamed from exists() in 1.10.2 -BMR
//--------------------------------------------------------------------------
bool H5Location::exists(const char* name, const LinkAccPropList& lapl) const
bool H5Location::nameExists(const char* name, const LinkAccPropList& lapl) const
{
htri_t ret_value = H5Lexists(getId(), name, lapl.getId());
if (ret_value > 0)
@@ -93,22 +97,54 @@ bool H5Location::exists(const char* name, const LinkAccPropList& lapl) const
return false;
else // Raise exception when H5Lexists returns a negative value
{
throw LocationException(inMemFunc("exists"), "H5Lexists failed");
throw LocationException(inMemFunc("nameExists"), "H5Lexists failed");
}
}
//--------------------------------------------------------------------------
// Function: H5Location::exists
// Function: H5Location::nameExists
///\brief Checks if a link of a given name exists in a location
///\param name - IN: Searched name
///\param lapl - IN: Link access property list
///\exception H5::LocationException
// Modification
// Renamed from exists() in 1.10.2 -BMR
//--------------------------------------------------------------------------
bool H5Location::nameExists(const H5std_string& name, const LinkAccPropList& lapl) const
{
return(nameExists(name.c_str(), lapl));
}
//--------------------------------------------------------------------------
// Function: H5Location::exists - Deprecated
// Purpose Checks if a link of a given name exists in a location
///\brief Deprecated in favor of nameExists
///\param name - IN: Searched name
///\param lapl - IN: Link access property list
///\exception H5::LocationException
// Programmer Binh-Minh Ribler - Nov, 2016
// Modification
// Renamed to nameExists() in 1.10.2 -BMR
//--------------------------------------------------------------------------
bool H5Location::exists(const char* name, const LinkAccPropList& lapl) const
{
return(nameExists(name, lapl));
}
//--------------------------------------------------------------------------
// Function: H5Location::exists - Deprecated
// Purpose Checks if a link of a given name exists in a location
///\brief Deprecated in favor of nameExists
///\param name - IN: Searched name
///\param lapl - IN: Link access property list
///\exception H5::LocationException
// Programmer Binh-Minh Ribler - Dec, 2016
// Modification
// Renamed to nameExists() in 1.10.2 -BMR
//--------------------------------------------------------------------------
bool H5Location::exists(const H5std_string& name, const LinkAccPropList& lapl) const
{
return(exists(name.c_str(), lapl));
return(nameExists(name.c_str(), lapl));
}
//--------------------------------------------------------------------------
@@ -198,7 +234,6 @@ void H5Location::setComment(const H5std_string& name, const H5std_string& commen
/// It differs from the above function in that it doesn't take
/// an object name.
// Programmer Binh-Minh Ribler - Sep 2013
// Modification
//--------------------------------------------------------------------------
void H5Location::setComment(const char* comment) const
{
@@ -481,9 +516,6 @@ void H5Location::reference(void* ref, const H5std_string& name, H5R_type_t ref_t
// from_func - IN: Name of the calling function
// Exception H5::ReferenceException
// Programmer Binh-Minh Ribler - Oct, 2006
// Modification
// May 2008 - BMR
// Moved from IdComponent.
//--------------------------------------------------------------------------
hid_t H5Location::p_dereference(hid_t loc_id, const void* ref, H5R_type_t ref_type, const PropList& plist, const char* from_func)
{
@@ -512,9 +544,6 @@ hid_t H5Location::p_dereference(hid_t loc_id, const void* ref, H5R_type_t ref_ty
///\param plist - IN: Property list - default to PropList::DEFAULT
///\exception H5::ReferenceException
// Programmer Binh-Minh Ribler - Oct, 2006
// Modification
// May, 2008
// Corrected missing parameters. - BMR
//--------------------------------------------------------------------------
void H5Location::dereference(const H5Location& loc, const void* ref, H5R_type_t ref_type, const PropList& plist)
{
@@ -531,8 +560,6 @@ void H5Location::dereference(const H5Location& loc, const void* ref, H5R_type_t
// exception H5::ReferenceException
// Programmer Binh-Minh Ribler - Oct, 2006
// Modification
// May, 2008
// Corrected missing parameters. -BMR
// Mar, 2017
// Removed in 1.10.1 because H5Location is Attribute's baseclass
// now. -BMR
@@ -727,7 +754,53 @@ DataSpace H5Location::getRegion(void *ref, H5R_type_t ref_type) const
//--------------------------------------------------------------------------
// Function: H5Location::createGroup
///\brief Creates a new group at this location.
///\brief Creates a new group at this location, which can be a file,
/// group, dataset, attribute, or named datatype.
///\param name - IN: Name of the group to create
///\param size_hint - IN: Indicates the number of bytes to reserve for
/// the names that will appear in the group
///\return Group instance
///\exception H5::FileIException/H5::GroupIException/H5::LocationException
///\par Description
/// The optional \a size_hint specifies how much file space to
/// reserve for storing the names that will appear in this new
/// group. If a non-positive value is provided for the \a size_hint
/// then a default size is chosen.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
Group H5Location::createGroup(const char* name, const LinkCreatPropList& lcpl) const
{
// Call C routine H5Gcreate2 to create the named group, giving the
// location id which can be a file id or a group id
hid_t group_id = H5Gcreate2(getId(), name, lcpl.getId(), H5P_DEFAULT, H5P_DEFAULT);
// If the creation of the group failed, throw an exception
if (group_id < 0)
throwException("createGroup", "H5Gcreate2 failed");
// No failure, create and return the Group object
Group group;
H5Location *ptr = &group;
ptr->p_setId(group_id);
return(group);
}
//--------------------------------------------------------------------------
// Function: H5Location::createGroup
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a name.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
Group H5Location::createGroup(const H5std_string& name, const LinkCreatPropList& lcpl) const
{
return(createGroup( name.c_str(), lcpl));
}
//--------------------------------------------------------------------------
// Function: H5Location::createGroup
///\brief Creates a new group at this location, which can be a file,
/// group, dataset, attribute, or named datatype.
///\param name - IN: Name of the group to create
///\param size_hint - IN: Indicates the number of bytes to reserve for
/// the names that will appear in the group
@@ -772,7 +845,6 @@ Group H5Location::createGroup(const char* name, size_t size_hint) const
// No failure, create and return the Group object
Group group;
//group.p_setId(group_id);
H5Location *ptr = &group;
ptr->p_setId(group_id);
return(group);
@@ -832,23 +904,32 @@ Group H5Location::openGroup(const H5std_string& name) const
//--------------------------------------------------------------------------
// Function: H5Location::createDataSet
///\brief Creates a new dataset at this location.
///\param name - IN: Name of the dataset to create
///\param data_type - IN: Datatype of the dataset
///\param name - IN: Name of the dataset to create
///\param data_type - IN: Datatype of the dataset
///\param data_space - IN: Dataspace for the dataset
///\param create_plist - IN: Creation properly list for the dataset
///\param dcpl - IN: Dataset creation properly list
///\param lcpl - IN: Link creation properly list
///\param dapl - IN: Dataset access properly list
///\return DataSet instance
///\exception H5::FileIException/H5::GroupIException/H5::LocationException
// Programmer Binh-Minh Ribler - 2000
// 2000
// Modification:
// Jul 2018
// Added LinkCreatPropList and DSetAccPropList but did not
// follow the order in the C function: lcpl, dcpl, dapl, to
// accommodate the existing createDataSet calls.
//--------------------------------------------------------------------------
DataSet H5Location::createDataSet(const char* name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist) const
DataSet H5Location::createDataSet(const char* name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& dcpl, const DSetAccPropList& dapl, const LinkCreatPropList& lcpl) const
{
// Obtain identifiers for C API
hid_t type_id = data_type.getId();
hid_t space_id = data_space.getId();
hid_t create_plist_id = create_plist.getId();
hid_t dcpl_id = dcpl.getId();
hid_t lcpl_id = lcpl.getId();
hid_t dapl_id = dapl.getId();
// Call C routine H5Dcreate2 to create the named dataset
hid_t dataset_id = H5Dcreate2(getId(), name, type_id, space_id, H5P_DEFAULT, create_plist_id, H5P_DEFAULT);
hid_t dataset_id = H5Dcreate2(getId(), name, type_id, space_id, lcpl_id, dcpl_id, dapl_id);
// If the creation of the dataset failed, throw an exception
if (dataset_id < 0)
@@ -865,11 +946,16 @@ DataSet H5Location::createDataSet(const char* name, const DataType& data_type, c
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a name.
// Programmer Binh-Minh Ribler - 2000
// 2000
// Modification:
// Jul 2018
// Added LinkCreatPropList and DSetAccPropList but did not
// follow the order in the C function: lcpl, dcpl, dapl, to
// accommodate the existing createDataSet calls.
//--------------------------------------------------------------------------
DataSet H5Location::createDataSet(const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist) const
DataSet H5Location::createDataSet(const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& dcpl, const DSetAccPropList& dapl, const LinkCreatPropList& lcpl) const
{
return(createDataSet(name.c_str(), data_type, data_space, create_plist));
return(createDataSet(name.c_str(), data_type, data_space, dcpl, dapl, lcpl));
}
//--------------------------------------------------------------------------
@@ -878,13 +964,17 @@ DataSet H5Location::createDataSet(const H5std_string& name, const DataType& data
///\param name - IN: Name of the dataset to open
///\return DataSet instance
///\exception H5::FileIException/H5::GroupIException/H5::LocationException
// Programmer Binh-Minh Ribler - 2000
// 2000
// Modification:
// Jul 2018
// Added DSetAccPropList argument
//--------------------------------------------------------------------------
DataSet H5Location::openDataSet(const char* name) const
DataSet H5Location::openDataSet(const char* name, const DSetAccPropList& dapl) const
{
// Call C function H5Dopen2 to open the specified dataset, giving
// the location id and the dataset's name
hid_t dataset_id = H5Dopen2(getId(), name, H5P_DEFAULT);
hid_t dapl_id = dapl.getId();
hid_t dataset_id = H5Dopen2(getId(), name, dapl_id);
// If the dataset's opening failed, throw an exception
if(dataset_id < 0)
@@ -901,11 +991,142 @@ DataSet H5Location::openDataSet(const char* name) const
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a name.
// Programmer Binh-Minh Ribler - 2000
// 2000
// Modification:
// Jul 2018
// Added DSetAccPropList argument
//--------------------------------------------------------------------------
DataSet H5Location::openDataSet(const H5std_string& name) const
DataSet H5Location::openDataSet(const H5std_string& name, const DSetAccPropList& dapl) const
{
return(openDataSet( name.c_str()));
return(openDataSet(name.c_str(), dapl));
}
//--------------------------------------------------------------------------
// Function: H5Location::link
///\brief Creates a soft link from \a link_name to \a target_name.
///\param target_name - IN: Name of object, can be a non-existing object
///\param link_name - IN: Link name for the target name
///\param lcpl - IN: Link creation plist - default to LinkCreatPropList::DEFAULT
///\param lapl - IN: Link access plist - default to LinkAccPropList::DEFAULT
///\exception H5::FileIException or H5::GroupIException
///\par Description
/// Note that both names are interpreted relative to the current
/// location.
/// For information on creating a soft link, please refer to the
/// H5Lcreate_soft APIs in the HDF5 C Reference Manual.
// March 2018
//--------------------------------------------------------------------------
void H5Location::link(const char *target_name, const char *link_name,
const LinkCreatPropList& lcpl, const LinkAccPropList& lapl) const
{
herr_t ret_value = -1;
hid_t lcpl_id = lcpl.getId();
hid_t lapl_id = lapl.getId();
ret_value = H5Lcreate_soft(target_name, getId(), link_name, lcpl_id, lapl_id);
if (ret_value < 0)
throwException("link", "creating soft link failed");
}
//--------------------------------------------------------------------------
// Function: H5Location::link
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a target_name and \a link_name.
///\exception H5::FileIException or H5::GroupIException
// March, 2018
//--------------------------------------------------------------------------
void H5Location::link(const H5std_string& target_name, const H5std_string&
link_name, const LinkCreatPropList& lcpl, const LinkAccPropList& lapl) const
{
link(target_name.c_str(), link_name.c_str(), lcpl, lapl);
}
//--------------------------------------------------------------------------
// Function: H5Location::link
///\brief Creates a hard link from \a new_name to \a curr_name.
///\param curr_name - IN: Name of the existing object
///\param new_loc - IN: New group or root group
///\param new_name - IN: New name for the object
///\param lcpl - IN: Link creation plist - default to LinkCreatPropList::DEFAULT
///\param lapl - IN: Link access plist - default to LinkAccPropList::DEFAULT
///\exception H5::FileIException or H5::GroupIException
///\par Description
/// Note that both names are interpreted relative to the
/// specified location.
/// For information on creating a hard link, please refer to the
/// H5Lcreate_hard APIs in the HDF5 C Reference Manual.
// March 2018
//--------------------------------------------------------------------------
void H5Location::link(const char *curr_name, const Group& new_loc,
const char *new_name, const LinkCreatPropList& lcpl, const LinkAccPropList& lapl) const
{
herr_t ret_value = -1;
hid_t new_loc_id = new_loc.getId();
hid_t lcpl_id = lcpl.getId();
hid_t lapl_id = lapl.getId();
ret_value = H5Lcreate_hard(getId(), curr_name, new_loc.getId(), new_name, H5P_DEFAULT, H5P_DEFAULT);
if (ret_value < 0)
throwException("link", "creating link failed");
}
//--------------------------------------------------------------------------
// Function: H5Location::link
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a curr_name and \a new_name.
///\exception H5::FileIException or H5::GroupIException
// March, 2018
//--------------------------------------------------------------------------
void H5Location::link(const H5std_string& curr_name, const Group& new_loc,
const H5std_string& new_name, const LinkCreatPropList& lcpl, const LinkAccPropList& lapl) const
{
link(curr_name.c_str(), new_loc, new_name.c_str(), lcpl, lapl);
}
//--------------------------------------------------------------------------
// Function: H5Location::link
///\brief Creates a hard link from \a new_name to \a curr_name - can be
/// used to pass in H5L_SAME_LOC.
///\param curr_name - IN: Name of the existing object
///\param loc_id - IN: Group or root group ID, or H5L_SAME_LOC
///\param new_name - IN: New name for the link
///\param lcpl - IN: Link creation plist - default to LinkCreatPropList::DEFAULT
///\param lapl - IN: Link access plist - default to LinkAccPropList::DEFAULT
///\exception H5::FileIException or H5::GroupIException
///\par Description
/// Note that both names are interpreted relative to the
/// specified location.
/// For information on creating a hard link, please refer to the
/// H5Lcreate_hard APIs in the HDF5 C Reference Manual.
// March 2018
//--------------------------------------------------------------------------
void H5Location::link(const char *curr_name, const hid_t same_loc,
const char *new_name, const LinkCreatPropList& lcpl, const LinkAccPropList& lapl) const
{
herr_t ret_value = -1;
hid_t lcpl_id = lcpl.getId();
hid_t lapl_id = lapl.getId();
ret_value = H5Lcreate_hard(getId(), curr_name, same_loc, new_name, H5P_DEFAULT, H5P_DEFAULT);
if (ret_value < 0)
throwException("link", "creating link failed");
}
//--------------------------------------------------------------------------
// Function: H5Location::link
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a curr_name and \a new_name.
///\exception H5::FileIException or H5::GroupIException
// March, 2018
//--------------------------------------------------------------------------
void H5Location::link(const H5std_string& curr_name, const hid_t same_loc,
const H5std_string& new_name, const LinkCreatPropList& lcpl, const LinkAccPropList& lapl) const
{
link(curr_name.c_str(), same_loc, new_name.c_str(), lcpl, lapl);
}
//--------------------------------------------------------------------------
@@ -923,12 +1144,14 @@ DataSet H5Location::openDataSet(const H5std_string& name) const
/// Note that both names are interpreted relative to the
/// specified location.
/// For information on creating hard link and soft link, please
/// refer to the C layer Reference Manual at:
/// http://hdfgroup.org/HDF5/doc/RM/RM_H5L.html#Link-CreateHard and
/// http://hdfgroup.org/HDF5/doc/RM/RM_H5L.html#Link-CreateSoft
/// refer to the H5Lcreate_hard and H5Lcreate_soft APIs in the
/// HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
// Modification
// 2007: QAK modified to use H5L APIs - BMR
// Mar 2018: Inadequate functionality, new hard link is only in
// H5L_SAME_LOC. This function will be retired in favor of
// its replacement. - BMR
//--------------------------------------------------------------------------
void H5Location::link(H5L_type_t link_type, const char* curr_name, const char* new_name) const
{
@@ -968,17 +1191,203 @@ void H5Location::link(H5L_type_t link_type, const H5std_string& curr_name, const
}
//--------------------------------------------------------------------------
// Function: H5Location::unlink
///\brief Removes the specified name at this location.
///\param name - IN: Name of the object to be removed
// Function: H5Location::copyLink
///\brief Copies a link from one group to another.
///\param src_name - IN: Original name
///\param dst - IN: Destination location
///\param dst_name - IN: New name
///\param lcpl - IN: Link creation plist - default LinkCreatPropList::DEFAULT
///\param lapl - IN: Link access plist - default LinkAccPropList::DEFAULT
///\exception H5::FileIException or H5::GroupIException
// March, 2018
//--------------------------------------------------------------------------
void H5Location::copyLink(const char *src_name,
const Group& dst, const char *dst_name, const LinkCreatPropList& lcpl,
const LinkAccPropList& lapl) const
{
herr_t ret_value;
hid_t dst_id = dst.getId();
hid_t lcpl_id = lcpl.getId();
hid_t lapl_id = lapl.getId();
ret_value = H5Lcopy(getId(), src_name, dst_id, dst_name, lcpl_id, lapl_id);
if(ret_value < 0)
throwException("copyLink", "H5Lcopy failed");
}
//--------------------------------------------------------------------------
// Function: H5Location::copyLink
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a src_name and \a dst_name.
///\exception H5::FileIException or H5::GroupIException
// March, 2018
//--------------------------------------------------------------------------
void H5Location::copyLink(const H5std_string& src_name,
const Group& dst, const H5std_string& dst_name, const LinkCreatPropList& lcpl,
const LinkAccPropList& lapl) const
{
copyLink(src_name.c_str(), dst, dst_name.c_str(), lcpl, lapl);
}
//--------------------------------------------------------------------------
// Function: H5Location::copyLink
///\brief Copies a link from a group in the same location.
///\param src_name - IN: Original name
///\param dst_name - IN: New name
///\param lcpl - IN: Link creation plist - default LinkCreatPropList::DEFAULT
///\param lapl - IN: Link access plist - default LinkAccPropList::DEFAULT
///\exception H5::FileIException or H5::GroupIException
// March, 2018
//--------------------------------------------------------------------------
void H5Location::copyLink(const char *src_name,
const char *dst_name, const LinkCreatPropList& lcpl,
const LinkAccPropList& lapl) const
{
herr_t ret_value;
hid_t lcpl_id = lcpl.getId();
hid_t lapl_id = lapl.getId();
ret_value = H5Lcopy(getId(), src_name, H5L_SAME_LOC, dst_name, lcpl_id, lapl_id);
if(ret_value < 0)
throwException("copyLink", "H5Lcopy H5L_SAME_LOC failed");
}
//--------------------------------------------------------------------------
// Function: H5Location::copyLink
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a src_name and \a dst_name.
///\exception H5::FileIException or H5::GroupIException
// March, 2018
//--------------------------------------------------------------------------
void H5Location::copyLink(const H5std_string& src_name,
const H5std_string& dst_name, const LinkCreatPropList& lcpl,
const LinkAccPropList& lapl) const
{
copyLink(src_name.c_str(), dst_name.c_str(), lcpl, lapl);
}
//--------------------------------------------------------------------------
// Function: H5Location::moveLink
///\brief Renames a link in this group and moves it to a new location.
///\param src_name - IN: Original name
///\param dst - IN: Destination location
///\param dst_name - IN: New name
///\param lcpl - IN: Link creation plist - default LinkCreatPropList::DEFAULT
///\param lapl - IN: Link access plist - default LinkAccPropList::DEFAULT
///\exception H5::FileIException or H5::GroupIException
///\note
/// Exercise care in moving groups as it is possible to render
/// data in a file inaccessible with H5Location::moveLink. Please refer
/// to the Group Interface in the HDF5 User's Guide for details.
// March, 2018
//--------------------------------------------------------------------------
void H5Location::moveLink(const char* src_name, const Group& dst, const char* dst_name, const LinkCreatPropList& lcpl, const LinkAccPropList& lapl) const
{
herr_t ret_value;
hid_t dst_id = dst.getId();
hid_t lcpl_id = lcpl.getId();
hid_t lapl_id = lapl.getId();
ret_value = H5Lmove(getId(), src_name, dst_id, dst_name, lcpl_id, lapl_id);
if (ret_value < 0)
throwException("moveLink", "H5Lmove failed");
}
//--------------------------------------------------------------------------
// Function: H5Location::moveLink
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a src_name and \a dst_name.
///\exception H5::FileIException or H5::GroupIException
// March, 2018
//--------------------------------------------------------------------------
void H5Location::moveLink(const H5std_string& src_name, const Group& dst, const H5std_string& dst_name, const LinkCreatPropList& lcpl, const LinkAccPropList& lapl) const
{
moveLink(src_name.c_str(), dst, dst_name.c_str(), lcpl, lapl);
}
//--------------------------------------------------------------------------
// Function: H5Location::moveLink
///\brief Renames a link in this group.
///\param src_name - IN: Original name
///\param dst_name - IN: New name
///\param lcpl - IN: Link creation plist - default LinkCreatPropList::DEFAULT
///\param lapl - IN: Link access plist - default LinkAccPropList::DEFAULT
///\exception H5::FileIException or H5::GroupIException
///\note
/// Exercise care in moving groups as it is possible to render
/// data in a file inaccessible with H5Location::moveLink. Please refer
/// to the Group Interface in the HDF5 User's Guide for details.
// March, 2018
//--------------------------------------------------------------------------
void H5Location::moveLink(const char* src_name, const char* dst_name, const LinkCreatPropList& lcpl, const LinkAccPropList& lapl) const
{
herr_t ret_value;
hid_t lcpl_id = lcpl.getId();
hid_t lapl_id = lapl.getId();
ret_value = H5Lmove(getId(), src_name, H5L_SAME_LOC, dst_name, lcpl_id, lapl_id);
if (ret_value < 0)
throwException("moveLink", "H5Lmove H5L_SAME_LOC failed");
}
//--------------------------------------------------------------------------
// Function: H5Location::moveLink
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a src_name and \a dst_name.
///\exception H5::FileIException or H5::GroupIException
// March, 2018
//--------------------------------------------------------------------------
void H5Location::moveLink(const H5std_string& src_name, const H5std_string& dst_name, const LinkCreatPropList& lcpl, const LinkAccPropList& lapl) const
{
moveLink(src_name.c_str(), dst_name.c_str(), lcpl, lapl);
}
//--------------------------------------------------------------------------
// Function: H5Location::move
///\brief Renames an object at this location. - Deprecated due to inadequate functionality
///\param src - IN: Object's original name
///\param dst - IN: Object's new name
///\exception H5::FileIException/H5::GroupIException/H5::LocationException
// Programmer Binh-Minh Ribler - 2000
///\note
/// Exercise care in moving groups as it is possible to render
/// data in a file inaccessible with H5Location::move. Please refer
/// to the Group Interface in the HDF5 User's Guide for details.
// Modification
// 2007: QAK modified to use H5L APIs - BMR
// 2018: Will be replaced by H5Location::moveLink() -BMR
//--------------------------------------------------------------------------
void H5Location::unlink(const char* name) const
void H5Location::move(const char* src, const char* dst) const
{
herr_t ret_value = H5Ldelete(getId(), name, H5P_DEFAULT);
moveLink(src, dst, LinkCreatPropList::DEFAULT, LinkAccPropList::DEFAULT);
}
//--------------------------------------------------------------------------
// Function: H5Location::move
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a src and \a dst. - Deprecated due to inadequate functionality
// Modification
// 2018: Will be replaced by H5Location::moveLink() -BMR
//--------------------------------------------------------------------------
void H5Location::move(const H5std_string& src, const H5std_string& dst) const
{
moveLink(src.c_str(), dst.c_str(), LinkCreatPropList::DEFAULT, LinkAccPropList::DEFAULT);
}
//--------------------------------------------------------------------------
// Function: H5Location::unlink
///\brief Removes the specified link from this group.
///\param name - IN: Name of the object to be removed
///\exception H5::FileIException/H5::GroupIException/H5::LocationException
// March, 2018
//--------------------------------------------------------------------------
void H5Location::unlink(const char* name, const LinkAccPropList& lapl) const
{
herr_t ret_value = H5Ldelete(getId(), name, lapl.getId());
if (ret_value < 0)
throwException("unlink", "H5Ldelete failed");
}
@@ -988,45 +1397,135 @@ void H5Location::unlink(const char* name) const
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a name.
// Programmer Binh-Minh Ribler - 2000
// March, 2018
//--------------------------------------------------------------------------
void H5Location::unlink(const H5std_string& name) const
void H5Location::unlink(const H5std_string& name, const LinkAccPropList& lapl) const
{
unlink(name.c_str());
unlink(name.c_str(), lapl);
}
//--------------------------------------------------------------------------
// Function: H5Location::move
///\brief Renames an object at this location.
///\param src - IN: Object's original name
///\param dst - IN: Object's new name
///\exception H5::FileIException/H5::GroupIException/H5::LocationException
///\note
/// Exercise care in moving groups as it is possible to render
/// data in a file inaccessible with H5Location::move. Please refer
/// to the Group Interface in the HDF5 User's Guide for details at:
/// https://www.hdfgroup.org/HDF5/doc/UG/HDF5_Users_Guide-Responsive%20HTML5/index.html#t=HDF5_Users_Guide%2FGroups%2FHDF5_Groups.htm
// Programmer Binh-Minh Ribler - 2000
// Modification
// 2007: QAK modified to use H5L APIs - BMR
// Function: H5Location::getObjinfo
///\brief Retrieves information about an HDF5 object.
///\param objinfo - OUT: Struct containing the object info
///\param fields - IN: Indicates the group of information to be retrieved
///\par Description
/// Valid values of \a fields are as follows:
/// \li \c H5O_INFO_BASIC (default)
/// \li \c H5O_INFO_TIME
/// \li \c H5O_INFO_NUM_ATTRS
/// \li \c H5O_INFO_HDR
/// \li \c H5O_INFO_META_SIZE
/// \li \c H5O_INFO_ALL
// July, 2018
//--------------------------------------------------------------------------
void H5Location::move(const char* src, const char* dst) const
void H5Location::getObjinfo(H5O_info_t& objinfo, unsigned fields) const
{
herr_t ret_value = H5Lmove(getId(), src, H5L_SAME_LOC, dst, H5P_DEFAULT, H5P_DEFAULT);
// Use C API to get information of the object
herr_t ret_value = H5Oget_info2(getId(), &objinfo, fields);
// Throw exception if C API returns failure
if (ret_value < 0)
throwException("move", "H5Lmove failed");
throwException(inMemFunc("getObjinfo"), "H5Oget_info2 failed");
}
//--------------------------------------------------------------------------
// Function: H5Location::move
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a src and \a dst.
// Programmer Binh-Minh Ribler - 2000
// Function: H5Location::getObjinfo
///\brief Retrieves information about an HDF5 object given its name.
///\param name - IN: Name of the object to be queried - \c char *
///\param objinfo - OUT: Struct containing the object info
///\param fields - IN: Indicates the group of information to be retrieved
/// - default to H5O_INFO_BASIC
///\param lapl - IN: Link access property list
///\par Description
/// Valid values of \a fields are as follows:
/// \li \c H5O_INFO_BASIC (default)
/// \li \c H5O_INFO_TIME
/// \li \c H5O_INFO_NUM_ATTRS
/// \li \c H5O_INFO_HDR
/// \li \c H5O_INFO_META_SIZE
/// \li \c H5O_INFO_ALL
// July, 2018
//--------------------------------------------------------------------------
void H5Location::move(const H5std_string& src, const H5std_string& dst) const
void H5Location::getObjinfo(const char* name, H5O_info_t& objinfo, unsigned fields, const LinkAccPropList& lapl) const
{
move(src.c_str(), dst.c_str());
// Use C API to get information of the object
herr_t ret_value = H5Oget_info_by_name2(getId(), name, &objinfo, fields, lapl.getId());
// Throw exception if C API returns failure
if (ret_value < 0)
throwException(inMemFunc("getObjinfo"), "H5Oget_info_by_name2 failed");
}
//--------------------------------------------------------------------------
// Function: H5Location::getObjinfo
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes
/// a reference to an \c H5std_string for \a name.
///\param name - IN: Name of the object to be queried - \c H5std_string
///\param objinfo - OUT: Struct containing the object info
///\param fields - IN: Indicates the group of information to be retrieved
/// - default to H5O_INFO_BASIC
///\param lapl - IN: Link access property list
// July, 2018
//--------------------------------------------------------------------------
void H5Location::getObjinfo(const H5std_string& name, H5O_info_t& objinfo, unsigned fields, const LinkAccPropList& lapl) const
{
getObjinfo(name.c_str(), objinfo, fields, lapl);
}
//--------------------------------------------------------------------------
// Function: H5Location::getObjinfo
///\brief Retrieves information about an HDF5 object given its index.
///\param grp_name - IN: Group name where the object belongs - \c char *
///\param idx_type - IN: Type of index
///\param order - IN: Order to traverse
///\param idx - IN: Object position
///\param objinfo - OUT: Struct containing the object info
///\param fields - IN: Indicates the group of information to be retrieved
/// - default to H5O_INFO_BASIC
///\param lapl - IN: Link access property list
///\par Description
/// Valid values of \a fields are as follows:
/// \li \c H5O_INFO_BASIC (default)
/// \li \c H5O_INFO_TIME
/// \li \c H5O_INFO_NUM_ATTRS
/// \li \c H5O_INFO_HDR
/// \li \c H5O_INFO_META_SIZE
/// \li \c H5O_INFO_ALL
// July, 2018
//--------------------------------------------------------------------------
void H5Location::getObjinfo(const char* grp_name, H5_index_t idx_type,
H5_iter_order_t order, hsize_t idx, H5O_info_t& objinfo, unsigned fields,
const LinkAccPropList& lapl) const
{
// Use C API to get information of the object
herr_t ret_value = H5Oget_info_by_idx2(getId(), grp_name, idx_type, order,
idx, &objinfo, fields, lapl.getId());
// Throw exception if C API returns failure
if (ret_value < 0)
throwException(inMemFunc("getObjinfo"), "H5Oget_info_by_idx2 failed");
}
//--------------------------------------------------------------------------
// Function: H5Location::getObjinfo
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes
/// a reference to an \c H5std_string for \a name.
///\param name - IN: Name of the object to be queried - \c H5std_string
///\param objinfo - OUT: Struct containing the object info
///\param fields - IN: Indicates a group of information to be retrieved
/// - default to H5O_INFO_BASIC
///\param lapl - IN: Link access property list
// July, 2018
//--------------------------------------------------------------------------
void H5Location::getObjinfo(const H5std_string& grp_name, H5_index_t idx_type,
H5_iter_order_t order, hsize_t idx, H5O_info_t& objinfo, unsigned fields,
const LinkAccPropList& lapl) const
{
getObjinfo(grp_name.c_str(), idx_type, order, idx, objinfo, fields, lapl);
}
#ifndef H5_NO_DEPRECATED_SYMBOLS
@@ -1038,10 +1537,9 @@ void H5Location::move(const H5std_string& src, const H5std_string& dst) const
///\param statbuf - OUT: Buffer to return information about the object
///\exception H5::FileIException/H5::GroupIException/H5::LocationException
///\par Description
/// For more information, please refer to the C layer Reference
/// Manual at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5G.html#Group-GetObjinfo
// Programmer Binh-Minh Ribler - 2000
/// For information, please refer to the H5Gget_objinfo API in
/// the HDF5 C Reference Manual.
// 2000
//--------------------------------------------------------------------------
void H5Location::getObjinfo(const char* name, hbool_t follow_link, H5G_stat_t& statbuf) const
{
@@ -1067,8 +1565,7 @@ void H5Location::getObjinfo(const H5std_string& name, hbool_t follow_link, H5G_s
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above functions in that it doesn't have
/// the paramemter \a follow_link.
// Programmer Binh-Minh Ribler - Nov, 2005
// Note: need to modify to use H5Oget_info and H5Lget_info - BMR
// Nov, 2005
//--------------------------------------------------------------------------
void H5Location::getObjinfo(const char* name, H5G_stat_t& statbuf) const
{
@@ -1088,8 +1585,40 @@ void H5Location::getObjinfo(const H5std_string& name, H5G_stat_t& statbuf) const
{
getObjinfo(name.c_str(), statbuf);
}
#endif /* H5_NO_DEPRECATED_SYMBOLS */
//--------------------------------------------------------------------------
// Function: H5Location::getLinkInfo
///\brief Returns the information of the named link.
///\param link_name - IN: Symbolic link to the object
///\param size - IN: Maximum number of characters of value to be returned
///\return Name of the object
///\exception H5::FileIException/H5::GroupIException/H5::LocationException
// 2000
//--------------------------------------------------------------------------
H5L_info_t H5Location::getLinkInfo(const char* link_name, const LinkAccPropList& lapl) const
{
H5L_info_t linkinfo; // link info structure
herr_t ret_value = H5Lget_info(getId(), link_name, &linkinfo, lapl.getId());
if (ret_value < 0)
throwException("getLinkInfo", "H5Lget_info to find buffer size failed");
return(linkinfo);
}
//--------------------------------------------------------------------------
// Function: H5Location::getLinkInfo
///\brief This is an overloaded member function, provided for convenience.
/// It differs from the above function in that it takes an
/// \c H5std_string for \a link_name.
//--------------------------------------------------------------------------
H5L_info_t H5Location::getLinkInfo(const H5std_string& link_name, const LinkAccPropList& lapl) const
{
return(getLinkInfo(link_name.c_str(), lapl));
}
//--------------------------------------------------------------------------
// Function: H5Location::getLinkval
///\brief Returns the name of the object that the symbolic link points to.
@@ -1097,7 +1626,7 @@ void H5Location::getObjinfo(const H5std_string& name, H5G_stat_t& statbuf) const
///\param size - IN: Maximum number of characters of value to be returned
///\return Name of the object
///\exception H5::FileIException/H5::GroupIException/H5::LocationException
// Programmer Binh-Minh Ribler - 2000
// 2000
//--------------------------------------------------------------------------
H5std_string H5Location::getLinkval(const char* name, size_t size) const
{
@@ -1403,8 +1932,8 @@ ssize_t H5Location::getObjnameByIdx(hsize_t idx, H5std_string& name, size_t size
/// \li \c H5O_TYPE_GROUP
/// \li \c H5O_TYPE_DATASET
/// \li \c H5O_TYPE_NAMED_DATATYPE
/// Refer to the C API documentation for more details:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5O.html#Object-GetInfo
/// For information, please refer to the H5Oget_info_by_name API in
/// the HDF5 C Reference Manual.
///\exception H5::FileIException/H5::GroupIException/H5::LocationException
/// Exception will be thrown when:
/// - an error returned by the C API
@@ -1417,7 +1946,7 @@ H5O_type_t H5Location::childObjType(const char* objname) const
H5O_type_t objtype = H5O_TYPE_UNKNOWN;
// Use C API to get information of the object
herr_t ret_value = H5Oget_info_by_name(getId(), objname, &objinfo, H5P_DEFAULT);
herr_t ret_value = H5Oget_info_by_name2(getId(), objname, &objinfo, H5O_INFO_BASIC, H5P_DEFAULT);
// Throw exception if C API returns failure
if (ret_value < 0)
@@ -1469,8 +1998,8 @@ H5O_type_t H5Location::childObjType(const H5std_string& objname) const
/// \li \c H5O_TYPE_GROUP
/// \li \c H5O_TYPE_DATASET
/// \li \c H5O_TYPE_NAMED_DATATYPE
/// Refer to the C API documentation for more details:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5O.html#Object-GetInfo
/// For information, please refer to the H5Oget_info_by_idx API in
/// the HDF5 C Reference Manual.
///\exception H5::FileIException/H5::GroupIException/H5::LocationException
/// Exception will be thrown when:
/// - an error returned by the C API
@@ -1492,7 +2021,7 @@ H5O_type_t H5Location::childObjType(hsize_t index, H5_index_t index_type, H5_ite
H5O_type_t objtype = H5O_TYPE_UNKNOWN;
// Use C API to get information of the object
ret_value = H5Oget_info_by_idx(getId(), objname, index_type, order, index, &objinfo, H5P_DEFAULT);
ret_value = H5Oget_info_by_idx2(getId(), objname, index_type, order, index, &objinfo, H5O_INFO_BASIC, H5P_DEFAULT);
// Throw exception if C API returns failure
if (ret_value < 0)
@@ -1534,7 +2063,7 @@ unsigned H5Location::childObjVersion(const char* objname) const
unsigned version = 0;
// Use C API to get information of the object
herr_t ret_value = H5Oget_info_by_name(getId(), objname, &objinfo, H5P_DEFAULT);
herr_t ret_value = H5Oget_info_by_name2(getId(), objname, &objinfo, H5O_INFO_HDR, H5P_DEFAULT);
// Throw exception if C API returns failure
if (ret_value < 0)
@@ -1647,7 +2176,7 @@ H5G_obj_t H5Location::getObjTypeByIdx(hsize_t idx, H5std_string& type_name) cons
// Programmer Binh-Minh Ribler - 2000
// Modification
// August 2017 - BMR
// Keep Group::throwException and H5File::throwException to
// Keep H5Location::throwException and H5File::throwException to
// maintain backward compatibility. For other subclasses, throw
// LocationException.
//--------------------------------------------------------------------------

View File

@@ -31,6 +31,11 @@ namespace H5 {
class H5_DLLCPP H5Location : public IdComponent {
public:
// Checks if a link of a given name exists in a location
bool nameExists(const char* name, const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
bool nameExists(const H5std_string& name, const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
// Checks if a link of a given name exists in a location
// Deprecated in favor of nameExists for better name.
bool exists(const char* name, const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
bool exists(const H5std_string& name, const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
@@ -85,6 +90,10 @@ class H5_DLLCPP H5Location : public IdComponent {
// Retrieves a dataspace with the region pointed to selected.
DataSpace getRegion(void *ref, H5R_type_t ref_type = H5R_DATASET_REGION) const;
// Create a new group with using link create property list.
Group createGroup(const char* name, const LinkCreatPropList& lcpl) const;
Group createGroup(const H5std_string& name, const LinkCreatPropList& lcpl) const;
// From CommonFG
// Creates a new group at this location which can be a file
// or another group.
@@ -96,13 +105,21 @@ class H5_DLLCPP H5Location : public IdComponent {
Group openGroup(const char* name) const;
Group openGroup(const H5std_string& name) const;
// Creates a new dataset in this group.
DataSet createDataSet(const char* name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist = DSetCreatPropList::DEFAULT) const;
DataSet createDataSet(const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist = DSetCreatPropList::DEFAULT) const;
// Creates a new dataset in this location.
DataSet createDataSet(const char* name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist = DSetCreatPropList::DEFAULT, const DSetAccPropList& dapl = DSetAccPropList::DEFAULT, const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT) const;
DataSet createDataSet(const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist = DSetCreatPropList::DEFAULT, const DSetAccPropList& dapl = DSetAccPropList::DEFAULT, const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT) const;
// Deprecated to add LinkCreatPropList and DSetAccPropList - 1.10.3
// DataSet createDataSet(const char* name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist = DSetCreatPropList::DEFAULT) const;
// DataSet createDataSet(const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist = DSetCreatPropList::DEFAULT) const;
// Opens an existing dataset at this location.
DataSet openDataSet(const char* name) const;
DataSet openDataSet(const H5std_string& name) const;
// DSetAccPropList is added - 1.10.3
DataSet openDataSet(const char* name, const DSetAccPropList& dapl = DSetAccPropList::DEFAULT) const;
DataSet openDataSet(const H5std_string& name, const DSetAccPropList& dapl = DSetAccPropList::DEFAULT) const;
H5L_info_t getLinkInfo(const char* link_name, const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
H5L_info_t getLinkInfo(const H5std_string& link_name, const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
// Returns the value of a symbolic link.
H5std_string getLinkval(const char* link_name, size_t size=0) const;
@@ -129,6 +146,27 @@ class H5_DLLCPP H5Location : public IdComponent {
unsigned childObjVersion(const char* objname) const;
unsigned childObjVersion(const H5std_string& objname) const;
// Retrieves information about an HDF5 object.
void getObjinfo(H5O_info_t& objinfo, unsigned fields = H5O_INFO_BASIC) const;
// Retrieves information about an HDF5 object, given its name.
void getObjinfo(const char* name, H5O_info_t& objinfo,
unsigned fields = H5O_INFO_BASIC,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
void getObjinfo(const H5std_string& name, H5O_info_t& objinfo,
unsigned fields = H5O_INFO_BASIC,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
// Retrieves information about an HDF5 object, given its index.
void getObjinfo(const char* grp_name, H5_index_t idx_type,
H5_iter_order_t order, hsize_t idx, H5O_info_t& objinfo,
unsigned fields = H5O_INFO_BASIC,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
void getObjinfo(const H5std_string& grp_name, H5_index_t idx_type,
H5_iter_order_t order, hsize_t idx, H5O_info_t& objinfo,
unsigned fields = H5O_INFO_BASIC,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
#ifndef H5_NO_DEPRECATED_SYMBOLS
// Returns the type of an object in this group, given the
// object's index.
@@ -137,7 +175,7 @@ class H5_DLLCPP H5Location : public IdComponent {
H5G_obj_t getObjTypeByIdx(hsize_t idx, H5std_string& type_name) const;
// Returns information about an HDF5 object, given by its name,
// at this location.
// at this location. - Deprecated
void getObjinfo(const char* name, hbool_t follow_link, H5G_stat_t& statbuf) const;
void getObjinfo(const H5std_string& name, hbool_t follow_link, H5G_stat_t& statbuf) const;
void getObjinfo(const char* name, H5G_stat_t& statbuf) const;
@@ -149,26 +187,95 @@ class H5_DLLCPP H5Location : public IdComponent {
int iterateElems(const H5std_string& name, int *idx, H5G_iterate_t op, void *op_data);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
// Creates a soft link from link_name to target_name.
void link(const char *target_name, const char *link_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
void link(const H5std_string& target_name,
const H5std_string& link_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
// Creates a hard link from new_name to curr_name.
void link(const char *curr_name,
const Group& new_loc, const char *new_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
void link(const H5std_string& curr_name,
const Group& new_loc, const H5std_string& new_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
// Creates a hard link from new_name to curr_name in same location.
void link(const char *curr_name,
const hid_t same_loc, const char *new_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
void link(const H5std_string& curr_name,
const hid_t same_loc, const H5std_string& new_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
// Creates a link of the specified type from new_name to current_name;
// both names are interpreted relative to the specified location id.
// Deprecated due to inadequate functionality.
void link(H5L_type_t link_type, const char* curr_name, const char* new_name) const;
void link(H5L_type_t link_type, const H5std_string& curr_name, const H5std_string& new_name) const;
// Removes the specified name at this location.
void unlink(const char* name) const;
void unlink(const H5std_string& name) const;
// Removes the specified link from this location.
void unlink(const char *link_name,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
void unlink(const H5std_string& link_name,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
// Mounts the file 'child' onto this location.
void mount(const char* name, const H5File& child, const PropList& plist) const;
//void mount(const char* name, H5File& child, PropList& plist) const; // removed from 1.8.18 and 1.10.1
void mount(const H5std_string& name, const H5File& child, const PropList& plist) const;
//void mount(const H5std_string& name, H5File& child, PropList& plist) const; // removed from 1.8.18 and 1.10.1
// Unmounts the file named 'name' from this parent location.
void unmount(const char* name) const;
void unmount(const H5std_string& name) const;
// Copies a link from a group to another.
void copyLink(const char *src_name,
const Group& dst, const char *dst_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
void copyLink(const H5std_string& src_name,
const Group& dst, const H5std_string& dst_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
// Makes a copy of a link in the same group.
void copyLink(const char *src_name, const char *dst_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
void copyLink(const H5std_string& src_name,
const H5std_string& dst_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
// Renames a link in this group and moves to a new location.
void moveLink(const char* src_name,
const Group& dst, const char* dst_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
void moveLink(const H5std_string& src_name,
const Group& dst, const H5std_string& dst_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
// Renames a link in this group.
void moveLink(const char* src_name, const char* dst_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
void moveLink(const H5std_string& src_name,
const H5std_string& dst_name,
const LinkCreatPropList& lcpl = LinkCreatPropList::DEFAULT,
const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
// Renames an object at this location.
// Deprecated due to inadequate functionality.
void move(const char* src, const char* dst) const;
void move(const H5std_string& src, const H5std_string& dst) const;

View File

@@ -23,7 +23,9 @@
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -56,35 +58,6 @@ extern "C" herr_t userAttrOpWrpr(hid_t loc_id, const char *attr_name,
//--------------------------------------------------------------------------
H5Object::H5Object() : H5Location() {}
//--------------------------------------------------------------------------
// Function: H5Object overloaded constructor (protected)
// Purpose Creates an H5Object object using the id of an existing HDF5
// object.
// Parameters object_id - IN: Id of an existing HDF5 object
// Programmer Binh-Minh Ribler - 2000
// *** Deprecation warning ***
// This constructor is no longer appropriate because the data member "id" had
// been moved to the sub-classes. It will be removed in 1.10 release. If its
// removal does not raise any problems in 1.10, it will be removed from 1.8 in
// subsequent releases.
// Removed in 1.10.1 - Aug 2016
//--------------------------------------------------------------------------
//H5Object::H5Object(const hid_t object_id) : H5Location() {}
//--------------------------------------------------------------------------
// Function: H5Object copy constructor
///\brief Copy constructor: makes a copy of the original H5Object
/// instance.
///\param original - IN: H5Object instance to copy
// Programmer Binh-Minh Ribler - 2000
// *** Deprecation warning ***
// This constructor is no longer appropriate because the data member "id" had
// been moved to the sub-classes. It is removed from 1.8.15 because it is
// a noop and it can be generated by the compiler if needed.
// Removed in 1.10.1 - Aug 2016
//--------------------------------------------------------------------------
// H5Object::H5Object(const H5Object& original) : H5Location() {}
//--------------------------------------------------------------------------
// Function: f_Attribute_setId - friend
// Purpose: This function is friend to class H5::Attribute so that it
@@ -224,9 +197,8 @@ Attribute H5Object::openAttribute(const unsigned int idx) const
///\par Description
/// The signature of user_op is
/// void (*)(H5::H5Location&, H5std_string, void*).
/// For information, please refer to the C layer Reference Manual
/// at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5A.html#Annot-Iterate
/// For information, please refer to the H5Aiterate2 API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
int H5Object::iterateAttrs(attr_operator_t user_op, unsigned *_idx, void *op_data)
@@ -273,7 +245,7 @@ unsigned H5Object::objVersion() const
unsigned version = 0;
// Use C API to get information of the object
herr_t ret_value = H5Oget_info(getId(), &objinfo);
herr_t ret_value = H5Oget_info2(getId(), &objinfo, H5O_INFO_HDR);
// Throw exception if C API returns failure
if (ret_value < 0)
@@ -299,7 +271,7 @@ int H5Object::getNumAttrs() const
{
H5O_info_t oinfo; /* Object info */
if(H5Oget_info(getId(), &oinfo) < 0)
if(H5Oget_info2(getId(), &oinfo, H5O_INFO_NUM_ATTRS) < 0)
throw AttributeIException(inMemFunc("getNumAttrs"), "H5Oget_info failed");
else
return(static_cast<int>(oinfo.num_attrs));
@@ -421,7 +393,6 @@ ssize_t H5Object::getObjName(char *obj_name, size_t buf_size) const
///\return Name of the object
///\exception H5::Exception
// Programmer Binh-Minh Ribler - Mar, 2014
// Modification
//--------------------------------------------------------------------------
H5std_string H5Object::getObjName() const
{

View File

@@ -104,19 +104,6 @@ class H5_DLLCPP H5Object : public H5Location {
// Default constructor
H5Object();
// *** Deprecation warning ***
// The following two constructors are no longer appropriate after the
// data member "id" had been moved to the sub-classes.
// The copy constructor is a noop and is removed in 1.8.15 and the
// other will be removed from 1.10 release, and then from 1.8 if its
// removal does not raise any problems in two 1.10 releases.
// Creates a copy of an existing object giving the object id
// H5Object(const hid_t object_id);
// Copy constructor: makes copy of an H5Object object.
// H5Object(const H5Object& original);
// Sets the identifier of this object to a new value. - this one
// doesn't increment reference count
virtual void p_setId(const hid_t new_id) = 0;

View File

@@ -88,7 +88,7 @@ ObjCreatPropList::ObjCreatPropList() : PropList(H5P_OBJECT_CREATE) {}
//--------------------------------------------------------------------------
// Function: ObjCreatPropList copy constructor
///\brief Copy Constructor: makes a copy of the original
///\brief Copy constructor: same HDF5 object as \a original
///\param original - IN: ObjCreatPropList instance to copy
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
@@ -113,8 +113,7 @@ ObjCreatPropList::ObjCreatPropList(const hid_t plist_id) : PropList(plist_id) {}
///\par Description
/// If \c max_compact is set to 0, dense storage will be used.
/// For more detail about on attribute storage, please refer to the
/// C layer Reference Manual at:
/// https://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetAttrPhaseChange
/// H5Pset_attr_phase_change API in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - September 2015
//--------------------------------------------------------------------------
void ObjCreatPropList::setAttrPhaseChange(unsigned max_compact, unsigned min_dense) const
@@ -137,8 +136,7 @@ void ObjCreatPropList::setAttrPhaseChange(unsigned max_compact, unsigned min_den
///\par Description
/// If \c max_compact is set to 0, dense storage will be used.
/// For more detail about on attribute storage, please refer to the
/// C layer Reference Manual at:
/// https://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-GetAttrPhaseChange
/// H5Pget_attr_phase_change API in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - September 2015
//--------------------------------------------------------------------------
void ObjCreatPropList::getAttrPhaseChange(unsigned& max_compact, unsigned& min_dense) const
@@ -166,8 +164,8 @@ void ObjCreatPropList::getAttrPhaseChange(unsigned& max_compact, unsigned& min_d
/// tracked not indexed. Note that HDF5 currently provides no
/// mechanism to turn on attribute creation order tracking at object
/// creation time and to build the index later.
/// The C layer Reference Manual at can be found at:
/// https://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetAttrCreationOrder
/// For detail, please refer to the H5Pset_attr_creation_order API
/// in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - September 2015
//--------------------------------------------------------------------------
void ObjCreatPropList::setAttrCrtOrder(unsigned crt_order_flags) const
@@ -188,8 +186,8 @@ void ObjCreatPropList::setAttrCrtOrder(unsigned crt_order_flags) const
///\par Description
/// When no flag is set, i.e. crt_order_flags = 0, attribute
/// creation order is neither tracked not indexed.
/// The C layer Reference Manual at can be found at:
/// https://www.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-GetAttrCreationOrder
/// For detail, please refer to the H5Pget_attr_creation_order API
/// in the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - September 2015
//--------------------------------------------------------------------------
unsigned ObjCreatPropList::getAttrCrtOrder() const

View File

@@ -46,7 +46,7 @@ class H5_DLLCPP ObjCreatPropList : public PropList {
///\brief Returns this class name.
virtual H5std_string fromClass () const { return("ObjCreatPropList"); }
// Copy constructor: creates a copy of a ObjCreatPropList object.
// Copy constructor: same as the original ObjCreatPropList.
ObjCreatPropList(const ObjCreatPropList& original);
// Creates a copy of an existing object creation property list

View File

@@ -19,7 +19,9 @@
#include "H5PropList.h"
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -54,7 +56,7 @@ PredType::PredType() : AtomType() {}
//--------------------------------------------------------------------------
// Function: PredType copy constructor
///\brief Copy constructor: makes a copy of the original PredType object.
///\brief Copy constructor: same HDF5 object as \a original
///\param original - IN: PredType instance to copy
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
@@ -913,10 +915,14 @@ September 2015:
+ PredType
+ DataSpace
+ PropList (and its subclasses below)
+ FileAccPropList
+ FileCreatPropList
+ DSetMemXferPropList
+ DSetCreatPropList
+ DSetAccPropList
+ FileAccPropList
+ FileCreatPropList
+ LinkAccPropList
+ LinkCreatPropList
+ ObjCreatPropList
The new method includes these main points:
@@ -1041,18 +1047,24 @@ September 2015:
4. This section shows the differences between the old and new methods
for allocating the following constants
- PropList constant, PropList::DEFAULT.
- DSetAccPropList constant, DSetAccPropList::DEFAULT.
- DSetCreatPropList constant, DSetCreatPropList::DEFAULT.
- DSetMemXferPropList constant, DSetMemXferPropList::DEFAULT.
- FileCreatPropList constant, FileCreatPropList::DEFAULT.
- FileAccPropList constant, FileAccPropList::DEFAULT.
- LinkAccPropList constant, LinkAccPropList::DEFAULT.
- LinkCreatPropList constant, LinkCreatPropList::DEFAULT.
- ObjCreatPropList constant, ObjCreatPropList::DEFAULT.
For these constants, the library has the same changes, except the
class names and the HDF5 corresponding constants. Only the items
of PropList are listed, and "PropList" can be replaced by any of
DSetCreatPropList, DSetMemXferPropList, FileCreatPropList,
FileAccPropList for those classes. The HDF5 C constant "H5P_DEFAULT"
can be replaced by any of these respectively: H5P_DATASET_CREATE,
H5P_DATASET_XFER, H5P_FILE_CREATE, and H5P_FILE_ACCESS.
DSetAccPropList, DSetCreatPropList, DSetMemXferPropList,
FileCreatPropList, FileAccPropList, LinkAccPropList, LinkCreatPropList,
ObjCreatPropList for those classes. The HDF5 C constant "H5P_DEFAULT"
can be replaced by any of these respectively: H5P_DATASET_ACCESS,
H5P_DATASET_CREATE, H5P_DATASET_XFER, H5P_FILE_CREATE, H5P_FILE_ACCESS,
H5P_LINK_ACCESS, H5P_LINK_CREATE, and H5P_OBJECT_CREATE.
Old Method:
----------

View File

@@ -34,7 +34,7 @@ class H5_DLLCPP PredType : public AtomType {
// id in the left hand side object.
PredType& operator=(const PredType& rhs);
// Copy constructor - makes copy of the original object
// Copy constructor: same as the original PredType.
PredType(const PredType& original);
// Noop destructor

View File

@@ -94,7 +94,7 @@ PropList::PropList() : IdComponent(), id(H5P_DEFAULT) {}
//--------------------------------------------------------------------------
// Function: PropList copy constructor
///\brief Copy constructor
///\brief Copy constructor: same HDF5 object as \a original
///\param original - IN: The original property list to copy
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
@@ -468,7 +468,7 @@ H5std_string PropList::getProperty(const char* name) const
throw PropListIException(inMemFunc("getProperty"), "H5Pget failed");
}
// Return propety value as a string after deleting temp C-string
// Return property value as a string after deleting temp C-string
H5std_string prop_strg(prop_strg_C);
delete []prop_strg_C;
return (prop_strg);

View File

@@ -92,7 +92,7 @@ class H5_DLLCPP PropList : public IdComponent {
// Determines whether a property list is a certain class.
bool isAClass(const PropList& prop_class) const;
/// Query the existance of a property in a property object.
/// Query the existence of a property in a property object.
bool propExist(const char* name) const;
bool propExist(const H5std_string& name) const;
@@ -106,7 +106,7 @@ class H5_DLLCPP PropList : public IdComponent {
// Default constructor: creates a stub PropList object.
PropList();
// Copy constructor: creates a copy of a PropList object.
// Copy constructor: same as the original PropList.
PropList(const PropList& original);
// Gets the property list id.

View File

@@ -20,7 +20,9 @@
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -119,7 +121,7 @@ StrType::StrType(const hid_t existing_id) : AtomType( existing_id ) {}
//--------------------------------------------------------------------------
// Function: StrType copy constructor
///\brief Copy constructor: makes a copy of the original StrType object.
///\brief Copy constructor: same HDF5 object as \a original
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
StrType::StrType(const StrType& original) : AtomType ( original ) {}
@@ -184,6 +186,7 @@ StrType::StrType(const H5Location& loc, const H5std_string& dtype_name) : AtomTy
// Function: StrType::decode
///\brief Returns an StrType object via DataType* by decoding the
/// binary object description of this type.
///
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - Aug 2017
//--------------------------------------------------------------------------
@@ -281,8 +284,8 @@ H5T_str_t StrType::getStrpad() const
///\param strpad - IN: String padding type
///\exception H5::DataTypeIException
///\par Description
/// For detail, please refer to the C layer Reference Manual at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5T.html#Datatype-SetStrpad
/// For information, please refer to the H5Tset_strpad API in
/// the HDF5 C Reference Manual.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
void StrType::setStrpad(H5T_str_t strpad) const

View File

@@ -65,7 +65,7 @@ class H5_DLLCPP StrType : public AtomType {
// Creates a string datatype using an existing id
StrType(const hid_t existing_id);
// Copy constructor - makes a copy of the original object
// Copy constructor: same as the original StrType.
StrType(const StrType& original);
// Noop destructor.

View File

@@ -19,7 +19,9 @@
#include "H5PropList.h"
#include "H5OcreatProp.h"
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -44,7 +46,7 @@ VarLenType::VarLenType(const hid_t existing_id) : DataType(existing_id) {}
//--------------------------------------------------------------------------
// Function: VarLenType copy constructor
///\brief Copy constructor: makes a copy of the original VarLenType object.
///\brief Copy constructor: same HDF5 object as \a original
// Programmer Binh-Minh Ribler - May, 2004
//--------------------------------------------------------------------------
VarLenType::VarLenType(const VarLenType& original) : DataType(original) {}
@@ -131,6 +133,7 @@ VarLenType::VarLenType(const H5Location& loc, const H5std_string& dtype_name) :
// Function: VarLenType::decode
///\brief Returns an VarLenType object via DataType* by decoding the
/// binary object description of this type.
///
///\exception H5::DataTypeIException
// Programmer Binh-Minh Ribler - Aug 2017
//--------------------------------------------------------------------------

View File

@@ -38,7 +38,7 @@ class H5_DLLCPP VarLenType : public DataType {
///\brief Returns this class name.
virtual H5std_string fromClass () const { return("VarLenType"); }
// Copy constructor: makes copy of the original object.
// Copy constructor: same as the original VarLenType.
VarLenType(const VarLenType& original);
// Constructor that takes an existing id

View File

@@ -32,27 +32,31 @@ bin_SCRIPTS=h5c++
# Source files for the library
libhdf5_cpp_la_SOURCES=H5Exception.cpp H5IdComponent.cpp \
H5DataSpace.cpp H5PropList.cpp H5Library.cpp \
H5FaccProp.cpp H5FcreatProp.cpp H5LaccProp.cpp \
H5DxferProp.cpp H5DcreatProp.cpp H5Location.cpp \
H5AbstractDs.cpp H5Attribute.cpp H5Object.cpp \
H5OcreatProp.cpp H5DataType.cpp H5AtomType.cpp \
H5PredType.cpp H5EnumType.cpp H5IntType.cpp \
H5FloatType.cpp H5StrType.cpp H5ArrayType.cpp \
H5VarLenType.cpp H5CompType.cpp H5DataSet.cpp \
H5CommonFG.cpp H5Group.cpp H5File.cpp
H5DataSpace.cpp H5PropList.cpp H5Library.cpp \
H5FaccProp.cpp H5FcreatProp.cpp H5LcreatProp.cpp \
H5LaccProp.cpp H5DaccProp.cpp H5DxferProp.cpp \
H5DcreatProp.cpp H5Location.cpp H5AbstractDs.cpp \
H5Attribute.cpp H5Object.cpp H5OcreatProp.cpp \
H5DataType.cpp H5AtomType.cpp H5PredType.cpp \
H5EnumType.cpp H5IntType.cpp H5FloatType.cpp \
H5StrType.cpp H5ArrayType.cpp H5VarLenType.cpp \
H5CompType.cpp H5DataSet.cpp H5CommonFG.cpp H5Group.cpp \
H5File.cpp
# HDF5 C++ library depends on HDF5 Library.
libhdf5_cpp_la_LIBADD=$(LIBHDF5)
# Public headers
include_HEADERS=H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h \
H5CommonFG.h H5CompType.h H5DataSet.h H5DataSpace.h H5DataType.h \
H5OcreatProp.h H5DcreatProp.h H5DxferProp.h H5EnumType.h \
H5Exception.h H5FaccProp.h H5FcreatProp.h H5File.h H5FloatType.h \
H5Group.h H5IdComponent.h H5Include.h H5IntType.h H5LaccProp.h \
H5Library.h H5Location.h H5Object.h H5PredType.h H5PropList.h \
H5StrType.h H5CppDoc.h H5ArrayType.h H5VarLenType.h
include_HEADERS=H5Cpp.h H5AbstractDs.h H5AtomType.h \
H5Attribute.h H5Classes.h H5CommonFG.h H5CompType.h \
H5DataSet.h H5DataSpace.h H5DataType.h H5OcreatProp.h \
H5DaccProp.h H5DcreatProp.h \
H5DxferProp.h H5EnumType.h H5Exception.h H5FaccProp.h \
H5FcreatProp.h H5File.h H5FloatType.h H5Group.h \
H5IdComponent.h H5Include.h H5IntType.h H5LcreatProp.h \
H5LaccProp.h H5Library.h H5Location.h H5Object.h \
H5PredType.h H5PropList.h H5StrType.h H5CppDoc.h \
H5ArrayType.h H5VarLenType.h
# h5c++ and libhdf5.settings are generated during configure. Remove only when
# distclean.

View File

@@ -32,13 +32,13 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.
PROJECT_NAME = "HDF5 C++ API"
PROJECT_NAME =
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = "1.11.0"
PROJECT_NUMBER = "1.10.4-snap0, currently under development"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -51,7 +51,7 @@ PROJECT_BRIEF =
# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
# to the output directory.
PROJECT_LOGO = ./header_files/hdf_logo.jpg
PROJECT_LOGO =
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is
@@ -1010,7 +1010,7 @@ USE_HTAGS = NO
VERBATIM_HEADERS = YES
# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
# clang parser (see: http://clang.llvm.org/) for more acurate parsing at the
# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
# cost of reduced performance. This can be particularly helpful with template
# rich C++ code for which doxygen's built-in parser lacks the necessary type
# information.
@@ -1124,7 +1124,7 @@ HTML_STYLESHEET =
# defined cascading style sheet that is included after the standard style sheets
# created by doxygen. Using this option one can overrule certain style aspects.
# This is preferred over using HTML_STYLESHEET since it does not replace the
# standard style sheet and is therefor more robust against future updates.
# standard style sheet and is therefore more robust against future updates.
# Doxygen will copy the style sheet file to the output directory. For an example
# see the documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1140,7 +1140,7 @@ HTML_EXTRA_STYLESHEET =
# This tag requires that the tag GENERATE_HTML is set to YES.
HTML_EXTRA_FILES = ./header_files/help.jpg \
./C2Cppfunction_map.mht
./C2Cppfunction_map.htm
# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
# will adjust the colors in the stylesheet and background images according to
@@ -2009,7 +2009,7 @@ PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS
EXPAND_AS_DEFINED =
# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
# remove all refrences to function-like macros that are alone on a line, have an
# remove all references to function-like macros that are alone on a line, have an
# all uppercase name, and do not end with a semicolon. Such function macros are
# typically used for boiler-plate code, and will confuse the parser if not
# removed.

View File

@@ -11,8 +11,8 @@
</address>
</td><td width="5%">&nbsp;</td>
<td align="right">
<a href="https://www.hdfgroup.org/HDF5/doc/Copyright.html">Copyright</a> by
<a href="https://www.hdfgroup.org">The HDF Group</a>
Copyright by
The HDF Group
<br>
and the Board of Trustees of the University of Illinois
</td>

View File

@@ -38,7 +38,7 @@ HL="@HL@"
## $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS ##
## $LDFLAGS $LIBS $clibpath $link_objs $link_args $shared_link ##
## ##
## These settings can be overriden by setting HDF5_CXXFLAGS, ##
## These settings can be overridden by setting HDF5_CXXFLAGS, ##
## HDF5_CPPFLAGS, HDF5_LDFLAGS, or HDF5_LIBS in the environment. ##
## ##
############################################################################
@@ -140,7 +140,7 @@ usage() {
echo " [default: no except when built with only"
echo " shared libraries]"
echo " You can also add or change paths and flags to the compile line using"
echo " the following environment varibles or by assigning them to their counterparts"
echo " the following environment variables or by assigning them to their counterparts"
echo " in the 'Things You Can Modify to Override...'" section of $prog_name
echo " "
echo " Variable Current value to be replaced"
@@ -311,7 +311,7 @@ fi
if test "x$do_link" = "xyes"; then
shared_link=""
# conditionnaly link with the hl library
# conditionally link with the hl library
if test "X$HL" = "Xhl"; then
libraries=" $libraries -lhdf5_hl_cpp -lhdf5_cpp -lhdf5_hl -lhdf5 "
else

View File

@@ -1,5 +1,6 @@
cmake_minimum_required (VERSION 3.2.2)
PROJECT (HDF5_CPP_TEST)
cmake_minimum_required (VERSION 3.10)
project (HDF5_CPP_TEST CXX)
# --------------------------------------------------------------------
# Notes: When creating unit test executables they should be prefixed
# with "cpp_". This allows for easier filtering of the test suite when
@@ -37,16 +38,16 @@ set (srcdir ${CMAKE_CURRENT_SOURCE_DIR})
configure_file (${HDF5_CPP_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h @ONLY)
add_executable (cpp_testhdf5 ${CPP_TEST_SOURCES} )
TARGET_NAMING (cpp_testhdf5 STATIC)
TARGET_C_PROPERTIES (cpp_testhdf5 STATIC " " " ")
target_link_libraries (cpp_testhdf5
target_include_directories(cpp_testhdf5 PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_TEST_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
target_compile_definitions(cpp_testhdf5
PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings
)
TARGET_C_PROPERTIES (cpp_testhdf5 STATIC)
target_link_libraries (cpp_testhdf5 PRIVATE
${HDF5_CPP_LIB_TARGET}
${HDF5_LIB_TARGET}
${HDF5_TEST_LIB_TARGET}
)
set_target_properties (cpp_testhdf5 PROPERTIES
FOLDER test/cpp
INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
set_target_properties (cpp_testhdf5 PROPERTIES FOLDER test/cpp)
include (CMakeTests.cmake)

View File

@@ -66,13 +66,9 @@ static size_t filter_bogus(unsigned int flags, size_t cd_nelmts,
*
* Programmer Binh-Minh Ribler (using C version)
* Friday, January 5, 2001
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
test_create( H5File& file)
static herr_t test_create( H5File& file)
{
SUBTEST("Create, open, close");
@@ -198,13 +194,9 @@ test_create( H5File& file)
*
* Programmer Binh-Minh Ribler (using C version)
* Friday, January 5, 2001
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
test_simple_io( H5File& file)
static herr_t test_simple_io( H5File& file)
{
SUBTEST("Simple I/O");
@@ -284,13 +276,9 @@ test_simple_io( H5File& file)
*
* Programmer Binh-Minh Ribler
* Thursday, March 22, 2012
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
test_datasize(FileAccPropList &fapl)
static herr_t test_datasize(FileAccPropList &fapl)
{
SUBTEST("DataSet::getInMemDataSize()");
try
@@ -354,13 +342,9 @@ test_datasize(FileAccPropList &fapl)
*
* Programmer Binh-Minh Ribler (using C version)
* Friday, January 5, 2001
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
test_tconv(H5File& file)
static herr_t test_tconv(H5File& file)
{
// Prepare buffers for input/output
char *out=NULL, *in=NULL;
@@ -437,6 +421,7 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{
(H5Z_func_t)filter_bogus, /* The actual filter function */
}};
/*-------------------------------------------------------------------------
* Function: bogus
*
@@ -448,13 +433,9 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{
*
* Programmer Robb Matzke
* Tuesday, April 21, 1998
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static size_t
filter_bogus(unsigned int flags, size_t cd_nelmts,
static size_t filter_bogus(unsigned int flags, size_t cd_nelmts,
const unsigned int cd_values[], size_t nbytes,
size_t *buf_size, void **buf)
// H5_ATTR_UNUSED variables caused warning, but taking them out caused failure.
@@ -477,13 +458,9 @@ filter_bogus(unsigned int flags, size_t cd_nelmts,
*
* Programmer Binh-Minh Ribler (using C version)
* Friday, January 5, 2001
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
test_compression(H5File& file)
static herr_t test_compression(H5File& file)
{
#ifndef H5_HAVE_FILTER_DEFLATE
const char *not_supported;
@@ -764,9 +741,10 @@ test_compression(H5File& file)
*
*-------------------------------------------------------------------------
*/
const H5std_string DSET_NBIT_NAME("nbit_dataset");
const H5std_string DSET_NBIT_NAME("nbit_dataset");
const hsize_t DIM1 = 2;
const hsize_t DIM2 = 5;
static herr_t test_nbit_compression(H5File& file)
{
typedef struct {
@@ -880,13 +858,9 @@ static herr_t test_nbit_compression(H5File& file)
*
* Programmer Binh-Minh Ribler (using C version)
* Saturday, February 17, 2001
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
test_multiopen (H5File& file)
static herr_t test_multiopen (H5File& file)
{
SUBTEST("Multi-open with extending");
@@ -963,13 +937,9 @@ test_multiopen (H5File& file)
*
* Programmer Binh-Minh Ribler (using C version)
* February 17, 2001
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static herr_t
test_types(H5File& file)
static herr_t test_types(H5File& file)
{
SUBTEST("Various datatypes");
@@ -1146,25 +1116,194 @@ test_types(H5File& file)
/*-------------------------------------------------------------------------
* Function: test_virtual
* Function: test_getObjinfo
*
* Purpose: Tests fixed, unlimited, and printf selections in the same
* VDS
* Purpose Tests getObjinfo()
*
* Return: Success: 0
* Return Success: 0
* Failure: -1
*
* July, 2018
*-------------------------------------------------------------------------
*/
static herr_t test_getinfo(H5File& file)
{
SUBTEST("Getting object information");
try {
// Create a data space
hsize_t dims[2];
dims[0] = 256;
dims[1] = 512;
DataSpace space (2, dims, NULL);
// Create a dataset using the default dataset creation properties.
// We're not sure what they are, so we won't check.
DataSet dataset(file.openDataSet(DSET_CHUNKED_NAME));
// Get dataset header info
H5O_info_t oinfo;
HDmemset(&oinfo, 0, sizeof(oinfo));
dataset.getObjinfo(oinfo, H5O_INFO_HDR);
verify_val(oinfo.hdr.nchunks, 1, "DataSet::getObjinfo", __LINE__, __FILE__);
dataset.close();
// Open the dataset we created above and then close it. This is one
// way to open an existing dataset for accessing.
dataset = file.openDataSet(DSET_DEFAULT_NAME);
HDmemset(&oinfo, 0, sizeof(oinfo));
dataset.getObjinfo(oinfo, H5O_INFO_ALL);
verify_val(oinfo.hdr.nchunks, 1, "DataSet::getObjinfo", __LINE__, __FILE__);
dataset.close();
PASSED();
return 0;
} // outer most try block
catch (InvalidActionException& E)
{
cerr << " FAILED" << endl;
cerr << " <<< " << E.getDetailMsg() << " >>>" << endl << endl;
return -1;
}
// catch all other exceptions
catch (Exception& E)
{
issue_fail_msg("test_getinfo", __LINE__, __FILE__);
return -1;
}
} // test_getinfo
/*-------------------------------------------------------------------------
* Function: test_chunk_cache
*
* Purpose Tests setting rdcc info on a DAPL, and interaction
* with the corresponding properties in the file structure.
*
* Return Success: 0
* Failure: number of errors
*
* Programmer: Binh-Minh Ribler
* Friday, March 10, 2017
* July 2018
*-------------------------------------------------------------------------
*/
const int RANK1 = 1;
const H5std_string FILE_ACCPLIST("test_accplist.h5");
static herr_t test_chunk_cache(FileAccPropList fapl)
{
SUBTEST("DSetAccPropList::set/getChunkCache");
try {
// Create a default dataset access and file access property lists
FileAccPropList fapl_def;
DSetAccPropList dapl;
// Verify that chunk cache parameters are the same
int mdc_nelmts = 0;
size_t nslots_1 = 0, nslots_4 = 0, nbytes_1 = 0, nbytes_4 = 0;
double w0_1 = 0.0F, w0_4 = 0.0F;
fapl_def.getCache(mdc_nelmts, nslots_1, nbytes_1, w0_1);
dapl.getChunkCache(nslots_4, nbytes_4, w0_4);
verify_val(nslots_1, nslots_4, "DSetAccPropList::getChunkCache", __LINE__, __FILE__);
verify_val(nbytes_1, nbytes_4, "DSetAccPropList::getChunkCache", __LINE__, __FILE__);
verify_val(w0_1, w0_4, "DSetAccPropList::getChunkCache", __LINE__, __FILE__);
// Set a link access property on dapl to verify property list inheritance
dapl.setNumLinks((size_t)134);
size_t nlinks = dapl.getNumLinks();
verify_val(nlinks, (size_t)134, "DSetAccPropList::getNumLinks", __LINE__, __FILE__);
// Make a copy of the external fapl
FileAccPropList fapl_local(fapl);
// Set new rdcc settings on fapl local
size_t nslots_2 = nslots_1 * 2;
size_t nbytes_2 = nbytes_1 * 2;
double w0_2 = w0_1 / (double)2.0F;
fapl_local.getCache(mdc_nelmts, nslots_2, nbytes_2, w0_2);
// Create a new file using default fcpl and the passed-in fapl
H5File file(FILE_ACCPLIST, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl_local);
// Create dataset creation property list
DSetCreatPropList dcpl;
// Set chunk dimensions
hsize_t cdims[RANK1];
cdims[0] = 10;
dcpl.setChunk(RANK1, cdims);
// Create memory space
hsize_t mdims[RANK1];
mdims[0] = 10;
DataSpace mspace(RANK1, mdims);
// Create a dataset using that dataset creation properties
DataSet dataset(file.createDataSet(DSET_CHUNKED_NAME, PredType::NATIVE_INT, mspace, dcpl, dapl));
// Get the dataset access property list
DSetAccPropList dapl2 = dataset.getAccessPlist();
// Retrieve and verify the raw data chunk cache parameters
nslots_4 = nbytes_4 = 0;
w0_4 = 0.0F;
dapl2.getChunkCache(nslots_4, nbytes_4, w0_4);
verify_val(nslots_2, nslots_4, "DSetCreatPropList::getChunkCache", __LINE__, __FILE__);
verify_val(nbytes_2, nbytes_4, "DSetCreatPropList::getChunkCache", __LINE__, __FILE__);
verify_val(H5_DBL_ABS_EQUAL(w0_2, w0_4), 1, "DSetCreatPropList::getChunkCache", __LINE__, __FILE__);
// Set new values on original dapl
size_t nslots_3 = nslots_1 * 2;
size_t nbytes_3 = H5D_CHUNK_CACHE_NBYTES_DEFAULT;
double w0_3 = w0_2 / 2;
dapl.getChunkCache(nslots_3, nbytes_3, w0_3);
// Close dataset
dataset.close();
// Reopen dataset
DataSet dataset2(file.openDataSet(DSET_CHUNKED_NAME, dapl));
// Get the dataset access property list
DSetAccPropList dapl3 = dataset2.getAccessPlist();
// Retrieve and verify the raw data chunk cache parameters
dapl3.getChunkCache(nslots_4, nbytes_4, w0_4);
verify_val(nslots_3, nslots_4, "DSetCreatPropList::getLayout", __LINE__, __FILE__);
verify_val(nbytes_3, nbytes_4, "DSetCreatPropList::getLayout", __LINE__, __FILE__);
verify_val(H5_DBL_ABS_EQUAL(w0_3, w0_4), 1, "DSetCreatPropList::getLayout", __LINE__, __FILE__);
PASSED();
return 0;
} // end top try block
catch (Exception& E)
{
return -1;
}
} // test_chunk_cache
/*-------------------------------------------------------------------------
* Function: test_virtual
*
* Modifications:
* Purpose Tests fixed, unlimited, and printf selections in the same
* VDS
*
* Return Success: 0
* Failure: number of errors
*
* Programmer Binh-Minh Ribler
* Friday, March 10, 2017
*
*-------------------------------------------------------------------------
*/
const int RANK = 2;
static herr_t
test_virtual()
static herr_t test_virtual()
{
SUBTEST("DSetCreatPropList::setVirtual");
@@ -1269,12 +1408,14 @@ void test_dset()
nerrors += test_create(file) < 0 ? 1:0;
nerrors += test_simple_io(file) < 0 ? 1:0;
nerrors += test_getinfo(file) < 0 ? 1:0;
nerrors += test_tconv(file) < 0 ? 1:0;
nerrors += test_compression(file) < 0 ? 1:0;
nerrors += test_nbit_compression(file) < 0 ? 1:0;
nerrors += test_multiopen (file) < 0 ? 1:0;
nerrors += test_types(file) < 0 ? 1:0;
nerrors += test_virtual() < 0 ? 1:0;
nerrors += test_chunk_cache(fapl) < 0 ? 1:0;
// Close group "emit diagnostics".
grp.close();
@@ -1293,17 +1434,15 @@ void test_dset()
cleanup_dsets();
} // test_dset
/*-------------------------------------------------------------------------
* Function: cleanup_dsets
*
* Purpose Cleanup temporary test files
*
* Return none
* Return None
*
* Programmer (use C version)
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
extern "C"

View File

@@ -47,9 +47,6 @@ using namespace H5;
*
* Programmer Binh-Minh Ribler (using C code segment for reporting tests)
* Friday, February 6, 2001
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
int test_report( int nerrors, const H5std_string& testname )
@@ -135,9 +132,6 @@ void issue_fail_msg(const char* where, int line, const char* file_name,
*
* Programmer Binh-Minh Ribler (using C code segment for checking values)
* Friday, February 6, 2001
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
int check_values (hsize_t i, hsize_t j, int apoint, int acheck)
@@ -191,9 +185,6 @@ void check_values(const char *value, const char* msg, int line, const char* file
*
* Programmer Binh-Minh Ribler
* May 2, 2010
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
void verify_val(const char* x, const char* value, const char* where, int line, const char* file_name)

View File

@@ -53,13 +53,10 @@ typedef enum int_t {
*
* Purpose Tests 1-D array of compound datatypes (with array fields)
*
* Return None.
* Return None
*
* Programmer Binh-Minh Ribler (using C version)
* January, 2016
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_array_compound_array()
@@ -280,23 +277,6 @@ static void test_array_compound_array()
} // end test_array_compound_array()
/*-------------------------------------------------------------------------
* Function: test_array_assignment
*
* Purpose Tests the operator=
*
* Return None.
*
* Programmer Binh-Minh Ribler (using C version)
* March, 2016
*
* Description:
* Used user's sample code in HDFFV-9562
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
/*
* Helper routine to demonstrate the issue in HDFFV-9562
*/
@@ -307,8 +287,23 @@ H5::DataType getArr()
H5::ArrayType ret;
ret = H5::ArrayType(H5::PredType::NATIVE_INT, 1, dims);
delete[] dims;
return ret; }
return ret;
}
/*-------------------------------------------------------------------------
* Function: test_array_assignment
*
* Purpose Tests the operator=
*
* Return None
*
* Programmer Binh-Minh Ribler (using C version)
* March, 2016
*
* Description:
* Used user's sample code in HDFFV-9562
*-------------------------------------------------------------------------
*/
static void test_array_assignment()
{
hsize_t sdims1[] = {SPACE1_DIM1};
@@ -359,13 +354,10 @@ static void test_array_assignment()
*
* Purpose Tests getting array information using the const methods.
*
* Return None.
* Return None
*
* Programmer Binh-Minh Ribler
* April, 2016
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_array_info()
@@ -477,11 +469,14 @@ static void test_array_info()
} // end test_array_info()
/****************************************************************
**
** test_array(): Main datatypes testing routine.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_array
*
* Purpose Main datatypes testing routine
*
* Return None
*-------------------------------------------------------------------------
*/
extern "C"
void test_array()
{
@@ -505,13 +500,10 @@ void test_array()
*
* Purpose Cleanup temporary test files
*
* Return none
* Return None
*
* Programmer Binh-Minh Ribler (using C version)
* January, 2016
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
extern "C"

View File

@@ -101,12 +101,15 @@ float attr_data5 = (float)-5.123; // Test data for 5th attribute
const H5std_string ATTR1A_NAME("Attr1_a");
int attr_data1a[ATTR1_DIM1]={256,11945,-22107};
/****************************************************************
**
** test_attr_basic_write(): Test basic write attribute.
** Tests integer attributes on both datasets and groups
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_basic_write
*
* Purpose Test basic write attribute on both datasets and groups.
*
* Return None
*-------------------------------------------------------------------------
*/
static void test_attr_basic_write()
{
hsize_t dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
@@ -233,29 +236,34 @@ static void test_attr_basic_write()
}
} // test_attr_basic_write()
/****************************************************************
**
** test_attr_getname(): Test getting attribute name functions.
**
** Test these functions:
** A. ssize_t Attribute::getName(char* attr_name, size_t buf_size)
** 1. With arbitrary buf_size that is larger than the name size
** 2. With arbitrary buf_size that is smaller than the name's length.
** 3. With a buf_size that equals the name's length.
**
** B. ssize_t Attribute::getName(H5std_string& attr_name, size_t buf_size)
** 1. With buffer smaller than the actual name
** 2. Same test but with retiring overloaded function
** ssize_t Attribute::getName(size_t buf_size, H5std_string& attr_name)
**
** C. H5std_string Attribute::getName()
**
** D. H5std_string Attribute::getName(size_t len)
**
** E. ssize_t Attribute::getName(H5std_string& attr_name, size_t buf_size)
** With buffer size equals the name's length, i.e., buf_size=0
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_getname
*
* Purpose Test getting attribute name.
*
* Description
* Test these functions:
* A. ssize_t Attribute::getName(char* attr_name, size_t buf_size)
* 1. With arbitrary buf_size that is larger than the name size
* 2. With arbitrary buf_size that is smaller than the name's length.
* 3. With a buf_size that equals the name's length.
*
* B. ssize_t Attribute::getName(H5std_string& attr_name, size_t buf_size)
* 1. With buffer smaller than the actual name
* 2. Same test but with retiring overloaded function
* ssize_t Attribute::getName(size_t buf_size, H5std_string& attr_name)
*
* C. H5std_string Attribute::getName()
*
* D. H5std_string Attribute::getName(size_t len)
*
* E. ssize_t Attribute::getName(H5std_string& attr_name, size_t buf_size)
* With buffer size equals the name's length, i.e., buf_size=0
*
* Return None
*-------------------------------------------------------------------------
*/
static void test_attr_getname()
{
// Output message about test being performed
@@ -368,11 +376,15 @@ static void test_attr_getname()
}
} // test_attr_getname()
/****************************************************************
**
** test_attr_rename(): Test renaming attribute function.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_rename
*
* Purpose Test renaming attribute function.
*
* Return None
*-------------------------------------------------------------------------
*/
static void test_attr_rename()
{
int read_data1[ATTR1_DIM1]={0}; // Buffer for reading the attribute
@@ -479,11 +491,15 @@ static void test_attr_rename()
}
} // test_attr_rename()
/********************************************************************
**
** test_attr_basic_read(): Test basic read attribute.
**
********************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_basic_read
*
* Purpose Test basic read attribute.
*
* Return None
*-------------------------------------------------------------------------
*/
static void test_attr_basic_read()
{
hsize_t i, j;
@@ -502,6 +518,12 @@ static void test_attr_basic_read()
int num_attrs = dataset.getNumAttrs();
verify_val(num_attrs, 3, "DataSet::getNumAttrs", __LINE__, __FILE__);
// Verify the correct number of attributes another way
H5O_info_t oinfo;
HDmemset(&oinfo, 0, sizeof(oinfo));
dataset.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS);
verify_val(oinfo.num_attrs, 3, "DataSet::getObjinfo", __LINE__, __FILE__);
// Open an attribute for the dataset
Attribute ds_attr=dataset.openAttribute(ATTR1_NAME);
@@ -522,7 +544,12 @@ static void test_attr_basic_read()
// Verify the correct number of attributes
num_attrs = group.getNumAttrs();
verify_val(num_attrs, 1, "H5Group::getNumAttrs", __LINE__, __FILE__);
verify_val(num_attrs, 1, "Group::getNumAttrs", __LINE__, __FILE__);
// Verify the correct number of attributes another way
HDmemset(&oinfo, 0, sizeof(oinfo));
group.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS);
verify_val(oinfo.num_attrs, 1, "Group::getObjinfo", __LINE__, __FILE__);
// Open an attribute for the group
Attribute gr_attr = group.openAttribute(ATTR2_NAME);
@@ -548,11 +575,15 @@ static void test_attr_basic_read()
}
} // test_attr_basic_read()
/****************************************************************
**
** test_attr_compound_write(): Tests compound datatype attributes
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_compound_write
*
* Purpose Test writing attributes with compound datatype.
*
* Return None
*-------------------------------------------------------------------------
*/
static void test_attr_compound_write()
{
@@ -608,11 +639,15 @@ static void test_attr_compound_write()
}
} // test_attr_compound_write()
/****************************************************************
**
** test_attr_compound_read(): Test basic H5A (attribute) code.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_compound_read
*
* Purpose Test reading attributes with compound datatype.
*
* Return None
*-------------------------------------------------------------------------
*/
static void test_attr_compound_read()
{
hsize_t dims[ATTR_MAX_DIMS]; // Attribute dimensions
@@ -634,6 +669,12 @@ static void test_attr_compound_read()
int num_attrs = dataset.getNumAttrs();
verify_val(num_attrs, 1, "DataSet::getNumAttrs", __LINE__, __FILE__);
// Verify the correct number of attributes another way
H5O_info_t oinfo;
HDmemset(&oinfo, 0, sizeof(oinfo));
dataset.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS);
verify_val(oinfo.num_attrs, 1, "DataSet::getObjinfo", __LINE__, __FILE__);
// Open 1st attribute for the dataset
Attribute attr = dataset.openAttribute((unsigned)0);
@@ -760,11 +801,15 @@ static void test_attr_compound_read()
}
} // test_attr_compound_read()
/****************************************************************
**
** test_attr_scalar_write(): Test scalar attribute writing functionality.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_scalar_write
*
* Purpose Test scalar attribute writing functionality.
*
* Return None
*-------------------------------------------------------------------------
*/
static void test_attr_scalar_write()
{
// Output message about test being performed
@@ -815,11 +860,15 @@ static void test_attr_scalar_write()
}
} // test_attr_scalar_write()
/****************************************************************
**
** test_attr_scalar_read(): Test scalar attribute reading functionality.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_scalar_read
*
* Purpose Test scalar attribute reading functionality.
*
* Return None
*-------------------------------------------------------------------------
*/
/* Epsilon for floating-point comparisons */
#define FP_EPSILON 0.000001F
@@ -864,11 +913,15 @@ static void test_attr_scalar_read()
}
} // test_attr_scalar_read()
/****************************************************************
**
** test_attr_mult_write(): Test multiple attributes
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_mult_write
*
* Purpose Test writing multiple attributes.
*
* Return None
*-------------------------------------------------------------------------
*/
static void test_attr_mult_write()
{
// Output message about test being performed
@@ -937,11 +990,15 @@ static void test_attr_mult_write()
}
} // test_attr_mult_write()
/****************************************************************
**
** test_attr_mult_read(): Test reading multiple attributes.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_mult_read
*
* Purpose Test reading multiple attributes.
*
* Return None
*-------------------------------------------------------------------------
*/
static void test_attr_mult_read()
{
int read_data1[ATTR1_DIM1]={0}; // Buffer for reading 1st attribute
@@ -1128,12 +1185,15 @@ static void test_attr_mult_read()
}
} // test_attr_mult_read()
/****************************************************************
**
** test_attr_delete(): Test deleting attribute from different
** hdf5 objects.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_delete
*
* Purpose Test deleting attribute from different hdf5 objects.
*
* Return None
*-------------------------------------------------------------------------
*/
static void test_attr_delete()
{
H5std_string attr_name; // Buffer for attribute names
@@ -1245,20 +1305,23 @@ static void test_attr_delete()
}
} // test_attr_delete()
/****************************************************************
**
** test_attr_dtype_shared(): Test code for using shared datatypes
** in attributes.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_dtype_shared
*
* Purpose Test accessing attributes using shared datatypes.
*
* Return None
*-------------------------------------------------------------------------
*/
static void test_attr_dtype_shared()
{
int data=8; /* Data to write */
int rdata=0; /* Read read in */
int data=8; // Data to write
int rdata=0; // Data read in
#ifndef H5_NO_DEPRECATED_SYMBOLS
H5G_stat_t statbuf; /* Object's information */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
h5_stat_size_t filesize; /* Size of file after modifications */
H5G_stat_t statbuf; // Object's information
#endif
h5_stat_size_t filesize; // Size of file after modifications
// Output message about test being performed
SUBTEST("Shared Datatypes with Attributes");
@@ -1294,7 +1357,7 @@ static void test_attr_dtype_shared()
// Check reference count on named datatype
fid1.getObjinfo(TYPE1_NAME, statbuf);
verify_val((int)statbuf.nlink, 1, "DataType::getObjinfo", __LINE__, __FILE__);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
#endif
// Create dataspace for dataset
DataSpace dspace;
@@ -1305,7 +1368,7 @@ static void test_attr_dtype_shared()
// Check reference count on named datatype
fid1.getObjinfo(TYPE1_NAME, statbuf);
verify_val((int)statbuf.nlink, 2, "H5File::getObjinfo", __LINE__, __FILE__);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
#endif
// Create attribute on dataset
Attribute attr = dset.createAttribute(ATTR1_NAME,dtype,dspace);
@@ -1314,7 +1377,7 @@ static void test_attr_dtype_shared()
// Check reference count on named datatype
fid1.getObjinfo(TYPE1_NAME, statbuf);
verify_val((int)statbuf.nlink, 3, "DataSet::getObjinfo", __LINE__, __FILE__);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
#endif
// Close attribute
attr.close();
@@ -1326,7 +1389,7 @@ static void test_attr_dtype_shared()
// Check reference count on named datatype
fid1.getObjinfo(TYPE1_NAME, statbuf);
verify_val((int)statbuf.nlink, 2, "DataSet::getObjinfo after DataSet::removeAttr", __LINE__, __FILE__);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
#endif
// Create attribute on dataset
attr = dset.createAttribute(ATTR1_NAME,dtype,dspace);
@@ -1335,7 +1398,7 @@ static void test_attr_dtype_shared()
// Check reference count on named datatype
fid1.getObjinfo(TYPE1_NAME, statbuf);
verify_val((int)statbuf.nlink, 3, "DataSet::createAttribute", __LINE__, __FILE__);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
#endif
// Write data into the attribute
attr.write(PredType::NATIVE_INT,&data);
@@ -1372,7 +1435,7 @@ static void test_attr_dtype_shared()
// Check reference count on named datatype
fid1.getObjinfo(TYPE1_NAME, statbuf);
verify_val((int)statbuf.nlink, 3, "DataSet::openAttribute", __LINE__, __FILE__);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
#endif
} // end of second enclosing
// Unlink the dataset
@@ -1382,7 +1445,7 @@ static void test_attr_dtype_shared()
// Check reference count on named datatype
fid1.getObjinfo(TYPE1_NAME, statbuf);
verify_val((int)statbuf.nlink, 1, "H5File::unlink", __LINE__, __FILE__);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
#endif
// Unlink the named datatype
fid1.unlink(TYPE1_NAME);
@@ -1403,12 +1466,15 @@ static void test_attr_dtype_shared()
}
} // test_attr_dtype_shared()
/****************************************************************
**
** test_string_attr(): Test read/write string attribute.
** Tests string attributes on groups.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_string_attr
*
* Purpose Test read/write string attribute.
*
* Return None
*-------------------------------------------------------------------------
*/
/* Info for a string attribute */
const H5std_string ATTR1_FL_STR_NAME("String_attr 1");
const H5std_string ATTR2_FL_STR_NAME("String_attr 2");
@@ -1528,12 +1594,18 @@ static void test_string_attr()
}
} // test_string_attr()
/****************************************************************
**
** test_attr_exists(): Test checking for attribute existence.
** (additional attrExists tests are in test_attr_rename())
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_exists
*
* Purpose Test checking for attribute existence.
*
* Return None
*
* Note
* Additional attrExists tests are in test_attr_rename().
*-------------------------------------------------------------------------
*/
static void test_attr_exists()
{
// Output message about test being performed
@@ -1577,12 +1649,15 @@ static void test_attr_exists()
}
} // test_attr_exists()
/****************************************************************
**
** test_attr_dense_create(): Test phase change properties
** Tests "dense" attribute storage creation
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_dense_create
*
* Purpose Test phase change properties
*
* Return None
*-------------------------------------------------------------------------
*/
const H5std_string FILE_CRTPROPS("tattr_crt_properties.h5");
const int NAME_BUF_SIZE = 1024;
const unsigned MAX_COMPACT_DEF = 8;
@@ -1686,12 +1761,15 @@ static void test_attr_dense_create(FileCreatPropList& fcpl,
}
} // test_attr_dense_create()
/****************************************************************
**
** test_attr_corder_create_basic(): Test creation order properties
** Tests creating an object w/attribute creation order info
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr_corder_create_basic
*
* Purpose Test creation order properties
*
* Return None
*-------------------------------------------------------------------------
*/
static void test_attr_corder_create_basic(FileCreatPropList& fcpl,
FileAccPropList& fapl)
{
@@ -1771,11 +1849,15 @@ static void test_attr_corder_create_basic(FileCreatPropList& fcpl,
}
} // test_attr_corder_create_basic()
/****************************************************************
**
** test_attr(): Main attribute testing routine.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_attr
*
* Purpose Main attribute testing routine
*
* Return None
*-------------------------------------------------------------------------
*/
extern "C"
void test_attr()
{
@@ -1858,19 +1940,14 @@ void test_attr()
issue_fail_msg("test_attr()", __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_attr()
/*-------------------------------------------------------------------------
* Function cleanup_attr
* Function: cleanup_attr
*
* Purpose Cleanup temporary test files
*
* Return none
*
* Programmer Albert Cheng
* July 2, 1998
*
* Modifications:
*
* Return None
*-------------------------------------------------------------------------
*/
extern "C"

View File

@@ -49,9 +49,6 @@ typedef struct complex_t {
*
* Programmer Binh-Minh Ribler (using C version)
* January, 2007
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_compound_1()
@@ -86,9 +83,6 @@ static void test_compound_1()
*
* Programmer Binh-Minh Ribler (use C version)
* January, 2007
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_compound_2()
@@ -211,9 +205,6 @@ static void test_compound_2()
*
* Programmer Binh-Minh Ribler (use C version)
* January, 2007
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_compound_3()
@@ -333,9 +324,6 @@ static void test_compound_3()
*
* Programmer Binh-Minh Ribler (use C version)
* January, 2007
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_compound_4()
@@ -466,9 +454,6 @@ static void test_compound_4()
*
* Programmer Binh-Minh Ribler (use C version)
* January, 2007
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_compound_5()
@@ -569,9 +554,6 @@ static void test_compound_5()
*
* Programmer Binh-Minh Ribler (use C version)
* January, 2007
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_compound_6()
@@ -651,6 +633,7 @@ static void test_compound_6()
}
} // test_compound_6()
/*-------------------------------------------------------------------------
* Function: test_compound_7
*
@@ -661,9 +644,6 @@ static void test_compound_6()
*
* Programmer Binh-Minh Ribler (use C version)
* January, 2007
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_compound_7()
@@ -717,6 +697,7 @@ static void test_compound_7()
issue_fail_msg(E.getCFuncName(), __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_compound_7()
/*-------------------------------------------------------------------------
* Function: test_compound_set_size
@@ -727,12 +708,10 @@ static void test_compound_7()
*
* Programmer Binh-Minh Ribler (use partial C version test_ooo_order)
* March, 2014
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
const H5std_string COMPFILE("tcompound_types.h5");
static void test_compound_set_size()
{
typedef struct {
@@ -807,6 +786,7 @@ static void test_compound_set_size()
issue_fail_msg(E.getCFuncName(), __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_compound_set_size()
/*-------------------------------------------------------------------------
* Function: test_compound
@@ -817,9 +797,6 @@ static void test_compound_set_size()
*
* Programmer Binh-Minh Ribler
* January 2007
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
extern "C"
@@ -844,10 +821,7 @@ void test_compound()
*
* Purpose Cleanup temporary test files - nothing at this time.
*
* Return none
*
* Modifications:
*
* Return None
*-------------------------------------------------------------------------
*/
extern "C"

View File

@@ -111,11 +111,14 @@ static void test_transfplist()
}
/****************************************************************
**
** test_dsproplist(): Main dataset property list testing routine.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_dsproplist
*
* Purpose Main dataset property list testing routine
*
* Return None
*-------------------------------------------------------------------------
*/
extern "C"
void test_dsproplist()
{
@@ -126,6 +129,15 @@ void test_dsproplist()
} // test_dsproplist()
/*-------------------------------------------------------------------------
* Function: cleanup_dsproplist
*
* Purpose Cleanup temporary test files
*
* Return none
*-------------------------------------------------------------------------
*/
extern "C"
void cleanup_dsproplist()
{

View File

@@ -76,9 +76,8 @@ const H5std_string FILE4("tfile4.h5");
* cases. Since there are no operator<< for 'long long'
* or int64 in VS C++ ostream, I casted the hsize_t values
* passed to verify_val to 'long' as well. If problems
* arises later, this will have to be specificly handled
* arises later, this will have to be specifically handled
* with a special routine.
*
*-------------------------------------------------------------------------
*/
static void test_file_create()
@@ -283,9 +282,8 @@ static void test_file_create()
* cases. Since there are no operator<< for 'long long'
* or int64 in VS C++ ostream, I casted the hsize_t values
* passed to verify_val to 'long' as well. If problems
* arises later, this will have to be specificly handled
* arises later, this will have to be specifically handled
* with a special routine.
*
*-------------------------------------------------------------------------
*/
static void test_file_open()
@@ -360,9 +358,6 @@ static void test_file_open()
*
* Programmer Raymond Lu
* June, 2004
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_file_size()
@@ -425,9 +420,6 @@ static void test_file_size()
*
* Programmer Binh-Minh Ribler
* July, 2004
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
const int RANK = 2;
@@ -507,6 +499,15 @@ static void test_file_name()
} // test_file_name()
/*-------------------------------------------------------------------------
*
* Function: test_file_attribute
*
* Purpose Test file attributes
*
* Return None
*-------------------------------------------------------------------------
*/
const int RANK1 = 1;
const int ATTR1_DIM1 = 3;
const H5std_string FILE5("tfattrs.h5");
@@ -618,11 +619,6 @@ static void test_file_attribute()
} // test_file_attribute()
const H5std_string FILE6("tfile5.h5");
const H5std_string ROOTGROUP("/");
const H5std_string GROUP1("/G1");
const H5std_string SUBGROUP3("/G1/G3");
/*-------------------------------------------------------------------------
* Function: test_libver_bounds_real
*
@@ -634,9 +630,13 @@ const H5std_string SUBGROUP3("/G1/G3");
*
* Programmer Binh-Minh Ribler (use C version)
* March, 2015
*
*-------------------------------------------------------------------------
*/
const H5std_string FILE6("tfile5.h5");
const H5std_string ROOTGROUP("/");
const H5std_string GROUP1("/G1");
const H5std_string SUBGROUP3("/G1/G3");
static void test_libver_bounds_real(
H5F_libver_t libver_create, unsigned oh_vers_create,
H5F_libver_t libver_mod, unsigned oh_vers_mod)
@@ -657,8 +657,15 @@ static void test_libver_bounds_real(
unsigned obj_version = file.childObjVersion(ROOTGROUP);
verify_val(obj_version, oh_vers_create, "H5File::childObjVersion", __LINE__, __FILE__);
// Verify object header version another way
H5O_info_t oinfo;
HDmemset(&oinfo, 0, sizeof(oinfo));
file.getObjinfo(oinfo, H5O_INFO_HDR);
verify_val(oinfo.hdr.version, oh_vers_create, "H5File::getObjinfo", __LINE__, __FILE__);
/*
* Reopen the file and make sure the root group still has the correct version
* Reopen the file and make sure the root group still has the correct
* version
*/
file.close();
@@ -678,6 +685,11 @@ static void test_libver_bounds_real(
obj_version = group.objVersion();
verify_val(obj_version, oh_vers_mod, "Group::objVersion", __LINE__, __FILE__);
// Verify object header version another way
HDmemset(&oinfo, 0, sizeof(oinfo));
group.getObjinfo(oinfo, H5O_INFO_HDR);
verify_val(oinfo.hdr.version, oh_vers_mod, "Group::getObjinfo", __LINE__, __FILE__);
group.close(); // close "/G1"
/*
@@ -707,6 +719,7 @@ static void test_libver_bounds_real(
} /* end test_libver_bounds_real() */
/*-------------------------------------------------------------------------
*
* Function: test_libver_bounds
@@ -718,7 +731,6 @@ static void test_libver_bounds_real(
*
* Programmer Binh-Minh Ribler (use C version)
* March 2015
*
*-------------------------------------------------------------------------
*/
static void test_libver_bounds()
@@ -731,9 +743,10 @@ static void test_libver_bounds()
test_libver_bounds_real(H5F_LIBVER_LATEST, H5O_VERSION_2, H5F_LIBVER_EARLIEST, H5O_VERSION_2);
PASSED();
} /* end test_libver_bounds() */
/*-------------------------------------------------------------------------
* Function: test_commonfg
* Function: test_commonfg
*
* Purpose Verify that H5File works as a root group.
*
@@ -741,7 +754,6 @@ static void test_libver_bounds()
*
* Programmer Binh-Minh Ribler (use C version)
* March, 2015
*
*-------------------------------------------------------------------------
*/
static void test_commonfg()
@@ -793,9 +805,8 @@ static void test_commonfg()
}
} /* end test_commonfg() */
const H5std_string FILE7("tfile7.h5");
/*-------------------------------------------------------------------------
* Function: test_file_info
*
@@ -807,11 +818,12 @@ const H5std_string FILE7("tfile7.h5");
*
* Programmer Binh-Minh Ribler
* February, 2017
*
*-------------------------------------------------------------------------
*/
const H5std_string FILE7("tfile7.h5");
const hsize_t FSP_SIZE_DEF = 4096;
const hsize_t FSP_SIZE512 = 512;
static void test_file_info()
{
// Output message about test being performed
@@ -932,6 +944,7 @@ static void test_file_info()
issue_fail_msg("test_filespace_info()", __LINE__, __FILE__, E.getCDetailMsg());
}
} /* test_file_info() */
/*-------------------------------------------------------------------------
* Function: test_file
@@ -942,9 +955,6 @@ static void test_file_info()
*
* Programmer Binh-Minh Ribler (use C version)
* January 2001
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
extern "C"
@@ -970,11 +980,6 @@ void test_file()
* Purpose Cleanup temporary test files
*
* Return none
*
* Programmer (use C version)
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
#ifdef __cplusplus

View File

@@ -65,6 +65,7 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{
(H5Z_func_t)filter_bogus, /* The actual filter function */
}};
/*-------------------------------------------------------------------------
* Function: filter_bogus
*
@@ -76,9 +77,6 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{
*
* Programmer Robb Matzke
* Tuesday, April 21, 1998
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static size_t
@@ -92,6 +90,7 @@ filter_bogus(size_t nbytes)
return nbytes;
}
/*-------------------------------------------------------------------------
* Function: test_null_filter
*
@@ -104,11 +103,8 @@ filter_bogus(size_t nbytes)
*
* Modifications:
* Note: H5Z interface is not implemented yet.
*
*-------------------------------------------------------------------------
*/
// Chunk dimensions
const hsize_t chunk_size[2] = {FILTER_CHUNK_DIM1, FILTER_CHUNK_DIM2};
static void test_null_filter()
@@ -144,6 +140,7 @@ static void test_null_filter()
}
} // test_null_filter
/*-------------------------------------------------------------------------
* Function: test_szip_filter
*
@@ -156,11 +153,9 @@ static void test_null_filter()
*
* Modifications:
* Note: H5Z interface is not implemented yet.
*
*-------------------------------------------------------------------------
*/
const H5std_string DSET_SZIP_NAME("szipped dataset");
const H5std_string DSET_SZIP_NAME("szipped dataset");
static void test_szip_filter(H5File& file1)
{
@@ -242,11 +237,14 @@ static void test_szip_filter(H5File& file1)
} // test_szip_filter
/****************************************************************
**
** test_filters(): Main routine for testing filters.
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: test_filters
*
* Purpose Main routine for testing filters
*
* Return None
*-------------------------------------------------------------------------
*/
const H5std_string FILE1("tfilters.h5");
extern "C"
void test_filters()
@@ -274,18 +272,13 @@ void test_filters()
}
} // test_filters()
/*-------------------------------------------------------------------------
* Function: cleanup_filters
*
* Purpose Cleanup temporary test files
*
* Return none
*
* Programmer Quincey Koziol
* September 10, 1999
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
extern "C"

View File

@@ -82,13 +82,13 @@ struct space4_struct {
/* Null dataspace */
int space5_data = 7;
/*-------------------------------------------------------------------------
*
* Function: test_h5s_basic
*
* Purpose Test basic H5S (dataspace) code
*
* Return none
* Return None
*
* Programmer Binh-Minh Ribler (using C version)
* Mar 2001
@@ -98,7 +98,7 @@ int space5_data = 7;
* cases. Since there are no operator<< for 'long long'
* or int64 in VS C++ ostream, I casted the hssize_t values
* passed to verify_val to 'long' as well. If problems
* arises later, this will have to be specificly handled
* arises later, this will have to be specifically handled
* with a special routine.
* April 12, 2011: Raymond Lu
* Starting from the 1.8.7 release, we allow dimension
@@ -214,13 +214,13 @@ static void test_h5s_basic()
}
} // test_h5s_basic()
/*-------------------------------------------------------------------------
*
* Function: test_h5s_scalar_write
*
* Purpose Test scalar H5S (dataspace) writing code
*
* Return none
* Return None
*
* Programmer Binh-Minh Ribler (using C version)
* Mar 2001
@@ -230,7 +230,7 @@ static void test_h5s_basic()
* cases. Since there are no operator<< for 'long long'
* or int64 in VS C++ ostream, I casted the hssize_t values
* passed to verify_val to 'long' as well. If problems
* arises later, this will have to be specificly handled
* arises later, this will have to be specifically handled
* with a special routine.
*-------------------------------------------------------------------------
*/
@@ -278,13 +278,13 @@ static void test_h5s_scalar_write()
}
} // test_h5s_scalar_write()
/*-------------------------------------------------------------------------
*
* Function: test_h5s_scalar_read
*
* Purpose Test scalar H5S (dataspace) reading code
*
* Return none
* Return None
*
* Programmer Binh-Minh Ribler (using C version)
* Mar 2001
@@ -294,7 +294,7 @@ static void test_h5s_scalar_write()
* cases. Since there are no operator<< for 'long long'
* or int64 in VS C++ ostream, I casted the hssize_t values
* passed to verify_val to 'long' as well. If problems
* arises later, this will have to be specificly handled
* arises later, this will have to be specifically handled
* with a special routine.
*-------------------------------------------------------------------------
*/
@@ -340,13 +340,13 @@ static void test_h5s_scalar_read()
} // test_h5s_scalar_read()
/*-------------------------------------------------------------------------
*
* Function: test_h5s_null
*
* Purpose Test null H5S (dataspace) code
*
* Return none
* Return None
*
* Programmer Raymond Lu (using C version)
* May 18, 2004
@@ -356,7 +356,7 @@ static void test_h5s_scalar_read()
* cases. Since there are no operator<< for 'long long'
* or int64 in VS C++ ostream, I casted the hssize_t values
* passed to verify_val to 'long' as well. If problems
* arises later, this will have to be specificly handled
* arises later, this will have to be specifically handled
* with a special routine.
*-------------------------------------------------------------------------
*/
@@ -394,14 +394,14 @@ static void test_h5s_null()
}
} // test_h5s_null()
/*-------------------------------------------------------------------------
*
* Function: test_h5s_compound_scalar_write
*
* Purpose Test scalar H5S (dataspace) writing for compound
* datatypes
*
* Return none
* Return None
*
* Programmer Binh-Minh Ribler (using C version)
* Mar 2001
@@ -411,7 +411,7 @@ static void test_h5s_null()
* cases. Since there are no operator<< for 'long long'
* or int64 in VS C++ ostream, I casted the hssize_t values
* passed to verify_val to 'long' as well. If problems
* arises later, this will have to be specificly handled
* arises later, this will have to be specifically handled
* with a special routine.
*-------------------------------------------------------------------------
*/
@@ -467,14 +467,14 @@ static void test_h5s_compound_scalar_write()
}
} // test_h5s_compound_scalar_write()
/*-------------------------------------------------------------------------
*
* Function: test_h5s_compound_scalar_read
*
* Purpose Test scalar H5S (dataspace) reading for compound
* datatypes
*
* Return none
* Return None
*
* Programmer Binh-Minh Ribler (using C version)
* Mar 2001
@@ -484,7 +484,7 @@ static void test_h5s_compound_scalar_write()
* cases. Since there are no operator<< for 'long long'
* or int64 in VS C++ ostream, I casted the hssize_t values
* passed to verify_val to 'long' as well. If problems
* arises later, this will have to be specificly handled
* arises later, this will have to be specifically handled
* with a special routine.
*-------------------------------------------------------------------------
*/
@@ -541,18 +541,16 @@ static void test_h5s_compound_scalar_read()
}
} // test_h5s_compound_scalar_read()
/*-------------------------------------------------------------------------
*
* Function: test_h5s
*
* Purpose Main dataspace testing routine
*
* Return none
* Return None
*
* Programmer Binh-Minh Ribler (using C version)
* Mar 2001
*
* Modifications:
*-------------------------------------------------------------------------
*/
extern "C"
@@ -575,13 +573,7 @@ void test_h5s()
*
* Purpose Cleanup temporary test files
*
* Return none
*
* Programmer Albert Cheng
* July 2, 1998
*
* Modifications:
*
* Return None
*-------------------------------------------------------------------------
*/
extern "C"

View File

@@ -78,23 +78,25 @@ typedef struct {
int iter_strcmp(const void *s1, const void *s2);
/****************************************************************
**
** iter_strcmp(): String comparison routine for qsort
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: iter_strcmp
*
* Purpose String comparison routine for qsort
*-------------------------------------------------------------------------
*/
int iter_strcmp(const void *s1, const void *s2)
{
return(HDstrcmp(*(const char * const *)s1,*(const char * const *)s2));
}
/****************************************************************
**
** liter_cb(): Custom link iteration callback routine.
**
****************************************************************/
static herr_t
liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t H5_ATTR_UNUSED *link_info, void *op_data)
/*-------------------------------------------------------------------------
* Function: liter_cb
*
* Purpose Custom link iteration callback routine
*-------------------------------------------------------------------------
*/
static herr_t liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t H5_ATTR_UNUSED *link_info, void *op_data)
{
iter_info *info = (iter_info *)op_data;
static int count = 0;
@@ -123,6 +125,7 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t H5_ATTR_
} /* end switch */
} /* end liter_cb() */
/*-------------------------------------------------------------------------
* Function: test_iter_group
*
@@ -133,9 +136,6 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t H5_ATTR_
*
* Programmer Binh-Minh Ribler
* Friday, September 9, 2016
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_iter_group(FileAccPropList& fapl)
@@ -348,13 +348,13 @@ static void test_iter_group(FileAccPropList& fapl)
#endif
} /* test_iter_group() */
/****************************************************************
**
** printelems(): Open an attribute and verify that it has a
** the correct name
**
****************************************************************/
/*-------------------------------------------------------------------------
* Function: printelems
*
* Purpose Open an attribute and verify that it has a the correct name
*-------------------------------------------------------------------------
*/
const H5std_string FILE_NAME("titerate.h5");
const H5std_string GRP_NAME("/Group_A");
const H5std_string FDATASET_NAME("file dset");
@@ -386,6 +386,7 @@ void printelems(const Group& group, const H5std_string& dsname, const H5std_stri
}
}
/*-------------------------------------------------------------------------
* Function: test_HDFFV_9920
*
@@ -393,9 +394,6 @@ void printelems(const Group& group, const H5std_string& dsname, const H5std_stri
*
* Programmer Binh-Minh Ribler
* Friday, September 9, 2016
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_HDFFV_9920()
@@ -444,7 +442,7 @@ static void test_HDFFV_9920()
}
}
/*-------------------------------------------------------------------------
* Function: test_iterate
*
@@ -455,9 +453,6 @@ static void test_HDFFV_9920()
*
* Programmer Binh-Minh Ribler
* Tuesday, September 6, 2016
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
extern "C"
@@ -476,17 +471,13 @@ void test_iterate()
} // test_iterate
/*-------------------------------------------------------------------------
* Function: cleanup_iterate
*
* Purpose Cleanup temporary test files
*
* Return none
*
* Programmer (use C version)
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
extern "C"

View File

@@ -323,14 +323,9 @@ static const char *FILENAME[] = {
* Purpose Test building a file with assorted links.
*
* Return Success: 0
*
* Failure: -1
*
* Programmer Binh-Minh Ribler
* October 16, 2009
*
* Modifications:
*
* October 16, 2009
*-------------------------------------------------------------------------
*/
static void test_basic_links(hid_t fapl_id, hbool_t new_format)
@@ -414,6 +409,11 @@ static void test_basic_links(hid_t fapl_id, hbool_t new_format)
H5File file(filename, H5F_ACC_RDWR, FileCreatPropList::DEFAULT, fapl);
// Verify link existence
if(file.nameExists("dset1", LinkAccPropList::DEFAULT) != TRUE)
throw InvalidActionException("H5File::nameExists", "dset1 doesn't exist");
if(file.nameExists("grp1/soft", LinkAccPropList::DEFAULT) != TRUE)
throw InvalidActionException("H5File::nameExists", "grp1/soft doesn't exist");
// Deprecated
if(file.exists("dset1", LinkAccPropList::DEFAULT) != TRUE)
throw InvalidActionException("H5File::exists", "dset1 doesn't exist");
if(file.exists("grp1/soft", LinkAccPropList::DEFAULT) != TRUE)
@@ -432,7 +432,369 @@ static void test_basic_links(hid_t fapl_id, hbool_t new_format)
{
issue_fail_msg("test_basic_links()", __LINE__, __FILE__, E.getCDetailMsg());
}
}
} // test_basic_links
/*-------------------------------------------------------------------------
* Function: test_lcpl
*
* Purpose: Tests link creation property lists, specifically, the
* character encoding property.
*
* Return: Success: 0
* Failure: number of errors
* March, 2018
*-------------------------------------------------------------------------
*/
const H5std_string GROUP1NAME("First_group");
const H5std_string GROUP2NAME("Second_group");
static void
test_lcpl(hid_t fapl_id, hbool_t new_format)
{
H5L_info_t linfo;
char filename[1024];
hsize_t dims[2];
if(new_format)
SUBTEST("Link creation property lists (w/new group format)")
else
SUBTEST("Link creation property lists")
try
{
FileAccPropList fapl(fapl_id);
// Create a new file.
h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
H5File file(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
// Create and link a group with the default LCPL.
Group grp_1(file.createGroup(GROUP1NAME));
grp_1.close();
// Check that its character encoding is the default.
linfo = file.getLinkInfo(GROUP1NAME);
if(linfo.cset != H5T_CSET_ASCII)
throw InvalidActionException("H5Lget_info", "Character encoding is not default");
// Create and commit a datatype with the default LCPL.
IntType dtype(PredType::NATIVE_INT);
dtype.commit(file, "/type");
dtype.close();
// Check that its character encoding is the default.
linfo = file.getLinkInfo("/type");
verify_val(linfo.cset, H5T_CSET_ASCII, "Character encoding is not default", __LINE__, __FILE__);
// Create a simple dataspace.
dims[0] = H5L_DIM1;
dims[1] = H5L_DIM2;
DataSpace dspace(2 ,dims);
// Create a dataset using the default LCPL.
DataSet dset(file.createDataSet("/dataset", PredType::NATIVE_INT, dspace));
dset.close();
// Check that its character encoding is the default.
linfo = file.getLinkInfo("/dataset");
verify_val(linfo.cset, H5T_CSET_ASCII, "Character encoding is not default", __LINE__, __FILE__);
// Create a link creation property list with the UTF-8 character encoding.
LinkCreatPropList lcpl;
lcpl.setCharEncoding(H5T_CSET_UTF8);
// Create and link a group with the new LCPL.
Group grp_2(file.createGroup(GROUP2NAME, lcpl));
grp_2.close();
// Check that its character encoding is UTF-8.
linfo = file.getLinkInfo(GROUP2NAME);
verify_val(linfo.cset, H5T_CSET_UTF8, "Character encoding is not UTF-8", __LINE__, __FILE__);
PASSED();
} // end of try block
catch (Exception& E)
{
issue_fail_msg("test_lcpl()", __LINE__, __FILE__, E.getCDetailMsg());
}
} // end test_lcpl()
/*-------------------------------------------------------------------------
* Function: test_move
*
* Purpose: Tests wrappers of H5Lmove()
*
* Return: Success: 0
* Failure: number of errors
* March, 2018
*-------------------------------------------------------------------------
*/
static void
test_move(hid_t fapl_id, hbool_t new_format)
{
char filename[1024];
if(new_format)
SUBTEST("Group::moveLink (w/new group format)")
else
SUBTEST("Group::moveLink")
try
{
FileAccPropList fapl(fapl_id);
// Create two new files
h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
H5File file_a(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
h5_fixname(FILENAME[1], fapl_id, filename, sizeof filename);
H5File file_b(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
// Create groups in first file
Group grp_1(file_a.createGroup(GROUP1NAME));
Group grp_2(file_a.createGroup(GROUP2NAME));
Group grp_move(grp_1.createGroup("group_move"));
// Create hard and soft links
grp_1.link(H5L_TYPE_HARD, "group_move", "hard");
grp_2.link(H5L_TYPE_SOFT, "/First_group/group_copy", "soft");
// Move a group across files, should fail
try {
grp_1.moveLink("group_move", file_b, "group_new_name");
// Should throw an exception but didn't
H5_FAILED();
cerr << " Group group_move should not be moved across files" << endl;
} catch (Exception& E) {
// expected
}
// Move a soft link across files, should succeed
grp_2.moveLink("soft", file_b, "soft_new_name");
if(file_b.exists("soft_new_name") != TRUE)
throw InvalidActionException("H5File::exists", "grp1/soft doesn't exist");
// Move a group across groups in the same file while renaming it
grp_1.moveLink("group_move", grp_2, "group_new_name");
// Open the group just moved to the new location. */
Group moved_grp = grp_2.openGroup("group_new_name");
moved_grp.close();
// Verify that the group is no longer in the original location
try {
moved_grp = grp_1.openGroup("group_move");
// Should throw an exception but didn't
H5_FAILED();
cerr << " Group group_move should not be in original location" << endl;
} catch (Exception& E) {
// expected
}
// Use H5Lmove to rename a group without moving it
H5std_string new_name("group_new_name");
H5std_string newer_name("group_newer_name");
grp_2.moveLink(new_name, newer_name);
// Open the group
moved_grp = grp_2.openGroup("group_newer_name");
moved_grp.close();
// Use H5Lmove to move a group without renaming it
grp_2.moveLink(newer_name, grp_1, newer_name);
// Open the group
moved_grp = grp_1.openGroup("group_newer_name");
moved_grp.close();
// Move the group while giving long paths
file_a.moveLink("/First_group/group_newer_name", grp_2, "/Second_group/group_newest_name");
// Open the group just moved to the new location
moved_grp = grp_2.openGroup("group_newest_name");
moved_grp.close();
// Verify that the groups are not in previous locations
try {
moved_grp = grp_1.openGroup("group_newer_name");
moved_grp.close();
H5_FAILED(); // Should throw an exception but didn't
cerr << " Group group_newer_name should not be in GROUP1NAME" << endl;
} catch (Exception& E) {
// expected
}
try {
moved_grp = grp_2.openGroup("group_newer_name");
moved_grp.close();
H5_FAILED(); // Should throw an exception but didn't
cerr << " Group group_newer_name should not be in GROUP2NAME" << endl;
} catch (Exception& E) {
// expected
}
try {
moved_grp = grp_2.openGroup("group_new_name");
moved_grp.close();
H5_FAILED(); // Should throw an exception but didn't
cerr << " Group group_new_name should not be in GROUP2NAME" << endl;
} catch (Exception& E) {
// expected
}
try {
moved_grp = grp_1.openGroup("group_copy");
moved_grp.close();
H5_FAILED(); // Should throw an exception but didn't
cerr << " Group group_copy should not be in GROUP1NAME" << endl;
} catch (Exception& E) {
// expected
}
PASSED();
} // end of try block
catch (Exception& E)
{
issue_fail_msg("test_move()", __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_move
/*-------------------------------------------------------------------------
* Function: test_copy
*
* Purpose: Tests wrappers of H5Lcopy()
*
* Return: Success: 0
* Failure: number of errors
* March, 2018
*-------------------------------------------------------------------------
*/
static void test_copy(hid_t fapl_id, hbool_t new_format)
{
char filename[1024];
if(new_format)
SUBTEST("Group::copyLink (w/new group format)")
else
SUBTEST("Group::copyLink")
try
{
// Create two new files
h5_fixname(FILENAME[0], fapl_id, filename, sizeof filename);
H5File file_a(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl_id);
h5_fixname(FILENAME[1], fapl_id, filename, sizeof filename);
H5File file_b(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl_id);
// Create groups in first file
Group grp_1(file_a.createGroup(GROUP1NAME));
Group grp_2(file_a.createGroup(GROUP2NAME));
Group grp_move(grp_1.createGroup("group_copy"));
// Create hard and soft links
grp_1.link("group_copy", H5L_SAME_LOC, "hard");
grp_2.link("/First_group/group_copy", "soft");
// Copy a group across files, should fail
try {
grp_1.copyLink("group_copy", file_b, "group_new_name");
} catch (Exception& E) {
// expected
}
// Copy a soft link across files, should succeed
grp_2.copyLink("soft", file_b, "soft_new_name");
if (file_b.exists("soft_new_name") != TRUE)
throw InvalidActionException("H5File::exists", "soft_new_name doesn't exist");
// Move a group across groups in the same file while renaming it
H5std_string copy_name("group_copy");
H5std_string new_name("group_new_name");
grp_1.copyLink(copy_name, grp_2, new_name);
// Open the group just moved to the new location.
Group moved_grp(grp_2.openGroup("group_new_name"));
moved_grp.close();
// Verify that the group is also in the original location
moved_grp = grp_1.openGroup("group_copy");
moved_grp.close();
// Create a group in the same location with a different name
grp_2.copyLink("group_new_name", "group_newer_name");
// Open the group
moved_grp = grp_2.openGroup("group_newer_name");
moved_grp.close();
// Verify that the group is also in the original location
moved_grp = grp_2.openGroup("group_new_name");
moved_grp.close();
// Use H5Lcopy to copy to a different location with the same name
grp_2.copyLink("group_newer_name", grp_1, "group_newer_name");
// Open the group
moved_grp = grp_1.openGroup("group_newer_name");
moved_grp.close();
// Verify that the group is still in the previous location
moved_grp = grp_2.openGroup("group_new_name");
moved_grp.close();
// Copy the group while giving long paths
file_a.copyLink("/First_group/group_newer_name", grp_2, "/Second_group/group_newest_name");
// Open the newest group just moved to the new location
moved_grp = grp_2.openGroup("group_newest_name");
moved_grp.close();
// Verify that the group is still in all previous original locations
moved_grp = grp_1.openGroup("group_newer_name");
moved_grp.close();
moved_grp = grp_2.openGroup("group_newer_name");
moved_grp.close();
moved_grp = grp_2.openGroup("group_new_name");
moved_grp.close();
moved_grp = grp_1.openGroup("group_copy");
moved_grp.close();
// Delete "group_newer_name" from group 2, then try to open it.
grp_2.unlink("group_newer_name");
try {
moved_grp = grp_2.openGroup("group_newer_name");
moved_grp.close();
H5_FAILED(); // Should throw an exception but didn't
cerr << " Group group_newer_name should not be in GROUP2NAME" << endl;
} catch (Exception& E) {
// expected
}
// Delete "group_copy" from group 1, then try to open it.
grp_1.unlink("group_copy");
try {
moved_grp = grp_1.openGroup("group_copy");
moved_grp.close();
H5_FAILED(); // Should throw an exception but didn't
cerr << " Group group_copy should not be in GROUP1NAME" << endl;
} catch (Exception& E) {
// expected
}
PASSED();
} // end of try block
catch (Exception& E)
{
issue_fail_msg("test_copy()", __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_copy
/*-------------------------------------------------------------------------
@@ -441,14 +803,9 @@ static void test_basic_links(hid_t fapl_id, hbool_t new_format)
* Purpose Test setting and getting limit of number of links
*
* Return Success: 0
*
* Failure: -1
*
* Programmer Binh-Minh Ribler
* October 16, 2009
*
* Modifications:
*
* October 16, 2009
*-------------------------------------------------------------------------
*/
static void test_num_links(hid_t fapl_id, hbool_t new_format)
@@ -483,6 +840,7 @@ static void test_num_links(hid_t fapl_id, hbool_t new_format)
issue_fail_msg("test_num_links()", __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_num_links
/*-------------------------------------------------------------------------
* Function: test_links
@@ -491,9 +849,7 @@ static void test_num_links(hid_t fapl_id, hbool_t new_format)
*
* Return None
*
* Programmer Binh-Minh Ribler
* October 16, 2009
*
* October 16, 2009
*-------------------------------------------------------------------------
*/
extern "C"
@@ -517,9 +873,10 @@ void test_links()
if((fapl2_id = H5Pcopy(fapl_id)) < 0)
throw Exception("test_links", "H5Pcopy failed");
/* Set the "use the latest version of the format" bounds for creating objects in the file */
/* Set the "use the latest version of the format" bounds for creating
objects in the file */
if(H5Pset_libver_bounds(fapl2_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
throw Exception("test_links", "H5Pset_libver_bounds failed");
throw Exception("test_links", "H5Pset_libver_bounds failed");
/* Loop over using new group format */
for(new_format = FALSE; new_format <= TRUE; new_format++)
@@ -535,124 +892,12 @@ void test_links()
/* General tests... (on both old & new format groups */
// FileAccPropList may be passed in instead of fapl id
test_basic_links(my_fapl_id, new_format);
#if 0
// these tests are from the C test links.c and left here for future
// implementation of H5L API
nerrors += test_basic_links(fapl_id, new_format) < 0 ? 1 : 0;
nerrors += cklinks(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += new_links(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += ck_new_links(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += long_links(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += toomany(my_fapl, new_format) < 0 ? 1 : 0;
/* Test new H5L link creation routine */
nerrors += test_lcpl(my_fapl, new_format);
nerrors += test_move(my_fapl, new_format);
nerrors += test_copy(my_fapl, new_format);
nerrors += test_move_preserves(my_fapl, new_format);
#ifndef H5_NO_DEPRECATED_SYMBOLS
nerrors += test_deprec(my_fapl, new_format);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
nerrors += external_link_root(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_path(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_mult(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_self(envval, my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_pingpong(envval, my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_toomany(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_dangling(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_recursive(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_query(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_unlink_compact(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_unlink_dense(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_move(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_ride(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_closing(envval, my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_endian(new_format) < 0 ? 1 : 0;
nerrors += external_link_strong(my_fapl, new_format) < 0 ? 1 : 0;
/* tests for external link */
nerrors += external_link_env(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_prefix(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_abs_mainpath(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_rel_mainpath(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_cwd(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_abstar(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_abstar_cur(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_reltar(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_chdir(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_set_elink_fapl1(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_set_elink_fapl2(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_set_elink_fapl3(new_format) < 0 ? 1 : 0;
nerrors += external_set_elink_acc_flags(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_set_elink_cb(my_fapl, new_format) < 0 ? 1 : 0;
#ifdef H5_HAVE_WINDOW_PATH
nerrors += external_link_win1(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_win2(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_win3(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_win4(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_win5(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_win6(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_win7(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_win8(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += external_link_win9(my_fapl, new_format) < 0 ? 1 : 0;
#endif
/* These tests assume that external links are a form of UD links,
* so assume that everything that passed for external links
* above has already been tested for UD links.
*/
if(new_format == TRUE) {
nerrors += ud_hard_links(fapl2) < 0 ? 1 : 0; /* requires new format groups */
nerrors += ud_link_reregister(fapl2) < 0 ? 1 : 0; /* requires new format groups */
} /* end if */
nerrors += ud_callbacks(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += ud_link_errors(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += lapl_udata(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += lapl_nlinks(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += linkinfo(my_fapl, new_format) < 0 ? 1 : 0;
/* Misc. extra tests, useful for both new & old format files */
nerrors += link_visit(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += link_visit_by_name(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += obj_visit(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += obj_visit_by_name(my_fapl, new_format) < 0 ? 1 : 0;
nerrors += obj_visit_stop(my_fapl, new_format) < 0 ? 1 : 0;
/* Keep this test last, it's testing files that are used above */
/* do not do this for files used by external link tests */
nerrors += check_all_closed(my_fapl, new_format, EXTSTOP) < 0 ? 1 : 0;
#endif // 0
test_num_links(my_fapl_id, new_format);
test_move(my_fapl_id, new_format);
test_copy(my_fapl_id, new_format);
test_lcpl(my_fapl_id, new_format);
} /* end for */
#if 0
/* New group revision feature tests */
nerrors += corder_create_empty(fapl2) < 0 ? 1 : 0;
/* XXX: when creation order indexing is fully working, go back and add checks
* to these tests to make certain that the creation order values are
* correct.
*/
nerrors += corder_create_compact(fapl2) < 0 ? 1 : 0;
nerrors += corder_create_dense(fapl2) < 0 ? 1 : 0;
nerrors += corder_transition(fapl2) < 0 ? 1 : 0;
nerrors += corder_delete(fapl2) < 0 ? 1 : 0;
nerrors += link_info_by_idx(fapl2) < 0 ? 1 : 0;
nerrors += delete_by_idx(fapl2) < 0 ? 1 : 0;
nerrors += link_iterate(fapl2) < 0 ? 1 : 0;
nerrors += open_by_idx(fapl2) < 0 ? 1 : 0;
nerrors += object_info(fapl2) < 0 ? 1 : 0;
nerrors += group_info(fapl2) < 0 ? 1 : 0;
nerrors += timestamps(fapl2) < 0 ? 1 : 0;
/* Test new API calls on old-style groups */
nerrors += link_info_by_idx_old(fapl) < 0 ? 1 : 0;
nerrors += delete_by_idx_old(fapl) < 0 ? 1 : 0;
nerrors += link_iterate_old(fapl) < 0 ? 1 : 0;
nerrors += open_by_idx_old(fapl) < 0 ? 1 : 0;
nerrors += object_info_old(fapl) < 0 ? 1 : 0;
nerrors += group_info_old(fapl) < 0 ? 1 : 0;
#endif
/* Close 2nd FAPL */
H5Pclose(fapl2_id);
@@ -671,23 +916,22 @@ void test_links()
}
/*-------------------------------------------------------------------------
* Function: cleanup_links
*
* Purpose Cleanup temporary test files
*
* Return none
*
* Programmer Binh-Minh Ribler
* October 16, 2009
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
extern "C"
void cleanup_links()
{
HDremove(FILENAME[0]);
HDremove(FILENAME[1]);
}

View File

@@ -45,6 +45,7 @@ const H5std_string DSET_IN_GRP1_PATH("/Top Group/Dataset_in_Group_1");
const H5std_string DSET_IN_GRP1_2("Dataset_in_Group_1.2");
const H5std_string DSET_IN_GRP1_2_PATH("/Top Group/Sub-Group 1.2/Dataset_in_Group_1.2");
/*-------------------------------------------------------------------------
* Function: test_get_objname
*
@@ -65,9 +66,6 @@ const H5std_string DSET_IN_GRP1_2_PATH("/Top Group/Sub-Group 1.2/Dataset_
*
* Programmer Binh-Minh Ribler
* Friday, March 4, 2014
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_get_objname()
@@ -153,6 +151,7 @@ static void test_get_objname()
}
} // test_get_objname
/*-------------------------------------------------------------------------
* Function: test_existance
*
@@ -173,9 +172,6 @@ static void test_get_objname()
*
* Programmer Binh-Minh Ribler
* Friday, March 4, 2014
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_existance()
@@ -187,18 +183,30 @@ static void test_existance()
H5File file(FILE_OBJECTS, H5F_ACC_RDONLY);
// Check if GROUP1 exists in the file
bool exists = file.exists(GROUP1);
bool exists = file.nameExists(GROUP1);
verify_val(exists, TRUE, "Group::nameExists GROUP1_1", __LINE__, __FILE__);
// Deprecated
exists = file.exists(GROUP1);
verify_val(exists, TRUE, "Group::exists GROUP1_1", __LINE__, __FILE__);
// Open GROUP1
Group grp1 = file.openGroup(GROUP1);
// Check if GROUP1_1 and GROUP1_2 exist in GROUP1
exists = grp1.nameExists(GROUP1_1);
verify_val(exists, TRUE, "Group::nameExists GROUP1_1", __LINE__, __FILE__);
exists = grp1.nameExists(GROUP1_2);
verify_val(exists, TRUE, "Group::nameExists GROUP1_2", __LINE__, __FILE__);
// Deprecated
exists = grp1.exists(GROUP1_1);
verify_val(exists, TRUE, "Group::exists GROUP1_1", __LINE__, __FILE__);
exists = grp1.exists(GROUP1_2);
verify_val(exists, TRUE, "Group::exists GROUP1_2", __LINE__, __FILE__);
// Check if DSET_IN_GRP1 exists in GROUP1
exists = grp1.nameExists(DSET_IN_GRP1);
verify_val(exists, TRUE, "Group::nameExists DSET_IN_GRP1", __LINE__, __FILE__);
// Deprecated
exists = grp1.exists(DSET_IN_GRP1);
verify_val(exists, TRUE, "Group::exists DSET_IN_GRP1", __LINE__, __FILE__);
@@ -206,14 +214,22 @@ static void test_existance()
Group grp1_2 = grp1.openGroup(GROUP1_2);
// Check if DSET_IN_GRP1_2 exists in GROUP1_2
exists = grp1_2.nameExists(DSET_IN_GRP1_2);
verify_val(exists, TRUE, "Group::nameExists DSET_IN_GRP1_2", __LINE__, __FILE__);
// Deprecated
exists = grp1_2.exists(DSET_IN_GRP1_2);
verify_val(exists, TRUE, "Group::exists DSET_IN_GRP1_2", __LINE__, __FILE__);
// Check if a dataset exists given dataset as location with full path name
DataSet dset1 = file.openDataSet(DSET_IN_FILE);
exists = dset1.nameExists("/Top Group/Dataset_in_Group_1");
verify_val(exists, TRUE, "Group::nameExists given dataset with full path name", __LINE__, __FILE__);
exists = grp1_2.nameExists(DSET_IN_GRP1);
verify_val(exists, FALSE, "Group::nameExists DSET_IN_GRP1", __LINE__, __FILE__);
// Deprecated
exists = dset1.exists("/Top Group/Dataset_in_Group_1");
verify_val(exists, TRUE, "Group::exists given dataset with full path name", __LINE__, __FILE__);
exists = grp1_2.exists(DSET_IN_GRP1);
verify_val(exists, FALSE, "Group::exists DSET_IN_GRP1", __LINE__, __FILE__);
@@ -229,6 +245,7 @@ static void test_existance()
}
} // test_existance
/*-------------------------------------------------------------------------
* Function: test_get_objname_ontypes
*
@@ -239,9 +256,6 @@ static void test_existance()
*
* Programmer Binh-Minh Ribler
* March 4, 2014
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_get_objname_ontypes()
@@ -330,6 +344,7 @@ static void test_get_objname_ontypes()
}
} // test_get_objname_ontypes
/*-------------------------------------------------------------------------
* Function: test_get_objtype
*
@@ -340,9 +355,6 @@ static void test_get_objname_ontypes()
*
* Programmer Binh-Minh Ribler
* Friday, March 4, 2014
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
static void test_get_objtype()
@@ -394,6 +406,7 @@ static void test_get_objtype()
issue_fail_msg("test_get_objtype", __LINE__, __FILE__);
}
} // test_get_objtype
/*-------------------------------------------------------------------------
* Function: test_open_object_header
@@ -404,9 +417,6 @@ static void test_get_objtype()
*
* Programmer Binh-Minh Ribler (use C version)
* March, 2017
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
const H5std_string GROUPNAME("group");
@@ -416,6 +426,7 @@ const H5std_string DSETNAME("dataset");
#define RANK 2
#define DIM0 5
#define DIM1 10
static void test_open_object_header()
{
hsize_t dims[2];
@@ -512,21 +523,106 @@ static void test_open_object_header()
cerr << " in Exception" << endl;
issue_fail_msg("test_file_name()", __LINE__, __FILE__, E.getCDetailMsg());
}
} /* test_open_object_header() */
} // test_open_object_header
/*-------------------------------------------------------------------------
* Function: test_objects
* Function: test_getobjectinfo_same_file
*
* Purpose Test that querying the object info for objects in the same
* file will return the same file "number".
*
* Return None
*
* July, 2018
*-------------------------------------------------------------------------
*/
const H5std_string FILE_OBJINFO("tobject_getinfo.h5");
const H5std_string GROUP1NAME("group1");
const H5std_string GROUP2NAME("group2");
static void test_getobjectinfo_same_file()
{
H5O_info_t oinfo1, oinfo2; /* Object info structs */
// Output message about test being performed
SUBTEST("Group::getObjinfo");
try {
// Create a new HDF5 file
H5File file1(FILE_OBJINFO, H5F_ACC_TRUNC);
// Create two groups in the file
Group grp1(file1.createGroup(GROUP1NAME));
Group grp2(file1.createGroup(GROUP2NAME));
// Reset object info
HDmemset(&oinfo1, 0, sizeof(oinfo1));
HDmemset(&oinfo2, 0, sizeof(oinfo2));
// Query the info of two groups and verify that they have the same
// file number
grp1.getObjinfo(oinfo1);
grp2.getObjinfo(oinfo2);
verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getObjinfo", __LINE__, __FILE__);
// Close groups and file
grp1.close();
grp2.close();
file1.close();
// Open the file twice
file1.openFile(FILE_OBJINFO, H5F_ACC_RDWR);
H5File file2(FILE_OBJINFO, H5F_ACC_RDWR);
// Create two groups in the file
grp1 = file1.openGroup(GROUP1NAME);
grp2 = file2.openGroup(GROUP2NAME);
// Reset object info
HDmemset(&oinfo1, 0, sizeof(oinfo1));
HDmemset(&oinfo2, 0, sizeof(oinfo2));
// Query the info of two groups and verify that they have the same
// file number
grp1.getObjinfo(oinfo1);
grp2.getObjinfo(oinfo2);
verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getObjinfo", __LINE__, __FILE__);
// Reset object info
HDmemset(&oinfo1, 0, sizeof(oinfo1));
HDmemset(&oinfo2, 0, sizeof(oinfo2));
file1.getObjinfo(GROUP1NAME, oinfo1);
file1.getObjinfo(GROUP2NAME, oinfo2);
verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getObjectInfo", __LINE__, __FILE__);
// Close groups and files
grp1.close();
grp2.close();
file1.close();
file2.close();
PASSED();
} // end of try block
// catch all other exceptions
catch (Exception& E)
{
cerr << " in Exception " << E.getCFuncName() << "detail: " << E.getCDetailMsg() << endl;
issue_fail_msg("test_file_name()", __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_h5o_getinfo_same_file
/*-------------------------------------------------------------------------
* Function: test_object
*
* Purpose Tests HDF5 object related functionality
*
* Return Success: 0
* Failure: -1
*
* Programmer Binh-Minh Ribler
* Friday, Mar 4, 2014
*
* Modifications:
*
* March 4, 2014
*-------------------------------------------------------------------------
*/
extern "C"
@@ -540,20 +636,17 @@ void test_object()
test_get_objname_ontypes(); // Test get object name from types
test_get_objtype(); // Test get object type
test_open_object_header(); // Test object header functions (H5O)
test_getobjectinfo_same_file(); // Test object info in same file
} // test_objects
} // test_object
/*-------------------------------------------------------------------------
* Function: cleanup_objects
*
* Purpose Cleanup temporary test files
*
* Return none
*
* Programmer (use C version)
*
* Modifications:
*
* Return None
*-------------------------------------------------------------------------
*/
extern "C"

Some files were not shown because too many files have changed in this diff Show More