Compare commits

...

1696 Commits

Author SHA1 Message Date
M. Scot Breitenfeld
35c9af8371 Merge branch 'develop' into parallel_vds_develop 2019-06-25 12:39:35 -05:00
Dana Robinson
1d8f7bf297 Merge pull request #1771 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:H5A_java_test_fix to develop
* commit 'f4015bed9e7ee43468240e734232f9114b749d4f':
  Updated the Java attribute test so that attribute access property lists are created and used correctly.
2019-06-24 17:31:56 -05:00
Allen Byrne
c89696e965 Merge pull request #1768 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f6ddfd7dda8aa95b33ae89b87c70493d5c644dbe':
  Add test cleanup
  Need to shift off two arguments
  HDFFV-9407 add autotools test
  HDFFV-9407 Add test
2019-06-24 16:56:33 -05:00
Dana Robinson
f4015bed9e Updated the Java attribute test so that attribute access
property lists are created and used correctly.
2019-06-24 14:33:54 -07:00
Allen Byrne
f6ddfd7dda Add test cleanup 2019-06-24 16:10:20 -05:00
Allen Byrne
cf3de59f84 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'e35effff7da40fa8b0dda273be9bbdfa9c8c3624':
  Move pragma statements outside of routines, to make older compilers happy.
  Updated H5Tcopy() to get the dataset's datatype through the VOL when that is passed in as the object ID.
2019-06-24 15:55:47 -05:00
Allen Byrne
1891324419 Need to shift off two arguments 2019-06-24 15:45:38 -05:00
Quincey Koziol
e35effff7d Merge pull request #1770 in HDFFV/hdf5 from ~KOZIOL/hdf5:develop to develop
* commit 'cb92adccf61d712ee8c4fcac04c1b297c05ab941':
  Move pragma statements outside of routines, to make older compilers happy.
2019-06-24 15:31:27 -05:00
Allen Byrne
ee07744966 HDFFV-9407 add autotools test 2019-06-24 15:04:07 -05:00
Quincey Koziol
cb92adccf6 Move pragma statements outside of routines, to make older compilers happy. 2019-06-24 14:39:51 -05:00
Dana Robinson
35fd0ec8ce Merge pull request #1767 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:H5Tcopy_dset_vol_fix to develop
* commit '8b00d921d7313cd21947992ab4a007d593c49207':
  Updated H5Tcopy() to get the dataset's datatype through the VOL when that is passed in as the object ID.
2019-06-24 10:55:39 -05:00
Allen Byrne
a03d35dc22 HDFFV-9407 Add test 2019-06-24 07:28:39 -05:00
Allen Byrne
4e06d523d5 Merge pull request #1765 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '21e147da71ef226b712ec4d087af95aad9691dec':
  Fix fortran test and test library linking
2019-06-24 07:26:30 -05:00
Dana Robinson
8b00d921d7 Updated H5Tcopy() to get the dataset's datatype through the VOL when
that is passed in as the object ID.
2019-06-23 22:34:08 -07:00
Allen Byrne
21e147da71 Fix fortran test and test library linking 2019-06-23 13:52:30 -05:00
Quincey Koziol
60dee604cd Merge pull request #1764 in HDFFV/hdf5 from ~KOZIOL/hdf5:feature/update_gcc_flags to develop
Updated CMake bulids, too.

* commit '17ae90917856e4cbab5a2f1c597197ee98802fc7':
  Update GCC 6 & 7 flags for CMake builds
  Move -Wnormalized down into GCC 6.x flags
  Add support for GCC 7.x warnings, update warnhist script to account for them, clean up warnings.
2019-06-22 19:37:18 -05:00
Quincey Koziol
17ae909178 Update GCC 6 & 7 flags for CMake builds 2019-06-22 19:34:47 -05:00
Quincey Koziol
4e3a0c505c Move -Wnormalized down into GCC 6.x flags 2019-06-22 11:41:33 -05:00
Quincey Koziol
128853b58a Merge branch 'develop' into feature/update_gcc_flags 2019-06-22 11:39:25 -05:00
Allen Byrne
df4ec243d4 Merge pull request #1759 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '468b130be3b77fe07b29709cd3fa854422fefa9c':
  Add lib dir for testing plugins
2019-06-22 10:06:58 -05:00
Dana Robinson
2d1017e381 Merge pull request #1763 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:memcpy_buffer_overlap_check to develop
* commit '5a6afeffd44c3ba51ce0e0fa11053c83e0807685':
  Put the memcpy overlap check back into H5MM.
2019-06-21 20:45:11 -05:00
Dana Robinson
5a6afeffd4 Put the memcpy overlap check back into H5MM. 2019-06-21 17:31:56 -07:00
Dana Robinson
7ef0e3f941 Merge pull request #1761 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:t_filters_parallel_bugs to develop
* commit '5aa8bc154dd9fcfdf6c7cbbe0611cb200f0a420e':
  Fixed the heap overflow in t_filters_parallel
2019-06-21 16:56:53 -05:00
Quincey Koziol
3dcc89625c Merge branch 'develop' into feature/update_gcc_flags 2019-06-21 16:56:11 -05:00
Dana Robinson
5aa8bc154d Fixed the heap overflow in t_filters_parallel 2019-06-21 14:13:16 -07:00
Dana Robinson
8eabdd28af Merge pull request #1760 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:t_filters_parallel_bugs to develop
* commit 'b4bd49ffdd5e313cd840698709f44f05ea323104':
  Fixed some low-hanging fruit from -fsanitize in t_filters_parallel.
2019-06-21 15:48:53 -05:00
Dana Robinson
b4bd49ffdd Fixed some low-hanging fruit from -fsanitize in t_filters_parallel. 2019-06-21 13:18:09 -07:00
Allen Byrne
468b130be3 Add lib dir for testing plugins 2019-06-21 13:46:46 -05:00
Quincey Koziol
1ccbdfee58 Add support for GCC 7.x warnings, update warnhist script to account for them,
clean up warnings.
2019-06-21 10:05:34 -05:00
Allen Byrne
5fc5d947f0 Merge pull request #1749 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit 'c24f11070aea56331110628d7645332534e4f227':
  Add H5_HLDLL prefix for windows link
  HDFFV-10805 cleanup examples and test code
  Add missing fortran mods
  HDFFV-10805 Fix test of library libinfo
  Cleanup possible CMake target conflicts
  Correct CMake issues
2019-06-20 17:02:49 -05:00
Allen Byrne
c24f11070a Add H5_HLDLL prefix for windows link 2019-06-20 08:54:49 -05:00
Allen Byrne
1e31a86dab Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '2e973f7e12301975f9d8dfdd5534682525554e77':
  Fix minor typo in H5S_select_iter_release
  Fix memory leak in objcopy test after H5Aread of vlen data
2019-06-20 06:55:29 -05:00
Allen Byrne
b106b883cc HDFFV-10805 cleanup examples and test code 2019-06-20 06:31:01 -05:00
Jordan Henderson
2e973f7e12 Merge pull request #1754 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '6c62678939b66400247dbbf4f9d0c32381a956d1':
  Fix minor typo in H5S_select_iter_release
2019-06-19 18:54:33 -05:00
Jordan Henderson
6c62678939 Fix minor typo in H5S_select_iter_release 2019-06-19 18:06:05 -05:00
Jerome Soumagne
ca1ee7fae1 Merge pull request #1753 in HDFFV/hdf5 from ~JSOUMAGNE/hdf5:topic_fix_objcopy_leak to develop
* commit '552cc1b4a4d1757d64f1b930135e0320a10ce8ce':
  Fix memory leak in objcopy test after H5Aread of vlen data
2019-06-19 16:24:56 -05:00
Allen Byrne
aa9a979fbb Add missing fortran mods 2019-06-19 15:42:35 -05:00
Allen Byrne
72116376b1 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'cc267767af89bf95807afc4e7b25d82638ef4892':
  HDFFV-10616 add h5fc script
2019-06-19 14:05:10 -05:00
Allen Byrne
cc267767af Merge pull request #1751 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '9397d67d91eb628b3b9096501cdab0a33335564c':
  HDFFV-10616 add h5fc script
2019-06-19 14:03:44 -05:00
Jerome Soumagne
552cc1b4a4 Fix memory leak in objcopy test after H5Aread of vlen data 2019-06-19 14:03:21 -05:00
Allen Byrne
08df37027c HDFFV-10805 Fix test of library libinfo 2019-06-19 13:59:49 -05:00
Allen Byrne
11f83e55ec Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'b9ec6a6400a556b1250c249e158c4fffafccd550':
  fixed pass_through vol
2019-06-19 13:55:34 -05:00
Allen Byrne
9397d67d91 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'b9ec6a6400a556b1250c249e158c4fffafccd550':
  fixed pass_through vol
2019-06-19 13:55:27 -05:00
Scot Breitenfeld
b9ec6a6400 Merge pull request #1746 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'a67c578e4b9275fa12b427b6e13021536838a448':
  fixed pass_through vol
2019-06-19 13:52:21 -05:00
Allen Byrne
5c865bd106 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '4d20db43bea4bc4588b20abebef5b0d043dcf31d':
  Fixed a problem in the ohdr test where hard-coded strings passed to H5Awrite() triggered -fsanitize failures.
2019-06-19 11:51:17 -05:00
Allen Byrne
d1b4eda28a HDFFV-10616 add h5fc script 2019-06-19 10:42:37 -05:00
Allen Byrne
562cd7f3ab Cleanup possible CMake target conflicts 2019-06-19 10:35:55 -05:00
Dana Robinson
4d20db43be Merge pull request #1750 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:ohdr_test_memory_issue to develop
* commit '6a1e9a1fbe9606d0dd3452092cab17794e131e64':
  Fixed a problem in the ohdr test where hard-coded strings passed to H5Awrite() triggered -fsanitize failures.
2019-06-19 10:23:04 -05:00
Allen Byrne
2051ee9118 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'c6e21cede788790b39af4a46a8bc15e49e382346':
  Yanked qsort assert
  Switched to HGOTO_DONE() in the links code.
  Updated the HDqsort() macro to ensure we don't pass NULL buffers to qsort(3) in the future.
  Fixed a bug in the links code where iterating over an empty group would pass a NULL pointer to qsort(3), which is undefined behavior.
2019-06-19 10:06:52 -05:00
Dana Robinson
6a1e9a1fbe Fixed a problem in the ohdr test where hard-coded strings passed
to H5Awrite() triggered -fsanitize failures.
2019-06-18 17:28:37 -07:00
Dana Robinson
c6e21cede7 Merge pull request #1748 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:links_iterate_zero_bug to develop
* commit '0a75da70a61d41a0bf20a5c617f3eb678ed0b103':
  Yanked qsort assert
  Switched to HGOTO_DONE() in the links code.
  Updated the HDqsort() macro to ensure we don't pass NULL buffers to qsort(3) in the future.
  Fixed a bug in the links code where iterating over an empty group would pass a NULL pointer to qsort(3), which is undefined behavior.
2019-06-18 17:36:42 -05:00
Allen Byrne
b3b6dcb44a Correct CMake issues 2019-06-18 17:10:46 -05:00
Allen Byrne
8973ba46c6 Merge pull request #1745 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '6cd728796dee1cbc5b1fdf28900b23b7a6870b67':
  HDFFV-10805 Add option to only build shared targets
2019-06-18 16:32:06 -05:00
Dana Robinson
0a75da70a6 Yanked qsort assert 2019-06-18 12:52:42 -07:00
Dana Robinson
b8c24388ec Switched to HGOTO_DONE() in the links code. 2019-06-18 12:27:51 -07:00
Dana Robinson
ea966597d5 Updated the HDqsort() macro to ensure we don't pass NULL buffers to
qsort(3) in the future.
2019-06-18 12:23:06 -07:00
Dana Robinson
d767e6a067 Fixed a bug in the links code where iterating over an empty group would
pass a NULL pointer to qsort(3), which is undefined behavior.

Fixes HDFFV-10829
2019-06-18 11:42:53 -07:00
Allen Byrne
6cd728796d Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '10535e0376d88e218cab782322bfc06f35835f31':
  Reset the other convenience pointer because why no
  Fixed a memory bug where a pointer is used after it's been freed.
2019-06-18 13:42:03 -05:00
Dana Robinson
10535e0376 Merge pull request #1747 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vds_memory_bug to develop
* commit '8d67b440f7d94f1b191ce154a41685bcaa90fd12':
  Reset the other convenience pointer because why no
  Fixed a memory bug where a pointer is used after it's been freed.
2019-06-18 12:52:27 -05:00
Dana Robinson
8d67b440f7 Reset the other convenience pointer because why no 2019-06-18 10:24:58 -07:00
Allen Byrne
d118a47a92 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '712a2a13d8add828d053135a172abb2e819d59ad':
  Fixed a warning in H5CX.c concerning incorrect use of freeing VOL connector info.
  Add H5S_SEL_ITER_SHARE_WITH_DATASPACE selection iterator creation flag, to share dataspace's selection with iterator (and with caution about not modifying or closing the dataspace while the iterator is open).
  Fix misc. typos, etc. from code review
  New hyperslab selection routines and new public selection iterator routines.
2019-06-18 12:12:24 -05:00
Dana Robinson
daaa56de3e Fixed a memory bug where a pointer is used after it's been freed.
This is going to need a release note when it's moved to 1.10.
2019-06-18 09:59:36 -07:00
M. Scot Breitenfeld
a67c578e4b fixed pass_through vol 2019-06-18 11:39:21 -05:00
Dana Robinson
712a2a13d8 Merge pull request #1744 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:H5CX_warning to develop
* commit '579793a7acebcb22d1adc2421a6c1b99618f3ee9':
  Fixed a warning in H5CX.c concerning incorrect use of freeing VOL connector info.
2019-06-18 10:32:52 -05:00
Quincey Koziol
1802d4cb14 Merge pull request #1740 in HDFFV/hdf5 from merge_hyperslab_04 to develop
* commit 'd20139399750246f55c902940987e0048a40c268':
  Add H5S_SEL_ITER_SHARE_WITH_DATASPACE selection iterator creation flag, to share dataspace's selection with iterator (and with caution about not modifying or closing the dataspace while the iterator is open).
  Fix misc. typos, etc. from code review
  New hyperslab selection routines and new public selection iterator routines.
2019-06-18 09:39:00 -05:00
Quincey Koziol
d201393997 Merge branch 'develop' into merge_hyperslab_04 2019-06-18 09:24:14 -05:00
Allen Byrne
e7f16c6f2c HDFFV-10805 Add option to only build shared targets
HDFFV-10805 Add ONLY_SHARED_LIBS option and prefer shared over static
HDFFV-10803 Update FindSZIP.cmake find module
Remove unneeded modules and update java modules
2019-06-18 07:46:25 -05:00
Dana Robinson
579793a7ac Fixed a warning in H5CX.c concerning incorrect use of freeing
VOL connector info.
2019-06-17 20:09:45 -07:00
Quincey Koziol
49f14964c3 Add H5S_SEL_ITER_SHARE_WITH_DATASPACE selection iterator creation flag, to
share dataspace's selection with iterator (and with caution about not modifying
or closing the dataspace while the iterator is open).
2019-06-17 18:19:05 -05:00
Dana Robinson
f73a190d2c Merge pull request #1743 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:warnhist to develop
* commit '72dd01b76bf0f521b95fc3ed10b5c305f7445fc6':
  Added a warning summary script for gcc to bin
2019-06-17 15:57:46 -05:00
Dana Robinson
72dd01b76b Added a warning summary script for gcc to bin 2019-06-17 13:35:08 -07:00
Quincey Koziol
73331f73dd Fix misc. typos, etc. from code review 2019-06-17 10:45:36 -05:00
Quincey Koziol
0656cd47d9 Merge branch 'develop' into merge_hyperslab_04 2019-06-17 10:35:36 -05:00
Vailin Choi
f7c2a75404 Merge pull request #1729 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV-10800-h5ocopy-failure to develop
* commit 'dfdc27b04b2e8bcd1985ba90ce6553d8b3805fda':
  Fix release notes based on feedback from pull request.
  Fix for HDFFV-10800 H5Ocopy failure: The value for the H5F_LIBVER_V18 index in H5O_fill_ver_bounds[], the format version bounds array for fill value message, should be version 3 not 2.
2019-06-17 10:28:58 -05:00
Dana Robinson
cbc95dee3c Merge pull request #1741 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'dbad1589008e2ef9e713c712ca5ffbf7c97159d0':
  Fixed problem with H5Fdelete "test" and split VFD.
2019-06-16 11:40:57 -05:00
Dana Robinson
dbad158900 Fixed problem with H5Fdelete "test" and split VFD. 2019-06-15 21:00:48 -07:00
Quincey Koziol
0525ee122f New hyperslab selection routines and new public selection iterator routines. 2019-06-15 21:25:28 -05:00
Dana Robinson
462b924eca Merge pull request #1739 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:aapl_test to develop
* commit 'ad168f5a7a08f6afd9ee506ce7c884fff994002a':
  Added the creation and use of an attribute access property list to testhdf5.
2019-06-15 17:25:01 -05:00
Dana Robinson
ad168f5a7a Added the creation and use of an attribute access property list to
testhdf5.
2019-06-15 12:44:36 -07:00
Larry Knox
68fb1c9f37 Merge pull request #1738 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '6c3f90ae222a8d4e8d8edf172a6745028209b75c':
  Update MANIFEST for move of h5cc.in and h5redeploy.in to bin directory.
2019-06-15 14:30:03 -05:00
Dana Robinson
c9d41341d6 Merge pull request #1713 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_dev_headers to develop
* commit '9ef56483f6447b60cf7568e2022aa5d8f193427c':
  Added missing DELETE enum value.
  Split VOL connector routines into separate headers: * H5VLconnector.h for terminal connector things * H5VLconnector_passthru.h for passthrough connector things
2019-06-15 14:18:04 -05:00
Larry Knox
6c3f90ae22 Update MANIFEST for move of h5cc.in and h5redeploy.in to bin directory. 2019-06-15 12:34:07 -05:00
Dana Robinson
9ef56483f6 Merge branch 'develop' into vol_dev_headers 2019-06-14 14:18:06 -07:00
Larry Knox
d5a262c424 Merge pull request #1736 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '04dc4ef436b087cfc45030b9183386598d1b4bae':
  Moved h5cc.in and h5redeploy.in from tools/misc to bin directory.  They should always be built and installed whether tools are enabled or disabled.  Also added Makefile.am to bin to build h5redeploy and to install and uninstall them.  h5cc is created from h5cc.in by configure.
2019-06-14 15:20:45 -05:00
Dana Robinson
a2890b5d09 Added missing DELETE enum value. 2019-06-14 13:00:17 -07:00
Dana Robinson
278dc38530 Merge branch 'develop' into vol_dev_headers 2019-06-14 12:48:57 -07:00
Scot Breitenfeld
7b97bcf972 Merge pull request #1737 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'a0f9e97769e1aa4890b1481182f55b8373d431fa':
  fixed linked library for testing
2019-06-14 14:43:09 -05:00
M. Scot Breitenfeld
a0f9e97769 fixed linked library for testing 2019-06-14 14:30:48 -05:00
Dana Robinson
bb9370d777 Merge branch 'develop' into vol_dev_headers
Also moved the wrapper functions from the H5VLconnector.h to
H5VLconnector_passthru.h
2019-06-14 12:23:06 -07:00
Scot Breitenfeld
57d5c207d9 Merge pull request #1734 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit '79916da3036f94a368ba8b29cb18c507e9939e16':
  added missing MOD dependency
  added missing MOD dependency
2019-06-14 13:13:31 -05:00
Vailin Choi
dfdc27b04b Fix release notes based on feedback from pull request. 2019-06-14 12:33:07 -05:00
M. Scot Breitenfeld
79916da303 added missing MOD dependency 2019-06-14 12:08:59 -05:00
Larry Knox
04dc4ef436 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop 2019-06-14 11:14:36 -05:00
Larry Knox
3dfc80a28a Moved h5cc.in and h5redeploy.in from tools/misc to bin directory. They
should always be built and installed whether tools are enabled or
disabled.  Also added Makefile.am to bin to build h5redeploy and
to install and uninstall them.  h5cc is created from h5cc.in by
configure.
2019-06-14 10:47:09 -05:00
M. Scot Breitenfeld
704c83217d Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2019-06-14 09:39:26 -05:00
M. Scot Breitenfeld
0f947f953d added missing MOD dependency 2019-06-14 09:39:18 -05:00
Dana Robinson
650f9e616d Merge pull request #1727 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:H5Fdelete_vol_only to develop
* commit 'bb5e7822f447b8a175e807e2e7bad5e0192394e5':
  Fixed an error string typo
  Added H5Fdelete call and VOL support (but no VFD/native implementation).
2019-06-13 16:58:58 -05:00
Scot Breitenfeld
054059a30c Merge pull request #1733 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'd754a86c2412747be587633fb7e7180570b3f82a':
  updated static vol_connector build
  updated static vol_connector build
  fixed dependencies
  fixed invalid pointer
  removed unregistering native vol
  fix for cycle dependency
2019-06-13 16:24:54 -05:00
M. Scot Breitenfeld
d754a86c24 updated static vol_connector build 2019-06-13 16:23:55 -05:00
M. Scot Breitenfeld
022a3f97b1 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2019-06-13 15:48:01 -05:00
M. Scot Breitenfeld
b08685f503 updated static vol_connector build 2019-06-13 15:47:55 -05:00
M. Scot Breitenfeld
d1b43964b3 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2019-06-13 10:41:39 -05:00
M. Scot Breitenfeld
92bebb782e fixed dependencies 2019-06-13 10:41:31 -05:00
M. Scot Breitenfeld
e5d1da0224 fixed invalid pointer 2019-06-13 10:31:14 -05:00
M. Scot Breitenfeld
c348d7d606 removed unregistering native vol 2019-06-13 09:56:50 -05:00
M. Scot Breitenfeld
46a62130fa fix for cycle dependency 2019-06-13 09:23:12 -05:00
Scot Breitenfeld
9a82fa66d4 Merge pull request #1708 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:H10621 to develop
* commit '0742c15fca95965ed4eb87c6d54f41bb07bd4526':
  makefile clean-up
  move the vol_info to an optional parameter
  added H5Pset_vol
  added vol connector
  added test for vol_connector
  removed H5VL constants
  removed VOLL NULL connector and replaced it with native VOL
  added connector_name test
  added missing files
  add tests
  added more tests
  added missing files
  Implemented VOL APIs and C constants, no tests
  Implemented VOL APIs and C constants, no tests
  initial API impl.
2019-06-12 16:06:21 -05:00
Larry Knox
7e929a9bec Merge pull request #1728 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:bugfix/HDFFV-9976-add-configuration-or-make-options to develop
* commit '6e1dc507240fba447c79827897b099e91b9dd5c1':
  Add release note for enable-tools and enable-tests options.
  Modified Makefile.ams for h5repack, h5watch and gif2h5 to allow disabling tests. Moved h5cc.in from tools/src/misc to src directory to always create h5cc whether or not tools are enabled. Added configuration status of tools and tests to libhdf5.settings.
  Add options to enable or disable building tools and tests.  The default is enabled for each.
2019-06-12 15:09:51 -05:00
Larry Knox
6e1dc50724 Add release note for enable-tools and enable-tests options. 2019-06-12 14:13:48 -05:00
Vailin Choi
8d72e5e3e0 Fix for HDFFV-10800 H5Ocopy failure:
The value for the H5F_LIBVER_V18 index in H5O_fill_ver_bounds[], the format
version bounds array for fill value message, should be version 3 not 2.
2019-06-12 12:55:12 -05:00
Larry Knox
5385f032dd Modified Makefile.ams for h5repack, h5watch and gif2h5 to allow
disabling tests.
Moved h5cc.in from tools/src/misc to src directory to always create h5cc
whether or not tools are enabled.
Added configuration status of tools and tests to libhdf5.settings.
2019-06-12 10:21:41 -05:00
M. Scot Breitenfeld
0742c15fca makefile clean-up 2019-06-12 09:21:59 -05:00
Dana Robinson
bb5e7822f4 Fixed an error string typo 2019-06-11 14:39:39 -07:00
Dana Robinson
436250369a Merge pull request #1725 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5dump_memory_bug to develop
* commit '0cf52525d5b45cc7cf6f89267da76b46ffa75f90':
  H5A__free() was renamed to H5A__shared_free() and now requires attr->shared to not be NULL.
  Fixed a memory issue where unfreed shared attribute dataspace memory tripped an assert in our memory sanity checks.
  Fixed a memory issue where unfreed shared attribute dataspace memory tripped an assert in our memory sanity checks.
2019-06-11 16:37:13 -05:00
Dana Robinson
0cf52525d5 H5A__free() was renamed to H5A__shared_free() and now requires
attr->shared to not be NULL.
2019-06-11 14:14:13 -07:00
M. Scot Breitenfeld
893641990a move the vol_info to an optional parameter 2019-06-11 14:28:10 -05:00
Dana Robinson
3fd4f270fd Merge branch 'h5dump_memory_bug' of https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into h5dump_memory_bug 2019-06-11 11:03:04 -07:00
Dana Robinson
c4ee9ef7c0 Fixed a memory issue where unfreed shared attribute dataspace memory
tripped an assert in our memory sanity checks.

Fixes HDFFV-10774.
2019-06-11 10:59:41 -07:00
Dana Robinson
2bd041f878 Added H5Fdelete call and VOL support (but no VFD/native implementation). 2019-06-11 09:04:23 -07:00
Dana Robinson
5098894ffd Fixed a memory issue where unfreed shared attribute dataspace memory
tripped an assert in our memory sanity checks.

Fixes HDFFV-10774.
2019-06-11 04:09:27 -07:00
Dana Robinson
48b0ff7724 Merge pull request #1721 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:release_fixes to develop
* commit 'a668acfc6cb541cc6afa63f964af3d808d058883':
  Minor tweaks to the VOL function comments to bring them in line with the RM.
2019-06-06 14:37:07 -05:00
Dana Robinson
a668acfc6c Minor tweaks to the VOL function comments to bring them in line with the
RM.
2019-06-06 11:06:04 -07:00
Larry Knox
54a07f556c Add options to enable or disable building tools and tests. The default
is enabled for each.
2019-06-05 23:20:01 -05:00
Larry Knox
f6b15437dd Merge pull request #1720 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '931abe94244c94e106835250e2f723f634a61c8c':
  Move set (MAX_PROC_COUNT 8) back to HPC options files.
  Move check for MPI defined to enable parallel from options scripts in HPC to config/cmake/HDF5options.cmake.
2019-06-05 17:19:19 -05:00
Larry Knox
931abe9424 Move set (MAX_PROC_COUNT 8) back to HPC options files. 2019-06-05 16:44:10 -05:00
Larry Knox
c64bfbd8a0 Move check for MPI defined to enable parallel from options scripts in HPC to config/cmake/HDF5options.cmake. 2019-06-05 16:35:04 -05:00
Allen Byrne
d3a6a9ed8f Merge pull request #1715 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '1ecce0e9bbc07cb3eb6f6bc1fca9d42c9e9c8176':
  Fix minor issues
  Update macro
  Java formatting of args
2019-06-05 15:06:53 -05:00
Dana Robinson
b31a53bfcb Merge pull request #1719 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vipl to develop
* commit 'a18727bc77c90a9925cabbde8d8ec46c757c6254':
  Added a VOL initialization property list type.
2019-06-05 15:04:06 -05:00
Dana Robinson
cb82b6c222 Merge pull request #1718 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:release_fixes to develop
* commit '9557087c0ed7811301610155654bf58d6583e38c':
  Minor warning fixes: * Fixed an error return value in H5Aint.c (NULL --> FAIL) * Added H5VL_FILE_GET_FILENO to H5trace.c
2019-06-05 11:26:12 -05:00
Dana Robinson
a18727bc77 Added a VOL initialization property list type. 2019-06-05 04:34:36 -07:00
Dana Robinson
9557087c0e Minor warning fixes:
* Fixed an error return value in H5Aint.c (NULL --> FAIL)
* Added H5VL_FILE_GET_FILENO to H5trace.c
2019-06-05 04:32:08 -07:00
Neil Fortner
66699f2c7d Merge pull request #1717 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:develop to develop
Complete rework of H5S__hyper_project_intersection. Addresses VDS performance issues raised in HDFFV-10693.

* commit 'd3e242eba1ba98726ed64b14e75f6adee724bea7':
  Minor fixes/improvements for VDS performance improvement (HDFFV-10693).
  Refactor H5S__hyper_project_intersection to operate directly on span trees, improving performance and removing the conditionn that the extents be equal.
  Refactor H5S__hyper_project_intersection to operate directly on span trees, improving performance and removing the conditionn that the extents be equal.
2019-06-04 11:06:23 -05:00
Binh-Minh Ribler
c9ae1cf557 Merge pull request #1693 in HDFFV/hdf5 from ~BMRIBLER/hdf5-bmr:develop to develop
* commit '8a57a683391eed79aca80a7325ef152bb76ad0a6':
  Code improvement Description:     Fixed potential division by zero occurrences and changed an assert to     if statement. Platforms tested:     Linux/64 (jelly)     Linux/64 (platypus)     Darwin (osx1011test)
2019-06-03 13:16:02 -05:00
Neil Fortner
d3e242eba1 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~nfortne2/hdf5_naf into develop 2019-06-03 12:48:02 -05:00
Neil Fortner
45daa3d168 Minor fixes/improvements for VDS performance improvement (HDFFV-10693). 2019-06-03 12:42:22 -05:00
Allen Byrne
1ecce0e9bb Fix minor issues 2019-06-03 10:45:20 -05:00
Neil Fortner
988d6d0844 Refactor H5S__hyper_project_intersection to operate directly on span trees, improving performance and removing the conditionn that the extents be equal. 2019-05-31 19:32:35 -05:00
Neil Fortner
35a8a549f6 Refactor H5S__hyper_project_intersection to operate directly on span
trees, improving performance and removing the conditionn that the
extents be equal.
2019-05-31 19:26:56 -05:00
Allen Byrne
94d3aa7166 Update macro 2019-05-31 12:33:50 -05:00
Allen Byrne
748da4d3e2 Java formatting of args 2019-05-30 15:56:02 -05:00
Dana Robinson
4af633d1c4 Merge pull request #1714 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:H5VLunregister_native to develop
* commit '0afb76228e16e63d72a7dbacdbb894d34fe29722':
  Added code that disallows unregistering the native VOL connector.
2019-05-24 16:04:47 -05:00
Dana Robinson
0afb76228e Added code that disallows unregistering the native VOL connector. 2019-05-24 13:39:45 -07:00
Dana Robinson
d5a8b2a80c Split VOL connector routines into separate headers:
* H5VLconnector.h for terminal connector things
* H5VLconnector_passthru.h for passthrough connector things

Note that these headers are arranged such that they are included in
hdf5.h so VOL connectors only need to include that. The separation into
multiple headers is mainly for readability.
2019-05-24 02:22:08 -07:00
Jerome Soumagne
e1879a23ae Merge pull request #1706 in HDFFV/hdf5 from ~JSOUMAGNE/hdf5:topic_getloc to develop
* commit '982ed75720d7dece10623868cda22c46908baebe':
  Rename H5VL_ID_GET_NAME to H5VL_OBJECT_GET_NAME
2019-05-23 13:51:56 -05:00
Jerome Soumagne
982ed75720 Rename H5VL_ID_GET_NAME to H5VL_OBJECT_GET_NAME
Implement native H5VL_OBJECT_GET_NAME by addr
2019-05-23 13:48:04 -05:00
M. Scot Breitenfeld
2c79243111 added H5Pset_vol 2019-05-22 14:09:17 -05:00
Jordan Henderson
f37a17a6ce Merge pull request #1709 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '802b2927254b1de163589b1e4eaced47ee81ad07':
  Assign NULL to func_name/file_name/desc error entry pointers when clearing error stack
  Avoid clearing error stack when calling H5Eget_msg()
2019-05-21 09:51:36 -05:00
Allen Byrne
2717a0da8b Merge pull request #1710 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '0b086c3db2c6cd376b7bffb3236df1ef158ae80d':
  Correct message command syntax
  Add note about CMake and spaces in paths
2019-05-19 10:59:14 -05:00
Allen Byrne
0b086c3db2 Correct message command syntax 2019-05-17 15:14:20 -05:00
Jordan Henderson
802b292725 Assign NULL to func_name/file_name/desc error entry pointers when clearing error stack 2019-05-17 10:49:27 -05:00
Jordan Henderson
04f171d0cb Avoid clearing error stack when calling H5Eget_msg() 2019-05-17 10:48:04 -05:00
M. Scot Breitenfeld
4673a34825 added vol connector 2019-05-16 16:22:05 -05:00
M. Scot Breitenfeld
5e3dfa8bbe added test for vol_connector 2019-05-16 15:33:16 -05:00
M. Scot Breitenfeld
1f505e5ab2 removed H5VL constants 2019-05-16 15:20:32 -05:00
M. Scot Breitenfeld
32c4900e89 removed VOLL NULL connector and replaced it with native VOL 2019-05-16 15:05:12 -05:00
Allen Byrne
03da97d792 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '6eaef5ebd61b8019f66f51d3fe74ec3c1b1d4f0f':
  Reorder lines in HDF5config.cmake so that additions to end of $HPC-HDF5options scripts will take precedence.
  updated -E option
  remove -M option
  added -M HPC to ctest command
  fixed missing paralle test
  Adding cross-compilation for theta (ANL) and qsub (COBALT) batch controls.
2019-05-14 14:55:12 -05:00
Allen Byrne
6eaef5ebd6 Merge pull request #1705 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '9406278103a7b72d3eacea9fbeaadbf34bf7e43a':
  Reorder lines in HDF5config.cmake so that additions to end of $HPC-HDF5options scripts will take precedence.
2019-05-14 14:51:21 -05:00
Larry Knox
9406278103 Reorder lines in HDF5config.cmake so that additions to end of $HPC-HDF5options scripts will take precedence. 2019-05-14 13:52:25 -05:00
Scot Breitenfeld
ef20b65be7 Merge pull request #1703 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit '6546c764d3d39028d2ec61da236cc69b44414127':
  updated -E option
  remove -M option
2019-05-10 16:07:27 -05:00
M. Scot Breitenfeld
6546c764d3 updated -E option 2019-05-10 16:07:12 -05:00
M. Scot Breitenfeld
b4b83f6733 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2019-05-10 15:51:27 -05:00
M. Scot Breitenfeld
44fdc3bf96 remove -M option 2019-05-10 15:45:47 -05:00
Scot Breitenfeld
5c5f6d9942 Merge pull request #1701 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit '19d2cea9aec648eb3c609dee4d2dc9baa101c967':
  added -M HPC to ctest command
2019-05-10 14:41:23 -05:00
M. Scot Breitenfeld
19d2cea9ae added -M HPC to ctest command 2019-05-10 14:34:56 -05:00
Scot Breitenfeld
c23118aff1 Merge pull request #1700 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'd786bedd18e6d521e240aa78bb633b66f8f975c8':
  fixed missing paralle test
2019-05-10 12:15:59 -05:00
M. Scot Breitenfeld
d786bedd18 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2019-05-10 12:13:31 -05:00
M. Scot Breitenfeld
aaacc50f64 fixed missing paralle test 2019-05-10 12:13:25 -05:00
Scot Breitenfeld
5b4fecaa39 Merge pull request #1699 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'cf6f2f039d8e1c98bdd9690357e2b4670f23ae4e':
  Adding cross-compilation for theta (ANL) and qsub (COBALT) batch controls.
2019-05-10 09:01:50 -05:00
M. Scot Breitenfeld
cf6f2f039d Adding cross-compilation for theta (ANL) and qsub (COBALT) batch controls. 2019-05-09 16:45:22 -05:00
Allen Byrne
7fdc2f7e20 Add note about CMake and spaces in paths 2019-05-07 10:03:20 -05:00
Larry Knox
68e34f7be1 Merge pull request #1695 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'df35529e3d0529e9df11806d267ef8c4779b79e3':
  Putting ctest command in variable CMD did not work for skipping failing tests.
2019-05-06 17:01:07 -05:00
Larry Knox
df35529e3d Putting ctest command in variable CMD did not work for skipping failing
tests.
2019-05-06 16:38:38 -05:00
Binh-Minh Ribler
8a57a68339 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5-bmr into develop 2019-05-05 00:43:37 -05:00
Binh-Minh Ribler
bdf882ae39 Code improvement
Description:
    Fixed potential division by zero occurrences and changed an assert to
    if statement.
Platforms tested:
    Linux/64 (jelly)
    Linux/64 (platypus)
    Darwin (osx1011test)
2019-05-05 00:41:19 -05:00
Scot Breitenfeld
e0ff0e8dd5 Merge pull request #1692 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '8a4f679fda20577c4528977d0ee9a7e4c5bee055':
  Combine "collective group and dataset write" and "independent group and dataset read" tests into one test.  The second test is dependent on the file created by the first test, and will not pass when run by itself.
2019-05-03 17:09:11 -05:00
Larry Knox
8a4f679fda Combine "collective group and dataset write" and "independent group and
dataset read" tests into one test.  The second test is dependent on the
file created by the first test, and will not pass when run by itself.
2019-05-03 16:08:22 -05:00
Scot Breitenfeld
d3a51964ae Merge pull request #1691 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '813d8fd597b030a248db6316dd98f738c0c61ea8':
  Add final list of single testphdf5 tests
2019-05-02 16:24:46 -05:00
Allen Byrne
813d8fd597 Add final list of single testphdf5 tests 2019-05-02 16:20:15 -05:00
hdftest
c389149d66 Merge pull request #1689 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:develop to develop
* commit 'ff596e9d356713a35dc35d9b5ba0439ed5ca29ac':
  Snapshot version 1.11 release 5.     Update version to 1.11.6.
2019-05-02 16:18:35 -05:00
Scot Breitenfeld
d7c6a99b7b Merge pull request #1690 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b6bebb245b043fae546390c00288a069da785868':
  Pull a test from default testphdf5
2019-05-02 12:23:58 -05:00
Allen Byrne
b6bebb245b Pull a test from default testphdf5 2019-05-02 12:07:37 -05:00
hdftest
ff596e9d35 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~hdftest/hdf5_hft into develop 2019-05-02 10:43:30 -05:00
hdftest
1cec61a775 Snapshot version 1.11 release 5.
Update version to 1.11.6.
2019-05-02 10:42:53 -05:00
Scot Breitenfeld
6991bf332a Merge pull request #1688 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'c643cc05316e11471c4bef30cd09b9d4437f85fd':
  Pull out another failing test
2019-05-02 10:33:49 -05:00
Allen Byrne
c643cc0531 Pull out another failing test 2019-05-02 10:27:49 -05:00
Allen Byrne
2f406b8955 Merge pull request #1687 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'ee35fb8a7fe3804e4146c54020b6e2272ab251e3':
  Change default for HPC
  Correct var usage syntax
2019-05-01 16:42:50 -05:00
Allen Byrne
ee35fb8a7f Change default for HPC 2019-05-01 16:23:08 -05:00
Allen Byrne
c030a7123d Correct var usage syntax 2019-05-01 14:46:27 -05:00
Scot Breitenfeld
c30a24bb16 Merge pull request #1686 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '854223e3fcf5e90ad5fae25ff05deb4276ce001b':
  Add missing default
  Correct varname
  Separate out MPI tests that fail on MPI version
2019-05-01 14:33:21 -05:00
Allen Byrne
854223e3fc Add missing default 2019-05-01 14:09:06 -05:00
Allen Byrne
725f75baa7 Correct varname 2019-05-01 13:24:02 -05:00
Allen Byrne
e0de04d355 Separate out MPI tests that fail on MPI version 2019-05-01 12:31:55 -05:00
Allen Byrne
bbf07128b5 Merge pull request #1685 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '87e491da88d49134e20418733f64a3307b5cd74c':
  HDFFV-10776 missing compiler flags
2019-05-01 09:32:53 -05:00
Allen Byrne
87e491da88 HDFFV-10776 missing compiler flags 2019-04-30 16:42:08 -05:00
Allen Byrne
610f7626ae Merge pull request #1683 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '0a73ce19a4e7f57fe1bb06ca5be8d4697fe079aa':
  Fix Java JUnit-TestH5P failure on 32-bit arch
2019-04-30 15:38:30 -05:00
Jordan Henderson
0a73ce19a4 Fix Java JUnit-TestH5P failure on 32-bit arch 2019-04-30 15:32:37 -05:00
Quincey Koziol
206276d6f4 Merge pull request #1605 in HDFFV/hdf5 from merge_hyperslab_update_01 to develop
* commit '08b009cc4ab2a8d8d289697d6d4688c0e5c53c6e':
  Clean up if-else chain.
  Remove thread-local copy of hyperslab operation generation value.
  Core changes to selection code from the hyperslab_updates branch.
2019-04-29 21:33:17 -05:00
Dana Robinson
803339a432 Merge pull request #1681 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:is_accessible_test_love to develop
* commit '0c896fcdf9ebde870ead2dcee9a82e135554c28d':
  Missed an env check before strcmp.
2019-04-29 17:54:12 -05:00
Quincey Koziol
08b009cc4a Merge remote-tracking branch 'origin/develop' into merge_hyperslab_update_01 2019-04-29 17:51:55 -05:00
Dana Robinson
0c896fcdf9 Missed an env check before strcmp. 2019-04-29 14:50:13 -07:00
Binh-Minh Ribler
3d904f8141 Merge pull request #1667 in HDFFV/hdf5 from ~BMRIBLER/hdf5-bmr:develop to develop
* commit '3bc708078c6da432e68d7c8cda695ad7b794c860':
  Added more info to the function headers.
  Added new C++ wrappers - HDFFV-10622
2019-04-27 23:14:36 -05:00
Quincey Koziol
1a4b236aad Merge pull request #1676 in HDFFV/hdf5 from ~KOZIOL/hdf5:refactor_obj_create_params to develop
* commit '53ffbf4bf89350b5d6b90c11585f39af94209754':
  Cast enum to int, for strict varargs handling.
  Refactor group creation parameters to take them out of the group creation property list and pass them as normal function parameters.
  Warning cleanup
  Refactor link creation parameters from being passing as properties in the link creation property list to vararg function parameters.
  Minor cleanups
  Refactor attribute creation parameters to move parameters out of creation property list and into function parameters.
  A few minor cleanups
  Refactor dataset creation parameters out of the dataset creation property list and pass them as regular function parameters.
2019-04-26 17:45:34 -05:00
Dana Robinson
5c234fb5fd Merge pull request #1677 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:is_accessible_test_love to develop
* commit 'e66bf948a7acba0ddc76239f6d02f17c8b10eb0f':
  Fix for split VFD and file cleanup when testing H5Fis_hdf5 and H5Fis_accessible in tfile.c.
  Improvements to the H5Fis_accessible() and H5Fis_hdf5() tests in tfile.c. * General code tidying. * Expanded tests to work with multi-file VFDs.
2019-04-26 15:59:34 -05:00
Dana Robinson
e66bf948a7 Fix for split VFD and file cleanup when testing H5Fis_hdf5
and H5Fis_accessible in tfile.c.
2019-04-26 12:10:54 -07:00
Allen Byrne
61e171cad3 Merge pull request #1678 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'e2eaac93386feadef194962cb258e660038d39f1':
  ESE-97 add vol_plugin test to CMake builds
2019-04-26 10:01:00 -05:00
Quincey Koziol
53ffbf4bf8 Cast enum to int, for strict varargs handling. 2019-04-25 12:57:23 -05:00
Ray Lu
5b0e8ab4bb Merge pull request #1679 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/HDFFV-10760-skipping-external_env-and-vds_env to develop
* commit '2c9025dcb96e5445ce878fa9e1d05fca738ae328':
  HDFFV-10760 Skipping external_env.c and vds_env.c for CMake to do VOL check and VFD check.  Temporarily skipping external_env.c and vds_env.c for VFD check and VOL check in CMake following the example of links_env. Leave them for future work.
2019-04-25 12:52:07 -05:00
Songyu Lu
2c9025dcb9 HDFFV-10760 Skipping external_env.c and vds_env.c for CMake to do VOL check and VFD check. Temporarily skipping external_env.c and vds_env.c for VFD check and VOL check in CMake following the example of links_env. Leave them for future work. 2019-04-25 11:55:45 -05:00
Allen Byrne
e2eaac9338 ESE-97 add vol_plugin test to CMake builds 2019-04-25 10:44:06 -05:00
Dana Robinson
568c3624de Improvements to the H5Fis_accessible() and H5Fis_hdf5() tests
in tfile.c.
* General code tidying.
* Expanded tests to work with multi-file VFDs.
2019-04-25 01:07:42 -07:00
Quincey Koziol
6d912bf0b5 Refactor group creation parameters to take them out of the group creation
property list and pass them as normal function parameters.
2019-04-25 01:12:46 -05:00
Quincey Koziol
ff0b56fa38 Warning cleanup 2019-04-25 01:12:28 -05:00
Quincey Koziol
b8bb6aec7e Refactor link creation parameters from being passing as properties in the
link creation property list to vararg function parameters.
2019-04-25 00:53:58 -05:00
Quincey Koziol
07c3a39bf5 Minor cleanups 2019-04-25 00:53:16 -05:00
Quincey Koziol
9fadb39656 Refactor attribute creation parameters to move parameters out of creation
property list and into function parameters.
2019-04-24 23:33:56 -05:00
Quincey Koziol
59635ab747 A few minor cleanups 2019-04-24 23:22:28 -05:00
Quincey Koziol
0ca6b1305f Refactor dataset creation parameters out of the dataset creation property
list and pass them as regular function parameters.
2019-04-24 22:31:36 -05:00
M. Scot Breitenfeld
1d6641ee3a added connector_name test 2019-04-24 15:17:10 -05:00
M. Scot Breitenfeld
fc769f425f added missing files 2019-04-24 13:59:26 -05:00
M. Scot Breitenfeld
7dd53873f7 Merge branch 'develop' into H10621 2019-04-24 12:57:30 -05:00
Ray Lu
4fbe80acc2 Merge pull request #1672 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/HDFFV-10658-performance-drop-between-1.8-fix4 to develop
* commit '562e8ec915c18f14390558399186aba7e3ead9c1':
  Changing file names and directory names to avoid possible conflict during parallel 'make check'.
2019-04-23 21:22:59 -05:00
Jordan Henderson
1adec082f2 Merge pull request #1670 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '4a4c0bc3972cde177c0a6e2a191b1fa187846c08':
  Fix issue with H5Iiterate always stopping with an error after the first iteration
2019-04-23 20:10:37 -05:00
Songyu Lu
562e8ec915 Changing file names and directory names to avoid possible conflict during parallel 'make check'. 2019-04-23 16:40:02 -05:00
Jordan Henderson
4a4c0bc397 Fix issue with H5Iiterate always stopping with an error after the first iteration 2019-04-23 14:12:58 -05:00
Quincey Koziol
544a36e75e Merge pull request #1666 in HDFFV/hdf5 from ~KOZIOL/hdf5:unwrap_vol_callback to develop
* commit '62198c2436ac3787afb49fa990d1ba8204264dba':
  Add an 'unwrap' VOL callback, so that connectors can unwrap an underlying object without closing it.  (Especially needed for pass-through connectors)
2019-04-23 11:06:04 -05:00
Binh-Minh Ribler
3bc708078c Added more info to the function headers. 2019-04-22 18:50:33 -05:00
Ray Lu
11dff70dc1 Merge pull request #1668 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/HDFFV-10658-performance-drop-between-1.8-fix3 to develop
* commit '2c47094d4004c916d16667a23efe018db2c0558d':
  Changing file names to avoid possible conflicts during parallel test.
2019-04-22 11:45:06 -05:00
Songyu Lu
2c47094d40 Changing file names to avoid possible conflicts during parallel test. 2019-04-22 10:23:38 -05:00
Binh-Minh Ribler
c3d7708e53 Added new C++ wrappers - HDFFV-10622
Description:
    Added wrappers for H5Pset/get_create_intermediate_group:
        // Specifies in property list whether to create missing
        // intermediate groups
        void setCreateIntermediateGroup(bool crt_intmd_group) const;

        // Determines whether property is set to enable creating missing
        // intermediate groups
        bool getCreateIntermediateGroup() const;
Platforms tested:
    Linux/64 (jelly)
    Linux/64 (platypus)
    Darwin (osx1011test)
2019-04-21 23:18:36 -05:00
Quincey Koziol
62198c2436 Add an 'unwrap' VOL callback, so that connectors can unwrap an underlying
object without closing it.  (Especially needed for pass-through connectors)
2019-04-21 14:45:54 -05:00
Ray Lu
500f6cccbd Merge pull request #1665 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/HDFFV-10658-performance-drop-between-1.8-fix2 to develop
* commit 'f42b6ace1899bd1e720bbdf4873e6f6e61bee39b':
  Changing output file names to avoid possible conflict during parallel build and test, especially on jelly.
2019-04-19 14:01:34 -05:00
Songyu Lu
f42b6ace18 Changing output file names to avoid possible conflict during parallel build and test, especially on jelly. 2019-04-19 12:55:39 -05:00
Ray Lu
73dda77dc7 Merge pull request #1663 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/HDFFV-10658-performance-drop-between-1.8_fix to develop
* commit 'cd9e9a1b5a20617f885ca6dc686625abb8a79a58':
  Minor fix: marking an internal function of the test for export.
2019-04-18 14:50:29 -05:00
Songyu Lu
cd9e9a1b5a Minor fix: marking an internal function of the test for export. 2019-04-18 14:23:24 -05:00
Vailin Choi
11c8c98352 Merge pull request #1654 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV-10579-h5arename-function-fails-when to develop
* commit '53a5c3be903ce7c24d02a6bd3a8d9b07a3f82404':
  Change the checking to H5I_INVALID_HID in test_attr_dense_rename().
  Fix for HDFFV-10579 H5Arename fails when creation order of attributes is tracked. The attribute needs to be removed from the creation order index v2 B-tree before re-inserting the renamed attribute via H5A__dense_insert().
2019-04-18 13:15:14 -05:00
Allen Byrne
80ec7cfd6a Merge pull request #1662 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'cc5f91d1d2b1373fae57afc4e79a530b19343949':
  Fix CMake errors
2019-04-18 11:44:50 -05:00
Allen Byrne
cc5f91d1d2 Fix CMake errors 2019-04-18 11:35:11 -05:00
Ray Lu
bdb11caa53 Merge pull request #1600 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:HDFFV-10658-performance-drop-from-1-8 to develop
* commit 'b5ef82a1786605ae86502bc82086047720b7d4ca': (21 commits)
  Moving the handling of null prefix into H5_combine_path.
  Changing the prefix of external file and VDS from empty string to null for performance improvement.
  Improving the condition checking of empty string.
  Replacing string operation strdup with assignment for empty string.
  Adding back links_env.out which I accidentally removed in my previous commit.
  Taking out two unnecessary diff output files.
  Taking out unnecessary diff files for output.
  Adding some comments.
  Some coding style changes.
  Adding the standard output files for the external_env.c and vds_env.c tests.
  Small correction for my previous commit.
  Forgot to add external_common.c and external_common.h.
  Updated CMake for the splitting of external.c and vds.c.
  Minor fix: removal of unnecessary enum values.
  Minor fixes: updating the test vds_env.c according to the set up of vds.c.
  Left out this file in previous commit.
  HDFFV-10658 - setting and getting properties in API context: 1. switched to use the existing H5F_prefix_open_t for enum type; 2. put the common private function used by external.c and external_env.c into external_common.c
  This commit basically has the following changes: 1. restored the datatype, dataspace, and LCPL of the dataset for VOL connector back to the properties. 2. splitted external.c and vds.c because they called HDsetenv in the program, instead using shell scripts to set the environment variables. 3. changed H5CX_get_vds_prefix and H5CX_get_ext_file_prefix to use H5P_peek instead of H5P_get.
  HDFFV-10658: I left out this file in my previous commit.
  HDFFV-10658: 1. moving HDgetenv to dataset initialization stage to reduce the overhead; 2. restoring the retrieval of three vol properties to H5P_get instead of using API context to prepare for Quincey's upcoming refactoring work.
  ...
2019-04-18 10:25:18 -05:00
Songyu Lu
b5ef82a178 Moving the handling of null prefix into H5_combine_path. 2019-04-17 17:42:01 -05:00
Songyu Lu
fc47e2e07a Changing the prefix of external file and VDS from empty string to null for performance improvement. 2019-04-17 16:53:40 -05:00
Songyu Lu
b90b5be59b Improving the condition checking of empty string. 2019-04-17 12:35:44 -05:00
Quincey Koziol
90efe04bee Merge pull request #1659 in HDFFV/hdf5 from ~KOZIOL/hdf5:vds_set_extent_fix to develop
* commit '659e212e119b4920d2bd41b397cfb0e958817eba':
  Correct set extent operation on VDS to iterate over # of used sub-datasets instead of # of allocated sub-datasets.
2019-04-17 12:31:30 -05:00
Songyu Lu
1c6bce2f9b Replacing string operation strdup with assignment for empty string. 2019-04-17 11:16:51 -05:00
Quincey Koziol
659e212e11 Correct set extent operation on VDS to iterate over # of used sub-datasets
instead of # of allocated sub-datasets.
2019-04-16 18:07:29 -05:00
Vailin Choi
53a5c3be90 Change the checking to H5I_INVALID_HID in test_attr_dense_rename(). 2019-04-16 11:47:13 -05:00
Allen Byrne
1bcad080c1 Merge pull request #1658 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '2420ea11ad510121cc7553378a6bfa6fd8fdcd05':
  Remove conflict symbols
  HDFFV-10741 - remove SKIP_ERRSTK_TESTS option
2019-04-15 15:13:48 -05:00
Allen Byrne
2420ea11ad Remove conflict symbols 2019-04-15 15:03:01 -05:00
Allen Byrne
68bddef35d HDFFV-10741 - remove SKIP_ERRSTK_TESTS option 2019-04-15 14:46:23 -05:00
Larry Knox
4d224f4f19 Merge pull request #1657 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '901c65eb2b102cbe431b82a6f72510b2f417ae6a':
  Fix merge conflicts
2019-04-15 14:36:51 -05:00
Allen Byrne
901c65eb2b Fix merge conflicts 2019-04-15 14:35:30 -05:00
Allen Byrne
685c4e08ae Merge pull request #1656 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '4c9efd70b0e6616fa2551a5a3a9b51bac0e54a1c':
  Fix fortran omission
  Fix java for new H5Fget_info function
2019-04-15 14:31:23 -05:00
Allen Byrne
4c9efd70b0 Fix fortran omission 2019-04-15 14:27:02 -05:00
Dana Robinson
5d3d1da927 Merge pull request #1652 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:check_passthrough_vol to develop
* commit '9ee3d472113fc3e66ef34e40a0990ed07a2824bc':
  Renamed the HDF5_TEST_VOL option to HDF5_TEST_PASSTHROUGH_VOL.
  Renamed the autotools check-vol target to check-passthrough-vol.
2019-04-15 13:43:16 -05:00
Allen Byrne
6bf109d1ae Fix java for new H5Fget_info function 2019-04-15 11:19:29 -05:00
Songyu Lu
6fdf7008c1 Adding back links_env.out which I accidentally removed in my previous commit. 2019-04-15 09:39:57 -05:00
Songyu Lu
bd137d2c59 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~songyulu/hdf5_ray into HDFFV-10658-performance-drop-from-1-8 2019-04-15 09:28:12 -05:00
Quincey Koziol
5696c02a3c Merge pull request #1653 in HDFFV/hdf5 from ~KOZIOL/hdf5:get_fileno to develop
* commit 'd7e1464058515d07b838741f65a77977224814de':
  Add C++, Java, and FORTRAN wrappers and tests for H5Fget_fileno
  Add trace macro.
  Add H5Fget_fileno() API routine.
2019-04-13 23:06:38 -05:00
Quincey Koziol
d7e1464058 Add C++, Java, and FORTRAN wrappers and tests for H5Fget_fileno 2019-04-13 22:58:16 -05:00
Quincey Koziol
4918d443bb Add trace macro. 2019-04-12 18:21:35 -05:00
Vailin Choi
4e05249f98 Fix for HDFFV-10579 H5Arename fails when creation order of attributes is tracked.
The attribute needs to be removed from the creation order index v2 B-tree before
re-inserting the renamed attribute via H5A__dense_insert().
2019-04-12 14:51:37 -05:00
Vailin Choi
66184e567c Merge pull request #3 in ~VCHOI/my_third_fork from develop to bugfix/HDFFV-10579-h5arename-function-fails-when
* commit '52276f3713eec584044bc72d4724507848cfeba0':
  Modifications based on PR feedback: (1) Add H5Sdeprec.c to src/CMakeLists.txt (2) Add test for H5Sencode1.
  Modification for num_elem based on PR feedback.
  HDFFV-10365: Changes as described in the RFC: H5Sencode/H5Sdecode Format Change. This also addresses HDFFV-10255: H5Sencode/decode performance issue.
2019-04-12 13:52:32 -05:00
Quincey Koziol
2eac0fccbc Add H5Fget_fileno() API routine. 2019-04-11 22:22:21 -05:00
Songyu Lu
02cc5ba678 Merge branch 'HDFFV-10658-performance-drop-from-1-8' of https://bitbucket.hdfgroup.org/scm/~songyulu/hdf5_ray into HDFFV-10658-performance-drop-from-1-8 2019-04-11 17:32:00 -05:00
songyulu
0243449188 Taking out two unnecessary diff output files. 2019-04-11 17:23:04 -05:00
Songyu Lu
d6ada6ff1f Taking out unnecessary diff files for output. 2019-04-11 16:50:06 -05:00
Songyu Lu
6e8bd1280a Adding some comments. 2019-04-11 16:10:54 -05:00
Songyu Lu
1d1e96f1dd Some coding style changes. 2019-04-11 15:51:21 -05:00
Dana Robinson
9ee3d47211 Renamed the HDF5_TEST_VOL option to HDF5_TEST_PASSTHROUGH_VOL. 2019-04-11 11:27:12 -07:00
Songyu Lu
c3c3c1e142 Adding the standard output files for the external_env.c and vds_env.c tests. 2019-04-11 12:59:07 -05:00
Dana Robinson
ff51724bdb Renamed the autotools check-vol target to check-passthrough-vol. 2019-04-11 10:46:22 -07:00
Songyu Lu
a58c01aac1 Small correction for my previous commit. 2019-04-11 10:19:45 -05:00
Songyu Lu
c0e05f0747 Forgot to add external_common.c and external_common.h. 2019-04-10 16:48:42 -05:00
Songyu Lu
417cd9da87 Updated CMake for the splitting of external.c and vds.c. 2019-04-10 16:02:28 -05:00
Songyu Lu
bf6479fcee Minor fix: removal of unnecessary enum values. 2019-04-10 11:22:24 -05:00
Songyu Lu
06002f8c22 Minor fixes: updating the test vds_env.c according to the set up of vds.c. 2019-04-10 10:21:38 -05:00
Songyu Lu
c0b13e078e Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~songyulu/hdf5_ray into HDFFV-10658-performance-drop-from-1-8 2019-04-09 18:11:06 -05:00
Songyu Lu
04d07d967a Left out this file in previous commit. 2019-04-09 17:40:24 -05:00
Songyu Lu
477dda3c0d HDFFV-10658 - setting and getting properties in API context:
1. switched to use the existing H5F_prefix_open_t for enum type;
2. put the common private function used by external.c and external_env.c into external_common.c
2019-04-09 16:20:19 -05:00
Vailin Choi
52276f3713 Merge pull request #1645 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV-10365-h5sencode-decode-bug-when-num to develop
* commit '3ccc98e256587c43f6ba5a31a2cf9d922f4e1773':
  Modifications based on PR feedback: (1) Add H5Sdeprec.c to src/CMakeLists.txt (2) Add test for H5Sencode1.
  Modification for num_elem based on PR feedback.
  HDFFV-10365: Changes as described in the RFC: H5Sencode/H5Sdecode Format Change. This also addresses HDFFV-10255: H5Sencode/decode performance issue.
2019-04-08 14:11:28 -05:00
Vailin Choi
3ccc98e256 Modifications based on PR feedback:
(1) Add H5Sdeprec.c to src/CMakeLists.txt
(2) Add test for H5Sencode1.
2019-04-08 12:33:45 -05:00
Songyu Lu
d8ff8da46c Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~songyulu/hdf5_ray into HDFFV-10658-performance-drop-from-1-8 2019-04-08 11:17:59 -05:00
Vailin Choi
c57ae99612 Modification for num_elem based on PR feedback. 2019-04-08 11:09:11 -05:00
Vailin Choi
2886cd9e45 HDFFV-10365: Changes as described in the RFC: H5Sencode/H5Sdecode Format Change.
This also addresses HDFFV-10255: H5Sencode/decode performance issue.
2019-04-06 16:55:14 -05:00
Quincey Koziol
92f30fd3d9 Merge remote-tracking branch 'origin/develop' into merge_hyperslab_update_01 2019-04-06 16:20:55 -05:00
Allen Byrne
74677ba5ce Merge pull request #1637 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '2e2301e683f0aadf3541b596416d04bbc7d690c0':
  Update java m4 to latest
2019-04-06 10:33:05 -05:00
Vailin Choi
bd54c3022b Merge pull request #2 in ~VCHOI/my_third_fork from develop to bugfix/HDFFV-10365-h5sencode-decode-bug-when-num
* commit 'f38fa53fee5e8caf1aa1a5356b48d692eb3a3d59':
  Fix for HDFFV-10271 hyperslab encoding incorrect length.
2019-04-05 22:20:43 -05:00
Vailin Choi
f38fa53fee Merge pull request #1644 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV-10271-version-2-hyperslab-encoding to develop
* commit '7fe665ebff3e86aaf1eef92199f757a5c0d1fe80':
  Fix for HDFFV-10271 hyperslab encoding incorrect length.
2019-04-05 22:18:00 -05:00
Vailin Choi
ace8e1a64f Merge pull request #1 in ~VCHOI/my_third_fork from develop to bugfix/HDFFV-10365-h5sencode-decode-bug-when-num
* commit '227b7131d1e4b5edce1c3eecc9a7e7f560363093':
  Move dataspace selection-specific coding to the callbacks as preparation for the H5Sencode changes.
2019-04-05 22:14:05 -05:00
Vailin Choi
227b7131d1 Merge pull request #1642 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/separate_selection_specific to develop
* commit '4142d8b7d4ac48cffcc2b92af4a54352b329865b':
  Move dataspace selection-specific coding to the callbacks as preparation for the H5Sencode changes.
2019-04-05 22:08:24 -05:00
Vailin Choi
7fe665ebff Fix for HDFFV-10271 hyperslab encoding incorrect length. 2019-04-05 11:34:58 -05:00
Allen Byrne
2e2301e683 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '9e934e75fa9a66bdd95fd3656ca0c19f910123c7':
  Set V112 as the latest format and extend the arrays of version bounds.
2019-04-05 10:36:43 -05:00
Quincey Koziol
ef7f3ef177 Merge remote-tracking branch 'origin/develop' into merge_hyperslab_update_01 2019-04-05 10:35:38 -05:00
Vailin Choi
9e934e75fa Merge pull request #1639 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/add_v112_version_bounds to develop
* commit '0073f198978dea0116bd74816b3119dfeb09144b':
  Set V112 as the latest format and extend the arrays of version bounds.
2019-04-05 10:23:05 -05:00
Allen Byrne
eb3db27532 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '87ddba868fdf0e14d004a697e09c12d0ca949b67':
  Setting API context for fapl and libver_bounnds in preparation for the H5Sencode changes.
2019-04-05 09:36:12 -05:00
Vailin Choi
87ddba868f Merge pull request #1640 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/api_context_fapl_libver to develop
* commit 'c50c2696e8b3885e2966b7e027ba219e65ef3646':
  Setting API context for fapl and libver_bounnds in preparation for the H5Sencode changes.
2019-04-04 23:36:15 -05:00
Vailin Choi
4142d8b7d4 Move dataspace selection-specific coding to the callbacks as preparation for the H5Sencode changes. 2019-04-04 23:31:01 -05:00
Vailin Choi
c50c2696e8 Setting API context for fapl and libver_bounnds in preparation for the H5Sencode changes. 2019-04-04 17:25:28 -05:00
Quincey Koziol
dde0a1c93a Merge remote-tracking branch 'origin/develop' into merge_hyperslab_update_01 2019-04-04 16:45:34 -05:00
Vailin Choi
0073f19897 Set V112 as the latest format and extend the arrays of version bounds. 2019-04-04 16:29:37 -05:00
Songyu Lu
5e7cccb5a2 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~songyulu/hdf5_ray into HDFFV-10658-performance-drop-from-1-8 2019-04-04 13:16:27 -05:00
Allen Byrne
73f01f98cd Update java m4 to latest 2019-04-04 12:59:43 -05:00
Songyu Lu
50d9a397ab This commit basically has the following changes:
1. restored the datatype, dataspace, and LCPL of the dataset for VOL connector back to the properties.
2. splitted external.c and vds.c because they called HDsetenv in the program, instead using shell scripts to set the environment variables.
3. changed H5CX_get_vds_prefix and H5CX_get_ext_file_prefix to use H5P_peek instead of H5P_get.
2019-04-04 11:03:05 -05:00
Quincey Koziol
aa696a4771 Merge pull request #1598 in HDFFV/hdf5 from env_vol_load to develop
* commit 'fc945999d00fc66f3b6251115f8bc13d4b18814c':
  Specify the default VOL connector to use with an environment variable.
2019-04-03 18:09:27 -05:00
Quincey Koziol
fc945999d0 Merge remote-tracking branch 'origin/develop' into env_vol_load 2019-04-03 17:27:10 -05:00
Allen Byrne
3d99a6a793 Merge pull request #1621 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '5774e451dde6410ab2491acda309c43517a49935':
  Add help info
  Update for namespace
  Add namespace option to dependencies
  Correct examples for packaging
  HDFFV-10741 -  add option to skip tool error stack tests
2019-04-03 16:33:06 -05:00
Allen Byrne
5774e451dd Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '7ff1e967b18bf8ba4583b27866b8c29c462af857':
  Correct namespace handling
2019-04-03 15:12:52 -05:00
Allen Byrne
7ff1e967b1 Merge pull request #1635 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '761070f561801a8eb8704a992764c3ad4716ca7c':
  Correct namespace handling
2019-04-03 15:06:28 -05:00
Allen Byrne
761070f561 Correct namespace handling 2019-04-03 15:02:42 -05:00
Allen Byrne
cb0ff923de Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '844f38c6462f42a9a3a6002de6a4acb0520b8fb7':
  Correct entry
  Snapshot version 1.11 release 4. Update version to 1.11.5.
  Allow option to select NAMESPACE
  Correct examples for packaging
2019-04-03 08:56:57 -05:00
Allen Byrne
844f38c646 Merge pull request #1634 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '9f7d66e0f4dfc4b710f91aad26c38287b159ed9c':
  Correct entry
2019-04-03 08:56:03 -05:00
Allen Byrne
9f7d66e0f4 Correct entry 2019-04-03 08:55:11 -05:00
Allen Byrne
bd2317cc11 Add help info 2019-04-03 08:52:28 -05:00
Allen Byrne
bf7a1c1fcd Merge pull request #1626 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit 'b968f9273a30124cb53ab0771fee5de437d20967':
  Allow option to select NAMESPACE
2019-04-02 13:37:20 -05:00
Allen Byrne
cab705c8cb Update for namespace 2019-04-02 12:57:02 -05:00
Allen Byrne
8a09caf90a Add namespace option to dependencies 2019-04-02 12:30:16 -05:00
Larry Knox
a61ba73814 Merge pull request #1630 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:develop to develop
* commit '7a0ac416c9e42a650d99b77feefbb2dc2df9a155':
  Snapshot version 1.11 release 4. Update version to 1.11.5.
2019-04-02 12:20:16 -05:00
hdftest
7a0ac416c9 Snapshot version 1.11 release 4.
Update version to 1.11.5.
2019-04-01 16:11:28 -05:00
Allen Byrne
b968f9273a Allow option to select NAMESPACE 2019-03-28 16:40:45 -05:00
Allen Byrne
c8494e34d1 Merge pull request #1625 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '90a58f2b2f5a612ce7326fbfe3a476e31d148084':
  Correct examples for packaging
2019-03-28 16:37:40 -05:00
Allen Byrne
90a58f2b2f Correct examples for packaging 2019-03-28 16:37:11 -05:00
Allen Byrne
0d6fd55212 Correct examples for packaging 2019-03-28 13:41:31 -05:00
Allen Byrne
6e2e461087 HDFFV-10741 - add option to skip tool error stack tests 2019-03-26 14:00:34 -05:00
Scot Breitenfeld
b530043b7a Merge pull request #1614 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'a1d7a9b8592e8b842b940f43733cc2df5d5d81bb':
  HDFFV-10738 Wrong INTENT for H5LTread_dataset_double_f
2019-03-26 13:30:37 -05:00
M. Scot Breitenfeld
a1d7a9b859 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2019-03-25 10:02:01 -05:00
M. Scot Breitenfeld
b2423350f4 HDFFV-10738 Wrong INTENT for H5LTread_dataset_double_f
Fixed.

Also fixed INTENT issues for H5DS, H5IM and H5TB when reading or getting.
2019-03-25 10:00:31 -05:00
Binh-Minh Ribler
d818edb110 Merge pull request #1610 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_fixbug:develop to develop
* commit 'fe104cc38ffbdb39d3e04da107d86ebfc7e8b622':
  Test improvement Description     Moved the new tests to a more appropriate test function. Platforms tested:     Linux/64 (jelly)
  Fixed HDFFV-10210 and HDFFV-10587 Description:     - Added parameter validation (HDFFV-10210)     - Added detection of division by zero (HDFFV-10587 - CVE-2018-17438)     - Fixed typos in various tests Platforms tested:     Linux/64 (jelly)     Linux/64 (platypus)     Darwin (osx1011test)
2019-03-23 21:10:30 -05:00
Quincey Koziol
7dce8523c1 Merge remote-tracking branch 'origin/develop' into merge_hyperslab_update_01 2019-03-23 11:50:48 -05:00
Songyu Lu
e09e2fc4ad HDFFV-10658: I left out this file in my previous commit. 2019-03-22 10:03:06 -05:00
Songyu Lu
9622aac313 HDFFV-10658: 1. moving HDgetenv to dataset initialization stage to reduce the overhead; 2. restoring the retrieval of three vol properties to H5P_get instead of using API context to prepare for Quincey's upcoming refactoring work. 2019-03-22 09:53:15 -05:00
Dana Robinson
02abb65dde Merge pull request #1611 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:tfile_vfd to develop
* commit 'b66df06dbf607741127137ebfda373890cb37649':
  Changes that show the right way to iterate over enums.
  Changes that show the right way to iterate over enums.
  Used the H5_INC_ENUM macro to squash enum value increment warnings.
2019-03-21 13:21:15 -05:00
Dana Robinson
b66df06dbf Merge branch 'tfile_vfd' of https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into tfile_vfd 2019-03-21 10:19:32 -07:00
Dana Robinson
85e2214d55 Changes that show the right way to iterate over enums. 2019-03-21 10:18:16 -07:00
Dana Robinson
ef8aa13174 Changes that show the right way to iterate over enums. 2019-03-21 10:09:55 -07:00
Binh-Minh Ribler
fe104cc38f Test improvement
Description
    Moved the new tests to a more appropriate test function.
Platforms tested:
    Linux/64 (jelly)
2019-03-21 11:09:17 -05:00
Dana Robinson
97cdcc47e4 Used the H5_INC_ENUM macro to squash enum value increment warnings. 2019-03-21 01:15:09 -07:00
Quincey Koziol
4f8a844a00 Clean up if-else chain. 2019-03-20 17:13:48 -05:00
Quincey Koziol
962fb0ccb8 Merge remote-tracking branch 'origin/develop' into merge_hyperslab_update_01 2019-03-20 17:02:21 -05:00
Allen Byrne
b01b84f245 Merge pull request #1608 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '7a589a0a39bc3b46981f4902e5fc1150c05ecebd':
  Fix CMake error in name
2019-03-20 16:05:30 -05:00
Binh-Minh Ribler
222346f373 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_fixbug into develop 2019-03-20 14:07:40 -05:00
Binh-Minh Ribler
7add52ff4f Fixed HDFFV-10210 and HDFFV-10587
Description:
    - Added parameter validation (HDFFV-10210)
    - Added detection of division by zero (HDFFV-10587 - CVE-2018-17438)
    - Fixed typos in various tests
Platforms tested:
    Linux/64 (jelly)
    Linux/64 (platypus)
    Darwin (osx1011test)
2019-03-20 14:03:48 -05:00
Quincey Koziol
adb0928827 Remove thread-local copy of hyperslab operation generation value. 2019-03-19 16:40:07 -05:00
Quincey Koziol
93b72d60ab Merge remote-tracking branch 'origin/develop' into merge_hyperslab_update_01 2019-03-19 16:20:54 -05:00
Allen Byrne
7a589a0a39 Fix CMake error in name 2019-03-19 14:47:08 -05:00
Dana Robinson
604b67df19 Merge pull request #1607 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '2e867d2a6dd5f330011f20333064aa0c12464d59':
  Commented out memcpy overlap check while we investigate parallel filters issues.
2019-03-18 22:39:30 -05:00
Dana Robinson
2e867d2a6d Commented out memcpy overlap check while we investigate
parallel filters issues.
2019-03-18 19:06:58 -07:00
Dana Robinson
c50b7c4b7e Merge pull request #1606 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '2db272521e2da51663aa65fc9297cd6cf763e641':
  Yanked check for memcpy n > 0
2019-03-17 20:34:15 -05:00
Dana Robinson
2db272521e Yanked check for memcpy n > 0 2019-03-17 16:01:31 -07:00
Quincey Koziol
cda6273737 Merge remote-tracking branch 'origin/develop' into merge_hyperslab_update_01 2019-03-16 23:01:18 -05:00
Dana Robinson
f0d22e54c7 Merge pull request #1604 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '5c80d3d91284bdcd048d9325b1a601d0ddfca8bd':
  - Added H5MMprivate.h #includes where needed - Added casts to quiet H5MM_memcpy warnings - Removed char * casts from HDmemcpy
  Added an H5MM_memcpy call that checks for buffer overlap.
2019-03-16 21:58:38 -05:00
Dana Robinson
5c80d3d912 - Added H5MMprivate.h #includes where needed
- Added casts to quiet H5MM_memcpy warnings
- Removed char * casts from HDmemcpy
2019-03-16 16:02:06 -07:00
Dana Robinson
a98747c0f9 Added an H5MM_memcpy call that checks for buffer overlap. 2019-03-16 08:06:52 -07:00
Quincey Koziol
9d86314f8b Core changes to selection code from the hyperslab_updates branch. 2019-03-15 20:14:41 -05:00
Dana Robinson
d2591ce377 Merge pull request #1602 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:wopen_squash to develop
* commit '0c20c65e2f3abf390ad87c9167daca4cdff2de39':
  Added the HDopen work-around on windows to pio_engine.c
  Adds _wopen support on Windows so that files with UTF-8 names can be opened.
2019-03-15 10:47:02 -05:00
Dana Robinson
0c20c65e2f Added the HDopen work-around on windows to pio_engine.c 2019-03-15 08:45:38 -07:00
Neil Fortner
a0c5d9a1d3 Merge pull request #1594 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:develop to develop
Fix issues with direct chunk operations and the single chunk index.

* commit 'c812a6c9ec5ff440dc405167c54b86fdb18dcfa4':
  Fix issue with direct chunk write not updating the "last chunk" index cache.  Fix issues involving datasets being "no allocated" when they contain cached raw data.
2019-03-15 10:22:12 -05:00
Neil Fortner
c812a6c9ec Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop 2019-03-15 10:20:25 -05:00
Dana Robinson
750b5c2930 Adds _wopen support on Windows so that files with UTF-8 names
can be opened.

Fixes: HDFFV-2714, HDFFV-3914, HDFFV-3895, HDFFV-8237, HDFFV-10413, HDFFV-10691
2019-03-15 00:41:39 -07:00
Jerome Soumagne
0ea7aa89ff Merge pull request #1601 in HDFFV/hdf5 from ~JSOUMAGNE/hdf5:topic_thread_private to develop
* commit 'dc69df49e6a8896606c9e4bd0987613a02f7a25a':
  CMake: fix pthread linking to only be private
2019-03-13 15:25:23 -05:00
Jerome Soumagne
dc69df49e6 CMake: fix pthread linking to only be private 2019-03-13 13:54:35 -05:00
Songyu Lu
594cd93543 HDFFV-10658: setting and getting properties in API context:
1. external file prefix and VDS prefix.
2. the datatype, dataspace, and LCPL of the dataset for VOL connector.
2019-03-13 10:20:30 -05:00
Quincey Koziol
e6b8ebe954 Merge remote-tracking branch 'origin/develop' into env_vol_load 2019-03-12 11:49:03 -05:00
Quincey Koziol
07baf44a86 Merge pull request #1599 in HDFFV/hdf5 from preserve_lib_state to develop
* commit '86598573641dfa27278c9e29df0fa79bd7d8e07f':
  Add API routines to retrieve, restore, reset, and free library state.
2019-03-12 11:48:11 -05:00
Quincey Koziol
8659857364 Add API routines to retrieve, restore, reset, and free library state.
(Primarily for use in the async VOL connector, which has to schedule API
operations for future execution and then restore the state of the library when
the operation actually executes)
2019-03-11 17:29:14 -05:00
M. Scot Breitenfeld
6682f51a11 add tests 2019-03-11 11:34:10 -05:00
M. Scot Breitenfeld
7c927a3590 added more tests 2019-03-11 11:32:49 -05:00
Quincey Koziol
deeb302747 Specify the default VOL connector to use with an environment variable.
This implicitly adds support for changing the VOL connector for command-line
tools or any application linked with the library.

Also, add 'make check-vol' support for all directories, clearing up necessary
issues in testing scripts, etc.
2019-03-09 21:41:38 -06:00
Ray Lu
679b49d43d Merge pull request #1597 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:HDFFV-10705-memory-leak-in-scale-offset-2 to develop
* commit '5f22afff3a05a2c8fc694ddb0c7e1081a660b398':
  Added a note of bug fix for HDFFV-10705.
2019-03-08 14:28:17 -06:00
Songyu Lu
5f22afff3a Added a note of bug fix for HDFFV-10705. 2019-03-08 13:51:27 -06:00
Dana Robinson
a56a97f979 Merge pull request #1595 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'fc3f606d5c30d614b7e6cddaf4d0dafd80987bec':
  Fixed the MANIFEST
2019-03-07 17:47:13 -06:00
Dana Robinson
fc3f606d5c Fixed the MANIFEST 2019-03-07 14:38:11 -08:00
M. Scot Breitenfeld
07fde1e25c Merge branch 'develop' into H10621 2019-03-07 14:47:38 -06:00
Larry Knox
8d2a047c25 Merge pull request #1593 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '775e3740d64ca9a8a31ded673e93815d76387dad':
  Update documents following DHF5 1.10.5 release.
2019-03-07 12:51:27 -06:00
Neil Fortner
faec33960f Fix issue with direct chunk write not updating the "last chunk" index
cache.  Fix issues involving datasets being "no allocated" when they
contain cached raw data.
2019-03-06 16:57:42 -06:00
Quincey Koziol
cdec6ca87f Merge pull request #1592 in HDFFV/hdf5 from dset_ohdr_min_fix to develop
* commit '33db9f56449c974fed6b4a8a19072546bcd31e15':
  Fix typo.
  Move 'minimize dataset object header flag' into API context
2019-03-06 10:18:33 -06:00
Quincey Koziol
33db9f5644 Fix typo. 2019-03-05 17:33:13 -06:00
Larry Knox
775e3740d6 Update documents following DHF5 1.10.5 release. 2019-03-05 17:23:56 -06:00
Quincey Koziol
b8468e6fdb Move 'minimize dataset object header flag' into API context 2019-03-05 10:36:28 -06:00
Ray Lu
5182e73d5e Merge pull request #1588 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:HDFFV-10705-memory-leak-in-scale-offset to develop
* commit 'b23079de3af4bfb7aa0508fb81aacd67a76c2114':
  HDFFV-10705: Fixed memory leak in scale offset filter.
2019-03-01 11:32:14 -06:00
Songyu Lu
b23079de3a HDFFV-10705: Fixed memory leak in scale offset filter. 2019-02-28 14:36:38 -06:00
Allen Byrne
d2dfe6ccbe Merge pull request #1582 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '64f21ec6397d00e45ff4d41e70c5131241be587e':
  Correct CMake examples for a binary install
  Correct varname
2019-02-27 13:34:23 -06:00
Allen Byrne
64f21ec639 Correct CMake examples for a binary install 2019-02-27 11:13:54 -06:00
Allen Byrne
6e77a5800e Correct varname 2019-02-26 10:40:40 -06:00
Quincey Koziol
d0329ea063 Merge pull request #1580 in HDFFV/hdf5 from update_vol_callbacks to develop
* commit 'd6663b95ac7e9e378b24bd721ea4403ca98d4adf':
  Revise "management" VOL callbacks into 'info' and object 'wrap / retrieval' classes.
2019-02-25 10:02:08 -06:00
Quincey Koziol
d6663b95ac Revise "management" VOL callbacks into 'info' and object 'wrap / retrieval'
classes.
2019-02-23 17:02:29 -06:00
Jordan Henderson
7e792d7795 Merge pull request #1571 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '8a4371f69ae07619fa9561431b9ee9df9d5b3e47':
  Minor fix in h5str_sprintf for NULL region references
2019-02-22 08:39:30 -06:00
Jordan Henderson
8a4371f69a Minor fix in h5str_sprintf for NULL region references 2019-02-21 22:39:57 -06:00
Jerome Soumagne
342cad2a3d Merge pull request #1569 in HDFFV/hdf5 from ~JSOUMAGNE/hdf5:topic_threadsafe to develop
* commit 'bcf5c400c06bf06820b25c37eceaa97245f15f1f':
  Fix CMake H5_HAVE_THREADSAFE to set value in H5pubconf.h
2019-02-21 18:18:39 -06:00
Jerome Soumagne
bcf5c400c0 Fix CMake H5_HAVE_THREADSAFE to set value in H5pubconf.h
Add REQUIRED to find_package(Threads)

Link against thread library if static and not WIN32 platform
2019-02-21 16:39:37 -06:00
Dana Robinson
065d63b4a4 Merge pull request #1466 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:c_stdlib_posix_call_cleanup to develop
* commit '32ea4e72f1e85e0e7ff6457aae0bd210e56d1cad':
  C and POSIX call cleanup
2019-02-20 15:41:02 -06:00
Dana Robinson
32ea4e72f1 Merge branch 'develop' into c_stdlib_posix_call_cleanup 2019-02-19 14:49:20 -08:00
Allen Byrne
b901552b1c Merge pull request #1559 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '6d07eb126e63b025199a5fe68f41a42269b5921b':
  Update standard check
  Fix typo
  HDFFV-10703 Update version match logic
  HDFFV-10703 revert pre-3.11 option
  HDFFV-10703 macro vars need quotes
  HDFFV-10703 Update CMake commands to latest standard
  Use correct variable name
2019-02-18 11:02:42 -06:00
Allen Byrne
6d07eb126e Update standard check 2019-02-17 13:56:54 -06:00
Allen Byrne
a27d1b909d Fix typo 2019-02-17 11:17:19 -06:00
Allen Byrne
67bc117efe Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '5ad3891d9b861593ebe25d540bed2d913eb83aba':
  Remove ' ' (typo).
  Code improvement
  Removed an extra "using" statement
  Adding documentation
  More changes to align with incoming selection improvements.
  Added C++ wrapper for H5Ovisit2
  Adding a C++ wrapper
2019-02-17 09:42:00 -06:00
Larry Knox
5ad3891d9b Merge pull request #1558 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'f69e11efa827521231813496a1ca1243dd0e1cba':
  Remove ' ' (typo).
2019-02-16 20:01:26 -06:00
Larry Knox
f69e11efa8 Remove ' ' (typo). 2019-02-16 19:02:44 -06:00
Binh-Minh Ribler
a9283319a9 Merge pull request #1547 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp5:develop to develop
C++ wrapper for H5Ovisit2

* commit '6c212353c45ef84b5c977c6019e4d72263534aea':
  Code improvement
  Removed an extra "using" statement
  Adding documentation
  Added C++ wrapper for H5Ovisit2
  Adding a C++ wrapper
2019-02-16 07:47:46 -06:00
Binh-Minh Ribler
6c212353c4 Code improvement
Description:
    Removed dead code and accidentally leftover code
Platforms tested:
    Linux/64 (jelly) - very minor
2019-02-16 00:47:47 -06:00
Allen Byrne
d16c4f59c2 HDFFV-10703 Update version match logic 2019-02-15 16:40:13 -06:00
Allen Byrne
0116375ed2 HDFFV-10703 revert pre-3.11 option 2019-02-15 16:22:31 -06:00
Allen Byrne
58e6e3e102 HDFFV-10703 macro vars need quotes 2019-02-15 16:04:06 -06:00
Allen Byrne
122b63a5a2 HDFFV-10703 Update CMake commands to latest standard 2019-02-15 15:48:24 -06:00
Quincey Koziol
e1046db0e6 Merge pull request #1548 in HDFFV/hdf5 from merge_hyperslab_updates_04 to develop
* commit '320eaf91b9adb36bb0fed9264d460e4a808200b7':
  More changes to align with incoming selection improvements.
2019-02-15 14:12:16 -06:00
Binh-Minh Ribler
f2f890fd82 Removed an extra "using" statement 2019-02-14 19:40:10 -06:00
Binh-Minh Ribler
dcf93b3ec5 Adding documentation
Description
    Added detail about the argument "fields" of H5Object::visit.
2019-02-14 19:27:02 -06:00
Quincey Koziol
320eaf91b9 More changes to align with incoming selection improvements. 2019-02-14 16:20:32 -06:00
Binh-Minh Ribler
268128e520 Added C++ wrapper for H5Ovisit2 2019-02-14 15:47:24 -06:00
Allen Byrne
6ea0dafa41 Use correct variable name 2019-02-14 15:47:02 -06:00
Binh-Minh Ribler
61abf991a1 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_cpp5 into develop 2019-02-14 15:37:41 -06:00
Binh-Minh Ribler
4a4ec03dfd Adding a C++ wrapper
Description:
    - Added a wrapper for H5Ovisit2 to class H5Object
        // Recursively visit elements reachable from this object.
        void visit(H5_index_t idx_type, H5_iter_order_t order,
                   visit_operator_t user_op, void *op_data, unsigned int fields);
    - Fixed various typos in documentation
Platforms tested:
    Linux/64 (jelly)
    Linux/64 (platypus)
    Darwin (osx1011test)
2019-02-14 15:35:04 -06:00
Allen Byrne
81687043d4 Merge pull request #1544 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b5a4f470cdf7113c0691cca6fb201672c4e1d86d':
  Use STREQUAL
  Add command to build options and check defines
  Skip testing of cache_image test
  CMake if statement correction
2019-02-14 15:28:31 -06:00
Allen Byrne
b5a4f470cd Use STREQUAL 2019-02-14 15:28:02 -06:00
Allen Byrne
d676456b54 Add command to build options and check defines 2019-02-14 15:03:05 -06:00
Allen Byrne
35e9128c7e Skip testing of cache_image test 2019-02-14 12:52:01 -06:00
Allen Byrne
2268685c08 CMake if statement correction 2019-02-14 11:20:17 -06:00
Quincey Koziol
10cdff5ca4 Merge pull request #1540 in HDFFV/hdf5 from merge_hyperslab_changes_01 to develop
* commit 'fb5d1a37c11bca613175a48262a2147e99c9dede':
  Align develop with incoming hyperslab_updates branch changes.
2019-02-13 18:13:18 -06:00
Allen Byrne
40589e28d8 Merge pull request #1542 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b95f05638ce40ccd944248f5865a248f39ef0d10':
  TRILAB-111 fixes for parallel testing
2019-02-13 17:05:25 -06:00
Allen Byrne
b95f05638c TRILAB-111 fixes for parallel testing 2019-02-13 15:53:59 -06:00
Quincey Koziol
fb5d1a37c1 Merge remote-tracking branch 'origin/develop' into merge_hyperslab_changes_01 2019-02-13 10:27:33 -06:00
Larry Knox
50b85e0330 Merge pull request #1539 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '3ed1ac0f1b760fe84ec009de19550d98f0b38071':
  Add missing toolchain include for cross-compile
  KNL option for batch scripts
2019-02-13 09:31:53 -06:00
Allen Byrne
3ed1ac0f1b Add missing toolchain include for cross-compile 2019-02-13 08:24:27 -06:00
Quincey Koziol
b5305b25a6 Align develop with incoming hyperslab_updates branch changes. 2019-02-12 21:51:15 -06:00
Allen Byrne
8c22f41801 KNL option for batch scripts 2019-02-12 15:51:42 -06:00
Jordan Henderson
112b813196 Merge pull request #1534 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '3acd486b83f319579b1c6884c90289b0eb1d44a6':
  Fixes for JNI updates
2019-02-12 13:42:15 -06:00
Jordan Henderson
3acd486b83 Fixes for JNI updates 2019-02-12 11:56:42 -06:00
Jordan Henderson
8f42566f7a Merge pull request #1523 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '8f447bd3564a88738b9a26b1b0ac3bba785efd39':
  Add RELEASE.txt note for collective metadata read fixes
  Fix some collective metadata read issues
2019-02-11 22:24:06 -06:00
Jordan Henderson
8f447bd356 Add RELEASE.txt note for collective metadata read fixes 2019-02-11 19:15:56 -06:00
Jordan Henderson
34508f0620 Merge in latest from develop 2019-02-11 19:13:39 -06:00
Jordan Henderson
65a820ae89 Fix some collective metadata read issues 2019-02-11 18:31:23 -06:00
Allen Byrne
fa83ab9f7c Merge pull request #1533 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '6f71b2cdcf3326b1d7bc67cf664b56d2f4056bfd':
  Refactor mpi test names
2019-02-11 12:47:02 -06:00
Allen Byrne
6f71b2cdcf Refactor mpi test names 2019-02-11 12:42:46 -06:00
Larry Knox
e2b6e72e7c Merge pull request #1530 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'edcbc9966f5c742970ad32eb50a7925fcf7ab677':
  Refactor parallel test names
  Rename parallel tests to start with PAR_
  Distinguish parallel performance tests
  Set the full generator name
  Add new cmake copy file tests to ignore
  Use correct values for other file versions
  CMake script changes to simplify execution
2019-02-11 12:05:24 -06:00
Allen Byrne
edcbc9966f Refactor parallel test names 2019-02-11 12:01:25 -06:00
Allen Byrne
f8d5add80b Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'a3a90e79afda2351f16181ec3592b96caceffbe1':
  Re-write of Java JNI error handling
2019-02-11 11:11:05 -06:00
Allen Byrne
d98faf5703 Rename parallel tests to start with PAR_ 2019-02-11 11:09:43 -06:00
Allen Byrne
a3a90e79af Merge pull request #1532 in HDFFV/hdf5 from ~JHENDERSON/hdf5_merge:develop to develop
* commit 'cc6a61215e508d047ed6aa2daf67475cfe34ee4d':
  Re-write of Java JNI error handling
2019-02-11 11:07:01 -06:00
Jordan Henderson
cc6a61215e Re-write of Java JNI error handling 2019-02-11 10:58:58 -06:00
Allen Byrne
f7bab665bb Distinguish parallel performance tests 2019-02-11 10:53:13 -06:00
Allen Byrne
691b92ff9c Set the full generator name 2019-02-11 10:09:32 -06:00
Allen Byrne
742894ce88 Add new cmake copy file tests to ignore 2019-02-11 08:56:14 -06:00
Allen Byrne
648a21473f Use correct values for other file versions 2019-02-08 21:38:39 -06:00
M. Scot Breitenfeld
c752332bfd Merge branch 'develop' into parallel_vds_develop 2019-02-08 12:00:14 -06:00
Allen Byrne
d0be2f5840 CMake script changes to simplify execution 2019-02-08 10:48:49 -06:00
Quincey Koziol
4300ca6234 Merge pull request #1528 in HDFFV/hdf5 from add_id_type_to_vol_wrap_cb to develop
* commit '163dcebec5d853b720dcb64b5e9828670b963773':
  Add ID type (of eventual hid_t) to the VOL "wrap" callback.
2019-02-07 16:20:26 -06:00
Jordan Henderson
0d1d61951f Merge pull request #1527 in HDFFV/hdf5 from ~JHENDERSON/hdf5_merge:develop to develop
* commit '28b9af4f28df6c0e4f7fbf1ce4a0f50e1797b4d3':
  Fix test issue in testpar/t_dset.c with MPI-2 implementations
2019-02-07 15:11:58 -06:00
Jordan Henderson
28b9af4f28 Fix test issue in testpar/t_dset.c with MPI-2 implementations 2019-02-07 14:31:32 -06:00
Quincey Koziol
163dcebec5 Add ID type (of eventual hid_t) to the VOL "wrap" callback. 2019-02-07 14:31:26 -06:00
Allen Byrne
865e35ea01 Merge pull request #1524 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '36e3d1600a3f9d771cfb9b4475f23c57d4b10280':
  Refactor out timeout values
  Correct name of variable
  Remove F2003 Option and references
  Remove obsolete file
  Update examples version
  Update to example reference version
  Switch OFF if compression source is not available
  Fail configure if SZIP/ZLIB is requested but not found
2019-02-07 12:07:26 -06:00
Allen Byrne
36e3d1600a Refactor out timeout values 2019-02-06 16:41:58 -06:00
Allen Byrne
5ba4266a04 Correct name of variable 2019-02-06 11:02:16 -06:00
Vailin Choi
c7977ec2f8 Merge pull request #1522 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit '7f5741825db0737db5ac46c43009681508a73002':
  Add release notes information.
  Modification based on feedback from pull request.
  Modification based on feedback from pull request.
  There is performance issue when closing an object.  The slow down is due to the search of the "tag_list" to find out the "corked" status of an object. The fix: (1)  Add a counter "num_objs_corked" in the cache structure to track the number of "corked" objects. (2) Skip the search of "tag_list" if the counter is zero i.e. no "corked" objects.
2019-02-06 10:49:51 -06:00
Vailin Choi
7f5741825d Add release notes information. 2019-02-06 10:48:30 -06:00
Allen Byrne
e73197077b Remove F2003 Option and references 2019-02-06 10:10:46 -06:00
Allen Byrne
3ebfd7edd4 Remove obsolete file 2019-02-06 08:45:59 -06:00
Allen Byrne
a476f5348e Update examples version 2019-02-06 08:38:55 -06:00
Allen Byrne
ee9771425f Update to example reference version 2019-02-06 08:37:11 -06:00
Vailin Choi
7d124cb796 Modification based on feedback from pull request. 2019-02-05 18:13:11 -06:00
Vailin Choi
e272e64e74 Modification based on feedback from pull request. 2019-02-05 17:04:04 -06:00
Allen Byrne
abd74c8310 Switch OFF if compression source is not available 2019-02-05 15:44:38 -06:00
Allen Byrne
18e875f75f Fail configure if SZIP/ZLIB is requested but not found 2019-02-05 15:25:30 -06:00
Vailin Choi
34f028070e Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into develop 2019-02-04 22:51:57 -06:00
Vailin Choi
7f718e9ea2 There is performance issue when closing an object. The slow down is due to the search of
the "tag_list" to find out the "corked" status of an object.
The fix:
(1)  Add a counter "num_objs_corked" in the cache structure to track the number
of "corked" objects.
(2) Skip the search of "tag_list" if the counter is zero i.e. no "corked" objects.
2019-02-04 22:30:48 -06:00
Dana Robinson
c7d04ee3af Merge pull request #1520 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:cmake_tweaks to develop
* commit '91c7ff81dcac1af7a7b609698aa69f0c213a6184':
  Added a line for the CMake pread/write option to INSTALL_CMake.txt.
2019-02-04 12:43:25 -06:00
Dana Robinson
91c7ff81dc Added a line for the CMake pread/write option to INSTALL_CMake.txt. 2019-02-04 10:11:59 -08:00
Larry Knox
08001e2f3f Merge pull request #1518 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '6c2a4b728f3c8eadb18d4e10d41bdbd7d1c8f3e8':
  Add LOCAL_BATCH_SCRIPT_ARG variable for submitting account information and other batch command variations with ctest command.
  Add batchscript options that work when running ctest directly.
2019-02-04 08:48:55 -06:00
Larry Knox
6c2a4b728f Add LOCAL_BATCH_SCRIPT_ARG variable for submitting account information
and other batch command variations with ctest command.
2019-02-04 08:46:57 -06:00
Larry Knox
d2624dae03 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop 2019-02-03 21:34:25 -06:00
Larry Knox
dddc940bdf Add batchscript options that work when running ctest directly. 2019-02-03 21:33:16 -06:00
Larry Knox
30df67700c Merge pull request #1517 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'c348d453b583ec9092152e6aef1f7fa9854cf5d9':
  Correct H5DIFF to PH5DIFF in *ctestS.sl.in.cmake list of parallel tests reserved for *ctestP.sl.cmake. Revise options to run batch tests and alternative options for cross compile in HPC/*-HDF5options.cmake.
  Change examples file to zip for CMake zip file.
  Update bin/release for filename changes and HPC-CMake tar file corrections.
  Add new files to MANIFEST. Update permissions for raybsub to 755.
2019-02-02 22:45:55 -06:00
Larry Knox
c348d453b5 Correct H5DIFF to PH5DIFF in *ctestS.sl.in.cmake list of parallel tests
reserved for *ctestP.sl.cmake.
Revise options to run batch tests and alternative options for cross
compile in HPC/*-HDF5options.cmake.
2019-02-02 08:02:48 -06:00
Dana Robinson
2d4f58adf0 Merge pull request #1515 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:pread_vfd_squash to develop
* commit '055208b71c573be3d4b1047b840d4d8b255bc25e':
  Minor tweak to CMake preadwrite entry.
  Updated sec2, log, and core VFDs to use pread/pwrite when available (can be controlled via a configure/CMake option)
2019-02-01 16:01:22 -06:00
Dana Robinson
055208b71c Minor tweak to CMake preadwrite entry. 2019-02-01 13:23:54 -08:00
Dana Robinson
f90e5bdc62 Merge pull request #1516 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:valgrind_fixes to develop
* commit '5f1f231310bcb3278f11a51e1ea47782f6ee3235':
  Updated H5Dio.c comment.
  Fixed a valgrind issue with the unprotect log message. The logging call was placed after the point where the cache entry was freed. The fix was to just use the entry's address directly in the log call instead of the entry itself.
  Fixed a bug revealed by the dtransform test. A datatype transform buffer needed to be calloc'd.
2019-02-01 15:14:15 -06:00
Dana Robinson
5f1f231310 Updated H5Dio.c comment. 2019-02-01 13:12:39 -08:00
Larry Knox
cc7ce0eb8b Change examples file to zip for CMake zip file. 2019-02-01 12:19:28 -06:00
Larry Knox
eb84f922c8 Update bin/release for filename changes and HPC-CMake tar file
corrections.
2019-02-01 10:21:53 -06:00
Larry Knox
5352bf4971 Add new files to MANIFEST.
Update permissions for raybsub to 755.
2019-02-01 08:57:52 -06:00
Larry Knox
b0e202a206 Merge pull request #1508 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'bae744199b69eb7c3f5eda2441cca30cb8c6175f':
  Add more specific batch scripts. Add script raybsub to handle submitting .lsf files on ray with bsub < script.lsf syntax that we couldn't handle with CMake. Add hpc-cmake-tgz option for bin/release.
  Account info can be submitted as an argument to run the batch scripts. Special versions for sandia are not needed.
  Add HDF5options.cmake files for serial and parallel tests on HPC machines (where tests are to be run as batch jobs. Add README_HPC file with instructions for setting up configuration to use batch scripts for running tests on HPC machines and some pointers for cross compiling.
  Remove knl configuration from ctestS.sl.in.cmake. Add sandia batch files with account info.
  Add batch files with batch parameters specific to cori and ray. Release.txt entry for skipping long double dt_arith tests on ppc64.
2019-01-31 14:31:38 -06:00
Larry Knox
bae744199b Add more specific batch scripts.
Add script raybsub to handle submitting .lsf files on ray with bsub <
script.lsf syntax that we couldn't handle with CMake.
Add hpc-cmake-tgz option for bin/release.
2019-01-31 14:22:52 -06:00
Dana Robinson
99d70c494d Fixed a valgrind issue with the unprotect log message. The logging
call was placed after the point where the cache entry was freed.
The fix was to just use the entry's address directly in the log
call instead of the entry itself.
2019-01-31 00:14:11 -08:00
Dana Robinson
90bf59edc5 Fixed a bug revealed by the dtransform test. A datatype transform
buffer needed to be calloc'd.
2019-01-30 23:45:32 -08:00
Dana Robinson
f833001e39 Updated sec2, log, and core VFDs to use pread/pwrite when
available (can be controlled via a configure/CMake option)
2019-01-30 17:32:40 -08:00
Neil Fortner
b561c2fce8 Merge pull request #1513 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:develop to develop
* commit '261c22e0459f63fd81c8942992ffe3668969f0cd':
  Add RELEASE.txt note for unknown message fix (pull request 1448)
2019-01-30 16:49:34 -06:00
Neil Fortner
261c22e045 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~nfortne2/hdf5_naf into develop 2019-01-30 16:48:12 -06:00
Neil Fortner
773c35a664 Add RELEASE.txt note for unknown message fix (pull request 1448) 2019-01-30 16:47:47 -06:00
Larry Knox
252beb50b6 Account info can be submitted as an argument to run the batch scripts.
Special versions for sandia are not needed.
2019-01-28 12:52:14 -06:00
Larry Knox
0ef4c812c7 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop 2019-01-28 12:51:12 -06:00
Larry Knox
277f57d371 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '9149d5a5352de4e0b9a2e57c91525a6cad767760':
  Revert build name setting
2019-01-28 12:49:00 -06:00
Larry Knox
64114e331a Add HDF5options.cmake files for serial and parallel tests on HPC
machines (where tests are to be run as batch jobs.
Add README_HPC file with instructions for setting up configuration
to use batch scripts for running tests on HPC machines and some
pointers for cross compiling.
2019-01-28 12:43:35 -06:00
Allen Byrne
9149d5a535 Merge pull request #1504 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f26ee27b1fd85d192b37d9e45fb6d20f1b7e23db':
  Revert build name setting
2019-01-28 08:24:16 -06:00
Larry Knox
cee36ca40d Remove knl configuration from ctestS.sl.in.cmake.
Add sandia batch files with account info.
2019-01-27 17:55:44 -06:00
Allen Byrne
f26ee27b1f Revert build name setting 2019-01-27 16:55:39 -06:00
Larry Knox
11e74daddd Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop 2019-01-26 16:46:31 -06:00
Larry Knox
b91cb20c69 Add batch files with batch parameters specific to cori and ray.
Release.txt entry for skipping long double dt_arith tests on ppc64.
2019-01-26 16:44:09 -06:00
Binh-Minh Ribler
7447f636a4 Merge pull request #1503 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_fixbug:develop to develop
Added test file for CMake

* commit '55d1931dc6af168adc3804586a0da22287b29187':
  Added test file for CMake
2019-01-26 12:39:15 -06:00
Binh-Minh Ribler
55d1931dc6 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_fixbug into develop 2019-01-26 11:59:45 -06:00
Binh-Minh Ribler
f522479035 Added test file for CMake 2019-01-26 11:58:52 -06:00
Allen Byrne
adc9b8b27a Merge pull request #1499 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'ad906dc708fc803e8c5f17963fafa63591d3cc8d':
  Invalid position of declaration fixed.
  Fix CMake on Windows
2019-01-26 09:48:40 -06:00
Allen Byrne
ad906dc708 Invalid position of declaration fixed. 2019-01-25 15:21:11 -06:00
Dana Robinson
dfaf51fda4 Merge pull request #1500 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:valgrind_fixes to develop
* commit '3fac85c00d6253f7b2c96ca46c7b9718d0203029':
  Fixed a bug identified by valgrind in the cork test.
2019-01-25 12:47:02 -06:00
Dana Robinson
3fac85c00d Fixed a bug identified by valgrind in the cork test. 2019-01-25 09:58:50 -08:00
Allen Byrne
822caec907 Fix CMake on Windows 2019-01-25 11:36:46 -06:00
Binh-Minh Ribler
395cfc9f1b Merge pull request #1498 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_fixbug:develop to develop
* commit '0247f7b78d056b04fa08f74a2d4c4eea37f48d22':
  Added data file for test and updated MANIFEST
2019-01-25 10:47:03 -06:00
Allen Byrne
8f1d895d17 Merge pull request #1496 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '73fcbbee97c6385fb2b5009e5858ae1d6c28b3c3':
  CMake fix
  Java html fix and cmake update
  Update CMake
2019-01-25 08:40:47 -06:00
Allen Byrne
73fcbbee97 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '2fe69e7639198b174da393e47a029d0ac35b31c8':
  Added test for HDFFV-10588
  Fixed HDFFV-10684
  Fixed HDFFV-10586 and HDFFV-10588 Description:     HDFFV-10586 CVE-2018-17434  Divide by zero inh5repack_filters         Added a check for zero value     HDFFV-10588 CVE-2018-17437  Memory leak in H5O_dtype_decode_helper         This is actually an Invalid read issue.  It was found that the         attribute name length in an attribute message was corrupted,         which caused the buffer pointer to be advanced too far and later         caused an invalid read.         Added a check to detect attribute name and its length mismatch.  The         fix is not perfect, but it'll reduce the chance of this issue when a         name length is corrupted or the attribute name is corrupted. Platforms tested:     Linux/64 (jelly)     Linux/64 (platypus)     Darwin (osx1010test)
2019-01-25 08:28:53 -06:00
Binh-Minh Ribler
0247f7b78d Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_fixbug into develop 2019-01-25 00:20:28 -06:00
Binh-Minh Ribler
51e0107d18 Added data file for test and updated MANIFEST 2019-01-25 00:19:16 -06:00
Binh-Minh Ribler
2fe69e7639 Merge pull request #1479 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_fixbug:develop to develop
HDFFV-10586 and HDFFV-10588

* commit '25cd1ab02b9ddaf58a4f5422f4ab4fde411e050a':
  Added test for HDFFV-10588
  Fixed HDFFV-10684
  Fixed HDFFV-10586 and HDFFV-10588 Description:     HDFFV-10586 CVE-2018-17434  Divide by zero inh5repack_filters         Added a check for zero value     HDFFV-10588 CVE-2018-17437  Memory leak in H5O_dtype_decode_helper         This is actually an Invalid read issue.  It was found that the         attribute name length in an attribute message was corrupted,         which caused the buffer pointer to be advanced too far and later         caused an invalid read.         Added a check to detect attribute name and its length mismatch.  The         fix is not perfect, but it'll reduce the chance of this issue when a         name length is corrupted or the attribute name is corrupted. Platforms tested:     Linux/64 (jelly)     Linux/64 (platypus)     Darwin (osx1010test)
2019-01-24 17:07:57 -06:00
Allen Byrne
37f5c682b6 CMake fix 2019-01-24 16:36:47 -06:00
Allen Byrne
62277207a4 Java html fix and cmake update 2019-01-24 15:56:42 -06:00
Binh-Minh Ribler
25cd1ab02b Added test for HDFFV-10588
Platforms tested:
    Linux/64 (jelly)
    Linux/64 (platypus)
    Darwin (osx1010test)
2019-01-24 09:42:19 -06:00
Allen Byrne
41010b8d1e Update CMake 2019-01-23 17:25:41 -06:00
Allen Byrne
f0e2fc6c62 Merge pull request #1491 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f033214796c383a9018dd760e92257dc27d7b852':
  Add clear objects to ignore tests
  Add clear objects to ignore tests
  Add new clear tests to ignore list
  Cleanup variable names
  HDFFV-10685 Correct syntax
  HDFFV-10685 Corrected version
  HDFFV-10685 Always set Mac version flags - use soversion
2019-01-22 16:59:50 -06:00
Allen Byrne
f033214796 Add clear objects to ignore tests 2019-01-22 16:30:37 -06:00
Allen Byrne
182e5f7556 Add clear objects to ignore tests 2019-01-22 16:26:43 -06:00
Allen Byrne
036a8e4fe1 Add new clear tests to ignore list 2019-01-22 16:18:22 -06:00
Allen Byrne
cdf9cb0efb Cleanup variable names 2019-01-22 15:38:32 -06:00
Allen Byrne
91249b9ad5 HDFFV-10685 Correct syntax 2019-01-22 12:54:34 -06:00
Allen Byrne
ff08bed268 HDFFV-10685 Corrected version 2019-01-22 12:29:45 -06:00
Allen Byrne
ce64bf57ce HDFFV-10685 Always set Mac version flags - use soversion 2019-01-22 12:10:09 -06:00
Larry Knox
811b4bea8e Merge pull request #1489 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'e6be5560882c2f598b3a0ddab7d9d29a552fcb10':
  MPI vars need passed in, change to grepTest
2019-01-20 22:36:26 -06:00
Binh-Minh Ribler
d584b233a5 Fixed HDFFV-10684
Description:
    The test for HDFFV-10588 has revealed a bug in H5Ewalk.
    H5Ewalk did not stop midway even when the call back function returns
    H5_ITER_STOP. This is because a condition is missing from the for
    loops in H5E__walk causing the callback functions unable to stop until
    all the errors in the stack are iterated. Quincey advised on the final
    fix.  In this fix, "status" is switched to "ret_value" and HGOTO_ERROR
    to HERROR, and the for loops won't continue when "ret_value" is not 0.
Platforms tested:
    Linux/64 (jelly)
    Linux/64 (platypus)
    Darwin (osx1010test)
2019-01-20 17:46:28 -06:00
Allen Byrne
e6be556088 MPI vars need passed in, change to grepTest 2019-01-20 16:47:50 -06:00
Allen Byrne
0c15df15e3 Merge pull request #1485 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '769837f3ae93f4cae3486aef95c1c580a9946406':
  Add parrallel runTest.cmake for ph5example
  Add missing depends to last test
  Fix CMake policy 54 warnings
  TRILABS-105 Fix CMake policy 54 warnings
2019-01-18 21:49:05 -06:00
Allen Byrne
769837f3ae Add parrallel runTest.cmake for ph5example 2019-01-18 16:30:36 -06:00
Allen Byrne
ab2ab38fa6 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'eeea2b91729b57a0cdec301312bd5713941ab2c6':
  Fix typo
2019-01-18 13:33:00 -06:00
Allen Byrne
eeea2b9172 Merge pull request #1484 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '2cf543b2941442a45a4cb878d4fb33c8c69188a2':
  Fix typo
2019-01-18 13:32:18 -06:00
Allen Byrne
f5a194ce58 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'c5b19f3dd2eb4144e614105e30bf149b5324e014':
  Fix missing depends for last repart test
2019-01-18 12:57:42 -06:00
Allen Byrne
2cf543b294 Fix typo 2019-01-18 12:57:15 -06:00
Allen Byrne
c5b19f3dd2 Merge pull request #1483 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '13d1568c3f491b1dfe6254f22f04fece29b6dad2':
  Fix missing depends for last repart test
2019-01-18 12:53:49 -06:00
Allen Byrne
13d1568c3f Fix missing depends for last repart test 2019-01-18 12:27:21 -06:00
Allen Byrne
a578e36038 Add missing depends to last test 2019-01-18 12:25:38 -06:00
Allen Byrne
8adbf2552b Fix CMake policy 54 warnings 2019-01-18 12:16:38 -06:00
Allen Byrne
f25e78ad42 TRILABS-105 Fix CMake policy 54 warnings 2019-01-18 11:55:16 -06:00
Dana Robinson
f81103e89e Merge pull request #1482 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:valgrind_fixes to develop
* commit 'a4e63bb98072868a145c45e8247280ebc86c3a6d':
  Fixed a memory issue flagged by valgrind in the direct_chunk test.
2019-01-18 10:40:44 -06:00
Dana Robinson
a4e63bb980 Fixed a memory issue flagged by valgrind in the direct_chunk test. 2019-01-16 21:37:07 -08:00
Quincey Koziol
ab0fa80994 Merge pull request #1481 in HDFFV/hdf5 from reduce_cache_image_num_groups to develop
* commit '47fb7c2ee6541bb006e76c34966102ebbdaec587':
  Update usage for FAPLs, and reduce # of groups for smoke checks
2019-01-16 11:27:53 -06:00
Quincey Koziol
47fb7c2ee6 Update usage for FAPLs, and reduce # of groups for smoke checks 2019-01-16 10:36:25 -06:00
Binh-Minh Ribler
43bd93c4f5 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_fixbug into develop 2019-01-15 11:49:07 -06:00
Binh-Minh Ribler
bc3d878add Fixed HDFFV-10586 and HDFFV-10588
Description:
    HDFFV-10586 CVE-2018-17434  Divide by zero inh5repack_filters
        Added a check for zero value
    HDFFV-10588 CVE-2018-17437  Memory leak in H5O_dtype_decode_helper
        This is actually an Invalid read issue.  It was found that the
        attribute name length in an attribute message was corrupted,
        which caused the buffer pointer to be advanced too far and later
        caused an invalid read.
        Added a check to detect attribute name and its length mismatch.  The
        fix is not perfect, but it'll reduce the chance of this issue when a
        name length is corrupted or the attribute name is corrupted.
Platforms tested:
    Linux/64 (jelly)
    Linux/64 (platypus)
    Darwin (osx1010test)
2019-01-15 11:48:31 -06:00
Allen Byrne
5fdc01ae99 Merge pull request #1476 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'fe5650727c55e44e2605b667ac35f74993834643':
  Correct fix for new policy
  Fix for new policy
2019-01-14 13:54:39 -06:00
Allen Byrne
fe5650727c Correct fix for new policy 2019-01-14 13:11:17 -06:00
Allen Byrne
a7aaf073d2 Fix for new policy 2019-01-14 12:13:03 -06:00
Quincey Koziol
703acba51f Merge pull request #1471 in HDFFV/hdf5 from fix_daily_test_on_platypus to develop
* commit '3a31d37abb1fe390d4e28502e7de3ad6da092970':
  Work around compiler fussiness on platypus.
2019-01-11 19:31:48 -06:00
Quincey Koziol
3a31d37abb Work around compiler fussiness on platypus. 2019-01-11 10:11:31 -06:00
Quincey Koziol
ef3c3970fb Merge pull request #1468 in HDFFV/hdf5 from merge_hyperslab_updates_02 to develop
* commit '4729d04d9123e8cd6b2bba071695ace7ddd2a7b5':
  Delta reduction against hyperslab_updates branch.
2019-01-11 09:58:46 -06:00
Quincey Koziol
4729d04d91 Delta reduction against hyperslab_updates branch. 2019-01-10 23:08:51 -06:00
Dana Robinson
b9c8ddbfcc Merge pull request #1465 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'b82ced10619731125b9db7b1ac36f3844463df9a':
  Fix for Fortran failures.
2019-01-10 20:39:29 -06:00
Dana Robinson
536a32c59b C and POSIX call cleanup 2019-01-10 17:51:42 -08:00
Dana Robinson
b82ced1061 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop 2019-01-10 19:43:43 -06:00
Dana Robinson
8522539a9e Fix for Fortran failures. 2019-01-10 19:43:17 -06:00
Quincey Koziol
0843353176 Merge pull request #1464 in HDFFV/hdf5 from vol_wrapping_apis to develop
* commit '6d897f3c10241cbc50a728870d58269d15e36984':
  Add API routines to wrap and retrieve objects
2019-01-10 18:29:26 -06:00
Quincey Koziol
6d897f3c10 Add API routines to wrap and retrieve objects 2019-01-10 18:00:13 -06:00
Allen Byrne
a7e0ef996a Merge pull request #1462 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '9b0281736ca488387afd8a301e36e6f5a5315c4a':
  Fix deprecated H5Pget_version
  Fix regex
2019-01-09 13:18:11 -06:00
Allen Byrne
9b0281736c Fix deprecated H5Pget_version 2019-01-09 12:55:31 -06:00
Allen Byrne
7b39e544c0 Fix regex 2019-01-09 12:05:40 -06:00
Scot Breitenfeld
f75d25707d Merge pull request #1461 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'b3743a44238c284dc3817652271aa1475e3c4946':
  fixed 8 byte integer issue
  fix for xlf compiler
2019-01-09 11:38:12 -06:00
M. Scot Breitenfeld
b3743a4423 fixed 8 byte integer issue 2019-01-09 11:21:56 -06:00
M. Scot Breitenfeld
8a8cb2fbb5 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2019-01-09 10:40:28 -06:00
M. Scot Breitenfeld
51d911a7f8 fix for xlf compiler 2019-01-09 10:40:18 -06:00
Dana Robinson
f41195ba8e Merge pull request #1460 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor_pr to develop
* commit '287b5d03df03f9da5cf47f52e594f9909493d8ff':
  Fixed the MANIFEST
2019-01-09 09:47:26 -06:00
Dana Robinson
287b5d03df Fixed the MANIFEST 2019-01-09 07:22:46 -08:00
Scot Breitenfeld
3e142c802d Merge pull request #1458 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit '4f9ecd71e510a3835a49073fc16d3091a7fc25b2':
  replaced uint
  fix uint
2019-01-08 23:07:30 -06:00
Scot Breitenfeld
4f9ecd71e5 replaced uint 2019-01-08 22:54:19 -06:00
Jordan Henderson
294d9c2847 Merge pull request #1455 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '2d7eb9a4c3a841f7612b88f6b559792cb6143930':
  Align behavior of H5Aget_name_by_idx with H5Aget_name when a NULL buffer is supplied
2019-01-08 20:32:46 -06:00
Binh-Minh Ribler
56b32278c4 Merge pull request #1441 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_fixbug:develop to develop
* commit '90d13bef33f9e2e80b23996a0c39f16f7c34ecf8':
  Fixed typo Platforms tested:     Darwin (osx1010test)
  Refixed HDFFV-10578 Description:     Applied Neil's fix for this issue after removing previous     attempt.  The resources are now released in init_objs() when     failure occurs there.     Neil will fix HDFFV-10676 separately. Platforms tested:     Linux/64 (jelly)     Linux/64 (platypus)     Darwin (osx1010test)
  Removed previous change in H5O__chunk_deserialize().
  Removed the previous change in H5O__chunk_deserialize()
  Removed previous change in table_list_add().
  Removed the previous change in table_list_add()
  Updated per review Description:     HDFFV-10676 - CVE-2018-13873         Changed the new assert to if statement, per Dana's comment. Platforms tested:     Linux/64 (jelly)
  HDFFV-10578 and HDFFV-10676 Description:     HDFFV-10578 - CVE-2018-17234         The file has some issue, however, there was a bug in h5dump that caused         memory leaks after the problem in the file was encountered. The bug         was that an if statement was missing in the function table_list_add()         resulting in the memory not being freed at a later time.         After the fix had been applied, there were no more leaks after h5dump         detected the issue in the file and reported the error.
2019-01-08 18:59:22 -06:00
Ray Lu
44a67451be Merge pull request #1450 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:TRILAB-98-dt_arith-and-cpp_testhdf5-tests to develop
* commit 'b02de315b93ac29d2483a91d526b110a25073505':
  NNSA Tri-LabsTRILAB-98: Another two test cases out.
  NNSA Tri-Labs TRILAB-98: Taking out a few more test cases.
  NNSA Tri-Labs TRILAB-98 dt_arith and cpp_testhdf5 tests fail on sierra.llnl.gov: According to the group decision, simply provide a macro to disable some failing test cases on sierra (IBM power9 cpu).  All failing cases involve long double data type.
2019-01-08 17:59:03 -06:00
M. Scot Breitenfeld
69edf8522c Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2019-01-08 17:31:32 -06:00
M. Scot Breitenfeld
9ea06b2e58 fix uint 2019-01-08 17:31:20 -06:00
Scot Breitenfeld
d3b107d1a4 Merge pull request #1456 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit 'fb5d83e146679f4d0ca16cf54b410f04a262451e':
  Updated Fortran Bug and new features
2019-01-08 17:03:06 -06:00
M. Scot Breitenfeld
fb5d83e146 Updated Fortran Bug and new features 2019-01-08 16:23:55 -06:00
Jordan Henderson
2d7eb9a4c3 Align behavior of H5Aget_name_by_idx with H5Aget_name when a NULL buffer is supplied 2019-01-08 15:52:30 -06:00
Allen Byrne
3f727a272c Merge pull request #1454 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b88df58cc952563c35107daa1b8ced24b0cc03b5':
  Add missing define created in configure.ac
  Correct regex option
2019-01-08 14:59:29 -06:00
Allen Byrne
b88df58cc9 Add missing define created in configure.ac 2019-01-08 14:31:46 -06:00
Songyu Lu
b02de315b9 NNSA Tri-LabsTRILAB-98: Another two test cases out. 2019-01-08 14:31:41 -06:00
Allen Byrne
25f272b4cb Correct regex option 2019-01-08 13:25:11 -06:00
Songyu Lu
2efc28cf63 NNSA Tri-Labs TRILAB-98: Taking out a few more test cases. 2019-01-08 12:45:01 -06:00
Jordan Henderson
206da2919d Merge pull request #1452 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '805b64685371982e9c7fd693497865197990cbd6':
  Fix for parallel filters tests with new read-proc0-broadcast feature
2019-01-08 11:32:42 -06:00
Scot Breitenfeld
9b6fe52bcf Merge pull request #1409 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:J10443 to develop
* commit 'b4d4d371a03158c39f120b1bde6c4bd51f1b2eb6':
  HDFFV-10443: Add "field" parameter to H5Oinfo* and H5Ovisit* APIs.
  Added chunked dataset, H5S_ALL test
  typo
  typo
  updated defined constants
  Documented HDFFV-10652
  HDFFV-10652 Implemented a process-0 read and then broadcast for collective read of full datasets (H5S_ALL) by all the processes in the file communicator.
  Removed reason for breaking read-proc0-and-bcast
  switched to using CX instead of a global var.
  HDFFV-10652 Implemented a process-0 read and then broadcast for collective read of full datasets (H5S_ALL) by all the processes in the file communicator.
2019-01-08 11:29:48 -06:00
Scot Breitenfeld
b4d4d371a0 HDFFV-10443: Add "field" parameter to H5Oinfo* and H5Ovisit* APIs. 2019-01-08 11:24:00 -06:00
Neil Fortner
7e50055920 Merge pull request #1453 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:develop to develop
* commit '0dd2c29f284b1ec2a3c070d39805f657f44b216d':
  Remove H5O_BOGUS_INVALID_ID from H5O_msg_class_g initialization, since space for it was removed.
2019-01-08 10:45:46 -06:00
Neil Fortner
0dd2c29f28 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~nfortne2/hdf5_naf into develop 2019-01-08 10:37:28 -06:00
Neil Fortner
214abbfd59 Remove H5O_BOGUS_INVALID_ID from H5O_msg_class_g initialization, since
space for it was removed.
2019-01-08 10:36:34 -06:00
Dana Robinson
c8c0cf9fa2 Merge pull request #1451 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:fortran_squash to develop
* commit '905766fa3e51a470c02328a63d92182d4a8481bf':
  Fortran wrappers for dataset obj header minimization API calls.
2019-01-08 10:14:26 -06:00
M. Scot Breitenfeld
1421059cfb Merge remote-tracking branch 'upstream/develop' into develop 2019-01-08 09:55:29 -06:00
Jordan Henderson
805b646853 Fix for parallel filters tests with new read-proc0-broadcast feature 2019-01-08 09:45:35 -06:00
Dana Robinson
905766fa3e Fortran wrappers for dataset obj header minimization API calls. 2019-01-08 07:34:58 -08:00
Larry Knox
74a41f92a4 Merge pull request #1443 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'e27df5a5fe365480b0809ce523b0e9cd1096a43d':
  Add variables to set up module switch between configure and build for cross compiling on CrayXC40.
  Remove install-exec-hook from hl/fortran/Makefile.am. Add check for existing links in hl/fortran/src/Makefile.am.
  Configure build directory in batch scripts.
  Add libhdf5_hl_fortran symlinks for libhdf5hl_fortran files. Set ctest*.lsf.in.cmake scripts for sierra. Correct src/CMakelists.txt syntax error.
  Correct syntax error in CMakeLists.txt.
  Add .lsf batch scripts and insert the build directory into the scripts during configuration.
2019-01-07 21:01:06 -06:00
Larry Knox
e27df5a5fe Add variables to set up module switch between configure and build for
cross compiling on CrayXC40.
2019-01-07 20:57:18 -06:00
Binh-Minh Ribler
90d13bef33 Fixed typo
Platforms tested:
    Darwin (osx1010test)
2019-01-07 20:46:55 -06:00
Binh-Minh Ribler
78d0564c2a Refixed HDFFV-10578
Description:
    Applied Neil's fix for this issue after removing previous
    attempt.  The resources are now released in init_objs() when
    failure occurs there.
    Neil will fix HDFFV-10676 separately.
Platforms tested:
    Linux/64 (jelly)
    Linux/64 (platypus)
    Darwin (osx1010test)
2019-01-07 20:36:34 -06:00
Songyu Lu
75c105a2a4 NNSA Tri-Labs TRILAB-98 dt_arith and cpp_testhdf5 tests fail on sierra.llnl.gov: According to the group decision, simply provide a macro to disable some failing test cases on sierra (IBM power9 cpu). All failing cases involve long double data type. 2019-01-07 20:28:37 -06:00
Neil Fortner
9c12b625fd Merge pull request #1448 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:develop to develop
Avoid potential invalid read when decoding unknown object header message.

* commit '685288beabc4f4383d69ec07be05c067fab78544':
  Delay checking if decoded message's "shareable" flag is appropriate for the message type until we've verified we understand the message type. Reduce size of H5O_msg_class_g to *not* include space for H5O_BOGUS_INVALID.  Make bogus messages shareable.  Add new bogus message test with shareable messages to cover the formerly problematic code.  Re-run gen_bogus.c to add this test case and also to fix the bogus_invalid messages that were no longer H5O_BOGUS_INVLAID due to a new message class being added in a previous commit.  Added comment to remind developers to run gen_bogus.c when adding a new message class.
2019-01-07 19:30:26 -06:00
Scot Breitenfeld
d9b1ec3ce8 Merge pull request #1439 in HDFFV/hdf5 from rank0_bcast to develop
* commit 'ab5fe769ab711f736238abc89ef215a6ecff5f7e':
  HDFFV-10625 -- Implemented a process-0 read and then broadcast for collective read of full (HS_ALL), contiguous, atomic datasets by all the processes in the file communicator.
  indent change
  changed logic statement in if
  Added chunking test, fixed issue with CX set
  Correct another git merge failure.
  Correct misplaced line from git merge.
  Updated and refined version of Scot's "rank 0 bcast" changes.
2019-01-07 17:08:33 -06:00
M. Scot Breitenfeld
ab5fe769ab Merge branch 'rank0_bcast' of ssh://bitbucket.hdfgroup.org:7999/hdffv/hdf5 into rank0_bcast 2019-01-07 16:57:39 -06:00
Quincey Koziol
fed17ed383 HDFFV-10625 -- Implemented a process-0 read and then broadcast for collective read of full (HS_ALL), contiguous, atomic datasets by all the processes in the file communicator. 2019-01-07 16:55:59 -06:00
M. Scot Breitenfeld
c9ae4fd62e indent change 2019-01-07 16:09:22 -06:00
M. Scot Breitenfeld
030cde7a20 changed logic statement in if 2019-01-07 16:09:22 -06:00
M. Scot Breitenfeld
98ed401a6c Added chunking test, fixed issue with CX set 2019-01-07 16:09:22 -06:00
Quincey Koziol
b7f660f432 Correct another git merge failure. 2019-01-07 16:09:22 -06:00
Quincey Koziol
a6fe79251b Correct misplaced line from git merge. 2019-01-07 16:09:22 -06:00
Quincey Koziol
8001a4c1c4 Updated and refined version of Scot's "rank 0 bcast" changes. 2019-01-07 16:09:22 -06:00
Neil Fortner
685288beab Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '5dfe00629588a54dbfb6f2d09dfbd88177e37cc2':
  HDFFV-10674 handle time as natural number
2019-01-07 15:54:02 -06:00
Allen Byrne
5dfe006295 Merge pull request #1444 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '591205127a167b914ef5557f30aa58b2dff96a85':
  HDFFV-10674 handle time as natural number
2019-01-07 15:43:00 -06:00
Neil Fortner
b043126e5e Delay checking if decoded message's "shareable" flag is appropriate for
the message type until we've verified we understand the message type.
Reduce size of H5O_msg_class_g to *not* include space for
H5O_BOGUS_INVALID.  Make bogus messages shareable.  Add new bogus
message test with shareable messages to cover the formerly problematic
code.  Re-run gen_bogus.c to add this test case and also to fix the
bogus_invalid messages that were no longer H5O_BOGUS_INVLAID due to a
new message class being added in a previous commit.  Added comment to
remind developers to run gen_bogus.c when adding a new message class.
2019-01-07 15:40:44 -06:00
Vailin Choi
e52e68c82f Merge pull request #1445 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit '982852c603c03a06ca24f219127f49616c7d42cb':
  Fix for daily test failure: too many arguments to function 'H5Gopen1'
2019-01-07 14:15:05 -06:00
Jordan Henderson
0bc3d1567b Merge pull request #1434 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit 'fe6bed2ad722578d0b701e29d22f591923d2fe9f':
  Fix TESTING_2 macro to align output with TESTING macro
2019-01-07 14:11:07 -06:00
Binh-Minh Ribler
6c7462b1a9 Removed previous change in H5O__chunk_deserialize(). 2019-01-07 14:09:30 -06:00
Jordan Henderson
fe6bed2ad7 Fix TESTING_2 macro to align output with TESTING macro
Add more indentation to TESTING_2 macro
2019-01-07 14:08:34 -06:00
Binh-Minh Ribler
c092f9167c Removed the previous change in H5O__chunk_deserialize() 2019-01-07 14:07:25 -06:00
Binh-Minh Ribler
5b721a060e Removed previous change in table_list_add(). 2019-01-07 14:03:22 -06:00
Binh-Minh Ribler
463515f7db Removed the previous change in table_list_add() 2019-01-07 14:00:56 -06:00
Vailin Choi
982852c603 Fix for daily test failure: too many arguments to function 'H5Gopen1' 2019-01-07 11:49:53 -06:00
Allen Byrne
591205127a HDFFV-10674 handle time as natural number 2019-01-07 10:39:09 -06:00
M. Scot Breitenfeld
b4828e7feb Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop 2019-01-07 09:49:52 -06:00
Larry Knox
61d3403d12 Remove install-exec-hook from hl/fortran/Makefile.am.
Add check for existing links in hl/fortran/src/Makefile.am.
2019-01-06 21:59:35 -06:00
Binh-Minh Ribler
820d8e34c5 Updated per review
Description:
    HDFFV-10676 - CVE-2018-13873
        Changed the new assert to if statement, per Dana's comment.
Platforms tested:
    Linux/64 (jelly)
2019-01-06 21:42:16 -06:00
Larry Knox
619b0abfd6 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '7bf6d847ae36940f1b1147820356795c7764dbeb':
  Remove incorrect comment.
  Updated error stacks for h5dump testing.
  Corrected comment in src/H5VLint.c, fixed pass-through info size in src/H5VLpassthru.c, switched to stashing VOL connector ID & info in API context (in src/H5CX.c, src/H5CXprivate.h, src/H5F.c, src/H5Fint.c, and src/H5Fefc.c), patched up all sorts of issues in the tests, to make them work with 'check-vfd' (and 'check-vol' again).
  Clean up style issues, make function callbacks static, correct debug statements, etc.  No functionality changes at all.
2019-01-06 17:31:51 -06:00
Quincey Koziol
7bf6d847ae Merge pull request #1440 in HDFFV/hdf5 from stackable_vol_fix_14 to develop
* commit 'f0656a57dc3baf02709e1ad5e496cf63cf820877':
  Remove incorrect comment.
  Updated error stacks for h5dump testing.
  Corrected comment in src/H5VLint.c, fixed pass-through info size in src/H5VLpassthru.c, switched to stashing VOL connector ID & info in API context (in src/H5CX.c, src/H5CXprivate.h, src/H5F.c, src/H5Fint.c, and src/H5Fefc.c), patched up all sorts of issues in the tests, to make them work with 'check-vfd' (and 'check-vol' again).
2019-01-06 16:28:06 -06:00
Quincey Koziol
ca1c9cff1a Merge pull request #1438 in HDFFV/hdf5 from mpio_vfd_neaten to develop
* commit '8a5d2c130a93a665933cda8db8554d006b7ca093':
  Clean up style issues, make function callbacks static, correct debug statements, etc.  No functionality changes at all.
2019-01-06 01:55:26 -06:00
Quincey Koziol
f0656a57dc Remove incorrect comment. 2019-01-06 01:49:02 -06:00
Binh-Minh Ribler
aa62951a5f Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_fixbug into develop 2019-01-06 01:45:15 -06:00
Binh-Minh Ribler
e1b59919bb HDFFV-10578 and HDFFV-10676
Description:
    HDFFV-10578 - CVE-2018-17234
        The file has some issue, however, there was a bug in h5dump that caused
        memory leaks after the problem in the file was encountered. The bug
        was that an if statement was missing in the function table_list_add()
        resulting in the memory not being freed at a later time.
        After the fix had been applied, there were no more leaks after h5dump
        detected the issue in the file and reported the error.

        In H5O__chunk_deserialize, replaced an assert with an if statement
        and reporting error, per Neil's recommendation

    HDFFV-10676 - CVE-2018-13873
        Also in H5O__chunk_deserialize, added an assertion to detect
        out of bound ids
2019-01-06 01:44:40 -06:00
Quincey Koziol
8ecd9cc1a1 Updated error stacks for h5dump testing. 2019-01-05 23:41:43 -06:00
Quincey Koziol
92300f954f Corrected comment in src/H5VLint.c, fixed pass-through info size in
src/H5VLpassthru.c, switched to stashing VOL connector ID & info in
API context (in src/H5CX.c, src/H5CXprivate.h, src/H5F.c, src/H5Fint.c, and
src/H5Fefc.c), patched up all sorts of issues in the tests, to make them work
with 'check-vfd' (and 'check-vol' again).
2019-01-05 23:06:45 -06:00
Quincey Koziol
8a5d2c130a Clean up style issues, make function callbacks static, correct debug statements,
etc.  No functionality changes at all.
2019-01-05 17:13:40 -06:00
Larry Knox
3be0fbd817 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop 2019-01-05 07:50:15 -06:00
Larry Knox
25fe692c5c Configure build directory in batch scripts. 2019-01-05 07:49:19 -06:00
Larry Knox
cceb9f06b8 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '0e34f0feaaeb6d2286f87f695f25fae45c070a42': (26 commits)
  HDFFV-10664 update reference file
  HDFFV-10664 update reference files
  HDFFV-10664 add missing function and check for restriction
  Remove "bad" statements at end of TEST_ERROR.     Formerly arguments to FAIL_PUTS_ERROR
  Add RELEASE.txt entry for HDFFV-10596.
  Add semicolon at end of TEST_ERROR() invocation for consistency.
  Uninstall should remove the libhdf5_hl_fortran links.
  Add symlinks named libhdf5_hl_fortran* to libhdf5hl_fortran in Makefile.am to match cmake install and the name pattern for other hl lib files.
  Change FAIL_PUTS_ERROR to TEST_ERROR.
  Cleaned up the parallel flush test and set t_pflush1 to always fail. Also set CMake to handle this.
  Update calls: H5Dcreate to H5Dcreate2, H5Acreate to H5Acreate2.
  Removed a comment.
  Fix comment
  Align H5Lcreate_ud behavior with documentation for NULL udata pointer
  Update toolchain comment
  Use c99 standard cmake variable
  Add PGI toolchain
  Correction based on code review.
  HDFFV-10664 add check for state before set call
  HDFFV-10546 refactor variable name
  ...
2019-01-05 07:41:12 -06:00
Larry Knox
0e34f0feaa Merge pull request #1433 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '564565b15ed38d78cb7b29b8c9d9b322d224ab42':
  HDFFV-10664 update reference file
  HDFFV-10664 update reference files
  HDFFV-10664 add missing function and check for restriction
2019-01-04 14:31:51 -06:00
Jordan Henderson
b0feaecdb9 Merge pull request #1425 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '659dd9bccf69f32bfdd01dc49410116ec5c1b0bb':
  Align H5Lcreate_ud behavior with documentation for NULL udata pointer
2019-01-04 14:06:10 -06:00
Allen Byrne
564565b15e HDFFV-10664 update reference file 2019-01-04 13:29:22 -06:00
Allen Byrne
e07fb46bdc HDFFV-10664 update reference files 2019-01-04 13:29:01 -06:00
Larry Knox
8887c357ee Merge pull request #1429 in HDFFV/hdf5 from HDFFV-10596-fortran-library-names-differ to develop
* commit 'f4c9ec5d41aa53829617274d3286f1e9a45ae57e':
  Add RELEASE.txt entry for HDFFV-10596.
  Uninstall should remove the libhdf5_hl_fortran links.
  Add symlinks named libhdf5_hl_fortran* to libhdf5hl_fortran in Makefile.am to match cmake install and the name pattern for other hl lib files.
2019-01-04 13:04:41 -06:00
Larry Knox
f4c9ec5d41 Merge remote-tracking branch 'origin/develop' into HDFFV-10596-fortran-library-names-differ 2019-01-04 13:02:27 -06:00
Allen Byrne
28d5d987b5 HDFFV-10664 add missing function and check for restriction 2019-01-04 12:52:37 -06:00
jake.smith
46bf1647d4 Merge pull request #1430 in HDFFV/hdf5 from ~JAKE.SMITH/hdf5:dset_ohdr_minimize to develop
* commit 'f7115c31363e80e850c0a228e63a5a035c48b74a':
  Remove "bad" statements at end of TEST_ERROR.     Formerly arguments to FAIL_PUTS_ERROR
  Add semicolon at end of TEST_ERROR() invocation for consistency.
2019-01-04 11:46:54 -06:00
Jacob Smith
f7115c3136 Remove "bad" statements at end of TEST_ERROR.
Formerly arguments to FAIL_PUTS_ERROR
2019-01-04 11:28:39 -06:00
Dana Robinson
f012602d3a Merge pull request #1428 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:openmpi_tweaks to develop
* commit 'd59aa1d75cb6d0ae4f5964d017e275aa53394eb6':
  Cleaned up the parallel flush test and set t_pflush1 to always fail. Also set CMake to handle this.
2019-01-04 10:35:22 -06:00
Larry Knox
482d95c8f9 Add RELEASE.txt entry for HDFFV-10596. 2019-01-04 09:34:18 -06:00
Jacob Smith
a0c6e622e4 Add semicolon at end of TEST_ERROR() invocation for consistency. 2019-01-04 09:07:55 -06:00
Larry Knox
cc0421291e Uninstall should remove the libhdf5_hl_fortran links. 2019-01-04 08:50:10 -06:00
Larry Knox
30abf02de2 Add symlinks named libhdf5_hl_fortran* to libhdf5hl_fortran in
Makefile.am to match cmake install and the name pattern for other hl lib
files.

Add missing ';' to test/dsets.c line 13075.
2019-01-04 07:26:15 -06:00
jake.smith
9ac12ce299 Merge pull request #1427 in HDFFV/hdf5 from ~JAKE.SMITH/hdf5:dset_ohdr_minimize to develop
* commit '763db8178e673fdcae4a370fe2e6d345f905d5f1':
  Change FAIL_PUTS_ERROR to TEST_ERROR.
  Update calls: H5Dcreate to H5Dcreate2, H5Acreate to H5Acreate2.
2019-01-03 23:16:12 -06:00
Jacob Smith
763db8178e Change FAIL_PUTS_ERROR to TEST_ERROR. 2019-01-03 23:02:20 -06:00
Dana Robinson
d59aa1d75c Cleaned up the parallel flush test and set t_pflush1 to always fail.
Also set CMake to handle this.
2019-01-03 20:45:58 -08:00
Allen Byrne
2a28b92e2b Merge pull request #1426 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f4516d40feb7ea696e228253bc64a94f55296cbb':
  Fix comment
  Update toolchain comment
  Use c99 standard cmake variable
  Add PGI toolchain
2019-01-03 14:47:10 -06:00
Jacob Smith
3b53747b3a Update calls: H5Dcreate to H5Dcreate2, H5Acreate to H5Acreate2. 2019-01-03 14:44:57 -06:00
Binh-Minh Ribler
5daddcc2d4 Merge pull request #1408 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_fixbug:develop to develop
Merged to catch daily test.

* commit '40c55f24ecbdd322fba527d768689fbdbd268374':
  Removed a comment.
  Fixed documentation - typo only
  Fixed CVE division-by-zero issues Description:     Fixed HDFFV-10577 and similar issues found in H5Dchunk.c.  All     the occurrences are in:         H5D__create_chunk_map_single         H5D__create_chunk_file_map_hyper         H5D__chunk_allocate         H5D__chunk_update_old_edge_chunks         H5D__chunk_prune_by_extent         H5D__chunk_copy_cb         H5D__chunk_collective_fill Platforms tested:     Linux/64 (jelly)     Linux/64 (platypus)     Darwin (osx1010test)
2019-01-03 09:50:01 -06:00
M. Scot Breitenfeld
390a3f6728 Added chunked dataset, H5S_ALL test 2019-01-03 09:47:14 -06:00
Binh-Minh Ribler
40c55f24ec Removed a comment. 2019-01-03 09:47:01 -06:00
Allen Byrne
f4516d40fe Fix comment 2019-01-03 09:36:00 -06:00
Jordan Henderson
659dd9bccf Align H5Lcreate_ud behavior with documentation for NULL udata pointer
Add test for H5Lcreate_ud fix
2019-01-03 09:35:44 -06:00
Allen Byrne
9d0c66c7cb Update toolchain comment 2019-01-03 09:33:55 -06:00
Allen Byrne
6f6d0921c0 Use c99 standard cmake variable 2019-01-02 17:07:37 -06:00
Allen Byrne
eaaddcc9e5 Add PGI toolchain 2019-01-02 14:39:38 -06:00
Allen Byrne
c820502e69 Merge pull request #1421 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'ed0c468902409ae7fa8fb91c5f5a3a3093846736':
  HDFFV-10664 add check for state before set call
  HDFFV-10546 refactor variable name
  HDFFV-10664 minimized dataset headers for java interface
2019-01-02 14:38:30 -06:00
Vailin Choi
c70498f7a9 Merge pull request #1414 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit 'd3dff6efe6f769b219f9dcccebd057afe75ed3c7':
  Correction based on code review.
  Changes based on feedback from pull request.
  Fix for HDFFV-10659: The library abort with "infinite loop closing library" after deleting attributes in densed storage. The fix: When deleting attribute nodes from the name index v2 B-tree, if an attribute is found in the intermediate B-tree nodes, which may be merged/redistributed in the process, we need to free the dynamically allocated spaces for the intermediate decoded attribute.
2019-01-02 13:26:58 -06:00
Vailin Choi
d3dff6efe6 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop
Resolve conflicts:
Conflicts:
	test/Makefile.am
2019-01-02 13:23:54 -06:00
Vailin Choi
7f9c459995 Correction based on code review. 2019-01-02 12:51:47 -06:00
Allen Byrne
ed0c468902 HDFFV-10664 add check for state before set call 2019-01-02 12:47:37 -06:00
jake.smith
71f4e1832c Merge pull request #1420 in HDFFV/hdf5 from ~JAKE.SMITH/hdf5:dset_ohdr_minimize to develop
* commit '8324be7fad5f1417aca3d283a8f8caf6b75c4af7':
  fix wrong function name that is missed by correctional macro
2019-01-02 12:29:11 -06:00
M. Scot Breitenfeld
3a738e249b Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2019-01-02 12:05:02 -06:00
M. Scot Breitenfeld
b39960580e typo 2019-01-02 12:04:43 -06:00
M. Scot Breitenfeld
422d6daf6b typo 2019-01-02 11:53:41 -06:00
M. Scot Breitenfeld
57c2637df2 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2019-01-02 11:48:59 -06:00
M. Scot Breitenfeld
774098afa6 updated defined constants 2019-01-02 11:48:48 -06:00
Allen Byrne
f3636c573f HDFFV-10546 refactor variable name 2019-01-02 11:27:55 -06:00
M. Scot Breitenfeld
ffff13f0f3 Documented HDFFV-10652 2019-01-02 11:11:24 -06:00
M. Scot Breitenfeld
602bdd1c6a Merge branch 'develop' into parallel_vds_develop 2019-01-02 10:55:37 -06:00
Larry Knox
f9736d817e Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'af21ce90d9465e805807f17da21f93e64e03492a': (46 commits)
  Changed to Unix line endings and chmod -x.
  Fix runtest case for data to stdout in tool
  Updated the parallel install docs.
  Eliminated the need for a separate script variable.
  Flipped swapped testing strings.
  Specify variable type. Remove unnecessary whitespace.
  Added test_vol_plugin.sh to the list of scripts to clean
  Fixed a CMake build issue (CMake still doesn't run the VOL plugin tests)
  Added more sub-tests to the VOL plugin test.
  Added a simple test for registration of VOL connector plugins. Autotools only for right now, but this will be fleshed out in future work.
  OHDR tests now accept h5_fileaccess() fapls. Formatting, informative comments, and minor renaming.
  Fix some CMake listings
  Add error checking to the minimized dset header size calculation. Update printf->HDprintf statements.
  Remove `#if 0` block of deprecated code.
  Fix mistake with H5E_BEGIN_TRY {...} H5E_END_TRY block containing ERROR-raising macros. Formatting tweaks.
  Added a helpful message to the flush script.
  Added a shell script so we can run the parallel flush test on OpenMPI.
  Add "compact" storage test to relative header size comparisons.
  Formatting adjustments.
  Formatting adjustments
  ...
2019-01-02 10:07:31 -06:00
M. Scot Breitenfeld
00990e28f3 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2019-01-02 09:52:38 -06:00
M. Scot Breitenfeld
58decdbd88 HDFFV-10652
Implemented a process-0 read and then broadcast
for collective read of full datasets (H5S_ALL) by
all the processes in the file communicator.
2019-01-02 09:51:44 -06:00
M. Scot Breitenfeld
55f7fe7f1b Removed reason for breaking read-proc0-and-bcast 2019-01-02 09:39:03 -06:00
Allen Byrne
fb5d3347e6 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'af21ce90d9465e805807f17da21f93e64e03492a':
  Changed to Unix line endings and chmod -x.
  Cleaned up and normalized VFD init calls.
2019-01-02 09:03:43 -06:00
Dana Robinson
af21ce90d9 Merge pull request #1423 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor_pr to develop
* commit '1f644fe7cd0188628571c5527f51fce4ddeeebf4':
  Changed to Unix line endings and chmod -x.
2019-01-02 07:14:37 -06:00
Dana Robinson
1f644fe7cd Changed to Unix line endings and chmod -x. 2019-01-01 14:30:26 -08:00
Dana Robinson
d5f642b559 Merge pull request #1422 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vfd_init_cleanup to develop
* commit '07b76068a4517f874fc5584049178ed5f61e3cea':
  Cleaned up and normalized VFD init calls.
2019-01-01 12:50:00 -06:00
Dana Robinson
07b76068a4 Merge branch 'develop' into vfd_init_cleanup 2018-12-31 17:19:39 -08:00
Allen Byrne
c3cad8e5f3 HDFFV-10664 minimized dataset headers for java interface 2018-12-31 16:34:07 -06:00
Jacob Smith
8324be7fad fix wrong function name that is missed by correctional macro 2018-12-31 15:18:13 -06:00
M. Scot Breitenfeld
f772ef9f2e switched to using CX instead of a global var. 2018-12-31 15:06:16 -06:00
Allen Byrne
fa6077332b Merge pull request #1416 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '0e6cf18b06d71dc8da9307dddce5e1833f197e19':
  Fix runtest case for data to stdout in tool
2018-12-31 14:07:57 -06:00
Allen Byrne
0e6cf18b06 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'b30a1fe44aa804a67f2291005bf8135ac5c2dc99':
  Updated the parallel install docs.
  Eliminated the need for a separate script variable.
  Added a helpful message to the flush script.
  Added a shell script so we can run the parallel flush test on OpenMPI.
2018-12-31 14:06:43 -06:00
Dana Robinson
b30a1fe44a Merge pull request #1400 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:openmpi_tweaks to develop
* commit 'd6c2a96ac2f103d90b96d5b39814810e6a31ef99':
  Updated the parallel install docs.
  Eliminated the need for a separate script variable.
  Added a helpful message to the flush script.
  Added a shell script so we can run the parallel flush test on OpenMPI.
2018-12-31 13:33:31 -06:00
Allen Byrne
028d47d707 Fix runtest case for data to stdout in tool 2018-12-31 12:38:09 -06:00
Dana Robinson
fba448b145 Merge pull request #1413 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:yay_plugins to develop
* commit '3ca19cca5395d79be69209f8d7d0a2b06834a648':
  Flipped swapped testing strings.
  Added test_vol_plugin.sh to the list of scripts to clean
  Fixed a CMake build issue (CMake still doesn't run the VOL plugin tests)
  Added more sub-tests to the VOL plugin test.
  Added a simple test for registration of VOL connector plugins. Autotools only for right now, but this will be fleshed out in future work.
2018-12-31 10:28:25 -06:00
Larry Knox
72124031ec Add libhdf5_hl_fortran symlinks for libhdf5hl_fortran files.
Set ctest*.lsf.in.cmake scripts for sierra.
Correct src/CMakelists.txt syntax error.
2018-12-31 09:20:27 -06:00
Dana Robinson
d6c2a96ac2 Updated the parallel install docs. 2018-12-31 05:07:30 -08:00
Dana Robinson
4faca62679 Eliminated the need for a separate script variable. 2018-12-31 05:04:30 -08:00
Larry Knox
715272eeb7 Correct syntax error in CMakeLists.txt. 2018-12-31 06:23:13 -06:00
Dana Robinson
a3faa92653 Merge branch 'develop' into openmpi_tweaks 2018-12-30 22:24:42 -08:00
Vailin Choi
e035c7abdd Changes based on feedback from pull request. 2018-12-31 00:11:45 -06:00
jake.smith
905c3ca3d7 Merge pull request #1372 in HDFFV/hdf5 from ~JAKE.SMITH/hdf5:dset_ohdr_minimize to develop
Dataset object header minimization
Jira TRILAB-45

* commit 'f54fb420d08ea0a7e7b026150c0ab559803e0acd': (34 commits)
  Specify variable type. Remove unnecessary whitespace.
  OHDR tests now accept h5_fileaccess() fapls. Formatting, informative comments, and minor renaming.
  Fix some CMake listings
  Add error checking to the minimized dset header size calculation. Update printf->HDprintf statements.
  Remove `#if 0` block of deprecated code.
  Fix mistake with H5E_BEGIN_TRY {...} H5E_END_TRY block containing ERROR-raising macros. Formatting tweaks.
  Add "compact" storage test to relative header size comparisons.
  Formatting adjustments.
  Formatting adjustments
  Move H5Fset_dset_no_attrs_hint VOL operations to native. Move minimzied object header tests from separate file to test/ohdr.c Some formatting changes.
  Re-format test/ohdr_mindset.c Fix a few transcription errors in other test files.
  formatting adjustments
  Reformat to be more consistent with existing code. Fix a few typos.
  add missing paramter - macro seemingly unused, but absence results in compiler complaint
  fix reference; move declaration in file
  Remove unused debugging print in '#if 0' block
  Fix typo. Fix CHECK of wrong ID (dset[2|3]_id).
  change test file name and apply 'h5_fixname' to it
  Sidestep and hide&flag minor issues causing test failures.
  Incorporate minimized dset ohdr tests into extant suite.
  ...
2018-12-29 14:31:31 -06:00
Larry Knox
126d1e6176 Add .lsf batch scripts and insert the build directory into the scripts
during configuration.
2018-12-28 16:50:48 -06:00
Vailin Choi
f808c108ed Fix for HDFFV-10659: The library abort with "infinite loop closing library"
after deleting attributes in densed storage.
The fix: When deleting attribute nodes from the name index v2 B-tree,
if an attribute is found in the intermediate B-tree nodes, which may be
merged/redistributed in the process, we need to free the dynamically
allocated spaces for the intermediate decoded attribute.
2018-12-28 16:49:11 -06:00
Dana Robinson
3ca19cca53 Flipped swapped testing strings. 2018-12-28 12:56:49 -08:00
Dana Robinson
dac76c579b Merge branch 'develop' into yay_plugins 2018-12-28 12:55:15 -08:00
Jacob Smith
f54fb420d0 Merge branch 'develop' into dset_ohdr_minimize 2018-12-28 12:45:10 -06:00
Jacob Smith
30493ce9b9 Specify variable type.
Remove unnecessary whitespace.
2018-12-28 10:17:09 -06:00
Dana Robinson
ba095e6a53 Merge pull request #1406 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:md_cache_logging_squash to develop
* commit '1ff756a1047d58f71c70deb48c797cb860904292':
  Updated the log function names.
  Squash merge of MDC logging changes.
2018-12-28 07:22:32 -06:00
Dana Robinson
1ff756a104 Updated the log function names. 2018-12-28 05:15:58 -08:00
Dana Robinson
552fec96e9 Merge branch 'develop' into md_cache_logging_squash 2018-12-27 22:22:24 -08:00
Dana Robinson
75dd3c9cab Merge branch 'develop' into yay_plugins 2018-12-27 22:20:09 -08:00
Dana Robinson
3a05e7109a Added test_vol_plugin.sh to the list of scripts to clean 2018-12-27 21:42:51 -08:00
Jordan Henderson
fe30b71086 Merge pull request #1386 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit 'b4fe787bb9fe4bfc4709a124df59dd987c9a09d2':
  Add test for H5Arename NULL/empty attribute name fix
  align H5Arename behavior with H5Arename_by_name
2018-12-27 23:05:20 -06:00
Dana Robinson
fafee5b8ae Fixed a CMake build issue (CMake still doesn't run the VOL plugin
tests)
2018-12-27 19:56:21 -08:00
Dana Robinson
544ab1c78a Added more sub-tests to the VOL plugin test. 2018-12-27 19:42:02 -08:00
Dana Robinson
621014be28 Added a simple test for registration of VOL connector plugins.
Autotools only for right now, but this will be fleshed out in future
work.
2018-12-27 15:50:04 -08:00
Dana Robinson
5b57c69ed4 Merge pull request #1412 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:yay_plugins to develop
* commit '9cc406633c29d4167031dc85b950858f90163cbc':
  Fixed plugin loading so it actually checks the plugin type.
2018-12-27 16:10:57 -06:00
Dana Robinson
9cc406633c Fixed plugin loading so it actually checks the plugin type. 2018-12-27 14:00:32 -08:00
Jacob Smith
29497cc4e1 Merge branch 'develop' into dset_ohdr_minimize 2018-12-27 12:33:32 -06:00
Dana Robinson
1cc890e333 Merge pull request #1410 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '9152547b766919eefb7163e17f0c03052a2d73f2':
  H5VLregister_by_value() should not set _BY_NAME when searching for plugins.
2018-12-27 11:10:05 -06:00
Dana Robinson
9152547b76 H5VLregister_by_value() should not set _BY_NAME when searching for
plugins.
2018-12-27 08:56:43 -08:00
Jacob Smith
b2afa88fa0 OHDR tests now accept h5_fileaccess() fapls.
Formatting, informative comments, and minor renaming.
2018-12-26 14:35:22 -06:00
Binh-Minh Ribler
9c6744778e Fixed documentation - typo only 2018-12-23 00:51:17 -06:00
Binh-Minh Ribler
c3f51c52d0 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_fixbug into develop 2018-12-23 00:18:42 -06:00
Binh-Minh Ribler
251ba120b5 Fixed CVE division-by-zero issues
Description:
    Fixed HDFFV-10577 and similar issues found in H5Dchunk.c.  All
    the occurrences are in:
        H5D__create_chunk_map_single
        H5D__create_chunk_file_map_hyper
        H5D__chunk_allocate
        H5D__chunk_update_old_edge_chunks
        H5D__chunk_prune_by_extent
        H5D__chunk_copy_cb
        H5D__chunk_collective_fill
Platforms tested:
    Linux/64 (jelly)
    Linux/64 (platypus)
    Darwin (osx1010test)
2018-12-23 00:18:13 -06:00
Jacob Smith
cfdbb220d8 Fix some CMake listings 2018-12-21 16:18:05 -06:00
Jacob Smith
db9cc49a6b Add error checking to the minimized dset header size calculation.
Update printf->HDprintf statements.
2018-12-21 15:47:49 -06:00
Allen Byrne
7d28a4295e Merge pull request #1407 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '991996b25122ff010b9af1bbb6cc05be491ce038':
  Remove unused CMake files
  Update option text
  Add reference file to list
  HDFFV-10656 remove moved source
  HDFFV-10656 Add CHECK_VOL support to CMake
2018-12-21 14:41:29 -06:00
Allen Byrne
991996b251 Remove unused CMake files 2018-12-21 12:22:32 -06:00
Allen Byrne
909fa39bc7 Update option text 2018-12-21 11:41:02 -06:00
Allen Byrne
99d1f614f1 Add reference file to list 2018-12-21 10:39:15 -06:00
Dana Robinson
18e6ec82d0 Squash merge of MDC logging changes. 2018-12-20 20:41:42 -08:00
Dana Robinson
d6adb6526d Merge pull request #1399 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_tweaks to develop
* commit '75a03ea0c36f24a6a3982b75a8c52325879bb569':
  Moved private native VOL connector functions to H5VLnative_private.h.
  Moved the remainder of the code into separate files.
  Split the native VOL connector code into multiple files and moved the attribute code over.
2018-12-20 19:48:36 -06:00
Quincey Koziol
830fac2fea Merge pull request #1402 in HDFFV/hdf5 from stackable_vol_fix_13 to develop
* commit '9e8cacaa5531f418f5d9d447c1251eb705da785a':
  Remove core VFD-specific property list call and regenerate encoded property lists.
2018-12-20 15:45:11 -06:00
Allen Byrne
3c8b00dbd8 HDFFV-10656 remove moved source 2018-12-20 15:35:37 -06:00
Allen Byrne
7e8923957f HDFFV-10656 Add CHECK_VOL support to CMake 2018-12-20 15:11:27 -06:00
Dana Robinson
75a03ea0c3 Merge branch 'develop' into vol_tweaks 2018-12-20 12:08:13 -08:00
Dana Robinson
a06249a21b Moved private native VOL connector functions to H5VLnative_private.h. 2018-12-20 10:47:00 -08:00
Quincey Koziol
9e8cacaa55 Remove core VFD-specific property list call and regenerate encoded property
lists.
2018-12-20 11:52:09 -06:00
Jacob Smith
13baaea005 Remove #if 0 block of deprecated code. 2018-12-20 11:18:59 -06:00
Jacob Smith
210ab50725 Fix mistake with H5E_BEGIN_TRY {...} H5E_END_TRY block containing ERROR-raising macros.
Formatting tweaks.
2018-12-20 11:12:53 -06:00
Quincey Koziol
416f68c670 Merge pull request #1401 in HDFFV/hdf5 from stackable_vol_fix_12 to develop
* commit 'ac5a65bb43dbb00808f4867d8f106143364742ad':
  Correct typo
2018-12-20 10:45:27 -06:00
Quincey Koziol
ac5a65bb43 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop 2018-12-20 10:19:33 -06:00
Quincey Koziol
2bbd1589fe Correct typo 2018-12-20 10:19:19 -06:00
Allen Byrne
99e4c14ea6 Merge pull request #1396 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f9e9c1ad0eeabce09b2f8613427b83daebbf8cb0':
  HDFFV-10664 Add new functions and constants to java interface
2018-12-20 08:27:53 -06:00
Dana Robinson
64eb1489de Added a helpful message to the flush script. 2018-12-20 03:43:53 -08:00
Dana Robinson
fe1a5b4279 Added a shell script so we can run the parallel flush test
on OpenMPI.
2018-12-20 03:03:16 -08:00
Dana Robinson
aad96a8c73 Moved the remainder of the code into separate files. 2018-12-19 19:19:05 -08:00
Dana Robinson
9cfe7fd18d Split the native VOL connector code into multiple files and
moved the attribute code over.
2018-12-19 17:41:50 -08:00
Quincey Koziol
34c0328c4d Merge pull request #1398 in HDFFV/hdf5 from stackable_vol_fix_11 to develop
* commit '9810526a89b1f91d441ccce6c6ca484778f99b33':
  Correct core VFD to run with a 1MB increment instead of a 1 byte increment!
2018-12-19 19:08:04 -06:00
Quincey Koziol
9810526a89 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop 2018-12-19 17:17:16 -06:00
Quincey Koziol
f1d8d889b4 Correct core VFD to run with a 1MB increment instead of a 1 byte increment! 2018-12-19 17:16:45 -06:00
Quincey Koziol
9fba6e082c Merge pull request #1397 in HDFFV/hdf5 from stackable_vol_fix_10 to develop
* commit '3587fe2638c45c087e970a3bdca07a9ffa7d435c':
  Switch return value to -1
  Fix return value type for get name operation.
2018-12-19 17:05:20 -06:00
Quincey Koziol
3587fe2638 Switch return value to -1 2018-12-19 16:54:02 -06:00
Quincey Koziol
371ed6a518 Fix return value type for get name operation. 2018-12-19 16:30:11 -06:00
Allen Byrne
a3121cf41a Merge pull request #1395 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit 'ec4902ae8d8bd009bb835d3a0bba335845f2c07d':
  Special text removal not conditional
  TRILABS special output removal
  TRILABS special text removal
2018-12-19 15:52:02 -06:00
Allen Byrne
ec4902ae8d Special text removal not conditional 2018-12-19 15:43:33 -06:00
Allen Byrne
c4913dd55f TRILABS special output removal 2018-12-19 15:41:15 -06:00
Jacob Smith
38de07aea3 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~jake.smith/hdf5 into dset_ohdr_minimize 2018-12-19 15:14:51 -06:00
Jacob Smith
2b4e540fad Add "compact" storage test to relative header size comparisons. 2018-12-19 14:57:38 -06:00
Dana Robinson
33345b835c Merge pull request #1393 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_optional_enum_to_macros to develop
* commit 'f60e8bb05e3203054e27bf41d0ebc657537736ed':
  Moved the optional enums to H5VLnative.h and converted to an int typedef and a set of #defines.
2018-12-19 14:55:21 -06:00
Allen Byrne
0bcae40c8a TRILABS special text removal 2018-12-19 14:44:29 -06:00
Allen Byrne
f9e9c1ad0e HDFFV-10664 Add new functions and constants to java interface 2018-12-19 12:59:05 -06:00
Quincey Koziol
fc7f4e59aa Merge pull request #1394 in HDFFV/hdf5 from stackable_vol_fix_08 to develop
* commit 'b61ad0f7b68f974356a33b335e94e21a941c0621':
  Clear driver properties before returning them to application.
2018-12-19 07:37:00 -06:00
Quincey Koziol
b61ad0f7b6 Clear driver properties before returning them to application.
Move write_tracking and page_size properties to be inside the core VFD's
driver properties.
2018-12-18 22:30:12 -06:00
Dana Robinson
f60e8bb05e Moved the optional enums to H5VLnative.h and converted to an int
typedef and a set of #defines.
2018-12-18 13:34:34 -08:00
Jacob Smith
7541ed1fc7 Formatting adjustments. 2018-12-18 15:11:42 -06:00
Dana Robinson
bd096066c3 Merge pull request #1384 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:build_tweaks to develop
* commit 'fc64bafb143b1d259282913fdbf0ba9f1a0a8069':
  Updates the autotools tests to also emit the VOL connector for each test.
2018-12-18 14:12:21 -06:00
Dana Robinson
b486fd10a4 Merge pull request #1392 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_optional_enum_to_macros to develop
* commit '70c8c629ce1d7b1eb98220135ddcca1bf9c5b7fc':
  Added missing H5O calls.
  Fixed a missing H5R call.
  Made hbool_t processing consistent in va_lists.
  Fixed an enums-in-va_list issue in the passthru VOL connector.
  Updated enums in VOL va_lists to be passed as ints.
2018-12-18 13:53:02 -06:00
Jacob Smith
507d9423c8 Formatting adjustments 2018-12-18 13:51:12 -06:00
Jacob Smith
99bc714c4b Move H5Fset_dset_no_attrs_hint VOL operations to native.
Move minimzied object header tests from separate file to test/ohdr.c
Some formatting changes.
2018-12-18 13:42:03 -06:00
Dana Robinson
70c8c629ce Added missing H5O calls. 2018-12-18 10:37:49 -08:00
Dana Robinson
b73052799c Fixed a missing H5R call. 2018-12-18 10:03:29 -08:00
Dana Robinson
6a87cc96a6 Made hbool_t processing consistent in va_lists. 2018-12-18 10:00:35 -08:00
Jacob Smith
5efc08a06d Merge branch 'develop' into dset_ohdr_minimize 2018-12-18 11:50:58 -06:00
Dana Robinson
b6d27bdf90 Fixed an enums-in-va_list issue in the passthru VOL connector. 2018-12-18 09:30:18 -08:00
Dana Robinson
b55e5efc1c Merge branch 'develop' into vol_optional_enum_to_macros 2018-12-18 09:20:07 -08:00
Dana Robinson
55fc5067b6 Updated enums in VOL va_lists to be passed as ints. 2018-12-18 09:16:46 -08:00
Dana Robinson
e8108d7699 Merge branch 'develop' into vfd_init_cleanup 2018-12-18 09:07:28 -08:00
Quincey Koziol
f0c83dedb6 Merge pull request #1391 in HDFFV/hdf5 from stackable_vol_fix_07 to develop
* commit '2b496c1e19c19847bd6ab9b692b13db3d3afb0a9':
  Correct error from refactoring out H5VL_FILE_CACHE_VOL_CONN callback.
2018-12-18 10:44:32 -06:00
Quincey Koziol
2b496c1e19 Correct error from refactoring out H5VL_FILE_CACHE_VOL_CONN callback. 2018-12-18 10:19:40 -06:00
Dana Robinson
ddf2cbad1b Cleaned up and normalized VFD init calls. 2018-12-17 23:00:25 -08:00
Quincey Koziol
c3df26afb4 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop 2018-12-17 18:04:46 -06:00
Quincey Koziol
aadebc1b7e Merge pull request #1390 in HDFFV/hdf5 from stackable_vol_fix_06 to develop
* commit '3597bd469ff0073134b31765d9b87660cd3e0039':
  Revert change to MSC_VER, in favor of Dana's
  Remove H5VL_FILE_CACHE_VOL_CONN from file specific callbacks, as it turns out not to be necessary.
2018-12-17 18:03:59 -06:00
Quincey Koziol
a018d86050 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop 2018-12-17 17:36:53 -06:00
Quincey Koziol
59efe89450 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop 2018-12-17 17:36:45 -06:00
Dana Robinson
bacabb3534 Merge pull request #1364 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5i_reference_removal to develop
* commit 'e21c1cf7c6ee6dba5dd5bfd1a525227ac1304b53':
  Removed H5I_REFERENCE from the library. It has always been unused and has been marked 'deprecated' since 1.10.0. Fixes HDFFV-10252.
2018-12-17 17:35:59 -06:00
Dana Robinson
d8656bdbb2 Merge pull request #1389 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:strtok_windows_fix to develop
* commit 'a7618f432b671ad041ae63a83bf9b9bb08096dbe':
  Updated with extra sanity check and improved comment.
  Fixed an issue in the passthru Windows va_copy hack.
2018-12-17 17:34:44 -06:00
Quincey Koziol
3597bd469f Revert change to MSC_VER, in favor of Dana's 2018-12-17 17:28:51 -06:00
Quincey Koziol
c6831c7a75 Remove H5VL_FILE_CACHE_VOL_CONN from file specific callbacks, as it turns out
not to be necessary.

Also, correct _MSC_VER #ifdef
2018-12-17 17:25:10 -06:00
Dana Robinson
a7618f432b Updated with extra sanity check and improved comment. 2018-12-17 14:48:39 -08:00
Dana Robinson
a71b77433c Fixed an issue in the passthru Windows va_copy hack. 2018-12-17 14:33:33 -08:00
Dana Robinson
8909646693 Merge pull request #1388 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_optional_enum_to_macros to develop
* commit '9f175afce8c08bf6193e45ce391e05e4198dd61c':
  Updated va_arg-->HDva_arg in the native VOL connector.
  Added HD to va_* calls in a couple of library files.
2018-12-17 16:05:20 -06:00
Dana Robinson
9f175afce8 Updated va_arg-->HDva_arg in the native VOL connector. 2018-12-17 14:03:11 -08:00
Dana Robinson
02eb52b5fd Merge pull request #1387 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:strtok_windows_fix to develop
* commit 'b0457117d867d9850d042d7c3f71a747899b932e':
  Further va_list improvements.
  Added a helpful comment to the va_copy() Windows hack.
  Added a work-around for va_copy() on pre-2013 versions of Visual Studio.
2018-12-17 15:32:49 -06:00
Dana Robinson
3214de7924 Added HD to va_* calls in a couple of library files. 2018-12-17 13:30:31 -08:00
Jordan Henderson
b4fe787bb9 Add test for H5Arename NULL/empty attribute name fix
Split checking of NULL vs. empty string arguments
2018-12-17 14:30:54 -06:00
Dana Robinson
b0457117d8 Further va_list improvements. 2018-12-17 11:40:10 -08:00
Dana Robinson
6306766fb4 Added a helpful comment to the va_copy() Windows hack. 2018-12-17 10:34:20 -08:00
Dana Robinson
1b9326d37f Added a work-around for va_copy() on pre-2013 versions of Visual Studio. 2018-12-17 10:29:58 -08:00
Allen Byrne
59b23c198c Merge pull request #1385 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '8dbadb41a3b23d6d74effee7bef0302fd81b80a6':
  HDFFV-10663 add new function H5Fis_accessible
2018-12-17 12:29:50 -06:00
Jordan Henderson
16cbd591cd align H5Arename behavior with H5Arename_by_name 2018-12-17 12:01:20 -06:00
Dana Robinson
339aebc69a Merge pull request #1381 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_tweaks to develop
* commit '9ae9b3ef513613bb2fca15f96461a156148c2627':
  Moved the native VOL connector's optional enums to the public headers and renamed to include native/NATIVE in the name.
2018-12-17 11:24:58 -06:00
Allen Byrne
8dbadb41a3 HDFFV-10663 add new function H5Fis_accessible 2018-12-17 11:16:59 -06:00
Allen Byrne
1e9efded02 Merge pull request #1378 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '1e4c7bf9c96dfb353b643f41c136a8fa3f511df2':
  Use H5I_INVALID_HID
  HDFFV-10632 update new files
2018-12-17 08:46:03 -06:00
Dana Robinson
fc64bafb14 Updates the autotools tests to also emit the VOL connector
for each test.
2018-12-16 12:41:55 -08:00
Dana Robinson
f5886d5802 Merge pull request #1383 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:strtok_windows_fix to develop
* commit '1b5190011bde5f2f47b01429cd97c11ade66f911':
  Added #define to use strtok_s instead of strtok_r on Windows.
2018-12-16 12:20:47 -06:00
Allen Byrne
1e4c7bf9c9 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '50ca26f3ec428de408040335f2a2999e750d98b3':
  Updated the passthru VOL connector: * snprintf --> sprintf (for Windows compat) * tabs --> spaces * removed spurious parens from returns * Changed the logging macro to something less clash-prone
  Make sure to free copy of VOL connector's name when H5VL_register_connector fails
2018-12-16 11:39:14 -06:00
Dana Robinson
50ca26f3ec Merge pull request #1382 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'e21dec94d85b02b6dd3b2020cf026414cea1eb0d':
  Updated the passthru VOL connector: * snprintf --> sprintf (for Windows compat) * tabs --> spaces * removed spurious parens from returns * Changed the logging macro to something less clash-prone
2018-12-15 22:05:40 -06:00
Dana Robinson
1b5190011b Added #define to use strtok_s instead of strtok_r on Windows. 2018-12-15 20:02:37 -08:00
Dana Robinson
e21dec94d8 Updated the passthru VOL connector:
* snprintf --> sprintf (for Windows compat)
* tabs --> spaces
* removed spurious parens from returns
* Changed the logging macro to something less clash-prone
2018-12-15 18:17:16 -08:00
Allen Byrne
8f3a777a8a Use H5I_INVALID_HID 2018-12-15 06:25:02 -06:00
Dana Robinson
9ae9b3ef51 Moved the native VOL connector's optional enums to the
public headers and renamed to include native/NATIVE in the
name.
2018-12-15 02:05:00 -08:00
Jordan Henderson
bc0a08d997 Merge pull request #1379 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '74d167d738f719fc1076ed16360e9fd5b7ba4c98':
  Make sure to free copy of VOL connector's name when H5VL_register_connector fails
2018-12-14 19:31:41 -06:00
Jordan Henderson
74d167d738 Make sure to free copy of VOL connector's name when H5VL_register_connector fails 2018-12-14 13:15:09 -06:00
Allen Byrne
c92f11b368 HDFFV-10632 update new files 2018-12-14 08:12:51 -06:00
Jacob Smith
61350bf350 Re-format test/ohdr_mindset.c
Fix a few transcription errors in other test files.
2018-12-13 22:11:29 -06:00
Jacob Smith
8e4b34afd0 formatting adjustments 2018-12-13 19:40:33 -06:00
Quincey Koziol
7670f112ca Merge pull request #1377 in HDFFV/hdf5 from stackable_vol_fix_05 to develop
* commit '833a4f73fd8dc696f8bf500cd842d88949bb1519':
  Fix plugin code from referencing invalid key ID value, and also switch from strtok() to strtok_r() to avoid possible interference with / to application use of strtok().
2018-12-13 17:59:09 -06:00
Quincey Koziol
833a4f73fd Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop 2018-12-13 17:32:39 -06:00
Quincey Koziol
247a6afb7e Fix plugin code from referencing invalid key ID value, and also switch from
strtok() to strtok_r() to avoid possible interference with / to application
use of strtok().
2018-12-13 17:31:00 -06:00
Allen Byrne
dd6c06f9a7 Merge pull request #1375 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f9f6e9fe24d8b0996a79af57d80e21a950f5009f':
  Still need the stamp1 files if PREGEN
2018-12-13 16:04:40 -06:00
Allen Byrne
f9f6e9fe24 Still need the stamp1 files if PREGEN 2018-12-13 15:32:49 -06:00
Allen Byrne
d88040edb3 Merge pull request #1374 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '248442eb00ec254bf632ddf6a0f62ed5f442a3f0':
  If MPI is enabled java will not compile because of include.
2018-12-13 15:15:48 -06:00
Allen Byrne
c1eca48305 Merge pull request #1371 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '98309270710fea1aee7012ded776be4260c63df8':
  TRILABS - exclude host info lines
  HDFFV-10660 Add new files to OUTPUT section of custom commands
2018-12-13 15:13:57 -06:00
Allen Byrne
248442eb00 If MPI is enabled java will not compile because of include. 2018-12-13 14:10:38 -06:00
Jacob Smith
0a4834c264 Reformat to be more consistent with existing code.
Fix a few typos.
2018-12-13 14:02:29 -06:00
Allen Byrne
9830927071 TRILABS - exclude host info lines 2018-12-13 12:52:50 -06:00
Jacob Smith
8b9c4b50e3 add missing paramter - macro seemingly unused, but absence results in compiler complaint 2018-12-13 11:33:58 -06:00
Jacob Smith
a959914695 fix reference; move declaration in file 2018-12-13 10:47:52 -06:00
Jacob Smith
943b7f9c02 Merge branch 'develop' into dset_ohdr_minimize 2018-12-13 10:27:27 -06:00
Allen Byrne
88137324fc HDFFV-10660 Add new files to OUTPUT section of custom commands 2018-12-13 09:40:43 -06:00
Allen Byrne
1dd81af5a2 Merge pull request #1368 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '6a87b59aeeda7839ff7b3b9f129192bd1579c6fa':
  HDFVIEW-4 Duplicate line
2018-12-13 09:35:19 -06:00
M. Scot Breitenfeld
ef21966d17 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2018-12-13 09:21:00 -06:00
Jordan Henderson
8faad0a959 Merge pull request #1369 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '76c0d8c434186107176fc83a0ce4e94b584196ae':
  Add test for H5Aget_info(_by_name/_by_idx) NULL info pointer
  align H5Aget_info behavior with H5Gget_info when null attribute pointer is supplied
2018-12-13 09:10:40 -06:00
Jordan Henderson
76c0d8c434 Add test for H5Aget_info(_by_name/_by_idx) NULL info pointer 2018-12-12 18:30:34 -06:00
Jacob Smith
ad6de59e4c Merge branch 'develop' into dset_ohdr_minimize 2018-12-12 17:34:13 -06:00
Jacob Smith
911b8e8fc2 Merge branch 'dset_ohdr_minimize' of https://bitbucket.hdfgroup.org/scm/~jake.smith/hdf5 into dset_ohdr_minimize
Incorporate a few housekeeping changes and one fix.
2018-12-12 17:27:27 -06:00
Jacob Smith
ea73325250 Merge branch 'develop' into dset_ohdr_minimize 2018-12-12 17:26:08 -06:00
Jordan Henderson
55dbf69573 align H5Aget_info behavior with H5Gget_info when null attribute pointer is supplied 2018-12-12 17:05:56 -06:00
M. Scot Breitenfeld
fdf38bb5f4 HDFFV-10652
Implemented a process-0 read and then broadcast
for collective read of full datasets (H5S_ALL) by
all the processes in the file communicator.
2018-12-12 15:39:18 -06:00
Jacob Smith
5a38ab71be Remove unused debugging print in '#if 0' block 2018-12-12 14:17:15 -06:00
Jacob Smith
c81e310214 Fix typo.
Fix CHECK of wrong ID (dset[2|3]_id).
2018-12-12 14:03:56 -06:00
hdftest
afdf3094cc Merge pull request #1367 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'deb7d2fb9714acc8222815328f71b0aae7e74275':
  Use version 2 functions in test file to address compile errors for --with-default-api-version=v16 option.
2018-12-12 11:30:05 -06:00
Allen Byrne
6a87b59aee HDFVIEW-4 Duplicate line 2018-12-12 10:54:39 -06:00
M. Scot Breitenfeld
3e445ef129 Merge branch 'develop' into parallel_vds_develop 2018-12-12 09:43:05 -06:00
Allen Byrne
8822bc3c41 Merge pull request #1349 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '139a12d13cda046fd3cd64a4f097eb3485f50173':
  HDFFV-10632 correct number
  HDFFV-10632 stder/stdout change note
  Add stamp files for generated  files
  HDFFV-10632 update autotools test scripts to match cmake
  HDFFV=10632 test cleanup
  Fix special macro stdout as empty
  Need nonexistent file to skip stdout compare
  HDFFV-10632 - split stderr and stdout in cmake
2018-12-12 09:29:10 -06:00
Allen Byrne
139a12d13c HDFFV-10632 correct number 2018-12-12 09:28:51 -06:00
Allen Byrne
ace20fc987 HDFFV-10632 stder/stdout change note 2018-12-12 09:27:45 -06:00
Allen Byrne
958e1f72cb Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '1be974ff963e2e538090bb3e65ba66feb93d5c68':
  HDFVIEW-4 note
  HDFVIEW-4 removed unused functions
  HDFVIEW-4 add datatype read to H5A like H5D
2018-12-12 09:17:07 -06:00
Allen Byrne
1be974ff96 Merge pull request #1365 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit 'ef6c80bbdbe6ce1ee4665a352099976d0fddf255':
  HDFVIEW-4 note
  HDFVIEW-4 removed unused functions
  HDFVIEW-4 add datatype read to H5A like H5D
2018-12-12 09:13:04 -06:00
Allen Byrne
ef6c80bbdb HDFVIEW-4 note 2018-12-12 09:12:50 -06:00
Allen Byrne
ce9bcb0dda HDFVIEW-4 removed unused functions 2018-12-12 08:50:58 -06:00
Larry Knox
deb7d2fb97 Use version 2 functions in test file to address compile errors for
--with-default-api-version=v16 option.
2018-12-12 06:53:26 -06:00
Jacob Smith
496de6922f change test file name and apply 'h5_fixname' to it 2018-12-11 17:45:12 -06:00
Allen Byrne
642d0cb00b Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '6f52793adcd5a14aa63731e3c33c9737b5a04d16':
  Minor tweak to address JIRA HDFFV-10611 (which was already fixed).
2018-12-10 16:52:54 -06:00
Allen Byrne
7ffba76bc3 HDFVIEW-4 add datatype read to H5A like H5D 2018-12-10 16:52:34 -06:00
Dana Robinson
6f52793adc Merge pull request #1363 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor_pr to develop
* commit '5d9a93b61d374c427554dd2ff9574539bc8861ab':
  Minor tweak to address JIRA HDFFV-10611 (which was already fixed).
2018-12-08 11:39:25 -06:00
Dana Robinson
e21c1cf7c6 Removed H5I_REFERENCE from the library. It has always been unused
and has been marked 'deprecated' since 1.10.0. Fixes HDFFV-10252.
2018-12-08 08:14:05 -08:00
Dana Robinson
5d9a93b61d Minor tweak to address JIRA HDFFV-10611 (which was already fixed). 2018-12-08 07:22:40 -08:00
Allen Byrne
962f35e761 Add stamp files for generated files 2018-12-07 16:02:00 -06:00
Allen Byrne
ce625a617e Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '4643860aa940fb52da251f7023ec2e48d7d10f34':
  HDFFV-10635: Some minor changes to the test case and the comments in the library.
  HDFFV-10635: add a test case.
  HDFFV-10635: Allowing to write the same variable-length element more than once.
2018-12-07 15:57:56 -06:00
Scot Breitenfeld
5a51c3677e Merge branch 'develop' into H10621 2018-12-07 15:43:51 -06:00
Scot Breitenfeld
a21f1d8aef added missing files 2018-12-07 15:25:34 -06:00
Ray Lu
4643860aa9 Merge pull request #1348 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/HDFFV-10635-hdf5-library-segmentation-fault to develop
* commit '3e8599591504c95d8a97100b9546174f6132dc97':
  HDFFV-10635: Some minor changes to the test case and the comments in the library.
  HDFFV-10635: add a test case.
  HDFFV-10635: Allowing to write the same variable-length element more than once.
2018-12-07 14:58:43 -06:00
Scot Breitenfeld
96b6f58ac8 Implemented VOL APIs and C constants, no tests 2018-12-07 12:06:29 -06:00
Scot Breitenfeld
5267454ebd Implemented VOL APIs and C constants, no tests 2018-12-07 12:00:47 -06:00
Allen Byrne
ac34d3e157 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '3682071b4a3760959c2ccc80d6de58a8d81b5048':
  RELEASE.txt updates for fixes pushed to 1.10.5.
2018-12-07 11:44:53 -06:00
Dana Robinson
3682071b4a Merge pull request #1362 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '4484c5d6ef2186805da44abfbec9bf21fc5e4414':
  RELEASE.txt updates for fixes pushed to 1.10.5.
2018-12-07 11:42:21 -06:00
Allen Byrne
698d0490b1 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '7796cbd4174e85aa211dbffa562ada7413f1dbf7':
  Fix build errors VOL changes, when using --disable-deprecated-symbols.
  Removed RELEASE.txt entry concerning --enable-debug/production configure flags as those changes were pushed to HDF5 1.10.
  Remove reference to h5_vol_external_log_native.
2018-12-07 11:26:03 -06:00
Dana Robinson
4484c5d6ef Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop 2018-12-07 08:33:28 -08:00
Dana Robinson
ec99efbae8 RELEASE.txt updates for fixes pushed to 1.10.5. 2018-12-07 08:31:52 -08:00
Scot Breitenfeld
1000e97d3a initial API impl. 2018-12-06 23:44:18 -06:00
Quincey Koziol
7796cbd417 Merge pull request #1360 in HDFFV/hdf5 from stackable_vol_fix_04 to develop
* commit 'a60702605496bb5dfb12af0c0385590df85b31a3':
  Fix build errors VOL changes, when using --disable-deprecated-symbols.
2018-12-06 18:03:00 -06:00
Songyu Lu
3e85995915 HDFFV-10635: Some minor changes to the test case and the comments in the library. 2018-12-06 17:36:34 -06:00
Dana Robinson
026507404b Merge pull request #1358 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'dd23dac577c70d7fc0aa3fe21c1ebf52a18975d2':
  Removed RELEASE.txt entry concerning --enable-debug/production configure flags as those changes were pushed to HDF5 1.10.
2018-12-06 15:42:31 -06:00
Quincey Koziol
a607026054 Fix build errors VOL changes, when using --disable-deprecated-symbols. 2018-12-06 13:37:09 -06:00
Allen Byrne
11b4c1f3af HDFFV-10632 update autotools test scripts to match cmake 2018-12-06 12:48:39 -06:00
Dana Robinson
dd23dac577 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop 2018-12-06 10:10:39 -08:00
Dana Robinson
e3c40fef1f Removed RELEASE.txt entry concerning --enable-debug/production configure flags
as those changes were pushed to HDF5 1.10.
2018-12-06 10:08:50 -08:00
Quincey Koziol
b9e08da165 Merge pull request #1357 in HDFFV/hdf5 from stackable_vol_fix_03 to develop
* commit '0a7c64f6e874c92cd2540af0b1fa032be0091502':
  Remove reference to h5_vol_external_log_native.
2018-12-06 11:28:40 -06:00
Quincey Koziol
0a7c64f6e8 Remove reference to h5_vol_external_log_native. 2018-12-06 11:11:28 -06:00
Allen Byrne
2998dbfc70 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'f2da47f732ded55837f6d008af46d0c448bec1f1':
  Update to new callbacks in H5VL_class_t.
2018-12-06 08:14:34 -06:00
Allen Byrne
eb1b3f42c4 HDFFV=10632 test cleanup 2018-12-06 07:54:19 -06:00
Quincey Koziol
f2da47f732 Merge pull request #1355 in HDFFV/hdf5 from stackable_vol_fix_02 to develop
* commit '592a22345517dc321c47b2df7e6d52c968fbae9b':
  Update to new callbacks in H5VL_class_t.
2018-12-05 18:47:03 -06:00
Songyu Lu
19a94503f3 HDFFV-10635: add a test case. 2018-12-05 16:48:47 -06:00
Jacob Smith
f1825f0d26 Sidestep and hide&flag minor issues causing test failures. 2018-12-05 16:39:39 -06:00
Allen Byrne
fe6a56c5cb Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'dbce6e852a508a9b5438ca0fb5278e1a10555635':
  Updates to t_filters_parallel for missing filters
2018-12-05 16:03:11 -06:00
Jordan Henderson
dbce6e852a Merge pull request #1356 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '406f7916ceaec959c0c22cdf05f45515f04a8529':
  Updates to t_filters_parallel for missing filters
2018-12-05 15:55:35 -06:00
Jordan Henderson
406f7916ce Updates to t_filters_parallel for missing filters 2018-12-05 15:23:44 -06:00
Quincey Koziol
592a223455 Update to new callbacks in H5VL_class_t. 2018-12-05 15:09:32 -06:00
Allen Byrne
307749cc71 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '55e87e5b86aacbb37c57614cd2e869541291caad': (51 commits)
  Correct Windows build.
  Refactor allocating & releasing pass through wrapper objects.
  Fix typo
  Remove duplicated comment.
  Add a couple of missing prototypes for static routines, along with updating a comment from VOL plugin -> connector.
  Switch H5VL_class_value_t from unsigned to int, and add "invalid" ID value.
  Correct "make check-vol" regression test target.
  Switch H5VL_class_value_t from enum to unsigned integer
  Add support for "make check-vol", along with a few minor cleanups, etc.
  Refactor infrastructure for setting FAPL information from environment variables during testing, including connecting native, pass-through, and dynamically loaded VOL connectors.   Also bring native and pass-through VOL connectors into alignment, removing the "H5VLnative_private.h" header.
  Remove example VOL connector, since it's been superceded by the pass-through VOL connector in the src subdirectory.
  Add pass-through VOL connector
  Update API tracing info for VOL functions and regenerate trace macros for VOL API calls.
  Added 'notify' callback for async requests; switched VOL class and info comparison to return comparison value as parameter, so they can return error values; "cancelled" -> "canceled"; switched order of 'wrap_object' and 'free_wrap_ctx' management callbacks.
  Add using FAPL from h5_fileaccess() to more tests.
  Remove unused test for unimplemented routine.
  Switch loc_params to VOL callbacks to pass struct by pointer instead of by value.
  Add info_to_str and str_to_info "management" callbacks for serializing and deserializing a connector's info object.
  Revert some of the changes to support the original property list value of metadata read attempts.
  Add VOL connector info to the flie access property list returned from H5Fget_access_plist().  Also, other misc. cleanups, etc.
  ...
2018-12-05 14:25:58 -06:00
Quincey Koziol
55e87e5b86 Merge pull request #1353 in HDFFV/hdf5 from stackable_vol_fix_01 to develop
* commit 'e395d1ed7c76ab224a862c396020758097681cad':
  Correct Windows build.
2018-12-05 14:09:05 -06:00
Quincey Koziol
e395d1ed7c Correct Windows build. 2018-12-05 13:33:08 -06:00
Quincey Koziol
14f463593b Merge pull request #1347 in HDFFV/hdf5 from stackable_vol to develop
* commit 'c58d84e721ef9fbda63abc834767a28dc978d121': (50 commits)
  Refactor allocating & releasing pass through wrapper objects.
  Fix typo
  Remove duplicated comment.
  Add a couple of missing prototypes for static routines, along with updating a comment from VOL plugin -> connector.
  Switch H5VL_class_value_t from unsigned to int, and add "invalid" ID value.
  Correct "make check-vol" regression test target.
  Switch H5VL_class_value_t from enum to unsigned integer
  Add support for "make check-vol", along with a few minor cleanups, etc.
  Refactor infrastructure for setting FAPL information from environment variables during testing, including connecting native, pass-through, and dynamically loaded VOL connectors.   Also bring native and pass-through VOL connectors into alignment, removing the "H5VLnative_private.h" header.
  Remove example VOL connector, since it's been superceded by the pass-through VOL connector in the src subdirectory.
  Add pass-through VOL connector
  Update API tracing info for VOL functions and regenerate trace macros for VOL API calls.
  Added 'notify' callback for async requests; switched VOL class and info comparison to return comparison value as parameter, so they can return error values; "cancelled" -> "canceled"; switched order of 'wrap_object' and 'free_wrap_ctx' management callbacks.
  Add using FAPL from h5_fileaccess() to more tests.
  Remove unused test for unimplemented routine.
  Switch loc_params to VOL callbacks to pass struct by pointer instead of by value.
  Add info_to_str and str_to_info "management" callbacks for serializing and deserializing a connector's info object.
  Revert some of the changes to support the original property list value of metadata read attempts.
  Add VOL connector info to the flie access property list returned from H5Fget_access_plist().  Also, other misc. cleanups, etc.
  Switch tool error output to match VOL changes within library
  ...
2018-12-05 13:03:59 -06:00
Allen Byrne
a68fd29208 Fix special macro stdout as empty 2018-12-05 09:44:13 -06:00
Allen Byrne
081e369ade Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '2f605eaa99e1d8fc359079f93b91522c561500b0':
  updated with HDFFV-10511
2018-12-05 09:37:08 -06:00
Scot Breitenfeld
2f605eaa99 Merge pull request #1351 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit '988eed8cf776c14d3e0ddac9fecc372c74e5484c':
  updated with HDFFV-10511
2018-12-05 09:03:08 -06:00
Scot Breitenfeld
e14ec4276e Removed libverbounds set, it was remove in develop. 2018-12-05 09:00:22 -06:00
Allen Byrne
d6de299f01 Need nonexistent file to skip stdout compare 2018-12-04 23:16:03 -06:00
Scot Breitenfeld
988eed8cf7 updated with HDFFV-10511 2018-12-04 12:25:30 -06:00
Scot Breitenfeld
291cd766bc Merge branch 'develop' into parallel_vds_develop 2018-12-04 10:47:53 -06:00
Quincey Koziol
c58d84e721 Refactor allocating & releasing pass through wrapper objects. 2018-12-03 13:11:17 -06:00
Allen Byrne
e3e24a2989 HDFFV-10632 - split stderr and stdout in cmake 2018-12-03 09:35:59 -06:00
Quincey Koziol
81d67d5fdc Fix typo 2018-11-30 15:00:38 -06:00
Quincey Koziol
50c4095c8c Remove duplicated comment. 2018-11-30 14:18:14 -06:00
Quincey Koziol
047269139f Add a couple of missing prototypes for static routines, along with updating
a comment from VOL plugin -> connector.
2018-11-30 14:12:32 -06:00
Songyu Lu
a89130553d HDFFV-10635: Allowing to write the same variable-length element more than once. 2018-11-30 09:02:03 -06:00
Quincey Koziol
beb7428f68 Switch H5VL_class_value_t from unsigned to int, and add "invalid" ID value. 2018-11-29 08:26:25 -06:00
Quincey Koziol
8c606f586e Correct "make check-vol" regression test target. 2018-11-28 22:54:46 -06:00
Quincey Koziol
f3ad03a538 Switch H5VL_class_value_t from enum to unsigned integer 2018-11-28 22:21:45 -06:00
Quincey Koziol
d442fe2d98 Add support for "make check-vol", along with a few minor cleanups, etc. 2018-11-28 19:07:30 -06:00
Quincey Koziol
6eabeabdaa Refactor infrastructure for setting FAPL information from environment
variables during testing, including connecting native, pass-through, and
dynamically loaded VOL connectors.   Also bring native and pass-through
VOL connectors into alignment, removing the "H5VLnative_private.h" header.
2018-11-28 17:38:03 -06:00
Quincey Koziol
3abf58dce0 Remove example VOL connector, since it's been superceded by the pass-through
VOL connector in the src subdirectory.
2018-11-28 10:38:52 -06:00
Quincey Koziol
238a207f2d Add pass-through VOL connector 2018-11-28 10:26:03 -06:00
Quincey Koziol
2db4b6df13 Update API tracing info for VOL functions and regenerate trace macros for VOL
API calls.
2018-11-28 10:22:29 -06:00
Quincey Koziol
bf79e1bd76 Added 'notify' callback for async requests; switched VOL class and info
comparison to return comparison value as parameter, so they can return error
values; "cancelled" -> "canceled"; switched order of 'wrap_object' and
'free_wrap_ctx' management callbacks.
2018-11-27 22:15:34 -06:00
Quincey Koziol
3c5706ff5b Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol 2018-11-27 18:51:57 -06:00
Dana Robinson
86c4e7ac0f Merge pull request #1345 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:openmpi_tweaks to develop
* commit '6fccabed2e8b522747ee8056a196273917af78c7':
  Missed some function renames in error text.
2018-11-27 15:05:03 -06:00
Ray Lu
041a8295ff Merge pull request #1344 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/HDFFV-10607-patches-for-warnings-in-the-core to develop
* commit '14de476c8cb1b797ad43bea3c71dfb32bcd2131c':
  HDFFV-10607 Fixing two compiler warnings in the library.
2018-11-27 14:59:43 -06:00
Dana Robinson
6fccabed2e Missed some function renames in error text. 2018-11-27 11:50:35 -08:00
Dana Robinson
3db8d69424 Merge pull request #1343 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:openmpi_tweaks to develop
* commit '8cf3bfb14bd2a80f13d269a9e84cd99f86f19254':
  Yanked all MPI-1 calls
  Updated H5S to use the MPI-2 function MPI_Type_get_exten() where available. OpenMPI 4.0 removed the deprecated MPI-1 MPI_type_extent() call by default, so this avoids needing a special OpenMPI build.
2018-11-27 13:08:54 -06:00
Dana Robinson
8cf3bfb14b Yanked all MPI-1 calls 2018-11-27 10:31:54 -08:00
Dana Robinson
bd820f7861 Merge branch 'develop' into openmpi_tweaks 2018-11-27 09:39:23 -08:00
Dana Robinson
b087f675e2 Merge pull request #1341 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'd517bdf9d36f423e7abad34e109b6ce694fd03c8':
  Pulled the RELEASE.txt note concerning HDFFV-10633 since that change was pushed to hdf5_1_10 in case we release the Windows VFD in 1.10.5.
2018-11-27 11:38:29 -06:00
Songyu Lu
14de476c8c HDFFV-10607 Fixing two compiler warnings in the library. 2018-11-27 09:04:42 -06:00
Dana Robinson
38c202df4d Updated H5S to use the MPI-2 function MPI_Type_get_exten()
where available. OpenMPI 4.0 removed the deprecated MPI-1
MPI_type_extent() call by default, so this avoids needing
a special OpenMPI build.
2018-11-26 22:10:06 -08:00
Dana Robinson
d517bdf9d3 Pulled the RELEASE.txt note concerning HDFFV-10633 since that
change was pushed to hdf5_1_10 in case we release the Windows VFD
in 1.10.5.
2018-11-24 11:56:28 -08:00
Quincey Koziol
3217ffa1ac Add using FAPL from h5_fileaccess() to more tests. 2018-11-22 01:21:50 -06:00
Quincey Koziol
340b7a4fb8 Remove unused test for unimplemented routine. 2018-11-22 01:08:47 -06:00
Quincey Koziol
f9b625ef5d Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol 2018-11-21 23:13:04 -06:00
Quincey Koziol
3055e499d5 Switch loc_params to VOL callbacks to pass struct by pointer instead of by
value.
2018-11-21 23:12:24 -06:00
Larry Knox
9c7161e105 Merge pull request #1334 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '7bf6e98bd921c4ef1899144ab8a1f0d66a141141':
  Move wait_H5init.cmake up to config/cmake.
  Changes to CMake code to pause cmake/ctest, waiting for batch jobs to run and finish.
  Really don't run parallel tests without option specifying script.
  Add script and changes to wait for H5Tinit.c Add more sample batch scripts, specifically for sbatch, not for knl cross compile. Don't run parallel tests when no parallel test script is configured in HDF5options.cmake.
2018-11-21 09:55:08 -06:00
Quincey Koziol
8939a2190f Add info_to_str and str_to_info "management" callbacks for serializing and
deserializing a connector's info object.
2018-11-21 00:56:13 -06:00
Larry Knox
7bf6e98bd9 Move wait_H5init.cmake up to config/cmake. 2018-11-20 12:09:14 -06:00
Larry Knox
8544aae3e8 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop 2018-11-20 11:58:27 -06:00
Larry Knox
720bbdfe61 Changes to CMake code to pause cmake/ctest, waiting for batch jobs to
run and finish.
2018-11-20 11:03:58 -06:00
Larry Knox
5a90dd3cae Merge pull request #1338 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '3dc4055aaf2c0917569cba38d47df051cc0eeb79':
  Fix typo
  Standardize script
  add max count to options file
  Check PARALLEL_LEVEL maximum
2018-11-20 06:54:11 -06:00
Quincey Koziol
23ff0240ae Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol 2018-11-19 21:09:28 -06:00
Ray Lu
160107a97c Merge pull request #1335 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/HDFFV-10571-cve-2018-17237-divided-by-zero to develop
* commit 'c923cdad6e515c842f3795a5b6d754ad94021e09':
  HDFFV-10571: Minor format changes.
  HDFFV-10571: Minor change - reformatting the error check.
  HDFFV-10571: Minor change - adding the error check right after decoding of chunk dimension for safeguard.
  HDFFV-10571: Minor change - revised the comment to be clearer.
  HDFFV-10571 Divided by Zero vulnerability.  Minor fix: I added an error check to make sure the chunk size is not zero.
2018-11-19 17:20:06 -06:00
Jacob Smith
1fed1a7be7 Incorporate minimized dset ohdr tests into extant suite. 2018-11-19 14:08:31 -06:00
Allen Byrne
3dc4055aaf Fix typo 2018-11-19 11:41:11 -06:00
Allen Byrne
4bc283a0f2 Standardize script 2018-11-19 11:03:42 -06:00
Allen Byrne
d9fbacff90 add max count to options file 2018-11-19 11:02:20 -06:00
Allen Byrne
a26aedce04 Check PARALLEL_LEVEL maximum 2018-11-19 10:03:18 -06:00
Quincey Koziol
6c99961bb2 Revert some of the changes to support the original property list value of
metadata read attempts.
2018-11-18 00:57:09 -06:00
Quincey Koziol
d0d360ff2d Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol 2018-11-18 00:39:27 -06:00
Quincey Koziol
59c28780d3 Add VOL connector info to the flie access property list returned from
H5Fget_access_plist().  Also, other misc. cleanups, etc.
2018-11-18 00:38:29 -06:00
Ray Lu
e9125d6a99 Merge pull request #1337 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/HDFFV-10601-issues-with-chunk-cache-hash2 to develop
* commit '4f5a52e595194562644517b7600f3b96d4008c17':
  HDFFV-10601: Adding the new hdf5/tools/test/perform/chunk_cache.c to MANIFEST.
  HDFFV-10601: Some compiler doesn't support clock_gettime().  So I changed to use gettimeofday (HDgettimeofday in the HDF5 library).
2018-11-17 19:03:30 -06:00
Songyu Lu
4f5a52e595 HDFFV-10601: Adding the new hdf5/tools/test/perform/chunk_cache.c to MANIFEST. 2018-11-16 16:25:50 -06:00
Songyu Lu
d25afb294c HDFFV-10601: Some compiler doesn't support clock_gettime(). So I changed to use gettimeofday (HDgettimeofday in the HDF5 library). 2018-11-16 12:06:30 -06:00
Songyu Lu
c923cdad6e HDFFV-10571: Minor format changes. 2018-11-15 16:50:13 -06:00
Songyu Lu
198bc059b0 HDFFV-10571: Minor change - reformatting the error check. 2018-11-15 15:05:23 -06:00
Songyu Lu
c132cb5565 HDFFV-10571: Minor change - adding the error check right after decoding of chunk dimension for safeguard. 2018-11-15 14:57:26 -06:00
Ray Lu
e07d097da1 Merge pull request #1316 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/HDFFV-10601-issues-with-chunk-cache-hash to develop
* commit 'cd13d24e5140578a880aebe4e2d8b899179d0870':
  HDFFV-10601: I added error checking to the HDF5 functions.
  HDFFV10601: Adding performance test to verify the improvement.
  HDFFV-10601: I changed to a better way to calculate the number of chunks in a dataset.
  HDFFV-10601 Issues with chunk cache hash value calcuation:
2018-11-15 09:43:46 -06:00
Scot Breitenfeld
73f881a838 Merge pull request #1325 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:J10511 to develop
* commit '9bbaca66ca1f987ede2f5c7e9c5938523a47262f':
  fixed sp.
  HDFFV-10511 -- Make fortran specific subroutines names PRIVATE
2018-11-15 09:27:16 -06:00
Songyu Lu
cd13d24e51 HDFFV-10601: I added error checking to the HDF5 functions. 2018-11-14 17:30:23 -06:00
Dana Robinson
e890eb89d2 Merge pull request #1336 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:sec2_to_posix to develop
* commit '3edd97731e90b7fc3a378e2c6e9c043a23327d93':
  Renamed h5repart's -family_to_sec2 to -family_to_single.
2018-11-14 16:21:08 -06:00
Dana Robinson
3edd97731e Renamed h5repart's -family_to_sec2 to -family_to_single. 2018-11-14 13:37:31 -08:00
Songyu Lu
1d89a55590 HDFFV-10571: Minor change - revised the comment to be clearer. 2018-11-14 14:54:03 -06:00
Songyu Lu
78af4c21cb HDFFV-10571 Divided by Zero vulnerability. Minor fix: I added an error check to make sure the chunk size is not zero. 2018-11-14 14:31:37 -06:00
Larry Knox
9620069142 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop 2018-11-14 11:37:49 -06:00
Larry Knox
38f7e3c86b Really don't run parallel tests without option specifying script. 2018-11-14 11:35:36 -06:00
Larry Knox
6cbd463d41 Add script and changes to wait for H5Tinit.c
Add more sample batch scripts, specifically for sbatch, not for knl
cross compile.
Don't run parallel tests when no parallel test script is configured in
HDF5options.cmake.
2018-11-14 11:19:28 -06:00
Dana Robinson
ca1788e082 Merge pull request #1332 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:java_test_error_stack to develop
* commit '110c1b671ea7f2f5e8154d66f6ca6fcfb00b2bb2':
  The Java tests will no longer fail when the zlib is not present.
2018-11-13 16:38:43 -06:00
Songyu Lu
2fe10c647c HDFFV10601: Adding performance test to verify the improvement. 2018-11-13 11:37:29 -06:00
Dana Robinson
110c1b671e The Java tests will no longer fail when the zlib is not present. 2018-11-13 07:45:56 -08:00
Quincey Koziol
e2ed2edf6e Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol 2018-11-12 16:23:54 -06:00
Dana Robinson
f515574dcf Merge pull request #1331 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:java_test_error_stack to develop
* commit 'ef29549f0d66612fcdeefc763785c6826c67ad8b':
  Updated the Java tests so that they don't fail when the error stack changes.
2018-11-12 16:05:16 -06:00
Dana Robinson
ef29549f0d Updated the Java tests so that they don't fail when the
error stack changes.
2018-11-12 13:31:10 -08:00
Allen Byrne
c2ceeb02b6 Merge pull request #1327 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '7e204759f861f4f482db2032127a4dc406fcd1d6':
  Fix generate file commands
  Fix target depends
  Fix target files for commands
2018-11-12 13:45:05 -06:00
Allen Byrne
7e204759f8 Fix generate file commands 2018-11-12 12:26:11 -06:00
Quincey Koziol
17f9cb4158 Switch tool error output to match VOL changes within library 2018-11-12 12:14:25 -06:00
Quincey Koziol
a442ce607b Fix a few error messages 2018-11-12 12:13:18 -06:00
Allen Byrne
ba609275d8 Fix target depends 2018-11-12 11:52:46 -06:00
Allen Byrne
fde902cb45 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '6a2e97bead3c4d366f28b6a1e4e338fc07014954':
  HDFFV-10537: Remove installation of Fortran test mod files
2018-11-12 08:55:11 -06:00
Quincey Koziol
1118672e8c Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol 2018-11-10 11:54:58 -06:00
Quincey Koziol
ca1b9025fe Switch switch remainder of API routines to use VOL callbacks. 2018-11-10 11:54:20 -06:00
Scot Breitenfeld
6a2e97bead Merge pull request #1329 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:J10537 to develop
* commit 'cd73b837db95493de0641b2c63537b42b8b57a84':
  HDFFV-10537: Remove installation of Fortran test mod files
2018-11-09 16:51:24 -06:00
M. Scot Breitenfeld
cd73b837db HDFFV-10537: Remove installation of Fortran test mod files
Removed from autools install, cmake does not have this issue.
2018-11-09 16:00:34 -06:00
Allen Byrne
6b959b1e21 Fix target files for commands 2018-11-09 14:38:11 -06:00
Allen Byrne
6e74d2f2ed Merge pull request #1324 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '1d2f7ca4901d126d677a32ecb4e2bc60b3b41182':
  TRILAB-36 only copy shared generated
2018-11-09 14:05:59 -06:00
M. Scot Breitenfeld
9bbaca66ca fixed sp. 2018-11-09 11:29:24 -06:00
M. Scot Breitenfeld
4fbd6bb8a5 HDFFV-10511 -- Make fortran specific subroutines names PRIVATE
Made non-public APIs private.
2018-11-09 11:24:42 -06:00
Allen Byrne
1d2f7ca490 TRILAB-36 only copy shared generated 2018-11-09 11:20:48 -06:00
Songyu Lu
3a13bb72e8 HDFFV-10601: I changed to a better way to calculate the number of chunks in a dataset. 2018-11-08 15:41:49 -06:00
Songyu Lu
709704528c Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~songyulu/hdf5_ray into bugfix/HDFFV-10601-issues-with-chunk-cache-hash 2018-11-08 10:16:47 -06:00
Quincey Koziol
140f72b748 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol 2018-11-07 15:20:28 -06:00
Allen Byrne
40338b9e40 Merge pull request #1298 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '4616c1e863ab756d22af696672ba9bc2fe0eea25':
  Add custom target to force wait on generated file
  TRILAB-81 fix typo
  TRILAB-82 fixed errors found in review
  Update windows test machine info
  TRILAB-81 Output error if filename length is greater then 255
  TRILAB-81 check for func success before using value
  TRILAB-81 Coverity fix
  Move options to root CMakeLists.txt
  TRILAB-34 fix required through testing
  TRILAB-34 add batch option (also patch2 from 10633)
  TRILAB-81 coverity fixes
2018-11-07 10:02:49 -06:00
Allen Byrne
4616c1e863 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '1652a60fcbe9894d7c34a778fb24dce1979fb9a9':
  HDFFV-10605 Only test plugins if SHARED enabled
  Correct platforms
  Correct extlib depends
  Commit version changes for additional files for 1.11.3 snapshot release.
2018-11-06 16:01:35 -06:00
Allen Byrne
1652a60fcb Merge pull request #1319 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '81cb24ac1db0f4936b19067cdb7fa4e14e0d00db':
  Commit version changes for additional files for 1.11.3 snapshot release.
2018-11-06 16:01:16 -06:00
Allen Byrne
0f4f4cf5dd Merge pull request #1320 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '79903575e64e1e8f46ce27e6212d5d5939a8a900':
  HDFFV-10605 Only test plugins if SHARED enabled
  Correct platforms
  Correct extlib depends
2018-11-06 15:47:10 -06:00
Allen Byrne
79903575e6 HDFFV-10605 Only test plugins if SHARED enabled 2018-11-06 15:45:58 -06:00
Allen Byrne
c77d044dd0 Correct platforms 2018-11-06 15:30:15 -06:00
Allen Byrne
b9b89705c3 Correct extlib depends 2018-11-06 15:10:55 -06:00
Allen Byrne
7f5d91fa8f Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '9f299a6eeb91b8bc59196ccbb7067285b23e6085':
  TRILAB-36 add custom target on generated files
  Fix typo in whitespace area
2018-11-06 15:08:36 -06:00
Allen Byrne
9f299a6eeb Merge pull request #1318 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '1bd3a2885865f4745209233ea84045a22e6dce9c':
  TRILAB-36 add custom target on generated files
  Fix typo in whitespace area
2018-11-06 15:07:37 -06:00
Larry Knox
81cb24ac1d Commit version changes for additional files for 1.11.3 snapshot release. 2018-11-06 10:56:36 -06:00
Quincey Koziol
ef9ffc630a Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol 2018-11-06 10:44:17 -06:00
Allen Byrne
1bd3a28858 TRILAB-36 add custom target on generated files 2018-11-06 09:35:11 -06:00
Allen Byrne
a6a46fb27f Add custom target to force wait on generated file 2018-11-06 09:32:34 -06:00
Allen Byrne
e753904d0b Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'e6545faa5699aae4d5dca23ed40e3080fa9dc72d':
  Update HDF5-Examples version to be included in CMake-* tar/zip files.
  Snapshot version 1.11 release 3.
2018-11-05 16:57:51 -06:00
Allen Byrne
05419b19fc Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'e6545faa5699aae4d5dca23ed40e3080fa9dc72d':
  Update HDF5-Examples version to be included in CMake-* tar/zip files.
  Snapshot version 1.11 release 3.
2018-11-05 16:57:39 -06:00
Larry Knox
e6545faa56 Merge pull request #1317 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:develop to develop
* commit 'be0d6b206aaa04f7d9cb406a71aeeb458ba67975':
  Update HDF5-Examples version to be included in CMake-* tar/zip files.
  Snapshot version 1.11 release 3.
2018-11-05 15:49:11 -06:00
hdftest
be0d6b206a Update HDF5-Examples version to be included in CMake-* tar/zip files. 2018-11-05 12:40:04 -06:00
hdftest
db48399bd8 Snapshot version 1.11 release 3. 2018-11-05 12:21:13 -06:00
Allen Byrne
550674d28a Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '20ad15a1a8e9008103fe7d30401408eaa2aff6e5':
  Fixed exit() to HDexit() in use_append_chunk.c and use_append_mchunks.c
  Fixed fprintf to HDfprintf in the following routines: 1) read_uc_file() in use_common.c 2) main() of use_append_chunk.c and use_append_mchunks.c
  Fix for HDFFV-10554 use_append_chunks in swmr use case test failure Fix the timing issue of the test by moving the open/close of the test file for the writer to use_append_chunk.c and use_append_mchunks.c.
2018-11-05 09:09:26 -06:00
Allen Byrne
9e0eb2fdca Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '20ad15a1a8e9008103fe7d30401408eaa2aff6e5':
  Fixed exit() to HDexit() in use_append_chunk.c and use_append_mchunks.c
  Fixed fprintf to HDfprintf in the following routines: 1) read_uc_file() in use_common.c 2) main() of use_append_chunk.c and use_append_mchunks.c
  Fix for HDFFV-10554 use_append_chunks in swmr use case test failure Fix the timing issue of the test by moving the open/close of the test file for the writer to use_append_chunk.c and use_append_mchunks.c.
2018-11-05 09:09:09 -06:00
Quincey Koziol
afd54bbe5c Remove most debugging shims & scaffolding. 2018-11-04 02:09:27 -06:00
Quincey Koziol
1daa7b830a Switch driver | plugin => connector. 2018-11-04 01:27:23 -05:00
Quincey Koziol
deb75622ca Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol 2018-11-04 00:25:36 -05:00
Quincey Koziol
df7cf2a9d3 Refactor, standardize, and revise the async request callbacks. 2018-11-04 00:05:08 -05:00
Songyu Lu
6fa26d7e49 HDFFV-10601 Issues with chunk cache hash value calcuation:
1. H5D__chunk_hash_val: When the number of chunks in the fastest changing dimension is larger than the number of slots in the hash table, H5D__chunk_hash_val abandons the normal hash value calculation algorithm and simply uses the scaled dimension.  This will cause chunks a selection that cuts across chunks in dimensions other than the fastest changing to all have the same hash value, and they will therefore always evict each other from the cache, having an obvious major performance impact. Eliminated the check  for the number of slots in this function and always use the full algorithm.

2. H5D__chunk_init: When the scaled dimensions (number of chunks in each dimension) are calculated in H5D__chunk_init, a simple divide ("/") operator is used with the dataset size in elements and the chunk size in elements. While this is fine when the dataset size is an exact multiple of the chunk size, in other cases, since "/" rounds down, it results in a scaled dimension one less than it should (it ignores the partial edge chunk). This has trickle down effects on hash value calculation that can cause excess hash value collisions and therefore performance issues. Changed the calculation to (((dataset_size - 1) / chunk_size) + 1).

Tested the build with Autotool and CMake.
2018-11-02 14:53:35 -05:00
Quincey Koziol
4806d29d9f Refactor and standardize named datatype VOL callbacks. 2018-11-01 17:02:27 -05:00
Vailin Choi
20ad15a1a8 Merge pull request #1314 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit '51076d40617aa6f0236809c2c919cc6921b3bbc1':
  Fixed exit() to HDexit() in use_append_chunk.c and use_append_mchunks.c
  Fixed fprintf to HDfprintf in the following routines: 1) read_uc_file() in use_common.c 2) main() of use_append_chunk.c and use_append_mchunks.c
  Fix for HDFFV-10554 use_append_chunks in swmr use case test failure Fix the timing issue of the test by moving the open/close of the test file for the writer to use_append_chunk.c and use_append_mchunks.c.
2018-11-01 16:12:07 -05:00
Vailin Choi
51076d4061 Fixed exit() to HDexit() in use_append_chunk.c and use_append_mchunks.c 2018-11-01 15:00:40 -05:00
Quincey Koziol
1b00d04080 Refactor and standardize object VOL callbacks. 2018-11-01 14:54:44 -05:00
Vailin Choi
4f62c084f1 Fixed fprintf to HDfprintf in the following routines:
1) read_uc_file() in use_common.c
2) main() of use_append_chunk.c and use_append_mchunks.c
2018-11-01 12:03:34 -05:00
Quincey Koziol
a5cc4e272b Refactor and standardize the link VOL callbacks. Also fix error stack for
testing.
2018-11-01 11:22:54 -05:00
Allen Byrne
2c266f2cb6 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '3fcc1e7929d99272cf3d29883de78b1ad544ea38':
  A trivial change to reformat a comment.  The purpose is simply to try out Git.
2018-11-01 08:40:53 -05:00
Allen Byrne
0e1c2d1c9e Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '3fcc1e7929d99272cf3d29883de78b1ad544ea38':
  A trivial change to reformat a comment.  The purpose is simply to try out Git.
2018-11-01 08:40:38 -05:00
Quincey Koziol
a39486a341 Refactor and standardize group VOL callbacks. 2018-10-31 19:17:37 -05:00
Quincey Koziol
ef7c458d73 Update for change in error stack when opening a dataset. 2018-10-31 18:41:19 -05:00
Quincey Koziol
d66d5e01c0 Refactor and standarize file object callbacks, including some fixes on the
dataset callbacks.
2018-10-31 18:18:45 -05:00
Ray Lu
3fcc1e7929 Merge pull request #1315 in HDFFV/hdf5 from ~SONGYULU/hdf5_ray:bugfix/ray_test to develop
* commit 'b72e926ed0c981d14d5219b32042c3d0b938d1e1':
  A trivial change to reformat a comment.  The purpose is simply to try out Git.
2018-10-31 10:43:22 -05:00
Songyu Lu
b72e926ed0 A trivial change to reformat a comment. The purpose is simply to try out Git. 2018-10-31 09:54:08 -05:00
Allen Byrne
3042976b65 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '99c1e577da3a2dd45fbfee748220986c42962921':
  Removed a couple of extraneous commas from VOL example.
  Cleaned up VOL example.
  Updated MANIFEST file.
  Fixed VOL example to use a platform-independent format specifier for size_t.
2018-10-31 08:49:58 -05:00
Allen Byrne
a5e33551d7 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '99c1e577da3a2dd45fbfee748220986c42962921':
  Removed a couple of extraneous commas from VOL example.
  Cleaned up VOL example.
  Updated MANIFEST file.
  Fixed VOL example to use a platform-independent format specifier for size_t.
2018-10-31 08:49:45 -05:00
Dana Robinson
99c1e577da Merge pull request #1313 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_tweaks to develop
* commit 'ee12aff2ca89e92b99590f29096794a84c6bacdc':
  Removed a couple of extraneous commas from VOL example.
  Cleaned up VOL example.
  Updated MANIFEST file.
  Fixed VOL example to use a platform-independent format specifier for size_t.
2018-10-30 18:54:05 -05:00
Vailin Choi
d1d2cf776d Fix for HDFFV-10554 use_append_chunks in swmr use case test failure
Fix the timing issue of the test by moving the open/close of the test file for the writer to
use_append_chunk.c and use_append_mchunks.c.
2018-10-30 16:53:09 -05:00
Dana Robinson
ee12aff2ca Removed a couple of extraneous commas from VOL example. 2018-10-30 14:44:54 -07:00
Dana Robinson
7a5e632c0d Cleaned up VOL example. 2018-10-30 10:32:17 -07:00
Allen Byrne
98353c18bd Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '3145690c9590778b857def090489c6d890e42a5b':
  Add script to run tests with sbatch when not cross compiling. Add new files to MANIFEST.
2018-10-30 12:03:50 -05:00
Allen Byrne
b2147800a8 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '3145690c9590778b857def090489c6d890e42a5b':
  Add script to run tests with sbatch when not cross compiling. Add new files to MANIFEST.
2018-10-30 12:03:39 -05:00
Dana Robinson
ab9e964c3e Updated MANIFEST file. 2018-10-30 09:53:20 -07:00
Dana Robinson
12e929e1ec Fixed VOL example to use a platform-independent format
specifier for size_t.
2018-10-29 16:06:22 -07:00
Quincey Koziol
4c6d8d376c Remove erroneous call. 2018-10-29 17:26:33 -05:00
Quincey Koziol
8c37f531a9 Switch to using VOL callbacks, instead of direct calls to internal routines. 2018-10-29 17:24:33 -05:00
Larry Knox
3145690c95 Merge pull request #1312 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '41faaf271ca1de929c1e12ae13c40fc67a53edff':
  Add script to run tests with sbatch when not cross compiling. Add new files to MANIFEST.
2018-10-29 17:11:15 -05:00
Quincey Koziol
aaaf1acc08 Add ref counter to VOL object wrapping in API contexts, so that re-entrant /
recursive routines work correctly.  Another minor cleanup in the attribute code.
2018-10-29 16:52:00 -05:00
Allen Byrne
89bd227aeb Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'ff34cd0a0506ca16f4971cf03bd1b6e33bfa132c':
  Updated RELEASE.txt to reflect HDFFV-10609 work (H5Xpkg.h files being incorrectly installed).
  Add files and changes to cross compile with CrayLinuxEnvironment and run ctest tests with a batch job on knl compute nodes.
2018-10-29 16:44:09 -05:00
Larry Knox
41faaf271c Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop 2018-10-29 16:18:27 -05:00
Larry Knox
f031cc7b7a Add script to run tests with sbatch when not cross compiling.
Add new files to MANIFEST.
2018-10-29 16:17:10 -05:00
Allen Byrne
ae0f4a23c0 Fix typo in whitespace area 2018-10-29 15:52:39 -05:00
Dana Robinson
ff34cd0a05 Merge pull request #1311 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:cmake_tweaks to develop
* commit 'c9273522e9a7e946802d8545b2532f9129b459a9':
  Updated RELEASE.txt to reflect HDFFV-10609 work (H5Xpkg.h files being incorrectly installed).
2018-10-29 15:35:55 -05:00
Dana Robinson
c9273522e9 Updated RELEASE.txt to reflect HDFFV-10609 work (H5Xpkg.h files
being incorrectly installed).
2018-10-29 12:59:25 -07:00
Larry Knox
81c0357645 Merge pull request #1309 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'b24259ed8cdb273273f82c2b3f3a2dcac60b32ba':
  Add files and changes to cross compile with CrayLinuxEnvironment and run ctest tests with a batch job on knl compute nodes.
2018-10-29 14:57:00 -05:00
Larry Knox
b24259ed8c Add files and changes to cross compile with CrayLinuxEnvironment and run
ctest tests with a batch job on knl compute nodes.
2018-10-29 14:24:08 -05:00
Quincey Koziol
ca5ff0c0c2 Convert dataset callbacks to standard form, for wrapping object IDs, etc.
Also, fix a few attribute issues that I missed.
2018-10-29 13:15:56 -05:00
Allen Byrne
2c48f6bd00 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '7db3ea76da5d3b5c237a707b09d1618d3206ba83':
  Makes the installed header files the same between the autotools and CMake.
2018-10-29 11:10:27 -05:00
Dana Robinson
7db3ea76da Merge pull request #1305 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:cmake_tweaks to develop
* commit '62b92ddf4096d9b8f6235587ec16f34f6c6fa119':
  Makes the installed header files the same between the autotools and CMake.
2018-10-29 09:16:23 -05:00
Quincey Koziol
8fd2e1d36e Convert attribute VOL callbacks to a standard form that sets up the wrapper
object info in a single place.
2018-10-28 20:51:16 -05:00
Quincey Koziol
ad92351809 Clean up va_list properly on error. 2018-10-28 02:03:08 -05:00
Quincey Koziol
58202337dd Minor coding style cleanups 2018-10-28 02:02:45 -05:00
Quincey Koziol
8ee361f185 Move all callback-related routines into the callback source file, standardizing
their coding style
2018-10-28 01:31:28 -05:00
Quincey Koziol
50dd616eb5 Correct error with parsing of "FUNC_ENTER_API_NOINIT" 2018-10-27 17:38:32 -05:00
Quincey Koziol
9bc6644ed1 Duplicate name of VOL plugin class, to avoid continuing to refer to the caller's
string when making a copy of the class for internal use.
2018-10-27 16:15:39 -05:00
Quincey Koziol
fb6ecf33b0 Fix names of VOL API routines. 2018-10-27 02:43:40 -05:00
Quincey Koziol
9c7b96b42f Move (final?) file operation from directly calling into library code to using
the file_optional VOL callback.
2018-10-27 02:21:48 -05:00
Quincey Koziol
43ffc1deb5 Remove some VOL-specific internal coding. 2018-10-27 02:06:43 -05:00
Quincey Koziol
83e03772eb Add VOL object wrapping to API context when refreshing groups, named datatypes
and objects.
2018-10-27 01:55:31 -05:00
Quincey Koziol
6e84fd8327 Remove virtual dataset refresh code's direct use of native VOL plugin's ID. 2018-10-27 01:33:07 -05:00
Dana Robinson
b29101c971 Merge branch 'develop' into cmake_tweaks 2018-10-26 20:49:07 -07:00
Dana Robinson
62b92ddf40 Makes the installed header files the same between the autotools
and CMake.

* CMake will no longer install private generated headers and tools
  library headers.
* Several empty public header files (which represent internal packages)
  were removed. These were only installed by CMake.
* Autotools installs will install H5FDwindows.h.

Fixes HDFFV-10614.
2018-10-26 20:44:29 -07:00
Quincey Koziol
ce3d1ec9ea Eliminate last call to H5VL_native_register, shifting everything over to
the VOL plugin wrapping code.
2018-10-26 17:27:10 -05:00
Quincey Koziol
171deaa588 Checkpoint progress on stacking VOL plugins - all standalone regression tests
in the 'test' directory appear to be working.
2018-10-26 16:09:06 -05:00
Quincey Koziol
305997501d Updates after merging changes from develop. 2018-10-26 00:54:29 -05:00
Quincey Koziol
4a32895724 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol 2018-10-25 18:32:13 -05:00
Quincey Koziol
0df6e44a6e Squashed commit of private branch changes to support stackable VOL plugins.
modified:   test/dsets.c
2018-10-24 23:52:47 -05:00
Allen Byrne
29afe82e79 TRILAB-81 fix typo 2018-10-24 15:39:09 -05:00
Allen Byrne
ee54368066 TRILAB-82 fixed errors found in review 2018-10-24 14:55:16 -05:00
Allen Byrne
f8b5d40c76 Update windows test machine info 2018-10-23 10:15:03 -05:00
Allen Byrne
1d06bbe523 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '47f30b474bdc498c20bd6d2a0ba7e8947ab389f0':
  HDFFV-10608 Move toolchain files into a subfolder
  TRILAB-36 add option for test script batch command
  Fixed warnings in the VOL example and run it from the script.
  Split H5VLnative.h into public and private files and updated
2018-10-23 09:32:00 -05:00
Allen Byrne
47f30b474b Merge pull request #1301 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '096279caf76a542306b840fb90e1e753e8bbf748':
  HDFFV-10608 Move toolchain files into a subfolder
  TRILAB-36 add option for test script batch command
2018-10-22 16:33:43 -05:00
Allen Byrne
096279caf7 HDFFV-10608 Move toolchain files into a subfolder 2018-10-22 16:08:52 -05:00
Allen Byrne
164bae2439 TRILAB-36 add option for test script batch command 2018-10-22 15:39:03 -05:00
Dana Robinson
8a12b57483 Merge pull request #1300 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_tweaks to develop
* commit 'b33a2e7dfe76a2947c12462adb40c88af9c92e75':
  Fixed warnings in the VOL example and run it from the script.
  Split H5VLnative.h into public and private files and updated
2018-10-22 10:59:07 -05:00
Dana Robinson
b33a2e7dfe Fixed warnings in the VOL example and run it from the script. 2018-10-21 10:08:26 -07:00
Dana Robinson
46c5b059f1 Split H5VLnative.h into public and private files and updated 2018-10-20 13:06:37 -07:00
Allen Byrne
9838dba4a4 TRILAB-81 Output error if filename length is greater then 255 2018-10-19 14:53:18 -05:00
Allen Byrne
cce1727525 TRILAB-81 check for func success before using value 2018-10-19 14:45:04 -05:00
Allen Byrne
6e84657314 TRILAB-81 Coverity fix 2018-10-19 14:03:51 -05:00
Allen Byrne
e1308fc432 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '5f99891e6dc59524fb6e43ca96a86df22b403c61':
  Move options to root cmake file
  EED-258 Add modules uses toolchain files
  Updates to the VOL ID and object API calls.
2018-10-19 13:49:55 -05:00
Allen Byrne
5f99891e6d Merge pull request #1299 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '494d39f1c2f6225c732cb857c860d6b475d03226':
  Move options to root cmake file
  EED-258 Add modules uses toolchain files
2018-10-19 13:49:33 -05:00
Allen Byrne
494d39f1c2 Move options to root cmake file 2018-10-19 13:34:31 -05:00
Allen Byrne
cd7a896ee4 Move options to root CMakeLists.txt 2018-10-19 13:33:12 -05:00
Dana Robinson
4e575a0865 Merge pull request #1297 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '2d6d5cad0cc426cd53b9d4fda15e53d8021e4c7b':
  Updates to the VOL ID and object API calls.
2018-10-18 16:05:40 -05:00
Allen Byrne
7e00924d1b EED-258 Add modules uses toolchain files 2018-10-18 14:44:27 -05:00
Allen Byrne
e3e0289d43 TRILAB-34 fix required through testing 2018-10-17 11:06:45 -05:00
Allen Byrne
e769ee8b5d TRILAB-34 add batch option (also patch2 from 10633) 2018-10-17 11:01:01 -05:00
Allen Byrne
633b7f93ce TRILAB-81 coverity fixes 2018-10-17 10:57:56 -05:00
Allen Byrne
a82aee9a5f Merge pull request #1292 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '2e28fad2d007841c08cdb3f06a3bd177d12ce30e':
  TRILAB-34 remove extra arg
  TRILAB-34 Add batch script config command
  TRILAB-36 Revert to target_file and correct property
  Add generated propoerty to H5lib_settings
  HDFFV-10603 patch 6
  TRILAB-34 batch command options
  Correct quote char
  Add more descriptive option name
  HDFFV-10603 fixup cmake usage
  TRILABS-34 add batch option. Also fix cmakedefine01 usage
2018-10-17 10:54:10 -05:00
Dana Robinson
2d6d5cad0c Updates to the VOL ID and object API calls.
This brings the H5VL code in line with the H5I code regarding
naming, parameter order, etc.

Several public API calls were affected by this change.

These changed names to reflect their use with VOL drivers:
    H5VLregister()          -->     H5VLregister_driver()
    H5VLregister_by_name()  -->     H5VLregister_driver_by_name()
    H5VLunregister()        -->     H5VLunregister_driver()
    H5VLis_registered()     -->     H5VLis_driver_registered()

This call was renamed to match H5Iregister(). The order of the first
two parameters also reversed and the object pointer is now const.
    H5VLobject_register()   -->     H5VLregister()
2018-10-17 02:06:28 -07:00
Allen Byrne
2e28fad2d0 TRILAB-34 remove extra arg 2018-10-16 16:46:45 -05:00
Allen Byrne
c39449fa12 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '1e8ef703cdc057211b3587be776a6e9f62e8f76f':
  Fixed a C++ style commenting issue and removed an unused field from H5F_trav_obj_ids_t.
  Fixed a memory issue in H5Drefresh() where the dataset's H5VL_object_t gets closed but we try to use it to find the driver.
2018-10-16 13:10:48 -05:00
Allen Byrne
6b65a1b78f TRILAB-34 Add batch script config command 2018-10-16 12:06:07 -05:00
Allen Byrne
77f284a175 TRILAB-36 Revert to target_file and correct property 2018-10-16 11:33:44 -05:00
Allen Byrne
db3fe90abd Add generated propoerty to H5lib_settings 2018-10-15 16:57:50 -05:00
Allen Byrne
2e4e4f38e6 HDFFV-10603 patch 6 2018-10-15 13:49:53 -05:00
Allen Byrne
689f184345 TRILAB-34 batch command options 2018-10-12 13:55:29 -05:00
Dana Robinson
1e8ef703cd Merge pull request #1294 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'b0b9eda809282f362eb0e49bebd2956ba5a11bbc':
  Fixed a C++ style commenting issue and removed an unused field from H5F_trav_obj_ids_t.
2018-10-12 13:24:08 -05:00
Dana Robinson
b0b9eda809 Fixed a C++ style commenting issue and removed an unused field
from H5F_trav_obj_ids_t.
2018-10-12 10:47:47 -07:00
Dana Robinson
bb9e268782 Merge pull request #1293 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'c3a813a37fb700d2d1039d6fdc54d8e377412b76':
  Fixed a memory issue in H5Drefresh() where the dataset's H5VL_object_t gets closed but we try to use it to find the driver.
2018-10-12 11:41:31 -05:00
Dana Robinson
c3a813a37f Fixed a memory issue in H5Drefresh() where the dataset's H5VL_object_t
gets closed but we try to use it to find the driver.
2018-10-11 15:08:02 -07:00
Allen Byrne
42c8dd66d7 Correct quote char 2018-10-11 14:34:34 -05:00
Allen Byrne
46e7e5f8f2 Add more descriptive option name 2018-10-11 12:35:53 -05:00
Allen Byrne
4659e43a6b HDFFV-10603 fixup cmake usage 2018-10-11 12:24:15 -05:00
Allen Byrne
d69b541c20 TRILABS-34 add batch option. Also fix cmakedefine01 usage 2018-10-11 11:31:09 -05:00
Dana Robinson
39b3b52a94 Merge pull request #1291 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_squash to develop
* commit 'e962df1591bc6eaee5b9e318de83b9c6698bc7b6':
  VOL FEATURE
2018-10-10 16:26:21 -05:00
Dana Robinson
e962df1591 VOL FEATURE 2018-10-10 08:10:15 -07:00
Dana Robinson
471150151d Merge pull request #1282 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:H5I_debug to develop
* commit '75b84b09bd249b36a063fd51ecd3383801b0118b':
  Updated the H5I debug dump to not segfault when types are not initialized or contain zero IDs in the skip list.
  The H5I debug ID dump function is now always available instead of hidden behind an H5_DEBUG_OUTPUT ifdef.
2018-10-06 22:35:29 -05:00
Dana Robinson
75b84b09bd Updated the H5I debug dump to not segfault when types are not initialized
or contain zero IDs in the skip list.
2018-10-05 22:16:51 -07:00
Dana Robinson
1b2c820b4b The H5I debug ID dump function is now always available instead
of hidden behind an H5_DEBUG_OUTPUT ifdef.
2018-10-05 21:47:51 -07:00
Allen Byrne
cd69ff0181 Merge pull request #1278 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '299852b6b565c906938ffaad5bb8e841b82118ab':
  Update examples version
  Fix typo
  Reconciled docs with 1.10 branch
  TRILABS-34 improve cross compile with emulator
  TRILABS-34 Cleanup try_run
  TRILABS-34 avoid try-run output capture
2018-10-04 17:00:35 -05:00
Allen Byrne
299852b6b5 Update examples version 2018-10-04 16:59:22 -05:00
Allen Byrne
7d5ced1d23 Fix typo 2018-10-04 16:56:44 -05:00
Allen Byrne
1fc646e52b Reconciled docs with 1.10 branch 2018-10-04 16:48:34 -05:00
Allen Byrne
4442b5b743 TRILABS-34 improve cross compile with emulator 2018-10-04 16:06:31 -05:00
Allen Byrne
a5301ee6b8 TRILABS-34 Cleanup try_run 2018-10-04 15:34:29 -05:00
Allen Byrne
9c39016e1d TRILABS-34 avoid try-run output capture 2018-10-04 14:00:49 -05:00
Allen Byrne
36594716c3 Merge pull request #1277 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '2a95ab5acbe032f58891b653f56b9db8a4938d95':
  TRILABS-21 add toolchain related info and files
  TRILABS-21 Add intel compiler support
  Fix undef for Xl compilers
  TRILAB-21 Intel flags
2018-10-04 13:04:53 -05:00
Allen Byrne
2a95ab5acb TRILABS-21 add toolchain related info and files 2018-10-04 11:40:33 -05:00
Allen Byrne
284cb8ffc0 TRILABS-21 Add intel compiler support 2018-10-04 10:42:44 -05:00
Allen Byrne
d581cbeb9e Merge pull request #1276 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '1cac34fc5bdae7f6cc265a4f94f82048642e5de7':
  Fix defines for XL compiler
2018-10-03 16:42:56 -05:00
Allen Byrne
1cac34fc5b Fix defines for XL compiler 2018-10-03 16:39:50 -05:00
Allen Byrne
c5256dcd9d Fix undef for Xl compilers 2018-10-03 16:24:46 -05:00
Allen Byrne
3209d1278f TRILAB-21 Intel flags 2018-10-02 18:13:21 -05:00
Jacob Smith
f5114fcddb Remove unnecessary H5_now() call; remove ohdr v2 mtime addition. 2018-10-02 10:50:37 -05:00
Allen Byrne
40179a9496 Merge pull request #1261 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'a2da9930af38a86387466a2021b71a2cc7484f1b':
  replace page chars
  Remove obsolete comment
2018-09-27 13:41:31 -05:00
Allen Byrne
a2da9930af replace page chars 2018-09-27 11:50:22 -05:00
Allen Byrne
8e48f6ec3a Remove obsolete comment 2018-09-27 09:58:27 -05:00
Allen Byrne
cc8538e1ed Merge pull request #1258 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'd26bb4d26ce5a23804a80c16dcb53e5f3eb957e4':
  HDFFV-10594 - mac must be space separated
  HDFFV-10594 - Add rpath configuration note
  Add extra path option for build location
  Use relative RPATH paths
2018-09-26 15:47:19 -05:00
Allen Byrne
d26bb4d26c HDFFV-10594 - mac must be space separated 2018-09-26 15:12:44 -05:00
Allen Byrne
ebec5c6117 HDFFV-10594 - Add rpath configuration note 2018-09-26 12:25:02 -05:00
Allen Byrne
5527dbfac2 Add extra path option for build location 2018-09-26 12:05:43 -05:00
Allen Byrne
01e40b31fe Use relative RPATH paths 2018-09-26 09:40:03 -05:00
Larry Knox
ab84c029c4 Merge pull request #1257 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '532a8df687e6acff18453fec6b8fe22f4bc65ebe':
  HDFFV-10531 document option for external libs
2018-09-25 15:05:47 -05:00
Allen Byrne
532a8df687 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '8e3b094bad1706b444554cd23591fd1c4431c1f1':
  Remainder of vol_normalization changes (dataset, attribute, files, objects).
2018-09-25 09:13:50 -05:00
Dana Robinson
8e3b094bad Merge pull request #1255 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '8a4695ed590809754794864d0473d15f8c1c69e3':
  Remainder of vol_normalization changes (dataset, attribute, files, objects).
2018-09-24 18:21:48 -05:00
Dana Robinson
8a4695ed59 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '2618dc314b9e4875e6ece7ee8696846ac2d02183':
  Remove extra unneeded
  Remove libsettings from pregenerated block
  CMake changes for SKIPPED and flush tests
  Correct $withval usage in configure
  HDFFV-10332 Adjust checks and generation of files
  HDFFV-10332 Use pre-generated files
2018-09-24 17:52:56 -05:00
Allen Byrne
ed6cfe8ee6 HDFFV-10531 document option for external libs 2018-09-24 16:18:42 -05:00
Allen Byrne
2618dc314b Merge pull request #1246 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '96d5da7f1ad681573d42d2a4fd9e422fe049442d':
  Remove extra unneeded
  Remove libsettings from pregenerated block
  Correct $withval usage in configure
  HDFFV-10332 Adjust checks and generation of files
  HDFFV-10332 Use pre-generated files
2018-09-24 16:17:39 -05:00
Allen Byrne
96d5da7f1a Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'e96bd2d46e208e0eb6c62cfcc4f86141f933884e':
  CMake changes for SKIPPED and flush tests
  H5S adjust callbacks now return an herr_t instead of void.
  Normalization with vol_integration (property lists, file drivers, other misc).
2018-09-24 15:55:19 -05:00
Allen Byrne
e96bd2d46e Merge pull request #1256 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '8d7bdb704163327cacf8be3a4e03f02fb88a957b':
  CMake changes for SKIPPED and flush tests
2018-09-24 15:54:31 -05:00
Allen Byrne
9045cf049f Remove extra unneeded 2018-09-24 15:31:39 -05:00
Allen Byrne
a8f46df2c2 Remove libsettings from pregenerated block 2018-09-24 15:29:26 -05:00
Allen Byrne
8d7bdb7041 CMake changes for SKIPPED and flush tests 2018-09-24 14:38:46 -05:00
Dana Robinson
2874af2cac Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop 2018-09-24 12:24:28 -07:00
Dana Robinson
a56b4db4ae Remainder of vol_normalization changes (dataset, attribute, files, objects). 2018-09-24 12:23:41 -07:00
Dana Robinson
496de34110 Merge pull request #1254 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '37309c1bd98b3d810f09569c72ac375e75117a91':
  H5S adjust callbacks now return an herr_t instead of void.
2018-09-24 14:06:13 -05:00
Dana Robinson
37309c1bd9 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop 2018-09-24 08:35:53 -07:00
Dana Robinson
30cd579a14 H5S adjust callbacks now return an herr_t instead of void. 2018-09-24 08:35:13 -07:00
Dana Robinson
8fb7c5a94f Merge pull request #1253 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '987bca5a34a09cd564445d53f58cf1e428e43276':
  Normalization with vol_integration (property lists, file drivers, other misc).
2018-09-24 10:01:53 -05:00
Allen Byrne
5b07855b2d Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '5c99d4e4df67699b81f1323e27a4df935d90e465':
  Normalization with vol_integration (misc internal and datatype)
2018-09-24 07:55:05 -05:00
Dana Robinson
987bca5a34 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop 2018-09-21 12:12:49 -07:00
Dana Robinson
265652fe54 Normalization with vol_integration (property lists, file drivers,
other misc).
2018-09-21 12:12:05 -07:00
Dana Robinson
5c99d4e4df Merge pull request #1252 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '1c8916ca0e9fe3447efe205094a2b5d3d5ccf8f6':
  Normalization with vol_integration (misc internal and datatype)
2018-09-21 12:42:06 -05:00
Allen Byrne
d8aa676175 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'f03758613a6ec83e5ddd664590d162ccc888f13e':
  Snapshot version 1.11 release 2.
  Normalization with vol_integration (test code and H5Xtest.c)
2018-09-21 12:17:19 -05:00
Dana Robinson
1c8916ca0e Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop 2018-09-20 13:39:31 -07:00
Dana Robinson
b48686febd Normalization with vol_integration (misc internal and datatype) 2018-09-20 13:38:40 -07:00
Allen Byrne
f03758613a Merge pull request #1251 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:develop to develop
* commit '04a2d68778bc978ac62b03b5b5bfa034e2ced7f7':
  Snapshot version 1.11 release 2.
2018-09-20 15:32:32 -05:00
Jacob Smith
ff7d250093 Remove unused/redundant external file link test 2018-09-20 15:25:10 -05:00
Jacob Smith
9dec62e0ae Modify MTIME size behavior to be closer to expectations (we hope).
Minor code cleanup.
2018-09-20 15:15:49 -05:00
hdftest
04a2d68778 Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~hdftest/hdf5_hft into develop 2018-09-20 14:59:17 -05:00
hdftest
e2f6e6f62f Snapshot version 1.11 release 2. 2018-09-20 14:54:10 -05:00
Jacob Smith
5f8f703dec Continued progress in implementing tests. 2018-09-20 14:16:26 -05:00
Dana Robinson
d3074fa8bd Merge pull request #1250 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '67a126c7ba8825ffb193c930c7b8cae939b3446d':
  Normalization with vol_integration (test code and H5Xtest.c)
2018-09-20 14:13:27 -05:00
Dana Robinson
67a126c7ba Normalization with vol_integration (test code and H5Xtest.c) 2018-09-20 10:40:51 -07:00
Allen Byrne
2862c93a2b Correct $withval usage in configure 2018-09-20 10:15:33 -05:00
Allen Byrne
a2da8fc776 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '99299e195b5294549b75b28321ae7f8d2c6f8644':
  Fix missed replacement
2018-09-20 10:01:58 -05:00
Allen Byrne
99299e195b Merge pull request #1248 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit 'b3ad9e1c0e3d70233518ee84bd68935f5adb3b89':
  Fix missed replacement
2018-09-20 10:01:12 -05:00
Allen Byrne
569682b478 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'bbafe0debae9886988e4b7ec31bb8ef7292e43f9':
  Remove extra constant
  Fix typo
  Add Constants to all ERR STK checks
  Use constants for test comparisons
  Develop normalization with vol_integration. Mostly peripheral things like the tools and wrappers, with just enough core library code to support that.
2018-09-20 09:04:51 -05:00
Allen Byrne
b3ad9e1c0e Fix missed replacement 2018-09-20 09:01:57 -05:00
Allen Byrne
bbafe0deba Merge pull request #1247 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '59f36c5cdef1899742feb1c06ee09886e2d0a220':
  Remove extra constant
  Fix typo
  Add Constants to all ERR STK checks
  Use constants for test comparisons
2018-09-19 17:02:26 -05:00
Dana Robinson
bbde33f6f9 Merge pull request #1245 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_pull_request to develop
* commit 'eb78fd88325d58a95c026129f1e2b4c7c50f621a':
  Develop normalization with vol_integration. Mostly peripheral things like the tools and wrappers, with just enough core library code to support that.
2018-09-19 16:48:52 -05:00
Allen Byrne
59f36c5cde Remove extra constant 2018-09-19 10:52:43 -05:00
Allen Byrne
bd1be52990 Fix typo 2018-09-19 08:59:03 -05:00
Allen Byrne
cd290ddecb Add Constants to all ERR STK checks 2018-09-19 08:58:08 -05:00
Allen Byrne
d2806d4875 HDFFV-10332 Adjust checks and generation of files 2018-09-19 08:52:13 -05:00
Allen Byrne
fe418f6c23 Use constants for test comparisons 2018-09-19 08:06:05 -05:00
Allen Byrne
521eebbce2 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'ec53237fb849042b4a5b276a3e66a98ebb3710ee':
  Removed 'VOL' versions of FUNC_ENTER macros as well as empty functions orginally intended to support the full SWMR feature.
2018-09-19 07:44:32 -05:00
Dana Robinson
eb78fd8832 Develop normalization with vol_integration.
Mostly peripheral things like the tools and wrappers,
with just enough core library code to support that.
2018-09-18 22:57:37 -07:00
Dana Robinson
ec53237fb8 Merge pull request #1244 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_pull_request to develop
* commit '680cf4d946fd10d50e0f7acdc5bc93f91037fb4f':
  Removed 'VOL' versions of FUNC_ENTER macros as well as empty functions orginally intended to support the full SWMR feature.
2018-09-18 20:48:50 -05:00
Allen Byrne
deaa1db852 HDFFV-10332 Use pre-generated files 2018-09-18 17:31:40 -05:00
Allen Byrne
44de4ee2e5 Merge pull request #1243 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '6c78869c19a88edfd7b6a2a99a8fb8f5febf0b7a':
  Fix whitespace and exit status
  HDFFV-9059 take file as argument
  HDFFV-9059 Allow detect to take a file as an argument
2018-09-18 16:39:28 -05:00
Dana Robinson
680cf4d946 Removed 'VOL' versions of FUNC_ENTER macros as well as empty functions
orginally intended to support the full SWMR feature.
2018-09-18 14:10:14 -07:00
Allen Byrne
6c78869c19 Fix whitespace and exit status 2018-09-18 13:22:48 -05:00
Larry Knox
cb5b36e4dc Merge pull request #1241 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'dfa58496a1f8d667de72a11affe0f5a2e3ae4558':
  Update COPYING file with new HDF5 license.
2018-09-18 13:03:17 -05:00
Allen Byrne
595b2d54ed HDFFV-9059 take file as argument 2018-09-18 12:35:17 -05:00
Allen Byrne
99f743ed1a HDFFV-9059 Allow detect to take a file as an argument 2018-09-18 10:29:12 -05:00
Larry Knox
dfa58496a1 Update COPYING file with new HDF5 license. 2018-09-17 16:09:59 -05:00
Jacob Smith
4e4d737eca Change H5F internals access 2018-09-14 15:49:45 -05:00
Jacob Smith
e1f3a10c52 Make questionable tests fail with TODOs 2018-09-14 15:24:00 -05:00
Jacob Smith
14c044f1b1 Change to use internal routines to get dcpl minimize setting.
Fix external file/link problem:
    Include H5Fpkg.h to access file private variables directly.
2018-09-14 15:10:01 -05:00
Jacob Smith
6af06e74be Add modtime dataset to explicitly not track 2018-09-14 13:55:56 -05:00
Jacob Smith
1e3efbcf52 Refactor file- and dataset-creation code for easier reading.
Add modification message test logic.
Minor formatting tweaks.
2018-09-14 13:34:34 -05:00
Jacob Smith
dbf6afee39 Remove redundant code and refactor 2018-09-12 15:40:26 -05:00
Jacob Smith
5beeb64c29 Add presumptive test for external links. 2018-09-12 15:38:32 -05:00
Jacob Smith
dde5666f42 Add additional tests (or placeholders for same).
Tests use h5_fixname().
Small changes.
2018-09-12 14:06:55 -05:00
Jacob Smith
7ef8d1d848 Add new test file 2018-09-11 16:45:33 -05:00
Jacob Smith
602dd3ac15 Stash work on object header reduction code and tests.
CMake stuff is not verified.
2018-09-11 16:37:14 -05:00
Allen Byrne
fbf837eac3 Merge pull request #1233 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'c9771263ae300a65f6f9ae518da766a314002bed':
  Minor text corrections
  HDFFV-10569 Add unsupported option notes to docs
2018-09-10 09:29:46 -05:00
Allen Byrne
c9771263ae Minor text corrections 2018-09-05 16:30:09 -05:00
Allen Byrne
1d2beee51f HDFFV-10569 Add unsupported option notes to docs 2018-09-04 11:43:15 -05:00
Allen Byrne
c834d9f99d Merge pull request #1232 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'fddbbc158d170b4e3a7ffd663f9799fd7e01a6a0':
  HDFFV-10568 fix hdf5_java library dependency
  Remove another extra path var
  Move muti-config dir setting to root process
  Fix one more intermediate location
  Use different variable
  Cleanup and add intermediate dir for java
2018-08-31 21:40:32 -05:00
Allen Byrne
fddbbc158d HDFFV-10568 fix hdf5_java library dependency 2018-08-31 21:00:16 -05:00
Allen Byrne
b951d1eae2 Remove another extra path var 2018-08-31 20:52:15 -05:00
Allen Byrne
fed65c435a Move muti-config dir setting to root process 2018-08-31 19:01:43 -05:00
Allen Byrne
a20168db02 Fix one more intermediate location 2018-08-31 14:45:32 -05:00
Allen Byrne
55e0b1e81e Use different variable 2018-08-31 14:05:25 -05:00
Allen Byrne
05c5d40dd5 Cleanup and add intermediate dir for java 2018-08-31 13:29:36 -05:00
Larry Knox
031088fc12 Merge pull request #1230 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '67220d101fbea90eab1c5bda0af531d39829c170':
  Java must use shared libs to allow dlopen calls
2018-08-30 22:18:25 -05:00
Allen Byrne
67220d101f Java must use shared libs to allow dlopen calls 2018-08-30 18:54:10 -05:00
Allen Byrne
e12f770b3e Merge pull request #1229 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'cd35778542c3c6e51ad334e6e4cf4be9f08bcaf8':
  Correct names
  Call new function
2018-08-30 13:00:21 -05:00
Larry Knox
fd2e588122 Merge pull request #1228 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'e6f8a55d8c42270efd7c870b7cee07b0d4ba7d08':
  Correct default API version for develop to 112.
2018-08-30 12:58:37 -05:00
Allen Byrne
cd35778542 Correct names 2018-08-30 08:38:28 -05:00
Allen Byrne
370db827ee Call new function 2018-08-30 08:29:21 -05:00
Larry Knox
e6f8a55d8c Correct default API version for develop to 112. 2018-08-29 23:06:50 -05:00
Allen Byrne
80c9c77d2e Merge pull request #1226 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'ff13ed67a9ce20e5f598bd46cd6dd544b5237e22':
  Fix typo
  HD prefix and whitespace
2018-08-28 15:09:31 -05:00
Allen Byrne
ff13ed67a9 Fix typo 2018-08-28 12:08:06 -05:00
Allen Byrne
27af9a7922 HD prefix and whitespace 2018-08-28 10:54:54 -05:00
Larry Knox
553b1a01f8 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-27 16:24:20 -05:00
Jordan Henderson
763b95c6b0 Update RELEASE.txt with suggested changes 2018-08-27 15:13:54 -05:00
Jordan Henderson
556bfd498c Update MANIFEST file for new t_coll_md_read.c file
Remove old line from copyright notice
2018-08-27 08:56:17 -05:00
Jordan Henderson
726642498c Remove now-unused local variable 2018-08-25 23:05:55 -05:00
Jordan Henderson
4cd10fa88e Add fix for HDFFV-10501
Add test for HDFFV-10501 fix

Add release note for HDFFV-10501 fix
2018-08-25 22:54:30 -05:00
Allen Byrne
cb9797f497 Merge pull request #1222 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'a02414cc24e01096a239fc774ce94c38655f53ce':
  Revert testfile FILE change
  change FILE path
  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 name of osx installer
  DT location incorrect
2018-08-24 10:27:42 -05:00
Allen Byrne
a02414cc24 Revert testfile FILE change 2018-08-23 21:27:32 -05:00
Allen Byrne
c9b37b93e9 change FILE path 2018-08-23 21:22:32 -05:00
Allen Byrne
510950623a Add testfiles to data copy 2018-08-23 17:26:33 -05:00
Allen Byrne
958c7bd833 Same changes needed for examples as test 2018-08-23 16:30:13 -05:00
Allen Byrne
22eda96a9c Correct name of test jar 2018-08-23 14:53:05 -05:00
Allen Byrne
d9d78f705e Only remove test jars 2018-08-23 14:21:16 -05:00
Allen Byrne
0651432031 Remove obsolete var 2018-08-23 13:19:35 -05:00
Larry Knox
0f7e13cdb5 Merge pull request #1219 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'd20fd310e42b73e9037fb1a3bcc5e55d5e5c5162':
  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:41:02 -05:00
Allen Byrne
a87f597d89 Correct name of osx installer 2018-08-23 09:40:22 -05:00
Allen Byrne
2417775bb3 DT location incorrect 2018-08-23 08:58:35 -05:00
Allen Byrne
8ba735e1c3 Merge pull request #1218 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '0483f47192df44235154954256fa0b927fb7c94f':
  Use project vars
  Fix for packaging prefix in examples
2018-08-23 08:07:47 -05:00
Larry Knox
d20fd310e4 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 07:37:00 -05:00
Allen Byrne
0483f47192 Use project vars 2018-08-22 14:10:38 -05:00
Allen Byrne
9d1dae5daf Fix for packaging prefix in examples 2018-08-22 12:13:53 -05:00
Allen Byrne
9dd922a75c Merge pull request #1217 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'fbd17f62ea505face5fb650d78a47135e288f0b6':
  Add installib path to test command
  Fix OSX SIP for libs
2018-08-22 10:37:28 -05:00
Allen Byrne
fbd17f62ea Add installib path to test command 2018-08-21 10:22:15 -05:00
Allen Byrne
085ec19a21 Fix OSX SIP for libs 2018-08-21 10:03:26 -05:00
Allen Byrne
6bfc56056a Merge pull request #1213 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f356d587a286f6407c9693c34201c89ea3adbbe1':
  Update fortran windows 10 version
2018-08-21 07:31:55 -05:00
Allen Byrne
f356d587a2 Update fortran windows 10 version 2018-08-20 18:26:57 -05:00
Allen Byrne
45603a6cdf Merge pull request #1211 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '732aae11c53fb63cdab58735604babbfd4d5db44':
  HDFFV-10547 develop needs 1.12 default option
  Fix quote
  HDFFV-10547 requires updated examples version
2018-08-20 18:08:11 -05:00
Allen Byrne
732aae11c5 HDFFV-10547 develop needs 1.12 default option 2018-08-20 15:07:19 -05:00
Allen Byrne
c78f43b25e Fix quote 2018-08-20 12:01:49 -05:00
Allen Byrne
b33fdb17c3 HDFFV-10547 requires updated examples version 2018-08-20 11:25:09 -05:00
Allen Byrne
91e9ba76c9 Merge pull request #1210 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit 'caa4324217914227ad5a9ea83215a0508226d725':
  HDFFV-10553 Update html tags
2018-08-20 11:22:13 -05:00
Allen Byrne
caa4324217 HDFFV-10553 Update html tags 2018-08-20 08:19:02 -05:00
Allen Byrne
965f673cea Merge pull request #1206 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit 'ae7da889ece8ea6cfe3207f146ee991951b5ce66':
  HDFFV-10552 Add missing HDF5_USE_110[2]_API_DEFAULT option
2018-08-17 14:56:45 -05:00
Allen Byrne
ae7da889ec HDFFV-10552 Add missing HDF5_USE_110[2]_API_DEFAULT option 2018-08-17 14:48:43 -05:00
Allen Byrne
105a05cb90 Merge pull request #1205 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit 'a6100a3445921480a9d65dbfc49e7600e7923bd5':
  HDFFV-10536 callback crash fixed by using stack structure
2018-08-17 14:25:10 -05:00
Allen Byrne
a6100a3445 HDFFV-10536 callback crash fixed by using stack structure 2018-08-17 14:12:11 -05:00
Allen Byrne
a7a814fa83 Merge pull request #1204 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '454b04176ae8daeadcd26bb532ed77c4c051a9c3':
  Update cmake warnings to match the autotools files better
2018-08-17 13:47:48 -05:00
Allen Byrne
454b04176a Update cmake warnings to match the autotools files better 2018-08-16 15:45:31 -05:00
Larry Knox
7d7929d43f Merge pull request #1198 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '201d1722dc14f5adb0ab5c42b11fac15e9da8454':
  Fix JIRA number format
2018-08-16 15:32:30 -05:00
Allen Byrne
201d1722dc Fix JIRA number format 2018-08-16 15:31:02 -05:00
Allen Byrne
42b1c08ee0 Merge pull request #1196 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '12adeedf6b817d99d00051d0549448f52a65c6a4':
  HDFFV-10552 fix version script (missed when 1.11 created)
2018-08-16 15:12:11 -05:00
Allen Byrne
12adeedf6b HDFFV-10552 fix version script (missed when 1.11 created) 2018-08-16 15:06:29 -05:00
Binh-Minh Ribler
8e92fd2b36 Merge pull request #1192 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp4:develop to develop
Add CVE issues.

* commit '7c2d969e85eac7c72f3a289385b2707ea3e77217':
  Added notes about CVE issues.
2018-08-14 23:05:47 -05:00
Binh-Minh Ribler
7c2d969e85 Added notes about CVE issues. 2018-08-14 18:22:10 -05:00
Jordan Henderson
5647dea421 Merge pull request #1186 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '4f4f177b0af6063c0c22ec2e1a9ca99549bc8aac':
  Rearrange issues by date order
  RELEASE.txt changes for MPI updates
2018-08-09 13:08:02 -05:00
Jordan Henderson
4f4f177b0a Rearrange issues by date order 2018-08-09 11:38:23 -05:00
Jordan Henderson
f82395f2db Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~jhenderson/hdf5 into develop 2018-08-09 11:26:29 -05:00
Jordan Henderson
90699af5f4 RELEASE.txt changes for MPI updates 2018-08-09 11:26:10 -05:00
Larry Knox
9c52453657 Merge pull request #1185 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '01c9aa1e76857bf22771342dadf87af08979aa33':
  Update Drop Site options and Coverage settings
2018-08-09 11:09:36 -05:00
Allen Byrne
01c9aa1e76 Update Drop Site options and Coverage settings 2018-08-09 10:59:32 -05:00
Neil Fortner
b27f981ea6 Fix uninitialized variable warning. Extend t_pvds to test different
source file without reopening the virtual dataset (except where
necessary).
2018-08-07 16:07:01 -05:00
Larry Knox
b5c6121a5d 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:25:13 -05:00
Larry Knox
a3385675b3 Reorder bugfix release notes from latest to earliest, and miscellaneous
format cleanup.
2018-08-07 13:18:56 -05:00
Larry Knox
bd27f0d419 Add RELEASE.txt entry for HDFFV-10475 2018-08-07 11:45:23 -05:00
Neil Fortner
0cc1d7d781 Fix error in MPIO file comparison. Modify H5F_sfile_search to always
pass the base file first to the comparison callback so the base file's
communicator is used for the broadcast.  Modify t_pvds to avoid
situations that won't work with the new scheme for opening source files
independently.
2018-08-06 17:56:36 -05:00
Allen Byrne
f455ac063f Merge pull request #1176 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f9074881cdfe04e96e7faa43e955b42428d9fcb9':
  HDFFV-10544 Add more descriptive text
2018-08-06 11:56:19 -05:00
Allen Byrne
f9074881cd HDFFV-10544 Add more descriptive text 2018-08-06 11:31:20 -05:00
Allen Byrne
fe7aaff8cc Merge pull request #1175 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '6e4c036d5dc476396428f4b044e23043a80e8df7':
  HDFFV-10544 Correct var name
  HDFFV-10544 remove native from class function
  HDFFV-10544 correct typo
  HDFFV-10544 add release note
  HDFFV-10544 add class name to error text
  HDFFV-10544 exception variable as local class
  Improve error handling of exceptions
2018-08-06 11:00:48 -05:00
Allen Byrne
6e4c036d5d HDFFV-10544 Correct var name 2018-08-06 11:00:28 -05:00
Allen Byrne
4d5255106c HDFFV-10544 remove native from class function 2018-08-06 09:56:01 -05:00
Allen Byrne
9efb9b7426 HDFFV-10544 correct typo 2018-08-06 09:44:41 -05:00
Allen Byrne
565ee9e7f9 HDFFV-10544 add release note 2018-08-06 09:39:44 -05:00
Allen Byrne
2f4832fe09 HDFFV-10544 add class name to error text 2018-08-06 09:23:21 -05:00
Allen Byrne
ca7d4f85a5 HDFFV-10544 exception variable as local class 2018-08-06 09:15:08 -05:00
Allen Byrne
762c14fde5 Improve error handling of exceptions 2018-08-06 08:14:04 -05:00
Neil Fortner
d007267f1b Modify VDS to open source files using the SEC2 driver when the VDS file
is openend in parallel.  Disable file locking on these source files.
Add independent read test to t_psubfile (from Richard).  Various
cleanup, etc.
2018-08-02 16:34:15 -05:00
Allen Byrne
51d31c5ff8 Merge pull request #1173 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b4571f619018f428569cbae5d025935ac5f1788e':
  Typo fix
  Set CMAKE_REQUIRED_INCLUDES instead of using path in call
2018-08-02 11:48:02 -05:00
Allen Byrne
b4571f6190 Typo fix 2018-08-02 10:38:54 -05:00
Allen Byrne
2c17b19861 Set CMAKE_REQUIRED_INCLUDES instead of using path in call 2018-08-02 10:22:37 -05:00
Jordan Henderson
70de0b18e3 Merge pull request #1167 in HDFFV/hdf5 from ~JHENDERSON/hdf5:bugfix/MPI2_only_fixes to develop
* commit '9aa2eaeb9ed9c94f63973cb55f13de256558497c':
  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
2018-08-02 09:25:00 -05:00
Jordan Henderson
9aa2eaeb9e Add Autotools and CMake checks for big I/O MPI-3 functions 2018-07-31 13:42:19 -05:00
Jordan Henderson
5e138dc1e9 Add hdf5settings section for parallel compression status in CMake builds 2018-07-31 10:45:43 -05:00
Allen Byrne
cca9fbcff0 Merge pull request #1163 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '77cb2dca17bf739fe8cf0979793bb0f00347a692':
  HDFFV-10508 rework sentence
  HDFFV-10508 clarify library differences
  HDFFV-10508 spelling and grammer
  HDFFV-10508 more config fixes
  HDFFV-10508 correct sizeof
  HDFFV-10508 pubconf changes found
  HDFFV-10508 Document binary diffs
  HDFFV-9755 Document BUILD_STATIC_EXECS
2018-07-31 09:56:44 -05:00
Allen Byrne
77cb2dca17 HDFFV-10508 rework sentence 2018-07-31 09:56:12 -05:00
Allen Byrne
2822921c23 HDFFV-10508 clarify library differences 2018-07-31 09:41:11 -05:00
Allen Byrne
b8945eac22 HDFFV-10508 spelling and grammer 2018-07-31 09:28:17 -05:00
Scot Breitenfeld
3c781c18c9 Merge pull request #1165 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit '2b41860efdd24a003a0981505553cf8b1040ea0a':
  Removed FORTRAN_SIZEOF_LONG_DOUBLE from public .h files
2018-07-30 17:15:36 -05:00
Allen Byrne
496372dc18 HDFFV-10508 more config fixes 2018-07-30 17:10:00 -05:00
M. Scot Breitenfeld
2b41860efd Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb into develop 2018-07-30 17:01:54 -05:00
M. Scot Breitenfeld
d105690263 Removed FORTRAN_SIZEOF_LONG_DOUBLE from public .h files 2018-07-30 17:01:44 -05:00
Allen Byrne
323635f2b5 HDFFV-10508 correct sizeof 2018-07-30 16:31:39 -05:00
Allen Byrne
63fa8acbac Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'b6d1e9abdc2571f6d7b56ebab26a245d2f036516':
  Fixed typo in H5_H5CONFIG_F_IKIND name
2018-07-30 16:30:51 -05:00
Allen Byrne
b6d1e9abdc Merge pull request #1164 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit '8f79022bc63c7eca3af66eec7c2a99585a7c5397':
  Fixed typo in H5_H5CONFIG_F_IKIND name
2018-07-30 16:29:55 -05:00
M. Scot Breitenfeld
8f79022bc6 Fixed typo in H5_H5CONFIG_F_IKIND name 2018-07-30 16:17:27 -05:00
Allen Byrne
2770f0bf9f HDFFV-10508 pubconf changes found 2018-07-30 15:46:42 -05:00
Allen Byrne
c0ff42f676 HDFFV-10508 Document binary diffs 2018-07-30 15:09:50 -05:00
Allen Byrne
b33ba00c9c HDFFV-9755 Document BUILD_STATIC_EXECS 2018-07-30 12:39:38 -05:00
Allen Byrne
958cc1a969 Merge pull request #1161 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '91f20982daf2f76d4b8f3ba4f4659db7cd62c821':
  HDFFV-10534 add note
2018-07-30 12:10:10 -05:00
Allen Byrne
91f20982da HDFFV-10534 add note 2018-07-30 11:51:20 -05:00
Allen Byrne
882e59d1b3 Merge pull request #1157 in HDFFV/hdf5 from ~JHENDERSON/hdf5:bugfix/CMake_MPI_libs_fix to develop
* commit 'd075c0854d1ffb5a8eae23c5eb9a4456067f30c9':
  Add quotes to places where MPI_C_LIBRARIES are linked against
2018-07-30 11:45:55 -05:00
Binh-Minh Ribler
94e96737a7 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-30 11:04:16 -05:00
Allen Byrne
7fe579d1f5 Merge pull request #1160 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '49a8da4ea79677804131aef87287f80b30658fd1':
  HDFFV-10534
  Add missing test option
  Add test file with unwritten datasets
2018-07-30 10:41:51 -05:00
Allen Byrne
49a8da4ea7 HDFFV-10534 2018-07-30 08:57:12 -05:00
Binh-Minh Ribler
7d9f5ed49a Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_cpp4 into develop 2018-07-28 08:05:16 -05:00
Binh-Minh Ribler
4578eb0fc1 Fixed document format
Platforms tested:
    Linux/64 (jelly) (only in comment sections)
2018-07-28 08:00:32 -05:00
Jordan Henderson
d075c0854d Add quotes to places where MPI_C_LIBRARIES are linked against 2018-07-27 14:58:01 -05:00
Jordan Henderson
256fc4754b Switch to CheckSymbolExists in CMake 2018-07-27 12:49:42 -05:00
Allen Byrne
e4741cd8f2 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '272eb4b8bffd2ab732d268c421583587317b8dc2':
  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-27 10:15:25 -05:00
Larry Knox
272eb4b8bf Merge pull request #1152 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to develop
* commit '5550fb330a00ef75b6ab6daa6d8dae8bcf832185':
  RELEASE.txt updates for HDFFV-10467 and HDFFV-10509
2018-07-26 17:05:59 -05:00
Jordan Henderson
e1e10743cf 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-07-26 12:50:26 -05:00
Jordan Henderson
5550fb330a RELEASE.txt updates for HDFFV-10467 and HDFFV-10509 2018-07-25 13:16:41 -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
Allen Byrne
14c060bbeb Add missing test option 2018-07-24 14:15:32 -05:00
Allen Byrne
b14c8bdb1c Add test file with unwritten datasets 2018-07-24 12:00:07 -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
Binh-Minh Ribler
f5551a9602 Fixed missing backslash 2018-07-24 08:39:16 -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
Richard Warren
f7a62775c1 Fix spelling typo in the RELEASE.txt notes 2018-07-18 16:44:14 -04:00
Richard Warren
439de0afcc Addresses issues raised by Allen in PR review 2018-07-18 15:26:43 -04: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
Richard Warren
37ff3a38cc Use a basic VDS example from the documentation with parallel extensions 2018-07-17 18:12:53 -04:00
Richard Warren
de64afbd39 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into parallel_vds_develop 2018-07-17 18:06:05 -04: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
Richard Warren
8e4cb935fc Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into parallel_vds_develop 2018-07-17 07:56:19 -04: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
Richard Warren
963954e756 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into parallel_vds_develop 2018-07-16 07:47:29 -04: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
Richard Warren
1657e0324d Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into parallel_vds_develop 2018-07-13 20:31:31 -04: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
Richard Warren
c946c72a30 Added skeleton-code for subfiling test. NOT Functional at this point. Commit only for sharing purposes. 2018-07-11 10:42:22 -04: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
Richard Warren
6ad9585342 Fix some commentary around the H5FD_mpio_cmp function and remove test_printf and test_all from testpar/t_pvds.c to remove issues with testing printf style parallel VDS. 2018-07-05 16:30:08 -04: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
Richard Warren
5ce8d5da40 Addresses the PR issues raised by Neil. 2018-07-02 08:52:30 -04:00
Richard Warren
e3a6bcc87a Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into parallel_vds_develop 2018-07-02 08:06:38 -04:00
Allen Byrne
3c07f4738f Add actual file names fo diff 2018-06-29 13:05:15 -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
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
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
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
Richard Warren
38ebfd7f4d Made code updates to reflect John Mainzer's comments. Also made a change unrelated to parallel vds, i.e. changed one instance of MPI_Type_extent to MPI_Type_get_extent to remove deprecated errors reported by OpenMPI 3.1 2018-06-14 20:24:11 -04:00
Richard Warren
8d7d1f1ab6 Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into parallel_vds_develop 2018-06-14 19:28:48 -04: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
Richard Warren
9b23d85f51 Add some merge changes to bring the PR changes up to date. Includes removal of H5D__virtual_insert_gh_obj in favor of a merged version of H5D__virtual_store_layout 2018-06-11 19:53:41 -04: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
Richard Warren
2a24cb0d0f Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into parallel_vds_develop 2018-05-31 10:02:46 -04: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
Richard Warren
de129217a4 Rebase parallel VDS work to develop branch for testing and review 2018-05-30 16:21:46 -04: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
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
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
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
9a8e1e1a7c Add missing file 2018-04-12 09:10:28 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Quincey Koziol
4a17aff408 Add API context interface and use it throughout the library. 2018-03-15 16:54:30 -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
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
1202 changed files with 172190 additions and 119973 deletions

6
.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

View File

@@ -27,7 +27,15 @@ if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT
set (TGZPATH ${HDF5_SOURCE_DIR})
endif ()
set (ZLIB_URL ${TGZPATH}/${ZLIB_TGZ_NAME})
if (NOT EXISTS "${ZLIB_URL}")
set (HDF5_ENABLE_Z_LIB_SUPPORT OFF CACHE BOOL "" FORCE)
message (STATUS "Filter ZLIB file ${ZLIB_URL} not found")
endif ()
set (SZIP_URL ${TGZPATH}/${SZIP_TGZ_NAME})
if (NOT EXISTS "${SZIP_URL}")
set (HDF5_ENABLE_SZIP_SUPPORT OFF CACHE BOOL "" FORCE)
message (STATUS "Filter SZIP file ${SZIP_URL} not found")
endif ()
else ()
set (ZLIB_USE_EXTERNAL 0)
set (SZIP_USE_EXTERNAL 0)

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
@@ -43,7 +33,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
EXPORT ${HDF5_EXPORTED_TARGETS}
DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/hdf5
FILE ${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-targets.cmake
NAMESPACE ${HDF5_PACKAGE}::
NAMESPACE ${HDF_PACKAGE_NAMESPACE}
COMPONENT configinstall
)
endif ()
@@ -55,7 +45,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
export (
TARGETS ${HDF5_LIBRARIES_TO_EXPORT} ${HDF5_LIB_DEPENDENCIES} ${HDF5_UTILS_TO_EXPORT}
FILE ${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-targets.cmake
NAMESPACE ${HDF5_PACKAGE}::
NAMESPACE ${HDF_PACKAGE_NAMESPACE}
)
endif ()
endif ()
@@ -114,6 +104,12 @@ endif ()
# Configure the hdf5-config-version .cmake file for the install directory
#-----------------------------------------------------------------------------
if (NOT HDF5_EXTERNALLY_CONFIGURED)
# 3.11 or greater
#write_basic_package_version_file (
# ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake
# VERSION ${HDF5_PACKAGE_VERSION}
# COMPATIBILITY SameMinorVersion
#)
configure_file (
${HDF_RESOURCES_DIR}/hdf5-config-version.cmake.in
${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake @ONLY
@@ -135,7 +131,7 @@ else ()
endif ()
configure_file (
${HDF_RESOURCES_DIR}/libhdf5.settings.cmake.in
${HDF5_BINARY_DIR}/libhdf5.settings @ONLY
${HDF5_BINARY_DIR}/libhdf5.settings ESCAPE_QUOTES @ONLY
)
install (
FILES ${HDF5_BINARY_DIR}/libhdf5.settings
@@ -144,7 +140,7 @@ install (
)
#-----------------------------------------------------------------------------
# Configure the HDF518_Examples.cmake file and the examples
# Configure the HDF5_Examples.cmake file and the examples
#-----------------------------------------------------------------------------
option (HDF5_PACK_EXAMPLES "Package the HDF5 Library Examples Compressed File" OFF)
if (HDF5_PACK_EXAMPLES)
@@ -225,6 +221,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.10)
PROJECT (HDF5 C CXX)
project (HDF5 C)
#-----------------------------------------------------------------------------
# Instructions for use : Normal Build
@@ -10,7 +10,7 @@ PROJECT (HDF5 C CXX)
# set CMAKE_INSTALL_PREFIX to the required install path.
# Make install can be used to install all components for system-wide use.
#
if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
MESSAGE(FATAL_ERROR "\nERROR! ${PROJECT_NAME} DOES NOT SUPPORT IN SOURCE BUILDS!\n"
"CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
" == CMAKE_CURRENT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}\n"
@@ -46,6 +46,9 @@ endif ()
# dependencies of the HDF5 libs may be 'incomplete', add additional
# dependencies to this variable so that external projects pick them up
#
#option (HDF5_EXTERNAL_LIB_PREFIX "Use prefix for custom library naming." "")
set (HDF5_EXTERNAL_LIB_PREFIX "" CACHE STRING "Use prefix for custom library naming.")
mark_as_advanced (HDF5_EXTERNAL_LIB_PREFIX)
# HDF5_EXTERNAL_LIB_PREFIX :
# If the parent project needs to install hdf libraries, but avoid
# name conflicts with system versions, then a prefix may be added
@@ -195,9 +198,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)
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
@@ -311,7 +314,7 @@ set (HDF5_PACKAGE_NAME "HDF5")
set (HDF5_PACKAGE_VERSION "${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}")
set (HDF5_PACKAGE_VERSION_MAJOR "${H5_VERS_MAJOR}.${H5_VERS_MINOR}")
set (HDF5_PACKAGE_VERSION_MINOR "${H5_VERS_RELEASE}")
if (NOT "${H5_VERS_SUBRELEASE}" STREQUAL "")
if (H5_VERS_SUBRELEASE)
set (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}-${H5_VERS_SUBRELEASE}")
else ()
set (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}")
@@ -413,24 +416,29 @@ set (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
# Mac OS X Options
#-----------------------------------------------------------------------------
if (HDF5_BUILD_FRAMEWORKS AND NOT BUILD_SHARED_LIBS)
set (BUILD_SHARED_LIBS ON CACHE BOOL "Build Shared Libraries")
set (BUILD_SHARED_LIBS ON CACHE BOOL "Build Shared Libraries" FORCE)
endif ()
#-----------------------------------------------------------------------------
# Option to Build Shared and Static libs, default is both
#-----------------------------------------------------------------------------
option (ONLY_SHARED_LIBS "Only Build Shared Libraries" OFF)
set (H5_ENABLE_STATIC_LIB YES)
if (ONLY_SHARED_LIBS)
set (H5_ENABLE_STATIC_LIB NO)
set (BUILD_SHARED_LIBS ON CACHE BOOL "Build Shared Libraries")
endif ()
option (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
set (H5_ENABLE_SHARED_LIB NO)
if (BUILD_SHARED_LIBS)
set (H5_ENABLE_SHARED_LIB YES)
endif ()
set (H5_ENABLE_STATIC_LIB YES)
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")
@@ -443,9 +451,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 ()
#-----------------------------------------------------------------------------
@@ -473,6 +486,15 @@ if (HDF5_MEMORY_ALLOC_SANITY_CHECK)
set (H5_MEMORY_ALLOC_SANITY_CHECK 1)
endif ()
#-----------------------------------------------------------------------------
# Option to enable/disable using pread/pwrite for VFDs
#-----------------------------------------------------------------------------
option (HDF5_ENABLE_PREADWRITE "Use pread/pwrite in sec2/log/core VFDs in place of read/write (when available)" ON)
mark_as_advanced (HDF5_ENABLE_PREADWRITE)
if (HDF5_ENABLE_PREADWRITE AND H5_HAVE_PREAD AND H5_HAVE_PWRITE)
set (H5_HAVE_PREADWRITE 1)
endif ()
#-----------------------------------------------------------------------------
# Option to use deprecated public API symbols
#-----------------------------------------------------------------------------
@@ -522,22 +544,12 @@ option (HDF5_BUILD_GENERATORS "Build Test Generators" OFF)
option (HDF5_ENABLE_TRACE "Enable API tracing capability" OFF)
mark_as_advanced (HDF5_ENABLE_TRACE)
if (${HDF_CFG_NAME} MATCHES "Debug")
add_definitions (-DDEBUG)
# Enable tracing of the API
if (HDF5_ENABLE_TRACE)
add_definitions (-DH5_DEBUG_API )
endif ()
# 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 ()
#-----------------------------------------------------------------------------
@@ -553,16 +565,11 @@ else ()
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)
find_package(MPI REQUIRED)
@@ -570,13 +577,33 @@ if (HDF5_ENABLE_PARALLEL)
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_DIRS}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Comm)
CHECK_SYMBOL_EXISTS (MPI_Info_c2f "${MPI_C_INCLUDE_DIRS}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Info)
INCLUDE_DIRECTORIES (${MPI_C_INCLUDE_DIRS})
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 ()
@@ -609,6 +636,26 @@ 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" OFF)
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 ()
#-----------------------------------------------------------------------------
# Option to use 1.12.x API
#-----------------------------------------------------------------------------
option (HDF5_USE_112_API_DEFAULT "Use the HDF5 1.12.x API by default" ON)
set (H5_USE_112_API_DEFAULT 0)
if (HDF5_USE_112_API_DEFAULT)
set (H5_USE_112_API_DEFAULT 1)
set (DEFAULT_API_VERSION "v112")
endif ()
#-----------------------------------------------------------------------------
# Include user macros
#-----------------------------------------------------------------------------
@@ -641,8 +688,10 @@ endif ()
option (HDF5_ENABLE_THREADSAFE "Enable thread-safety" OFF)
if (HDF5_ENABLE_THREADSAFE)
# check for unsupported options
message (STATUS " **** thread-safety option not supported with static library **** ")
message (STATUS " **** thread-safety option will not be used building static library **** ")
if (WIN32)
message (STATUS " **** thread-safety option not supported with static library **** ")
message (STATUS " **** thread-safety option will not be used building static library **** ")
endif ()
if (HDF5_ENABLE_PARALLEL)
if (NOT ALLOW_UNSUPPORTED)
message (FATAL_ERROR " **** parallel and thread-safety options are not supported **** ")
@@ -680,9 +729,9 @@ if (HDF5_ENABLE_THREADSAFE)
endif ()
endif ()
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads)
if (NOT Threads_FOUND)
message (STATUS " **** thread-safe package not found - threads still might work **** ")
find_package(Threads REQUIRED)
if (Threads_FOUND)
set (H5_HAVE_THREADSAFE 1)
endif ()
endif ()
@@ -693,13 +742,17 @@ 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)
if (NOT ONLY_SHARED_LIBS)
add_dependencies (${HDF5_LIB_TARGET} ZLIB)
endif ()
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)
if (NOT ONLY_SHARED_LIBS)
add_dependencies (${HDF5_LIB_TARGET} SZIP)
endif ()
if (BUILD_SHARED_LIBS)
add_dependencies (${HDF5_LIBSH_TARGET} SZIP)
endif ()
@@ -712,10 +765,15 @@ endif ()
option (BUILD_TESTING "Build HDF5 Unit Testing" ON)
if (BUILD_TESTING)
set (DART_TESTING_TIMEOUT 1200
CACHE INTEGER
CACHE STRING
"Timeout in seconds for each test (default 1200=20minutes)"
)
# Generate a list of timeouts based on DART_TESTING_TIMEOUT
math (EXPR CTEST_SHORT_TIMEOUT "${DART_TESTING_TIMEOUT} / 2")
math (EXPR CTEST_LONG_TIMEOUT "${DART_TESTING_TIMEOUT} * 2")
math (EXPR CTEST_VERY_LONG_TIMEOUT "${DART_TESTING_TIMEOUT} * 3")
option (HDF5_TEST_VFD "Execute tests with different VFDs" OFF)
mark_as_advanced (HDF5_TEST_VFD)
if (HDF5_TEST_VFD)
@@ -723,6 +781,13 @@ if (BUILD_TESTING)
mark_as_advanced (HDF5_TEST_FHEAP_VFD)
endif ()
option (HDF5_TEST_PASSTHROUGH_VOL "Execute tests with different passthrough VOL connectors" OFF)
mark_as_advanced (HDF5_TEST_PASSTHROUGH_VOL)
if (HDF5_TEST_PASSTHROUGH_VOL)
option (HDF5_TEST_FHEAP_PASSTHROUGH_VOL "Execute fheap test with different passthrough VOL connectors" ON)
mark_as_advanced (HDF5_TEST_FHEAP_PASSTHROUGH VOL)
endif ()
option (HDF_TEST_EXPRESS "Control testing framework (0-3)" "0")
mark_as_advanced (HDF_TEST_EXPRESS)
@@ -786,25 +851,20 @@ 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)
if (HDF5_BUILD_FORTRAN)
option (HDF5_ENABLE_F2003 "Enable FORTRAN 2003 Standard" ON)
include (${HDF_RESOURCES_EXT_DIR}/HDFUseFortran.cmake)
message (STATUS "Fortran compiler ID is ${CMAKE_Fortran_COMPILER_ID}")
# Building with PGI requires CMake 3.3 or greater because previous versions
# of CMake add the wrong compiler flag for the PGI Fortran compiler.
if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "PGI" AND "${CMAKE_VERSION}" VERSION_LESS "3.3")
if (CMAKE_Fortran_COMPILER_ID MATCHES "PGI" AND CMAKE_VERSION VERSION_LESS "3.3")
message (FATAL_ERROR " **** PGI FORTRAN REQUIRES CMAKE VERSION 3.3 OR GREATER **** ")
endif ()
include (${HDF_RESOURCES_DIR}/HDF5UseFortran.cmake)
set (LINK_Fortran_LIBS ${LINK_LIBS})
if (HDF5_ENABLE_F2003)
if (NOT FORTRAN_HAVE_ISO_C_BINDING)
set (HDF5_ENABLE_F2003 OFF)
endif ()
if (NOT H5_FORTRAN_HAVE_ISO_C_BINDING)
message (FATAL_ERROR " **** Fortran compiler lacks required Fortran 2003 features; unsupported Fortran 2003 compiler, disable HDF5_BUILD_FORTRAN **** ")
endif ()
# Parallel IO usage requires MPI to be Linked and Included
@@ -839,6 +899,9 @@ 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 ()
@@ -857,7 +920,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 ()
@@ -877,4 +940,10 @@ endif ()
#-----------------------------------------------------------------------------
configure_file (${HDF_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY)
#-----------------------------------------------------------------------------
# Options for use by cross compiling and toolchains
#-----------------------------------------------------------------------------
option (HDF5_USE_PREGEN "Use pre-generated Files" OFF)
option (HDF5_BATCH_H5DETECT "Use a batch command for running h5detect" OFF)
include (CMakeInstallation.cmake)

43
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,27 @@ 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 +55,9 @@ 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 +98,9 @@ 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 (https://support.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=HDF5110")
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")
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=HDF5Trunk")
else ()
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5")
endif ()
endif ()
set (CTEST_DROP_SITE_CDASH TRUE)
@@ -34,9 +45,9 @@ set (VALGRIND_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=
set (CTEST_MEMORYCHECK_COMMAND "/usr/bin/valgrind")
set (CTEST_MEMORYCHECK_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe")
set (CTEST_TEST_TIMEOUT 600 CACHE STRING
set (CTEST_TEST_TIMEOUT 1200 CACHE STRING
"Maximum time allowed before CTest will kill the test.")
set (DART_TESTING_TIMEOUT 600 CACHE STRING
set (DART_TESTING_TIMEOUT 1200 CACHE STRING
"Maximum time allowed before CTest will kill the test." FORCE)
SET(CTEST_SUBMIT_RETRY_DELAY 20 CACHE STRING

277
MANIFEST
View File

@@ -71,12 +71,15 @@
./bin/errors _DO_NOT_DISTRIBUTE_
./bin/genparser
./bin/gcov_script _DO_NOT_DISTRIBUTE_
./bin/h5cc.in
./bin/h5redeploy.in
./bin/h5vers
./bin/iostats
./bin/locate_sw
./bin/make_err
./bin/make_overflow
./bin/make_vers
./bin/Makefile.am
./bin/makehelp
./bin/mkdirs
./bin/newer
@@ -85,12 +88,25 @@
./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_
./bin/timekeeper _DO_NOT_DISTRIBUTE_
./bin/trace
./bin/warnhist _DO_NOT_DISTRIBUTE_
./bin/yodconfigure
./bin/batch/ctestP.lsf.in.cmake
./bin/batch/ctestP.sl.in.cmake
./bin/batch/ctestS.lsf.in.cmake
./bin/batch/ctestS.sl.in.cmake
./bin/batch/knl_ctestP.sl.in.cmake
./bin/batch/knl_ctestS.sl.in.cmake
./bin/batch/knl_H5detect.sl.in.cmake
./bin/batch/ctest.qsub.in.cmake
./bin/batch/ray_ctestP.lsf.in.cmake
./bin/batch/ray_ctestS.lsf.in.cmake
./bin/batch/raybsub
./bin/pkgscrpts/h5rmflags _DO_NOT_DISTRIBUTE_
./bin/pkgscrpts/makeHDF5BinaryTarfiles.pl _DO_NOT_DISTRIBUTE_
./bin/pkgscrpts/makeInternalREADME.pl _DO_NOT_DISTRIBUTE_
@@ -230,10 +246,12 @@
./fortran/src/H5Sff.F90
./fortran/src/H5Tf.c
./fortran/src/H5Tff.F90
./fortran/src/H5VLff.F90
./fortran/src/H5Zf.c
./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
@@ -248,8 +266,8 @@
./fortran/src/h5fc.in
./fortran/src/hdf5_fortrandll.def.in
./fortran/test/Makefile.am
./fortran/test/vol_connector.F90
./fortran/test/fflush1.F90
./fortran/test/fflush2.F90
./fortran/test/fortranlib_test.F90
@@ -349,6 +367,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
@@ -394,7 +414,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
@@ -441,7 +461,10 @@
./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/README_HDF5_CMake
./release_docs/README_HPC
./release_docs/RELEASE.txt
./release_docs/USING_HDF5_CMake.txt
./release_docs/USING_HDF5_VS.txt
@@ -477,7 +500,6 @@
./src/H5Apublic.h
./src/H5AC.c
./src/H5ACdbg.c
./src/H5AClog.c
./src/H5ACmodule.h
./src/H5ACmpio.c
./src/H5ACpkg.h
@@ -490,7 +512,6 @@
./src/H5Bmodule.h
./src/H5Bpkg.h
./src/H5Bprivate.h
./src/H5Bpublic.h
./src/H5B2.c
./src/H5B2cache.c
./src/H5B2dbg.c
@@ -501,7 +522,6 @@
./src/H5B2module.h
./src/H5B2pkg.h
./src/H5B2private.h
./src/H5B2public.h
./src/H5B2stat.c
./src/H5B2test.c
./src/H5C.c
@@ -509,6 +529,9 @@
./src/H5Cepoch.c
./src/H5Cimage.c
./src/H5Clog.c
./src/H5Clog.h
./src/H5Clog_json.c
./src/H5Clog_trace.c
./src/H5Cmodule.h
./src/H5Cmpio.c
./src/H5Cpkg.h
@@ -520,6 +543,9 @@
./src/H5Ctest.c
./src/H5CS.c
./src/H5CSprivate.h
./src/H5CX.c
./src/H5CXmodule.h
./src/H5CXprivate.h
./src/H5D.c
./src/H5Dbtree.c
./src/H5Dbtree2.c
@@ -568,6 +594,7 @@
./src/H5EAsblock.c
./src/H5EAstat.c
./src/H5EAtest.c
./src/H5ESpublic.h
./src/H5F.c
./src/H5Faccum.c
./src/H5Fcwfs.c
@@ -642,7 +669,6 @@
./src/H5FSmodule.h
./src/H5FSpkg.h
./src/H5FSprivate.h
./src/H5FSpublic.h
./src/H5FSsection.c
./src/H5FSstat.c
./src/H5FStest.c
@@ -682,7 +708,6 @@
./src/H5HFmodule.h
./src/H5HFpkg.h
./src/H5HFprivate.h
./src/H5HFpublic.h
./src/H5HFsection.c
./src/H5HFspace.c
./src/H5HFstat.c
@@ -694,7 +719,6 @@
./src/H5HGmodule.h
./src/H5HGpkg.h
./src/H5HGprivate.h
./src/H5HGpublic.h
./src/H5HGquery.c
./src/H5HL.c
./src/H5HLcache.c
@@ -705,7 +729,6 @@
./src/H5HLpkg.h
./src/H5HLprfx.c
./src/H5HLprivate.h
./src/H5HLpublic.h
./src/H5HP.c
./src/H5HPprivate.h
./src/H5I.c
@@ -748,6 +771,7 @@
./src/H5Ocont.c
./src/H5Ocopy.c
./src/H5Odbg.c
./src/H5Odeprec.c
./src/H5Odrvinfo.c
./src/H5Odtype.c
./src/H5Oefl.c
@@ -825,6 +849,7 @@
./src/H5S.c
./src/H5Sall.c
./src/H5Sdbg.c
./src/H5Sdeprec.c
./src/H5Shyper.c
./src/H5Smodule.h
./src/H5Smpio.c
@@ -877,6 +902,27 @@
./src/H5Tvlen.c
./src/H5TS.c
./src/H5TSprivate.h
./src/H5VL.c
./src/H5VLcallback.c
./src/H5VLconnector.h
./src/H5VLconnector_passthru.h
./src/H5VLint.c
./src/H5VLmodule.h
./src/H5VLnative.c
./src/H5VLnative.h
./src/H5VLnative_attr.c
./src/H5VLnative_dataset.c
./src/H5VLnative_datatype.c
./src/H5VLnative_file.c
./src/H5VLnative_group.c
./src/H5VLnative_link.c
./src/H5VLnative_object.c
./src/H5VLnative_private.h
./src/H5VLpassthru.c
./src/H5VLpassthru.h
./src/H5VLpkg.h
./src/H5VLprivate.h
./src/H5VLpublic.h
./src/H5VM.c
./src/H5VMprivate.h
./src/H5WB.c
@@ -936,6 +982,8 @@
./test/cross_read.c
./test/dangle.c
./test/deflate.h5
./test/del_many_dense_attrs.c
./test/direct_chunk.c
./test/dsets.c
./test/dt_arith.c
./test/dtypes.c
@@ -948,6 +996,9 @@
./test/evict_on_close.c
./test/extend.c
./test/external.c
./test/external_common.c
./test/external_common.h
./test/external_env.c
./test/error_test.c
./test/err_compat.c
./test/filter_error.h5
@@ -965,6 +1016,7 @@
./test/file_image.c
./test/file_image_core_test.h5
./test/fill_old.h5
./test/fill18.h5
./test/fillval.c
./test/filter_fail.c
./test/filter_plugin.c
@@ -988,6 +1040,7 @@
./test/gen_deflate.c
./test/gen_file_image.c
./test/gen_filespace.c
./test/gen_filters.c
./test/gen_mergemsg.c
./test/gen_new_array.c
./test/gen_new_fill.c
@@ -1022,6 +1075,7 @@
./test/le_extlink2.h5
./test/lheap.c
./test/links.c
./test/memleak_H5O_dtype_decode_helper_H5Odtype.h5
./test/mergemsg.h5
./test/mf.c
./test/mount.c
@@ -1031,6 +1085,8 @@
./test/noencoder.h5
./test/none.h5
./test/ntypes.c
./test/null_vol_connector.c
./test/null_vol_connector.h
./test/ohdr.c
./test/objcopy.c
./test/page_buffer.c
@@ -1066,20 +1122,25 @@
./test/tcheck_version.c
./test/tconfig.c
./test/tcoords.c
./test/testabort_fail.sh.in
./test/testcheck_version.sh.in
./test/testexternal_env.sh.in
./test/testerror.sh.in
./test/testlinks_env.sh.in
./test/test_filenotclosed.sh.in
./test/test_filter_plugin.sh.in
./test/test_filters_le.h5
./test/test_filters_be.h5
./test/testflushrefresh.sh.in
./test/testframe.c
./test/testhdf5.c
./test/testhdf5.h
./test/testlibinfo.sh.in
./test/test_usecases.sh.in
./test/test_vol_plugin.sh.in
./test/testmeta.c
./test/testswmr.sh.in
./test/testvdsswmr.sh.in
./test/testvds_env.sh.in
./test/tfile.c
./test/tgenprop.c
./test/th5o.c
@@ -1118,16 +1179,15 @@
./test/use_common.c
./test/use_disable_mdc_flushes.c
./test/use.h
./test/vfd.c
./test/test_filters_le.h5
./test/test_filters_be.h5
./test/gen_filters.c
./test/chunk_info.c
./test/vds.c
./test/vds_env.c
./test/vds_swmr.h
./test/vds_swmr_gen.c
./test/vds_swmr_reader.c
./test/vds_swmr_writer.c
./test/vfd.c
./test/vol.c
./test/vol_plugin.c
./test/testfiles/err_compat_1
./test/testfiles/err_compat_2
@@ -1238,6 +1298,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
@@ -1254,9 +1315,12 @@
./testpar/t_shapesame.c
./testpar/t_pshutdown.c
./testpar/t_prestart.c
./testpar/t_psubfile.c
./testpar/t_pvds.c
./testpar/t_span_tree.c
./testpar/t_init_term.c
./testpar/testpar.h
./testpar/testpflush.sh.in
./testpar/testphdf5.c
./testpar/testphdf5.h
@@ -1363,14 +1427,17 @@
./tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err
./tools/test/h5format_convert/testfiles/h5fc_v_non_chunked.ddl
./tools/test/h5format_convert/testfiles/h5fc_d_file.ddl
./tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err
./tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl
./tools/test/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl
./tools/test/h5format_convert/testfiles/h5fc_dname.ddl
./tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl
./tools/test/h5format_convert/testfiles/h5fc_dname.err
./tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err
./tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err
./tools/test/h5format_convert/testfiles/h5fc_help.ddl
./tools/test/h5format_convert/testfiles/h5fc_v_all.ddl
./tools/test/h5format_convert/testfiles/h5fc_nooption.ddl
./tools/test/h5format_convert/testfiles/h5fc_v_n_1d.ddl
./tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl
./tools/test/h5format_convert/testfiles/h5fc_non_v3.h5
./tools/test/h5format_convert/testfiles/h5fc_edge_v3.h5
./tools/test/h5format_convert/testfiles/h5fc_err_level.h5
@@ -1440,6 +1507,11 @@
./tools/test/h5ls/vds_prefix/tvds-4.ls
./tools/test/h5ls/vds_prefix/tvds-5.ls
# h5ls test error files
./tools/test/h5ls/errfiles/nosuchfile.err
./tools/test/h5ls/errfiles/textlinksrc-nodangle-1.err
./tools/test/h5ls/errfiles/tgroup-1.err
# h5copy sources
./tools/src/h5copy/Makefile.am
./tools/src/h5copy/h5copy.c
@@ -1476,11 +1548,9 @@
./tools/lib/io_timer.h
./tools/src/misc/Makefile.am
./tools/src/misc/h5cc.in
./tools/src/misc/h5clear.c
./tools/src/misc/h5debug.c
./tools/src/misc/h5mkgrp.c
./tools/src/misc/h5redeploy.in
./tools/src/misc/h5repart.c
./tools/test/misc/Makefile.am
./tools/test/misc/h5repart_gentest.c
@@ -1495,10 +1565,11 @@
./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_missing_file.err
./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_no_mdc_image.err
./tools/test/misc/testfiles/h5clear_open_fail.err
./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
@@ -1552,10 +1623,12 @@
./tools/test/h5stat/testh5stat.sh.in
./tools/test/h5stat/testfiles/h5stat_dims1.ddl
./tools/test/h5stat/testfiles/h5stat_dims2.ddl
./tools/test/h5stat/testfiles/h5stat_err1_dims.ddl
./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
@@ -1587,10 +1660,21 @@
./tools/test/h5stat/testfiles/h5stat_threshold.h5
./tools/test/h5stat/testfiles/h5stat_tsohm.ddl
./tools/test/h5stat/testfiles/h5stat_tsohm.h5
./tools/test/h5stat/testfiles/h5stat_err_refcount.err
./tools/test/h5stat/testfiles/h5stat_err_old_layout.err
./tools/test/h5stat/testfiles/h5stat_err_old_fill.err
./tools/test/h5stat/testfiles/h5stat_err1_dims.err
./tools/test/h5stat/testfiles/h5stat_err1_links.err
./tools/test/h5stat/testfiles/h5stat_err1_numattrs.err
./tools/test/h5stat/testfiles/h5stat_err2_numattrs.err
./tools/test/h5stat/testfiles/h5stat_notexist.err
./tools/test/h5stat/testfiles/h5stat_nofile.err
# h5dump test files
./tools/testfiles/charsets.h5
./tools/testfiles/charsets.ddl
./tools/testfiles/err_attr_dspace.h5
./tools/testfiles/err_attr_dspace.ddl
./tools/testfiles/family_file00000.h5
./tools/testfiles/family_file00001.h5
./tools/testfiles/family_file00002.h5
@@ -1616,6 +1700,7 @@
./tools/testfiles/h5dump-help.txt
./tools/testfiles/non_existing.ddl
./tools/testfiles/packedbits.ddl
./tools/testfiles/t128bit_float.h5
./tools/testfiles/taindices.h5
./tools/testfiles/tall-1.ddl
./tools/testfiles/tall-2.ddl
@@ -1780,6 +1865,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
@@ -2244,7 +2331,6 @@
./tools/test/h5diff/testfiles/h5diff_600.txt
./tools/test/h5diff/testfiles/h5diff_601.txt
./tools/test/h5diff/testfiles/h5diff_601_ERR.err
./tools/test/h5diff/testfiles/h5diff_601_ERR.txt
./tools/test/h5diff/testfiles/h5diff_603.txt
./tools/test/h5diff/testfiles/h5diff_604.txt
./tools/test/h5diff/testfiles/h5diff_605.txt
@@ -2351,21 +2437,12 @@
./tools/test/h5diff/testfiles/h5diff_452.txt
./tools/test/h5diff/testfiles/h5diff_453.txt
./tools/test/h5diff/testfiles/h5diff_454.txt
./tools/test/h5diff/testfiles/h5diff_454_ERR.err
./tools/test/h5diff/testfiles/h5diff_454_ERR.txt
./tools/test/h5diff/testfiles/dangling_link.err
./tools/test/h5diff/testfiles/h5diff_455.txt
./tools/test/h5diff/testfiles/h5diff_455_ERR.err
./tools/test/h5diff/testfiles/h5diff_455_ERR.txt
./tools/test/h5diff/testfiles/h5diff_456.txt
./tools/test/h5diff/testfiles/h5diff_457.txt
./tools/test/h5diff/testfiles/h5diff_457_ERR.err
./tools/test/h5diff/testfiles/h5diff_457_ERR.txt
./tools/test/h5diff/testfiles/h5diff_458.txt
./tools/test/h5diff/testfiles/h5diff_458_ERR.err
./tools/test/h5diff/testfiles/h5diff_458_ERR.txt
./tools/test/h5diff/testfiles/h5diff_459.txt
./tools/test/h5diff/testfiles/h5diff_459_ERR.err
./tools/test/h5diff/testfiles/h5diff_459_ERR.txt
./tools/test/h5diff/testfiles/h5diff_465.txt
./tools/test/h5diff/testfiles/h5diff_466.txt
./tools/test/h5diff/testfiles/h5diff_467.txt
@@ -2455,6 +2532,7 @@
./tools/test/h5diff/testfiles/tudfilter.h5
./tools/test/h5diff/testfiles/tudfilter2.h5
./tools/test/h5diff/testfiles/h5diff_ud.txt
./tools/test/h5diff/testfiles/h5diff_udfail.err
./tools/test/h5diff/testfiles/h5diff_udfail.txt
./tools/test/h5diff/testfiles/diff_strings1.h5
./tools/test/h5diff/testfiles/diff_strings2.h5
@@ -2555,6 +2633,7 @@
./tools/test/h5copy/testfiles/h5copy_extlinks_src.h5
./tools/test/h5copy/testfiles/h5copy_extlinks_trg.h5
./tools/test/h5copy/testfiles/h5copy_extlinks_src.out.ls
./tools/test/h5copy/testfiles/h5copy_misc1.err
./tools/test/h5copy/testfiles/h5copy_misc1.out
./tools/test/h5copy/testfiles/h5copytst_new.h5
./tools/test/h5copy/testfiles/h5copytst_new.out.ls
@@ -2584,6 +2663,8 @@
./tools/test/perform/build_h5perf_alone.sh
./tools/test/perform/build_h5perf_serial_alone.sh
./tools/test/perform/chunk.c
./tools/test/perform/chunk_cache.c
./tools/test/perform/direct_write_perf.c
./tools/test/perform/gen_report.pl
./tools/test/perform/iopipe.c
./tools/test/perform/overhead.c
@@ -2661,7 +2742,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
@@ -2680,8 +2760,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
@@ -2722,16 +2802,17 @@
# expected test output from testing h5watch
#
./hl/tools/testfiles/w-err-cmpd1.ddl
./hl/tools/testfiles/w-err-cmpd2.ddl
./hl/tools/testfiles/w-err-cmpd3.ddl
./hl/tools/testfiles/w-err-cmpd4.ddl
./hl/tools/testfiles/w-err-cmpd5.ddl
./hl/tools/testfiles/w-err-dset1.ddl
./hl/tools/testfiles/w-err-dset2.ddl
./hl/tools/testfiles/w-err-dset-nomax.ddl
./hl/tools/testfiles/w-err-dset-none.ddl
./hl/tools/testfiles/w-err-file.ddl
./hl/tools/testfiles/w-err-std.ddl
./hl/tools/testfiles/w-err-cmpd1.err
./hl/tools/testfiles/w-err-cmpd2.err
./hl/tools/testfiles/w-err-cmpd3.err
./hl/tools/testfiles/w-err-cmpd4.err
./hl/tools/testfiles/w-err-cmpd5.err
./hl/tools/testfiles/w-err-dset1.err
./hl/tools/testfiles/w-err-dset2.err
./hl/tools/testfiles/w-err-dset-nomax.err
./hl/tools/testfiles/w-err-dset-none.err
./hl/tools/testfiles/w-err-file.err
./hl/tools/testfiles/w-err-poll0.ddl
./hl/tools/testfiles/w-err-poll.ddl
./hl/tools/testfiles/w-err-width.ddl
@@ -2833,6 +2914,32 @@
./java/src/jni/h5oImp.h
./java/src/jni/h5pImp.c
./java/src/jni/h5pImp.h
./java/src/jni/h5pACPLImp.c
./java/src/jni/h5pACPLImp.h
./java/src/jni/h5pDAPLImp.c
./java/src/jni/h5pDAPLImp.h
./java/src/jni/h5pDCPLImp.c
./java/src/jni/h5pDCPLImp.h
./java/src/jni/h5pDXPLImp.c
./java/src/jni/h5pDXPLImp.h
./java/src/jni/h5pFAPLImp.c
./java/src/jni/h5pFAPLImp.h
./java/src/jni/h5pFCPLImp.c
./java/src/jni/h5pFCPLImp.h
./java/src/jni/h5pGAPLImp.c
./java/src/jni/h5pGAPLImp.h
./java/src/jni/h5pGCPLImp.c
./java/src/jni/h5pGCPLImp.h
./java/src/jni/h5pLAPLImp.c
./java/src/jni/h5pLAPLImp.h
./java/src/jni/h5pLCPLImp.c
./java/src/jni/h5pLCPLImp.h
./java/src/jni/h5pOCPLImp.c
./java/src/jni/h5pOCPLImp.h
./java/src/jni/h5pOCpyPLImp.c
./java/src/jni/h5pOCpyPLImp.h
./java/src/jni/h5pStrCPLImp.c
./java/src/jni/h5pStrCPLImp.h
./java/src/jni/h5plImp.c
./java/src/jni/h5plImp.h
./java/src/jni/h5rImp.c
@@ -2841,6 +2948,8 @@
./java/src/jni/h5sImp.h
./java/src/jni/h5tImp.c
./java/src/jni/h5tImp.h
./java/src/jni/h5vlImp.c
./java/src/jni/h5vlImp.h
./java/src/jni/h5zImp.c
./java/src/jni/h5zImp.h
@@ -3044,9 +3153,43 @@
./java/test/Makefile.am
./java/test/CMakeLists.txt
./java/test/junit.sh.in
./java/test/JUnit-interface.txt
./java/test/JUnit-unit.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-TestH5VL.txt
./java/test/testfiles/JUnit-TestH5Z.txt
./java/test/h5ex_g_iterate.orig
./java/test/TestH5.java
./java/test/TestH5A.java
@@ -3083,26 +3226,29 @@
./java/test/TestH5Tparams.java
./java/test/TestH5Tbasic.java
./java/test/TestH5T.java
./java/test/TestH5VL.java
./java/test/TestH5Z.java
./java/test/TestAll.java
./java/test/TestUnit.java
./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/toolchain/crayle.cmake
./config/toolchain/GCC.cmake
./config/toolchain/intel.cmake
./config/toolchain/PGI.cmake
./config/cmake/cacheinit.cmake
./config/cmake/CMakeFindJavaCommon.cmake
./config/cmake/ConversionTests.c
./config/cmake/ConfigureChecks.cmake
./config/cmake/CPack.Info.plist.in
./config/cmake/CTestCustom.cmake
./config/cmake/FindHDFJAVA.cmake.in
./config/cmake/FindJNI.cmake
./config/cmake/H5cxx_config.h.in
./config/cmake/H5pubconf.h.in
./config/cmake/hdf5-config.cmake.in
@@ -3124,6 +3270,8 @@
./config/cmake/UseJavaSymlinks.cmake
./config/cmake/userblockTest.cmake
./config/cmake/vfdTest.cmake
./config/cmake/volTest.cmake
./config/cmake/wait_H5Tinit.cmake
./config/cmake_ext_mod/ConfigureChecks.cmake
./config/cmake_ext_mod/CTestCustom.cmake
@@ -3137,6 +3285,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
@@ -3148,7 +3297,6 @@
# CMake-specific Examples Files
./config/cmake/HDF5_Examples.cmake.in
./config/cmake/HDF518_Examples.cmake.in
./release_docs/USING_CMake_Examples.txt
./CMakeLists.txt
@@ -3162,6 +3310,7 @@
./c++/src/CMakeLists.txt
./c++/test/CMakeLists.txt
./c++/test/CMakeTests.cmake
./c++/test/CMakeVFDTests.cmake
./examples/CMakeLists.txt
./examples/CMakeTests.cmake
./examples/run-all-ex.sh
@@ -3199,10 +3348,14 @@
./hl/tools/h5watch/CMakeTests.cmake
./src/CMakeLists.txt
./test/CMakeLists.txt
./test/CMakePassthroughVOLTests.cmake
./test/CMakeTests.cmake
./test/CMakeVFDTests.cmake
./test/flushrefreshTest.cmake
./test/ShellTests.cmake
./testpar/CMakeLists.txt
./testpar/CMakeTests.cmake
./testpar/CMakeVFDTests.cmake
./tools/CMakeLists.txt
./tools/lib/CMakeLists.txt
./tools/src/CMakeLists.txt
@@ -3235,6 +3388,7 @@
./tools/src/h5repack/CMakeLists.txt
./tools/test/h5repack/CMakeLists.txt
./tools/test/h5repack/CMakeTests.cmake
./tools/test/h5repack/CMakeVFDTests.cmake
./tools/src/h5stat/CMakeLists.txt
./tools/test/h5stat/CMakeLists.txt
./tools/test/h5stat/CMakeTests.cmake
@@ -3254,6 +3408,12 @@
./config/cmake/scripts/HDF5config.cmake
./config/cmake/scripts/HDF5options.cmake
# CMake-specific HPC Scripts
./config/cmake/scripts/HPC/sbatch-HDF5options.cmake
./config/cmake/scripts/HPC/bsub-HDF5options.cmake
./config/cmake/scripts/HPC/qsub-HDF5options.cmake
./config/cmake/scripts/HPC/raybsub-HDF5options.cmake
# Files generated by autogen
./aclocal.m4
./bin/compile
@@ -3267,6 +3427,7 @@
./c++/examples/Makefile.in
./c++/Makefile.in
./configure
./bin/Makefile.in
./c++/src/Makefile.in
./c++/test/Makefile.in
./examples/Makefile.in

View File

@@ -49,11 +49,6 @@ include $(top_srcdir)/config/commence.am
# Conditionals. These conditionals are defined during configure
# Define each variable to empty if it is not used to placate pmake
if BUILD_PARALLEL_CONDITIONAL
TESTPARALLEL_DIR =testpar
else
TESTPARALLEL_DIR=
endif
if BUILD_CXX_CONDITIONAL
CXX_DIR =c++
else
@@ -74,9 +69,24 @@ if BUILD_HDF5_HL_CONDITIONAL
else
HDF5_HL_DIR=
endif
if BUILD_TESTS_CONDITIONAL
TESTSERIAL_DIR =test
else
TESTSERIAL_DIR=
endif
if BUILD_TESTS_PARALLEL_CONDITIONAL
TESTPARALLEL_DIR =testpar
else
TESTPARALLEL_DIR=
endif
if BUILD_TOOLS_CONDITIONAL
TOOLS_DIR =tools
else
TOOLS_DIR=
endif
SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
$(JAVA_DIR) $(HDF5_HL_DIR)
SUBDIRS = src $(TESTSERIAL_DIR) $(TESTPARALLEL_DIR) bin $(TOOLS_DIR) . \
$(CXX_DIR) $(FORTRAN_DIR) $(JAVA_DIR) $(HDF5_HL_DIR)
DIST_SUBDIRS = src test testpar tools . c++ fortran hl examples java
# Some files generated during configure that should be cleaned
@@ -186,6 +196,16 @@ check-vfd:
fi; \
done
# Run tests with different passthrough Virtual Object Layer Connectors.
# NOTE: Will only succeed with passthrough VOL connectors that use
# the native VOL connector as the terminal connector.
check-passthrough-vol:
for d in $(SUBDIRS); do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
fi; \
done
# Automake wants to make config.status depend on configure. This
# makes sense, but config.status can't always be regenerated
# properly, which can cause builds to fail.

View File

@@ -1,4 +1,4 @@
HDF5 version 1.10.3-snap1 currently under development
HDF5 version 1.11.6 currently under development
------------------------------------------------------------------------------
Please refer to the release_docs/INSTALL file for installation instructions.

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
#

57
bin/Makefile.am Normal file
View File

@@ -0,0 +1,57 @@
#
# 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.
##
## Makefile.am
## Run automake to generate a Makefile.in from this file.
#
# HDF5 Library Makefile(.in)
#
include $(top_srcdir)/config/commence.am
# Include src directory
AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# These are our main targets
bin_SCRIPTS=h5redeploy
# Tell automake to clean h5redeploy script
CLEANFILES=h5redeploy
# These were generated by configure. Remove them only when distclean.
DISTCLEANFILES=h5cc
# All programs rely on hdf5 library and h5tools library
LDADD=$(LIBH5TOOLS) $(LIBHDF5)
# How to build h5redeploy script
h5redeploy: h5redeploy.in
@cp $(srcdir)/$@.in $@
# h5cc needs custom install and uninstall rules, since it may be
# named h5pcc if hdf5 is being built in parallel mode.
if BUILD_PARALLEL_CONDITIONAL
H5CC_NAME=h5pcc
else
H5CC_NAME=h5cc
endif
$(DESTDIR)$(bindir):
echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
$(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1;
install-exec-local: $(DESTDIR)$(bindir)
@$(INSTALL) h5cc $(DESTDIR)$(bindir)/$(H5CC_NAME)
uninstall-local:
@$(RM) $(DESTDIR)$(bindir)/$(H5CC_NAME)
include $(top_srcdir)/config/conclude.am

21
bin/batch/ctest.qsub.in.cmake Executable file
View File

@@ -0,0 +1,21 @@
#!/bin/bash -l
if [ $# -gt 0 ]; then
SUMMARY_FILE=$1
fi
ACCOUNT_ID=@ACCOUNT_ID@
echo "Run parallel test command. Test output will be in build/${SUMMARY_FILE}"
CTEST_CMD=`which ctest`
#SKIPTESTS <<KEYWORD:script inserts list of skips tests here -- don't remove>>
cd @HDF5_BINARY_DIR@
if [[ $SUMMARY_FILE == *"ctestS"* ]]; then
CMD="${CTEST_CMD} . -E MPI_TEST_ -C Release -j 32 -T test"
else
CMD="${CTEST_CMD} . -R MPI_TEST_ ${SKIP_TESTS} -C Release -T test"
fi
qsub -t 60 -n 1 -q debug-flat-quad -A ${ACCOUNT_ID} ${CMD} >& ${SUMMARY_FILE}
echo "Done running ctest parallel command."

View File

@@ -0,0 +1,19 @@
#!/bin/tcsh
### LSF syntax
#BSUB -nnodes 1 #number of nodes
#BSUB -W 30 #walltime in minutes
#BSUB -G guests #account
#BSUB -e ctestPerrors.txt #stderr
#BSUB -o ctestPoutput.txt #stdout
#BSUB -J hdf5_ctestP #job
##BSUB -q pbatch #queue to use
#BSUB -q pdebug
##date; hostname
##echo -n 'JobID is '; echo $LSB_JOBID
cd @HDF5_BINARY_DIR@
echo "Run parallel test command. Test output will be in build/ctestP.out"
ctest . -R MPI_TEST_ -C Release -T test >& ctestP.out
echo "Done running ctest parallel command."

View File

@@ -0,0 +1,14 @@
#!/bin/bash
#SBATCH --nodes=1
#SBATCH -t 00:30:00
#SBATCH --mail-type=BEGIN,END,FAIL
##SBATCH --mail-user=<username>@sandia.gov
#SBATCH --export=ALL
#SBATCH --job-name=h5_ctestP
cd @HDF5_BINARY_DIR@
ctest . -R MPI_TEST_ -C Release -T test >& ctestP.out
echo "Done running ctestP.sl"

View File

@@ -0,0 +1,18 @@
#!/bin/tcsh
### LSF syntax
#BSUB -nnodes 1 #number of nodes
#BSUB -W 29 #walltime in minutes
#BSUB -G guests #account
#BSUB -e ctestSerrors.txt #stderr
#BSUB -o ctestSoutput.txt #stdout
#BSUB -J hdf5_ctestS #job
##BSUB -q pbatch #queue to use
#BSUB -q pdebug
cd @HDF5_BINARY_DIR@
echo "Run command. Test output will be in build/ctestS.out"
ctest . -E MPI_TEST_ -C Release -j 32 -T test >& ctestS.out
##$CMD >& ctestS.out
echo "Done running command."

View File

@@ -0,0 +1,15 @@
#!/bin/bash
#SBATCH --nodes=1
#SBATCH -t 00:30:00
#SBATCH --mail-type=BEGIN,END,FAIL
##SBATCH --mail-user=<username>@sandia.gov
#SBATCH --export=ALL
#SBATCH --job-name=h5_ctestS
cd @HDF5_BINARY_DIR@
CMD="ctest . -E MPI_TEST_ -C Release -j 32 -T test"
echo "Run $CMD. Test output will be in build/ctestS.out"
$CMD >& ctestS.out
echo "Done running $CMD"

View File

@@ -0,0 +1,20 @@
#!/bin/bash
#SBATCH -p knl -C quad
#SBATCH --nodes=1
#SBATCH -t 00:10:00
#SBATCH --mail-type=BEGIN,END,FAIL
#SBATCH --mail-user=<username>@sandia.gov
#SBATCH --export=ALL
#SBATCH --job-name=knl_h5detect
# Inputs: Build directory, output file name, executable file name (username/email if available).
PROGNAME=H5detect
OUTPUT=H5Tinit.c
CMD="@HDF5_BINARY_DIR@/bin/${PROGNAME} @HDF5_GENERATED_SOURCE_DIR@/${OUTPUT}"
echo "Run $CMD"
srun -n 1 $CMD
echo "Done running $CMD"

View File

@@ -0,0 +1,16 @@
#!/bin/bash
#SBATCH -p knl -C quad,cache
#SBATCH --nodes=1
#SBATCH -t 00:30:00
#SBATCH --mail-type=BEGIN,END,FAIL
##SBATCH --mail-user=<username>@sandia.gov
#SBATCH --export=ALL
#SBATCH --job-name=h5_ctestP
cd @HDF5_BINARY_DIR@
#run parallel tests except t_cache_image test
ctest . -R MPI_TEST_ -C Release -T test >& ctestP.out
echo "Done running $CMD"

View File

@@ -0,0 +1,17 @@
#!/bin/bash
#SBATCH -p knl -C quad,cache
#SBATCH --nodes=1
#SBATCH -t 00:30:00
#SBATCH --mail-type=BEGIN,END,FAIL
##SBATCH --mail-user=<username>@sandia.gov
#SBATCH --export=ALL
#SBATCH --job-name=h5_ctestS
cd @HDF5_BINARY_DIR@
CMD="ctest . -E MPI_TEST_ -C Release -j 32 -T test"
echo "Run $CMD. Test output will be in build/ctestS.out"
$CMD >& ctestS.out
echo "Done running $CMD"

View File

@@ -0,0 +1,20 @@
#!/bin/tcsh
### LSF syntax
#BSUB -n 6 #number of nodes
#BSUB -R "span[ptile=6]"
#BSUB -W 30 #walltime in minutes
#BSUB -G guests #account
#BSUB -e ctestPerrors.txt #stderr
#BSUB -o ctestPoutput.txt #stdout
#BSUB -J hdf5_ctestP #job
##BSUB -q pbatch #queue to use
#BSUB -q pdebug
##date; hostname
##echo -n 'JobID is '; echo $LSB_JOBID
cd @HDF5_BINARY_DIR@
echo "Run parallel test command. Test output will be in build/ctestP.out"
ctest . -R 'MPI_TEST_' -C Release -T test >& ctestP.out
echo "Done running ctest parallel command."

View File

@@ -0,0 +1,18 @@
#!/bin/tcsh
### LSF syntax
#BSUB -n 1 #number of nodes
#BSUB -W 29 #walltime in minutes
#BSUB -G guests #account
#BSUB -e ctestSerrors.txt #stderr
#BSUB -o ctestSoutput.txt #stdout
#BSUB -J hdf5_ctestS #job
##BSUB -q pbatch #queue to use
#BSUB -q pdebug
cd @HDF5_BINARY_DIR@
echo "Run command. Test output will be in build/ctestS.out"
ctest . -E 'MPI_TEST_' -C Release -j 32 -T test >& ctestS.out
##$CMD >& ctestS.out
echo "Done running command."

7
bin/batch/raybsub Executable file
View File

@@ -0,0 +1,7 @@
#!/bin/tcsh
# ray.llnl.gov requires a '<' with bsub for submitting .lsf batch jobs.
# CMake is reluctant to pass the '<', so we put it in this script and use
# the script to submit the bsub command on ray.
bsub < $1

View File

@@ -13,101 +13,165 @@ require 5.003;
# If you do not have access to either file, you may request a copy from
# help@hdfgroup.org.
#
# Robb Matzke, matzke@llnl.gov
# 30 Aug 1997
# Dana Robinson
# Spring 2019
# (Original by Robb Matzke)
#
# Purpose: Given the names of C source files this script will print the
# file name, line number, and function name of any function that
# doesn't begin with the letter `h' or `H' as stipulated by the
# HDF5 programming style guide.
# Purpose: Given the names of C source files this script will print the
# file name, line number, and function name of any function that
# doesn't begin with the letter 'h' or 'H' as stipulated by the
# HDF5 programming style guide.
#
# Emacs users can run this script as the compile command and
# use `next-error' (usually bound to M-`) to find each name
# violation.
# Emacs users can run this script as the compile command and
# use 'next-error' (usually bound to M-`) to find each name
# violation.
if(<>) {
if($ARGV =~ /\//) {
($filename) = ($ARGV =~ /^.*\/([A-Za-z0-9_]*)\.c$/);
} else {
($filename) = ($ARGV =~ /([A-Za-z0-9_]*)\.c$/);
use File::Basename;
# Loop over all files passed to the function
foreach $arg (@ARGV) {
# Get the filename from the path
$filename = fileparse($arg);
# Skip files that don't include H5private.h
# H5system. has to be inspected by hand since it wraps POSIX files
#
# H5detect and H5make_libsettings are created before the library exists
# so calls that link to function replacements won't work. We'll ignore
# it here.
#
# If a user specifies one file, process it no matter what so people
# can inspect files we normally skip (like H5system.c).
if($#ARGV gt 0 and $filename =~ /H5FDmulti|H5FDstdio|H5VLpassthru|H5system|H5detect|H5make_libsettings/) {
print "$filename is exempt from using Standard library macro wrappers\n";
next;
}
if($filename =~ /H5FDmulti|H5FDstdio/) {
print "$ARGV is exempt from using Standard library macro wrappers\n";
} else {
while (<>) {
# Open the file
open(my $fh, "<", $arg) or do {
warn "NOTE: Unable to open $arg: !$\n";
next;
};
# Get rid of comments by removing the inside part.
s|/\*.*?\*/||g;
if ($in_comment) {
if (/\*\//) {
s|.*?\*/||;
$in_comment = 0;
} else {
$_="\n";
}
} elsif (m|/\*|) {
s|/\*.*||;
$in_comment = 1;
}
# Loop over all lines in the file to find undecorated functions
while (<$fh>) {
# Get rid of string constants if they begin and end on this line.
s/([\'\"])([^\1]|\\\1)*?\1/$1$1/g;
# Get rid of preprocessor directives
s/^\#.*//;
# Skip callbacks invoked as methods in a struct
next if $_ =~ /\b(\)?->|\.)\(?([a-z_A-Z]\w*)\s*\(/;
# Now find all function calls on this line which don't start with 'H'
while (($name)=/\b([a-z_A-GI-Z]\w*)\s*\(/) {
$_ = $';
# Ignore C statements that look sort of like function
# calls.
next if $name =~ /^(if|for|offsetof|return|sizeof|switch|while|void)$/;
# Ignore things that get misdetected because of the simplified
# parsing that takes place here.
next if $name =~ /^(int|herr_t|_term_interface)$/;
# These are really HDF5 functions/macros even though they don't
# start with `h' or `H'.
next if $name =~ /^FUNC_(ENTER|LEAVE)(_(NO)?API|_PACKAGE|_STATIC)?(_NOFS|_NOCLEAR|_NOINIT)?(_NOFUNC|_TAG)?$/;
next if $name =~ /^(BEGIN|END)_FUNC$/;
next if $name =~ /^U?INT(8|16|32|64)(ENCODE|DECODE)(_VAR)?$/;
next if $name =~ /^CI_(PRINT_STATS|INC_SRC|INC_DST)$/;
next if $name =~ /^(ABS|ADDR_OVERFLOW|ALL_MEMBERS|BOUND|CONSTR|DETECT_[I|F|M]|DOWN)$/;
next if $name =~ /^(MIN3?|MAX3?|NELMTS|POWER_OF_TWO|REGION_OVERFLOW)$/;
next if $name =~ /^(UNIQUE_MEMBERS)$/;
next if $name =~ /^addr_defined$/;
# These functions/macros are exempt.
next if $name =~ /^(main|[fs]?printf|va_(start|arg|end))$/;
# These are Windows system calls. Ignore them.
next if $name =~ /^(_get_osfhandle|GetFileInformationByHandle|SetFilePointer|GetLastError|SetEndOfFile)$/;
next if $name =~ /^(FindNextFile|FindClose|_tzset|Wgettimeofday|GetSystemTimeAsFileTime|Wgetlogin|GetUserName)$/;
# These are MPI function calls. Ignore them.
next if $name =~ /^(MPI_|MPE_)/;
# These are POSIX threads function calls. Ignore them.
next if $name =~ /^pthread_/;
# These are Windows threads function calls. Ignore them.
next if $name =~ /^(_beginthread|(Initialize|Enter|Leave)CriticalSection|TlsAlloc)$/;
# These are zlib & szlib function calls. Ignore them.
next if $name =~ /^(inflate|SZ_)/;
next if $name =~ /^compress2$/;
print "$ARGV:$.: $name\n";
}
} continue {
close ARGV if eof; # reset line number
# Get rid of comments by removing the inside part.
s|/\*.*?\*/||g;
if ($in_comment) {
if (/\*\//) {
s|.*?\*/||;
$in_comment = 0;
} else {
$_="\n";
}
} elsif (m|/\*|) {
s|/\*.*||;
$in_comment = 1;
}
# Get rid of string constants if they begin and end on this line.
s/([\'\"])([^\1]|\\\1)*?\1/$1$1/g;
# Get rid of preprocessor directives
s/^\#.*//;
# Skip callbacks invoked as methods in a struct
next if $_ =~ /\b(\)?]?->|\.)\(?([a-z_A-Z]\w*)\s*\(/;
# Now find all function calls on this line which don't start with 'H'
while (($name)=/\b([a-z_A-GI-Z]\w*)\s*\(/) {
$_ = $';
# Ignore C statements that look sort of like function
# calls.
next if $name =~ /^(if|for|offsetof|return|sizeof|switch|while|void)$/;
# Ignore things that get misdetected because of the simplified
# parsing that takes place here.
next if $name =~ /^(int|herr_t|_term_interface|_term_package)$/;
# These are really HDF5 functions/macros even though they don't
# start with `h' or `H'.
next if $name =~ /^FUNC_(ENTER|LEAVE)(_(NO)?API|_PACKAGE|_STATIC)?(_NOFS|_NOCLEAR|_NOINIT)?(_NOFUNC|_TAG)?$/;
next if $name =~ /^(BEGIN|END)_FUNC$/;
next if $name =~ /^U?INT(8|16|32|64)(ENCODE|DECODE)(_VAR)?$/;
next if $name =~ /^CI_(PRINT_STATS|INC_SRC|INC_DST)$/;
next if $name =~ /^(ABS|ADDR_OVERFLOW|ALL_MEMBERS|BOUND|CONSTR|DETECT_[I|F|M]|DOWN)$/;
next if $name =~ /^(MIN3?|MAX3?|NELMTS|POWER_OF_TWO|REGION_OVERFLOW)$/;
next if $name =~ /^(UNIQUE_MEMBERS|S_ISDIR)$/;
next if $name =~ /^addr_defined$/;
# These functions/macros are exempt.
# op, cb, and OP are often spuriously flagged so ignore them.
next if $name =~ /^(main|op|cb|OP)$/;
# This often appears in preprocessor lines that span multiple lines
next if $name =~ /^(defined)$/;
# These are Windows system calls. Ignore them.
next if $name =~ /^(_get_osfhandle|GetFileInformationByHandle|SetFilePointer|GetLastError|SetEndOfFile)$/;
next if $name =~ /^(FindNextFile|FindClose|_tzset|Wgettimeofday|GetSystemTimeAsFileTime|Wgetlogin|GetUserName)$/;
next if $name =~ /^(DeleteCriticalSection|TlsFree|TlsGetValue|CreateThread)$/;
next if $name =~ /^(ExpandEnvironmentStringsA|LockFileEx|UnlockFileEx)$/;
next if $name =~ /^(DllMain|LocalAlloc|LocalFree)$/;
next if $name =~ /^(FindFirstFileA|FindNextFileA)$/;
next if $name =~ /^(_beginthread|(Initialize|Enter|Leave)CriticalSection|TlsAlloc)$/;
# These are MPI function calls. Ignore them.
next if $name =~ /^(MPI_|MPE_)/;
# These are POSIX threads function calls. Ignore them.
next if $name =~ /^pthread_/;
# These are zlib & szlib function calls. Ignore them.
next if $name =~ /^(inflate|SZ_)/;
next if $name =~ /^compress2$/;
# These is an H5Dfill function. Ignore it in this file.
if($filename =~ /H5Dfill/) {
next if $name =~ /^(alloc_func)$/;
}
# These are H5Zscaleoffset functions. Ignore them in this file.
if($filename =~ /H5Zscaleoffset/) {
next if $name =~ /^(pow_fun|round_fun|abs_fun|lround_fun|llround_fun)$/;
}
# TESTING (not comprehensive - just noise reduction)
# Test macros and functions (testhdf5.h)
next if $name =~ /^(AddTest|TestErrPrintf|TestSummary|TestCleanup|TestShutdown)$/;
next if $name =~ /^(CHECK|CHECK_PTR|CHECK_PTR_NULL|CHECK_PTR_EQ|CHECK_I)$/;
next if $name =~ /^(VERIFY|VERIFY_STR|VERIFY|TYPE|MESSAGE|ERROR)$/;
# Test macros and functions (h5test.h)
next if $name =~ /^(TESTING|PASSED|SKIPPED|FAIL_PUTS_ERROR|FAIL_STACK_ERROR|TEST_ERROR)$/;
next if $name =~ /^(GetTestExpress)$/;
# Ignore functions that start with test_ or check_
next if $name =~ /^test_/;
next if $name =~ /^check_/;
# Ignore functions that start with h5_
next if $name =~ /^h5_/;
# Ignore usage functions
next if $name =~ /^usage$/;
print "$filename:$.: $name\n";
}
}
# Close the file
close($fh);
}
if($#ARGV gt 0) {
print "\n";
print "NOTE:\n";
print "If any files were skipped due to being exempt, you can inspect them manually\n";
print "by using this script on them one at a time, which will always process the file.\n";
}

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

@@ -244,8 +244,8 @@ sub create_init ($) {
print HEADER "/* Major error codes */\n";
print HEADER "/*********************/\n\n";
foreach $name (keys %major) {
print HEADER " "x(0*$indent),"assert(${name}_g==(-1));\n";
print HEADER " "x(0*$indent),"if((msg = H5E_create_msg(cls, H5E_MAJOR, \"${major{$name}}\"))==NULL)\n";
print HEADER " "x(0*$indent),"HDassert(${name}_g==(-1));\n";
print HEADER " "x(0*$indent),"if((msg = H5E__create_msg(cls, H5E_MAJOR, \"${major{$name}}\"))==NULL)\n";
print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, \"error message initialization failed\")\n";
print HEADER " "x(0*$indent),"if((${name}_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)\n";
print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, \"can't register error message\")\n";
@@ -260,8 +260,8 @@ sub create_init ($) {
# Iterate over all the minor errors in each section
for $name ( @{$section_list{$sect_name}}) {
print HEADER " "x(0*$indent),"assert(${name}_g==(-1));\n";
print HEADER " "x(0*$indent),"if((msg = H5E_create_msg(cls, H5E_MINOR, \"${minor{$name}}\"))==NULL)\n";
print HEADER " "x(0*$indent),"HDassert(${name}_g==(-1));\n";
print HEADER " "x(0*$indent),"if((msg = H5E__create_msg(cls, H5E_MINOR, \"${minor{$name}}\"))==NULL)\n";
print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, \"error message initialization failed\")\n";
print HEADER " "x(0*$indent),"if((${name}_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<0)\n";
print HEADER " "x(1*$indent),"HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, \"can't register error message\")\n";

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

@@ -40,6 +40,7 @@ make distclean: remove all files generated by make, make check, or
make check-p: Only run parallel tests
make check-s: Only run serial tests
make check-vfd: Run tests with each virtual file driver
make check-vol: Run tests with each virtual object layer connector
HDF5 uses Automake, so any standard Automake targets not listed here
should also work.

View File

@@ -55,13 +55,21 @@ for compressing the resulting tar archive (if none are given then
tar -- use tar and don't do any compressing.
gzip -- use gzip with "-9" and append ".gz" to the output name.
bzip2 -- use bzip2 with "-9" and append ".bz2" to the output name.
zip -- convert all text files to DOS style and form a zip file for Windows use.
cmake-tgz -- create a tar file using the gzip default level with a build-unix.sh
command file and all other CMake files needed to build HDF5 source
using CMake on unix machines.
bzip2 -- use bzip2 with "-9" and append ".bz2" to the output name.
zip -- convert all text files to DOS style and form a zip file for Windows use.
cmake-zip -- convert all text files to DOS style and create a zip file inluding cmake
scripts and .bat files to build HDF5 source using CMake on Windows.
hpc-cmake-tgz
-- create a tar file using the gzip default level with a build-unix.sh
command file and all other CMake files needed to build HDF5 source
using CMake on unix machines, with HDF5options.cmake files for serial
and parallel builds on machines requiring batch jobs to run tests.
The default is for parallel build, with serial only build by changing
the HDF5options.cmake symlink to ser-HDF5options.cmake. More
information is available in the README_HPC file.
doc -- produce the latest doc tree in addition to the archive.
An md5 checksum is produced for each archive created and stored in the md5 file.
@@ -188,46 +196,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 files for building CMake on windows
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2013-32.bat $cmziptmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2013-64.bat $cmziptmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2015-32.bat $cmziptmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2015-64.bat $cmziptmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2017-32.bat $cmziptmpdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5_1_10/build-VS2017-64.bat $cmziptmpdir
# step 2: add batch file for building CMake on window
(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 /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.7-Source.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.12.4-Source.zip $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.
@@ -235,16 +244,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
mkdir $cmziptmpdir/CMake-$HDF5_VERS
mv $cmziptmpdir/* $cmziptmpdir/CMake-$HDF5_VERS
# step 3: make zipball
# -9 maximum compression
# -y Store symbolic links as such in the zip archive
@@ -258,7 +264,7 @@ tar2cmakezip()
}
# Function name: tar2cmaketgz
# Convert the release tarball to a Windows zipball with files to run CMake build.
# Convert the release tarball to a gzipped tar file with files to run CMake build.
#
# Programmer: Larry Knox
# Creation date: 2017-02-20
@@ -289,9 +295,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
@@ -299,16 +305,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
@@ -316,23 +323,108 @@ 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 /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.7-Source.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
mkdir $cmgztmpdir/CMake-$HDF5_VERS
mv $cmgztmpdir/* $cmgztmpdir/CMake-$HDF5_VERS
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.12.4-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
rm -rf $cmgztmpdir
}
# Function name: tar2hpccmaketgz
# Convert the release tarball to a gzipped tarfile with files to run CMake build
# and HDF5options.cmake files for parallel or serial only builds where build
# tests are run on compute nodes using batch scripts.
#
# Programmer: Larry Knox
# Creation date: 2019-01-28
#
# Modifications
#
# Steps:
# 1. untar the tarball in a temporary directory;
# Note: do this in a temporary directory to avoid changing
# the original source directory which may be around.
# 2. add build-unix.sh script.
# 3. add SZIP.tar.gz, ZLib.tar.gz and cmake files to top level directory.
# 4. create gzipped tar file with these contents:
# build-unix.sh script
# hdf5-<version> source code directory extracted from tar file
# CTestScript.cmake cmake file copied from <hdf5 source code>/config/cmake/scripts
# HDF5config.cmake cmake file copied from <hdf5 source code>/config/cmake/scripts
# HDF5options.cmake cmake file copied from <hdf5 source code>/config/cmake/scripts
# SZip.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake
# ZLib.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake
#
# 5. For HPC-CMake tgz file the following are also needed in the top-level directory:
# README_HPC copied from release_docs
# ser-HDF5options.cmake copied from <hdf5 source code>/config/cmake/scripts/HPC
# par-HDF5options.cmake copied from <hdf5 source code>/config/cmake/scripts/HPC
# HDF5options.cmake symlink to par-HDF5options.cmake
#
# Parameters:
# $1 version
# $2 release tarball
# $3 output zipball file name
#
# Returns 0 if successful; 1 otherwise
#
# need function to create another temporary directory, extract the
# $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.
tar2hpccmaketgz()
{
if [ $# -ne 3 ]; then
echo "usage: tar2hpccmaketgz <tarfilename> <tgzfilename>"
return 1
fi
cmgztmpdir=/tmp/cmgztmpdir$$
cmgztmpsubdir=$cmgztmpdir/HPC-CMake-$HDF5_VERS
mkdir -p $cmgztmpsubdir
version=$1
tarfile=$2
tgzfile=$3
# step 1: untar tarball in cmgztmpdir
(cd $cmgztmpsubdir; tar xf -) < $tarfile
# sanity check
if [ ! -d $cmgztmpsubdir/$version ]; then
echo "untar did not create $cmgztmpsubdir/$version source dir"
# cleanup
rm -rf $cmgztmpdir
return 1
fi
# step 2: add build-unix.sh script
(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 $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.12.4-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/release_docs/README_HPC $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/HPC/ser-HDF5options.cmake $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/HPC/par-HDF5options.cmake $cmgztmpsubdir
(cd $cmgztmpsubdir; ln -s par-HDF5options.cmake HDF5options.cmake)
tar czf $DEST/HPC-CMake-$HDF5_VERS.tar.gz -C $cmgztmpdir . || exit 1
# cleanup
rm -rf $cmgztmpdir
}
# This command must be run at the top level of the hdf5 source directory.
# Verify this requirement.
if [ ! \( -f configure.ac -a -f bin/release \) ]; then
@@ -517,6 +609,11 @@ for comp in $methods; do
tar2cmaketgz $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/CMake-$HDF5_VERS.tar.gz 1>&2
(cd $DEST; md5sum CMake-$HDF5_VERS.tar.gz >> $MD5file)
;;
hpc-cmake-tgz)
test "$verbose" && echo " Creating HPC-CMake tar.gz file..." 1>&2
tar2hpccmaketgz $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/HPC-CMake-$HDF5_VERS.tar.gz 1>&2
(cd $DEST; md5sum HPC-CMake-$HDF5_VERS.tar.gz >> $MD5file)
;;
bzip2)
test "$verbose" && echo " Running bzip2..." 1>&2
bzip2 -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.bz2

87
bin/runbkgprog Executable 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

@@ -130,9 +130,10 @@ DISPLAYUSAGE()
set -
cat <<EOF
Usage: $PROGNAME [all] [checkout] [ftp <URL> [diff] [test] [srcdir] [release] [help]
[clean] [distclean] [echo] [deploy <dir>] [deploydir <dir>]
[zlib <zlib_path>] [releasedir <dir>] [srcdirname <dir>] [check-vfd]
[exec <command>] [module-load <module-list>] [op-configure <option>]
[clean] [distclean] [echo] [deploy <dir>] [deploydir <dir>]
[zlib <zlib_path>] [releasedir <dir>] [srcdirname <dir>] [check-vfd]
[check-passthrough-vol]
[exec <command>] [module-load <module-list>] [op-configure <option>]
[--<option>]
all: Run all commands (checkout, test & release)
[Default is all]
@@ -149,8 +150,8 @@ Usage: $PROGNAME [all] [checkout] [ftp <URL> [diff] [test] [srcdir] [release] [h
setenv <name> <value>:
Set environment variable <name> to <value>.
setenvN <N> <name> <value> ...:
Set environment variable with <N> values.
E.g., setenvN 3 x a b c is same as setenv x="a b c".
Set environment variable with <N> values.
E.g., setenvN 3 x a b c is same as setenv x="a b c".
srcdir: Use srcdir option (does not imply other commands)
"snapshot srcdir" is equivalent to "snapshot srcdir all"
"snapshot srcdir checkout" is equivalent to "snapshot checkout"
@@ -168,7 +169,12 @@ Usage: $PROGNAME [all] [checkout] [ftp <URL> [diff] [test] [srcdir] [release] [h
Use <dir> as the release directory
[Default is $ReleaseDir_default]
check-vfd:
Run make check-vfd instead of just make check.
Run make check-vfd instead of just make check.
check-passthrough-vol:
Run make check-passthrough-vol instead of just make check.
NOTE: Will only succeed with passthrough VOL connectors
that use the native VOL connector as the terminal
connector.
exttest <testscript>;
Run testscript;
exec <command>:
@@ -422,6 +428,9 @@ while [ $# -gt 0 ] ; do
check-vfd)
CHECKVAL=check-vfd
;;
check-passthrough-vol)
CHECKVAL=check-passthrough-vol
;;
module-load)
shift
if [ $# -lt 1 ]; then

View File

@@ -46,6 +46,7 @@ $Source = "";
"H5E_direction_t" => "Ed",
"H5E_error_t" => "Ee",
"H5E_type_t" => "Et",
"H5ES_status_t" => "Es",
"H5F_close_degree_t" => "Fd",
"H5F_fspace_strategy_t" => "Ff",
"H5F_file_space_type_t" => "Ff",
@@ -67,6 +68,7 @@ $Source = "";
"unsigned" => "Iu",
"unsigned int" => "Iu",
"uint32_t" => "Iu",
"uint64_t" => "UL",
"H5I_type_t" => "It",
"H5G_link_t" => "Ll", #Same as H5L_type_t now
"H5L_type_t" => "Ll",
@@ -95,6 +97,23 @@ $Source = "";
"H5T_str_t" => "Tz",
"unsigned long" => "Ul",
"unsigned long long" => "UL",
"H5VL_attr_get_t" => "Va",
"H5VL_attr_specific_t" => "Vb",
"H5VL_class_value_t" => "VC",
"H5VL_dataset_get_t" => "Vc",
"H5VL_dataset_specific_t" => "Vd",
"H5VL_datatype_get_t" => "Ve",
"H5VL_datatype_specific_t" => "Vf",
"H5VL_file_get_t" => "Vg",
"H5VL_file_specific_t" => "Vh",
"H5VL_group_get_t" => "Vi",
"H5VL_group_specific_t" => "Vj",
"H5VL_link_create_type_t" => "Vk",
"H5VL_link_get_t" => "Vl",
"H5VL_link_specific_t" => "Vm",
"H5VL_object_get_t" => "Vn",
"H5VL_object_specific_t" => "Vo",
"H5VL_request_specific_t" => "Vr",
"void" => "x",
"FILE" => "x",
"H5A_operator_t" => "x",
@@ -124,6 +143,7 @@ $Source = "";
"H5G_iterate_t" => "x",
"H5G_info_t" => "x",
"H5I_free_t" => "x",
"H5I_iterate_func_t" => "x",
"H5I_search_func_t" => "x",
"H5L_class_t" => "x",
"H5L_elink_traverse_t" => "x",
@@ -147,6 +167,10 @@ $Source = "";
"H5T_cdata_t" => "x",
"H5T_conv_t" => "x",
"H5T_conv_except_func_t" => "x",
"H5VL_t" => "x",
"H5VL_class_t" => "x",
"H5VL_loc_params_t" => "x",
"H5VL_request_notify_t" => "x",
"H5Z_func_t" => "x",
"H5Z_filter_func_t" => "x",
"va_list" => "x",
@@ -295,7 +319,7 @@ sub rewrite_func ($$$$$) {
# Ignored due to NO TRACE comment.
} elsif ($body =~ s/((\n[ \t]*)H5TRACE\d+\s*\(.*?\);)\n/"$2$trace"/es) {
# Replaced an H5TRACE macro.
} elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*\s*(\(.*?\))?;??)\n/"$1$2$trace"/es) {
} elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*[ \t]*(\(.*?\))?;??)\n/"$1$2$trace"/es) {
# Added an H5TRACE macro after a FUNC_ENTER macro.
} else {
errmesg $file, $name, "unable to insert tracing information";

514
bin/warnhist Executable file
View File

@@ -0,0 +1,514 @@
#!/usr/bin/perl -w
require 5.003;
#
# Copyright by The HDF Group.
# 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 files COPYING and Copyright.html. COPYING can be found at the root
# of the source code distribution tree; Copyright.html can be found at the
# root level of an installed copy of the electronic HDF5 document set and
# is linked from the top-level documents page. It can also be found at
# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
# access to either file, you may request a copy from help@hdfgroup.org.
#
# Quincey Koziol, koziol@hdfgroup.org
# 9 Aug 2013
#
# Purpose: Given an input file containing the output from a build of the
# library, gather the file names and line numbers, alias
# identical types of warnings together into a single bin and
# report the number of warnings for each type of warning, each file
# and the total count of warnings
# Perl modules/settings
use strict;
use Getopt::Std;
# Global variables, for accumulating information
my $totalcount = 0;
my %warn_count = ();
my $warncount;
my %warn_file = ();
my %warn_file_line = ();
my %file_count = ();
my $filecount;
my $ignorecount = 0;
my @ignorenames;
my %ignored_files = ();
my %warn_file_indices = ();
my %file_warn_indices = ();
my %file_warn = ();
my %file_warn_line = ();
my $current_warning = 0;
my $current_file = 0;
my $warn_index;
my $last_c_name;
my $last_fort_name;
my $last_fort_line;
# declare the Perl command line flags/options we want to allow
my %options=();
getopts("FWht:w:f:i:l", \%options);
# Display usage, if requested
if($options{h}) {
print "Usage: 'warnhist [-h] [-t <prefix>] [-w <n>] [-W] [-f <n>] [-F] [-l] [-i <name list> [file]'\n";
print "\t-h\tDisplay this usage\n";
print "\t-t <prefix>\tTrim pathname prefix from filenames, <prefix>\n";
print "\t-w <n>\tDisplay files for a given warning index list, <n>\n";
print "\t\t<n> can be a single value, a range, or a comma separated list\n";
print "\t\tFor example: '0' or '0,4' or '8-10' or '0,2-4,8-10,13'\n";
print "\t-W\tDisplay files for all warnings\n";
print "\t-f <n>\tDisplay warnings for a given file index list, <n>\n";
print "\t\t<n> can be a single value, a range, or a comma separated list\n";
print "\t\tFor example: '0' or '0,4' or '8-10' or '0,2-4,8-10,13'\n";
print "\t-F\tDisplay warnings for all files\n";
print "\t-l\tDisplay line nunbers for file/warning\n";
print "\t-i <name list>\tIgnore named files, <name list>\n";
print "\t\t<name list> is a comma separated list, with no spaces\n";
print "\t\tFor example: 'H5LTparse' or 'H5LTparse,H5LTanalyze'\n";
print "\tfile\tFilename containing build output\n";
print "\t\tIf no file is given, standard input is used.\n";
exit;
}
# Parse list of file names to ignore
if(exists $options{i}) {
@ignorenames = split /,/, $options{i};
#print @ignorenames;
}
# Parse list of warning indices to expand file names
if(exists $options{w}) {
my @tmp_indices;
@tmp_indices = split /,/, $options{w};
#print @tmp_indices;
for my $x (@tmp_indices) {
#print "x = '$x'\n";
if($x =~ /\-/) {
my $start_index;
my $end_index;
#print "matched = '$x'\n";
($start_index, $end_index) = split /\-/, $x;
#print "start_index = '$start_index', end_index = '$end_index'\n";
for my $y ($start_index..$end_index) {
#print "y = '$y'\n";
if(!(exists $warn_file_indices{$y})) {
$warn_file_indices{$y} = $y;
}
}
}
else {
if(!(exists $warn_file_indices{$x})) {
$warn_file_indices{$x} = $x;
}
}
}
#foreach (sort keys %warn_file_indices) {
# print "$_ : $warn_file_indices{$_}\n";
#}
}
# Parse list of file indices to expand warnings
if(exists $options{f}) {
my @tmp_indices;
@tmp_indices = split /,/, $options{f};
#print @tmp_indices;
for my $x (@tmp_indices) {
#print "x = '$x'\n";
if($x =~ /\-/) {
my $start_index;
my $end_index;
#print "matched = '$x'\n";
($start_index, $end_index) = split /\-/, $x;
#print "start_index = '$start_index', end_index = '$end_index'\n";
for my $y ($start_index..$end_index) {
#print "y = '$y'\n";
if(!(exists $file_warn_indices{$y})) {
$file_warn_indices{$y} = $y;
}
}
}
else {
if(!(exists $file_warn_indices{$x})) {
$file_warn_indices{$x} = $x;
}
}
}
#foreach (sort keys %warn_file_indices) {
# print "$_ : $warn_file_indices{$_}\n";
#}
}
PARSE_LINES:
while (<>) {
my $name;
my $line;
my $prev_line;
my $toss;
my $offset;
my $warning;
my $extra;
# Retain last FORTRAN compile line, which comes a few lines before warning
if($_ =~ /.*\.[fF]90:.*/) {
($last_fort_name, $last_fort_line, $toss) = split /\:/, $_;
($last_fort_line, $toss) = split /\./, $last_fort_line;
}
# Retain last C compile line, which possibly comes a few lines before warning
if($_ =~ /.*[A-Za-z0-9_]\.c:.*/) {
($last_c_name, $toss) = split /\:/, $_;
}
next if $_ !~ /[Ww]arning:/;
# Skip warnings from linker
next if $_ =~ /ld: warning:/;
# Check for weird formatting of warning message
if($_ =~ /^cc1: warning:.*/) {
$name = $last_c_name;
$line = "??";
($toss, $toss, $warning, $extra) = split /\:/, $_;
# Check for FORTRAN warning output
} elsif($_ =~ /^Warning:.*/) {
$name = $last_fort_name;
$line = $last_fort_line;
($toss, $warning, $extra) = split /\:/, $_;
#print "1:",$.,":",$_;
# $_ = <>;
#print "2:",$.,":",$_;
# if($_ =~ /^\sFC.*/) {
# $_ = <>;
#print "3:",$.,":",$_;
# }
# ($name, $line, $toss) = split /\:/, $_;
#print "4:","'",$name,"'","-","'",$line,"'","\n";
# Check for improperly parsed filename or line
if($name =~ /^$/) {
print "Filename is a null string! Input line #$. is: '$_'";
next
}
if($line =~ /^$/) {
print "Line is a null string! Input line #$. is: '$_'";
next
}
} else {
# Check for 'character offset' field
if($_ =~ /^.*[0-9]+\:[0-9]+\:/) {
($name, $line, $offset, $toss, $warning, $extra) = split /\:/, $_;
} else {
($name, $line, $toss, $warning, $extra) = split /\:/, $_;
}
}
# Check for extra ':' followed by more text in original warning string,
# and append the ':' and text back onto the parsed warning
# (Use 'length $extra' idiom to avoid warning when $extra is undefined)
if(length $extra ) {
$warning = join ':', $warning, $extra;
}
# Trim leading '..' paths from filename
while($name =~ /^\.\.\//) {
$name =~ s/^\.\.\///g;
}
# Check for trimming prefix
if((exists $options{t}) && ($name =~ /$options{t}/)) {
$name =~ s/^$options{t}\///g;
}
# Check for ignored file
if(exists $options{i}) {
for my $x (@ignorenames) {
#print "x = '$x'\n";
if($name =~ /$x/) {
# print "matched name = '$name'\n";
$ignorecount++;
if(!(exists $ignored_files{$name})) {
$ignored_files{$name} = $name;
}
next PARSE_LINES;
}
}
}
# Check for improperly parsed warning (usually an undefined warning string)
if(!defined $warning) {
print "Warning Undefined! Input line is: '$_'";
next
}
# Get rid of leading & trailing whitespace
$warning =~ s/^\s//g;
$warning =~ s/\s$//g;
# Check for improperly parsed warning
if($warning =~ /^$/) {
print "Warning is a null string! Input line is: '$_'";
next
}
# Convert all quotes to '
$warning =~ s//'/g;
$warning =~ s//'/g;
# Skip supplemental warning message
next if $warning =~ /near initialization for/;
# Skip GCC warning that should be a note
next if $_ =~ /\(this will be reported only once per input file\)/;
# Eliminate "{aka <some type>}" info
if($warning =~ /\s\{aka [A-Za-z_0-9\s\*]*\}'/) {
$warning =~ s/\s\{aka [A-Za-z_0-9\s\*]*\}//g;
}
# Genericize warnings
if($warning =~ /variable '[A-Za-z_0-9]*' set but not used.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /unused variable '[A-Za-z_0-9]*'.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /implicit conversion from '[A-Za-z_0-9]*' to '[A-Za-z_0-9]*' when passing argument to function.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /implicit conversion from '[A-Za-z_0-9]*' to '[A-Za-z_0-9]*' to match other operand of binary expression.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /conversion to '[A-Za-z_0-9\s]*' from '[A-Za-z_0-9\s]*' may alter its value.*/) {
$warning =~ s/'[A-Za-z_0-9\s]*'/'-'/g;
} elsif($warning =~ /conversion to '[A-Za-z_0-9\s]*' from '[A-Za-z_0-9\s]*' may change the sign of the result.*/) {
$warning =~ s/'[A-Za-z_0-9\s]*'/'-'/g;
} elsif($warning =~ /passing argument [0-9]* of '[A-Za-z_0-9\s]*' discards '[A-Za-z_0-9\s]*'.*/) {
$warning =~ s/passing argument [0-9]*/passing argument -/g;
$warning =~ s/'[A-Za-z_0-9\s]*'/'-'/g;
} elsif($warning =~ /'[A-Za-z_0-9\s]*' defined but not used.*/) {
$warning =~ s/'[A-Za-z_0-9\s]*'/'-'/g;
} elsif($warning =~ /cast discards '[A-Za-z_0-9\(\)\s]*'.*/) {
$warning =~ s/'[A-Za-z_0-9\(\)\s]*'/'-'/g;
} elsif($warning =~ /size of '[A-Za-z_0-9\(\)\s\*]*' is [0-9]* bytes.*/) {
$warning =~ s/is [0-9]* bytes/is - bytes/g;
$warning =~ s/'[A-Za-z_0-9\(\)\s\*]*'/'-'/g;
} elsif($warning =~ /passing argument [0-9]* of '[A-Za-z_0-9\(\)\s]*' from incompatible.*/) {
$warning =~ s/passing argument [0-9]*/passing argument -/g;
$warning =~ s/'[A-Za-z_0-9\(\)\s]*'/'-'/g;
} elsif($warning =~ /stack usage is [0-9]* bytes.*/) {
$warning =~ s/stack usage is [0-9]*/stack usage is -/g;
} elsif($warning =~ /stack usage might be [0-9]* bytes.*/) {
$warning =~ s/stack usage might be [0-9]*/stack usage might be -/g;
} elsif($warning =~ /the frame size of [0-9]* bytes is larger than [0-9]* bytes.*/) {
$warning =~ s/the frame size of [0-9]* bytes is larger than [0-9]*/the frame size of - bytes is larger than -/g;
} elsif($warning =~ /enumeration value '[A-Za-z_0-9\s]*' not handled in switch.*/) {
$warning =~ s/'[A-Za-z_0-9\s]*'/'-'/g;
} elsif($warning =~ /"[A-Za-z_0-9\s]*" is not defined.*/) {
$warning =~ s/"[A-Za-z_0-9\s]*"/"-"/g;
} elsif($warning =~ /macro "[A-Za-z_0-9\s]*" is not used.*/) {
$warning =~ s/"[A-Za-z_0-9\s]*"/"-"/g;
} elsif($warning =~ /unused parameter '[A-Za-z_0-9\s]*'.*/) {
$warning =~ s/'[A-Za-z_0-9\s]*'/'-'/g;
} elsif($warning =~ /request for implicit conversion from '[A-Za-z_0-9\s\*]*' to '[A-Za-z_0-9\s\<\>\[\]\(\)\*]*' not permitted in C\+\+.*/) {
$warning =~ s/'[A-Za-z_0-9\s\*\<\>\[\]\(\)]*'/'-'/g;
} elsif($warning =~ /no previous prototype for '[A-Za-z_0-9\s]*'.*/) {
$warning =~ s/'[A-Za-z_0-9\s]*'/'-'/g;
} elsif($warning =~ /declaration of '[A-Za-z_0-9\s]*' shadows a previous local.*/) {
$warning =~ s/'[A-Za-z_0-9\s]*'/'-'/g;
} elsif($warning =~ /cast from function call of type '[A-Za-z_0-9\s\*]*' to non-matching type '[A-Za-z_0-9\s\*]*'.*/) {
$warning =~ s/'[A-Za-z_0-9\s\*]*'/'-'/g;
} elsif($warning =~ /'[A-Za-z_0-9\s]*' declared '[A-Za-z_0-9\s]*' but never defined.*/) {
$warning =~ s/'[A-Za-z_0-9\s]*'/'-'/g;
} elsif($warning =~ /declaration of '[A-Za-z_0-9\s]*' shadows a global declaration.*/) {
$warning =~ s/'[A-Za-z_0-9\s]*'/'-'/g;
} elsif($warning =~ /typedef '[A-Za-z_0-9\s]*' locally defined but not used.*/) {
$warning =~ s/'[A-Za-z_0-9\s]*'/'-'/g;
} elsif($warning =~ /format '%[a-z]*' expects argument of type '[A-Za-z_0-9\s\*]*', but argument [0-9]* has type '[A-Za-z_0-9\s\*\(\),]*'.*/) {
$warning =~ s/but argument [0-9]*/but argument -/g;
$warning =~ s/'[%A-Za-z_0-9\s\*\(\),]*'/'-'/g;
} elsif($warning =~ /conversion to '[A-Za-z_0-9\s]*' alters '[A-Za-z_0-9\s]*' constant value.*/) {
$warning =~ s/'[A-Za-z_0-9\s]*'/'-'/g;
} elsif($warning =~ /to be safe all intermediate pointers in cast from '[A-Za-z_0-9\s\*]*' to '[A-Za-z_0-9\s\*]*' must be 'const' qualified.*/) {
$warning =~ s/'[A-Za-z_0-9\s\*]*'/'-'/g;
} elsif($warning =~ /identifier '[A-Za-z_0-9]*' conflicts with C\+\+ keyword.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /nested extern declaration of '[A-Za-z_0-9]*'.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /Procedure '[A-Za-z_0-9]*' called with an implicit interface.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /Unused dummy argument '[A-Za-z_0-9]*'.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /Unused parameter '[A-Za-z_0-9]*' declared at.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /Unused variable '[A-Za-z_0-9]*' declared at.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /Inequality comparison for REAL\([0-9]*\) at.*/) {
$warning =~ s/REAL\([0-9]*\)/REAL\(-\)/g;
} elsif($warning =~ /Possible change of value in conversion from INTEGER\([0-9]*\) to (INTEGER|REAL)\([0-9]*\) at.*/) {
$warning =~ s/INTEGER\([0-9]*\)/INTEGER\(-\)/g;
$warning =~ s/REAL\([0-9]*\)/REAL\(-\)/g;
} elsif($warning =~ /passing argument [0-9]* of '[A-Za-z_0-9]*' with different width due to prototype.*/) {
$warning =~ s/passing argument [0-9]*/passing argument -/g;
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /passing argument [0-9]* of '[A-Za-z_0-9]*' as unsigned due to prototype.*/) {
$warning =~ s/passing argument [0-9]*/passing argument -/g;
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /passing argument [0-9]* of '[A-Za-z_0-9]*' discards qualifiers from pointer target type.*/) {
$warning =~ s/passing argument [0-9]*/passing argument -/g;
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /passing argument [0-9]* of '[A-Za-z_0-9]*' as floating rather than integer due to prototype.*/) {
$warning =~ s/passing argument [0-9]*/passing argument -/g;
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /passing argument [0-9]* of '[A-Za-z_0-9]*' as 'float' rather than 'double' due to prototype.*/) {
$warning =~ s/passing argument [0-9]*/passing argument -/g;
$warning =~ s/'[A-Za-z_0-9]*'/'-'/;
} elsif($warning =~ /passing argument [0-9]* of '[A-Za-z_0-9]*' as signed due to prototype.*/) {
$warning =~ s/passing argument [0-9]*/passing argument -/g;
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /format '\%[A-Za-z0-9]*' expects type '[a-z][a-z\s\*]*', but argument [0-9]* has type '[a-z][a-z\(\)_,\s\*]*'.*/) {
$warning =~ s/but argument [0-9]*/but argument -/g;
$warning =~ s/'\%[A-Za-z0-9]*'/'\%-'/g;
$warning =~ s/'[a-z][a-z_,\s\*\(\)]*'/'-'/g;
} elsif($warning =~ /implicit declaration of function '[A-Za-z_0-9]*'.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /'[A-Za-z_\.\[\]0-9]*' may be used uninitialized in this function.*/) {
$warning =~ s/'[A-Za-z_\.\[\]0-9]*'/'-'/g;
} elsif($warning =~ /redundant redeclaration of '[A-Za-z_0-9]*'.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /declaration of '[A-Za-z_0-9]*' shadows a parameter.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /ISO C90 does not support the '[a-z]*' gnu_scanf length modifier.*/) {
$warning =~ s/'[a-z]*'/'-'/g;
} elsif($warning =~ /ISO C90 does not support the '[a-z]*' gnu_printf length modifier.*/) {
$warning =~ s/'[a-z]*'/'-'/g;
} elsif($warning =~ /ISO C90 does not support the '%[a-z]*' gnu_printf format.*/) {
$warning =~ s/'%[a-z]*'/'%-'/g;
} elsif($warning =~ /string length '[0-9]*' is greater than the length.*/) {
$warning =~ s/string length '[0-9]*' is/string length '-' is/g;
} elsif($warning =~ /enum conversion when passing argument [0-9]* of '[A-Za-z_0-9]*' is invalid.*/) {
$warning =~ s/passing argument [0-9]*/passing argument -/g;
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /duplicate declaration of '[A-Za-z_0-9]*' is invalid in.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /Variable '[A-Za-z_0-9]*' at \([0-9]*\) is a dummy argument of the BIND\(C\) procedure '[A-Za-z_0-9]*' but may not be C interoperable.*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
$warning =~ s/at \([0-9]*\)/at \(-\)/g;
} elsif($warning =~ /Variable '[A-Za-z_0-9]*' at \([0-9]*\) may not be a C interoperable kind but it is BIND\(C\).*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
$warning =~ s/at \([0-9]*\)/at \(-\)/g;
} elsif($warning =~ /Component '[A-Za-z_0-9]*' in derived type '[A-Za-z_0-9]*' at \([0-9]*\) may not be C interoperable, even though derived type '[A-Za-z_0-9]*' is BIND\(C\).*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
$warning =~ s/at \([0-9]*\)/at \(-\)/g;
} elsif($warning =~ /function might be candidate for attribute '[A-Za-z_0-9]*' if it is known to return normally \[-Wsuggest-attribute=[A-Za-z_0-9]*\].*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
$warning =~ s/=[A-Za-z_0-9]*\]/=-\]/g;
} elsif($warning =~ /function might be candidate for attribute '[A-Za-z_0-9]*' \[-Wsuggest-attribute=[A-Za-z_0-9]*\].*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
$warning =~ s/=[A-Za-z_0-9]*\]/=-\]/g;
} elsif($warning =~ /passing argument [0-9]+ of '[A-Za-z_0-9]*' makes integer from pointer without a cast \[-Wint-conversion\].*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
$warning =~ s/[0-9]+/-/g;
} elsif($warning =~ /function '[A-Za-z_0-9]*' might be a candidate for '[A-Za-z_0-9]*' format attribute \[-Wsuggest-attribute=format\].*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /inlining failed in call to '[A-Za-z_0-9]*': call is unlikely and code size would grow \[-Winline\].*/) {
$warning =~ s/'[A-Za-z_0-9]*'/'-'/g;
} elsif($warning =~ /'%[0-9]*[\.\*]*[0-9]*[dfsu]' directive writing between [0-9]+ and [0-9]+ bytes into a region of size [0-9]+ \[-Wformat-overflow=\].*/) {
$warning =~ s/'%[0-9]*[\.\*]*[0-9]*[dfsu]'/'-'/g;
$warning =~ s/[0-9]+/-/g;
} elsif($warning =~ /'%[0-9]*[\.\*]*[0-9]*[dfsu]' directive writing between [0-9]+ and [0-9]+ bytes into a region of size between [0-9]+ and [0-9]+ \[-Wformat-overflow=\].*/) {
$warning =~ s/'%[0-9]*[\.\*]*[0-9]*[dfsu]'/'-'/g;
$warning =~ s/[0-9]+/-/g;
} elsif($warning =~ /'%[0-9]*[\.\*]*[0-9]*[dfsu]' directive output may be truncated writing between [0-9]+ and [0-9]+ bytes into a region of size [0-9]+ \[-Wformat-truncation=\].*/) {
$warning =~ s/'%[0-9]*[\.\*]*[0-9]*[dfsu]'/'-'/g;
$warning =~ s/[0-9]+/-/g;
} elsif($warning =~ /'%[0-9]*[\.\*]*[0-9]*[dfsu]' directive output may be truncated writing up to [0-9]+ bytes into a region of size [0-9]+ \[-Wformat-truncation=\].*/) {
$warning =~ s/'%[0-9]*[\.\*]*[0-9]*[dfsu]'/'-'/g;
$warning =~ s/[0-9]+/-/g;
} elsif($warning =~ /'%[0-9]*[\.\*]*[0-9]*[dfsu]' directive output may be truncated writing between [0-9]+ and [0-9]+ bytes into a region of size between [0-9]+ and [0-9]+ \[-Wformat-truncation=\].*/) {
$warning =~ s/'%[0-9]*[\.\*]*[0-9]*[dfsu]'/'-'/g;
$warning =~ s/[0-9]+/-/g;
}
# Increment count for [generic] warning
$warn_count{$warning}++;
$warn_file{$warning}{$name}++;
push(@{ $warn_file_line{$warning}{$name} }, $line);
# Increment count for filename
$file_count{$name}++;
$file_warn{$name}{$warning}++;
push(@{ $file_warn_line{$name}{$warning} }, $line);
# Increment total count of warnings
$totalcount++;
# print "name = $name\n";
# print "line = $line\n";
# print "offset = $offset\n";
# print "warning = \"$warning\"\n";
}
print "Total [non-ignored] warnings: $totalcount\n";
print "Total ignored warnings: $ignorecount\n";
$warncount = keys %warn_count;
print "Total unique kinds of warnings: $warncount\n";
$filecount = keys %file_count;
print "Total files with warnings: $filecount\n\n";
# Print warnings in decreasing frequency
print "# of Warnings by frequency (file count)\n";
print "=======================================\n";
for my $x (sort {$warn_count{$b} <=> $warn_count{$a}} keys(%warn_count)) {
printf ("[%2d] %4d (%2d) - %s\n", $current_warning++, $warn_count{$x}, scalar(keys %{$warn_file_line{$x}}), $x);
if((exists $options{W}) || (exists $options{w})) {
my $curr_index = $current_warning - 1;
if((exists $warn_file_indices{$curr_index}) && $curr_index == $warn_file_indices{$curr_index}) {
for my $y (sort {$warn_file{$x}{$b} <=> $warn_file{$x}{$a}} keys(%{$warn_file{$x}})) {
printf ("\t%4d - %s\n", $warn_file{$x}{$y}, $y);
if(exists $options{l}) {
printf ("\t\tLines: ");
for my $z ( @{ $warn_file_line{$x}{$y} } ) {
printf ("%s, ", $z);
}
printf("\n");
}
}
}
}
}
# Print warnings in decreasing frequency, by filename
print "\n# of Warnings by filename (warning type)\n";
print "========================================\n";
for my $x (sort {$file_count{$b} <=> $file_count{$a}} keys(%file_count)) {
printf ("[%3d] %4d (%2d) - %s\n", $current_file++, $file_count{$x}, scalar(keys %{$file_warn_line{$x}}), $x);
if((exists $options{F}) || (exists $options{f})) {
my $curr_index = $current_file - 1;
if((exists $file_warn_indices{$curr_index}) && $curr_index == $file_warn_indices{$curr_index}) {
for my $y (sort {$file_warn{$x}{$b} <=> $file_warn{$x}{$a}} keys(%{$file_warn{$x}})) {
printf ("\t%4d - %s\n", $file_warn{$x}{$y}, $y);
if(exists $options{l}) {
printf ("\t\tLines: ");
for my $z ( @{ $file_warn_line{$x}{$y} } ) {
printf ("%s, ", $z);
}
printf("\n");
}
}
}
}
}
# Print names of files that were ignored
print "\nIgnored filenames\n";
print "=================\n";
for my $x (sort keys(%ignored_files)) {
print "$x\n";
}

View File

@@ -1,31 +1,5 @@
cmake_minimum_required (VERSION 3.10)
PROJECT (HDF5_CPP)
#-----------------------------------------------------------------------------
# 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 ()
project (HDF5_CPP CXX)
add_subdirectory (src)

View File

@@ -18,9 +18,21 @@
include $(top_srcdir)/config/commence.am
if BUILD_TESTS_CONDITIONAL
TEST_DIR = test
else
TEST_DIR=
endif
## Only recurse into subdirectories if C++ interface is enabled.
if BUILD_CXX_CONDITIONAL
SUBDIRS=src test
SUBDIRS=src $(TEST_DIR)
# Test with just the native connector, with a single pass-through connector
# and with a doubly-stacked pass-through.
VOL_LIST = native "pass_through under_vol=0;under_info={}" \
"pass_through under_vol=505;under_info={under_vol=0;under_info={}}"
endif
DIST_SUBDIRS = src test examples

View File

@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 3.10)
PROJECT (HDF5_CPP_EXAMPLES)
project (HDF5_CPP_EXAMPLES CXX)
# --------------------------------------------------------------------
# Notes: When creating examples they should be prefixed
@@ -34,15 +34,27 @@ set (tutr_examples
foreach (example ${examples})
add_executable (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp)
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}>")
if (NOT BUILD_SHARED_LIBS)
TARGET_C_PROPERTIES (cpp_ex_${example} STATIC)
target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
else ()
TARGET_C_PROPERTIES (cpp_ex_${example} SHARED)
target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
endif ()
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_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}>")
if (NOT BUILD_SHARED_LIBS)
TARGET_C_PROPERTIES (cpp_ex_${example} STATIC)
target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
else ()
TARGET_C_PROPERTIES (cpp_ex_${example} SHARED)
target_link_libraries (cpp_ex_${example} PRIVATE ${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
endif ()
set_target_properties (cpp_ex_${example} PROPERTIES FOLDER examples/cpp)
endforeach ()

View File

@@ -26,7 +26,7 @@
SDSextendible.h5
Select.h5
)
if (NOT "${last_test}" STREQUAL "")
if (last_test)
set_tests_properties (CPP_ex-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "CPP_ex-clear-objects")
@@ -46,7 +46,7 @@
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
if (NOT "${last_test}" STREQUAL "")
if (last_test)
set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "CPP_ex_${example}")
@@ -66,7 +66,7 @@
h5tutr_groups.h5
h5tutr_subset.h5
)
if (NOT "${last_test}" STREQUAL "")
if (last_test)
set_tests_properties (CPP_ex_tutr-clear-objects PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "CPP_ex_tutr-clear-objects")
@@ -86,7 +86,7 @@
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
endif ()
if (NOT "${last_test}" STREQUAL "")
if (last_test)
set_tests_properties (CPP_ex_${example} PROPERTIES DEPENDS ${last_test})
endif ()
set (last_test "CPP_ex_${example}")

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"`

24304
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.10)
PROJECT (HDF5_CPP_SRC)
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
@@ -58,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
@@ -82,29 +84,38 @@ set (CPP_HDRS
${HDF5_CPP_SRC_SOURCE_DIR}/H5VarLenType.h
)
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} 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
INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
set (install_targets ${HDF5_CPP_LIB_TARGET})
if (NOT ONLY_SHARED_LIBS)
add_library (${HDF5_CPP_LIB_TARGET} STATIC ${CPP_SOURCES} ${CPP_HDRS})
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})
endif ()
if (BUILD_SHARED_LIBS)
add_library (${HDF5_CPP_LIBSH_TARGET} SHARED ${CPP_SOURCES} ${CPP_HDRS})
TARGET_C_PROPERTIES (${HDF5_CPP_LIBSH_TARGET} SHARED " " " ")
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
COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB"
INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_DYNAMIC_LIB=1
)
set_target_properties (${HDF5_CPP_LIBSH_TARGET} PROPERTIES FOLDER libraries/cpp)
set (install_targets ${install_targets} ${HDF5_CPP_LIBSH_TARGET})
endif ()
@@ -127,7 +138,9 @@ if (HDF5_EXPORTED_TARGETS)
if (BUILD_SHARED_LIBS)
INSTALL_TARGET_PDB (${HDF5_CPP_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} cpplibraries)
endif ()
INSTALL_TARGET_PDB (${HDF5_CPP_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} cpplibraries)
if (NOT ONLY_SHARED_LIBS)
INSTALL_TARGET_PDB (${HDF5_CPP_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} cpplibraries)
endif ()
install (
TARGETS
@@ -154,7 +167,9 @@ 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 (NOT ONLY_SHARED_LIBS)
set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_CPP_LIB_CORENAME}")
endif ()
if (BUILD_SHARED_LIBS)
set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}")
endif ()

View File

@@ -24,6 +24,7 @@
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataSpace.h"

View File

@@ -21,6 +21,7 @@
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -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
//--------------------------------------------------------------------------

View File

@@ -21,6 +21,7 @@
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"

View File

@@ -29,6 +29,7 @@
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5AbstractDs.h"

View File

@@ -24,6 +24,7 @@
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5Alltypes.h"

View File

@@ -22,6 +22,7 @@
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5Alltypes.h"
@@ -128,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
//--------------------------------------------------------------------------

View File

@@ -27,6 +27,7 @@
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5AbstractDs.h"

View File

@@ -48,13 +48,12 @@
Datatype Interface (H5T) DataType and subclasses
\endverbatim
*
* This <a href="./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
* The HDF5 C++ API is included with the HDF5 source code.
*
* 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

@@ -30,6 +30,7 @@
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -171,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.

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;

View File

@@ -30,6 +30,7 @@
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -280,6 +281,7 @@ hid_t DataType::p_decode() const
// 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.

View File

@@ -90,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;

View File

@@ -22,6 +22,7 @@
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -252,6 +253,7 @@ 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
@@ -666,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

View File

@@ -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
//--------------------------------------------------------------------------

View File

@@ -24,6 +24,7 @@
#include "H5DataSpace.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5AbstractDs.h"
@@ -150,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

@@ -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"

View File

@@ -29,6 +29,7 @@
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5CommonFG.h"
@@ -191,16 +192,17 @@ H5File::H5File(const H5File& original) : Group()
//--------------------------------------------------------------------------
bool H5File::isHdf5(const char* name)
{
// Calls C routine H5Fis_hdf5 to determine whether the file is in
// Calls C routine H5Fis_accessible to determine whether the file is in
// HDF5 format. It returns positive value, 0, or negative value
htri_t ret_value = H5Fis_hdf5(name);
htri_t ret_value = H5Fis_accessible(name, H5P_DEFAULT);
if (ret_value > 0)
return true;
else if (ret_value == 0)
return false;
else // Raise exception when H5Fis_hdf5 returns a negative value
else // Raise exception when H5Fis_accessible returns a negative value
{
throw FileIException("H5File::isHdf5", "H5Fis_hdf5 returned negative value");
throw FileIException("H5File::isHdf5", "H5Fis_accessible returned negative value");
}
}
@@ -216,6 +218,46 @@ bool H5File::isHdf5(const H5std_string& name)
return(isHdf5( name.c_str()));
}
//--------------------------------------------------------------------------
// Function: H5File::isAccessible (static)
///\brief Determines whether a file can be accessed as HDF5. (Static)
///\param name - IN: Name of the file
///\param access_plist - IN: File access property list. Default to
/// FileAccPropList::DEFAULT
///\return true if the file can be accessed as HDF5, and false, otherwise
///\exception H5::FileIException
// September 2018
//--------------------------------------------------------------------------
bool H5File::isAccessible(const char* name, const FileAccPropList& access_plist)
{
// Calls C routine H5Fis_accessible to determine whether the file is in
// HDF5 format. It returns positive value, 0, or negative value
hid_t access_plist_id = access_plist.getId();
htri_t ret_value = H5Fis_accessible(name, access_plist_id);
if (ret_value > 0)
return true;
else if (ret_value == 0)
return false;
else // Raise exception when H5Fis_accessible returns a negative value
{
throw FileIException("H5File::isAccessible", "H5Fis_accessible returned negative value");
}
}
//--------------------------------------------------------------------------
// Function: H5File::isAccessible (static)
///\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
///\param access_plist - IN: File access property list. Default to
/// FileAccPropList::DEFAULT
// September 2018
//--------------------------------------------------------------------------
bool H5File::isAccessible(const H5std_string& name, const FileAccPropList& access_plist)
{
return(isAccessible(name.c_str(), access_plist));
}
//--------------------------------------------------------------------------
// Function: openFile
///\brief Opens an HDF5 file
@@ -537,6 +579,27 @@ hsize_t H5File::getFileSize() const
return (file_size);
}
//--------------------------------------------------------------------------
// Function: H5File::getFileNum
///\brief Returns the file number of the HDF5 file.
///\return File number
///\exception H5::FileIException
///\par Description
/// This function is called after an existing file is opened in
/// order to retrieve the unique 'file number' for the file.
// Programmer Quincey Koziol - April 13, 2019
//--------------------------------------------------------------------------
unsigned long H5File::getFileNum() const
{
unsigned long fileno = 0;
herr_t ret_value = H5Fget_fileno(id, &fileno);
if (ret_value < 0)
{
throw FileIException("H5File::getFileNum", "H5Fget_fileno failed");
}
return (fileno);
}
//--------------------------------------------------------------------------
// Function: H5File::getId
///\brief Get the id of this file

View File

@@ -69,10 +69,17 @@ class H5_DLLCPP H5File : public Group {
// Returns the file size of the HDF5 file.
hsize_t getFileSize() const;
// Returns the 'file number' of the HDF5 file.
unsigned long getFileNum() const;
// Determines if a file, specified by its name, is in HDF5 format
static bool isHdf5(const char* name);
static bool isHdf5(const H5std_string& name);
// Determines if a file, specified by its name, can be accessed as HDF5
static bool isAccessible(const char* name, const FileAccPropList& access_plist = FileAccPropList::DEFAULT);
static bool isAccessible(const H5std_string& name, const FileAccPropList& access_plist = FileAccPropList::DEFAULT);
// Reopens this file.
void reOpen(); // added for better name

View File

@@ -22,6 +22,7 @@
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -132,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

@@ -29,6 +29,7 @@
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5AbstractDs.h"
@@ -65,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
//--------------------------------------------------------------------------

View File

@@ -174,8 +174,8 @@ H5I_type_t IdComponent::getHDFObjType() const
/// \li \c H5I_DATASPACE
/// \li \c H5I_DATASET
/// \li \c H5I_ATTR
/// \li \c H5I_REFERENCE (DEPRECATED)
/// \li \c H5I_VFL
/// \li \c H5I_VOL
/// \li \c H5I_GENPROP_CLS
/// \li \c H5I_GENPROP_LST
/// \li \c H5I_ERROR_CLASS
@@ -227,8 +227,8 @@ bool IdComponent::isValid(hid_t an_id)
/// \li \c H5I_DATASPACE
/// \li \c H5I_DATASET
/// \li \c H5I_ATTR
/// \li \c H5I_REFERENCE (DEPRECATED)
/// \li \c H5I_VFL
/// \li \c H5I_VOL
/// \li \c H5I_GENPROP_CLS
/// \li \c H5I_GENPROP_LST
/// \li \c H5I_ERROR_CLASS
@@ -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

@@ -22,6 +22,7 @@
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -131,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

@@ -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

@@ -12,9 +12,6 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
// Class LinkAccPropList represents the HDF5 file access property list and
// inherits from DataType.
#ifndef __H5LinkAccPropList_H
#define __H5LinkAccPropList_H
@@ -22,15 +19,15 @@ namespace H5 {
/*! \class LinkAccPropList
\brief Class LinkAccPropList inherits from PropList and provides
wrappers for the HDF5 file access property list.
wrappers for the HDF5 link access property list.
*/
// Inheritance: PropList -> IdComponent
class H5_DLLCPP LinkAccPropList : public PropList {
public:
///\brief Default file access property list.
///\brief Default link access property list.
static const LinkAccPropList& DEFAULT;
// Creates a file access property list.
// Creates a link access property list.
LinkAccPropList();
///\brief Returns this class name.
@@ -39,7 +36,7 @@ class H5_DLLCPP LinkAccPropList : public PropList {
// Copy constructor: same as the original LinkAccPropList.
LinkAccPropList(const LinkAccPropList& original);
// Creates a copy of an existing file access property list
// Creates a copy of an existing link access property list
// using the property list id.
LinkAccPropList (const hid_t plist_id);

View File

@@ -102,9 +102,50 @@ LinkCreatPropList::LinkCreatPropList(const LinkCreatPropList& original) : PropLi
//--------------------------------------------------------------------------
LinkCreatPropList::LinkCreatPropList(const hid_t plist_id) : PropList(plist_id) {}
//--------------------------------------------------------------------------
// Function: LinkCreatPropList::setCreateIntermediateGroup
///\brief Specifies in property list whether to create missing
/// intermediate groups.
///\param crt_intmd_group - IN: Flag specifying whether to create
/// intermediate groups upon the creation of an object
///\exception H5::PropListIException
// April, 2019
//--------------------------------------------------------------------------
void LinkCreatPropList::setCreateIntermediateGroup(bool crt_intmd_group) const
{
herr_t ret_value = H5Pset_create_intermediate_group(id, (unsigned)crt_intmd_group);
// Throw exception if H5Pset_create_intermediate_group returns failure
if (ret_value < 0)
{
throw PropListIException("setCreateIntermediateGroup", "H5Pset_create_intermediate_group failed");
}
}
//--------------------------------------------------------------------------
// Function: LinkCreatPropList::getCreateIntermediateGroup
///\brief Determines whether property is set to enable creating missing
/// intermediate groups.
///\return true if creating intermediate groups is enabled, and false, otherwise
///\exception H5::PropListIException
// April, 2019
//--------------------------------------------------------------------------
bool LinkCreatPropList::getCreateIntermediateGroup() const
{
unsigned crt_intmd_group;
herr_t ret_value = H5Pget_create_intermediate_group(id, &crt_intmd_group);
// Throw exception if H5Pget_create_intermediate_group returns failure
if (ret_value < 0)
{
throw PropListIException("getCreateIntermediateGroup", "H5Pget_create_intermediate_group failed");
}
return((bool)crt_intmd_group);
}
//--------------------------------------------------------------------------
// Function: LinkCreatPropList::setCharEncoding
///\brief Sets the character encoding of the string.
///
///\exception H5::PropListIException
// March, 2018
//--------------------------------------------------------------------------
@@ -121,6 +162,7 @@ void LinkCreatPropList::setCharEncoding(H5T_cset_t encoding) const
//--------------------------------------------------------------------------
// Function: LinkCreatPropList::getCharEncoding
///\brief Gets the character encoding of the string.
///\return The character encoding
///\exception H5::PropListIException
// March, 2018
//--------------------------------------------------------------------------

View File

@@ -12,9 +12,6 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
// Class LinkCreatPropList represents the HDF5 file access property list and
// inherits from DataType.
#ifndef __H5LinkCreatPropList_H
#define __H5LinkCreatPropList_H
@@ -22,15 +19,15 @@ namespace H5 {
/*! \class LinkCreatPropList
\brief Class LinkCreatPropList inherits from PropList and provides
wrappers for the HDF5 file access property list.
wrappers for the HDF5 link creation property list.
*/
// Inheritance: PropList -> IdComponent
class H5_DLLCPP LinkCreatPropList : public PropList {
public:
///\brief Default file access property list.
///\brief Default link creation property list.
static const LinkCreatPropList& DEFAULT;
// Creates a file access property list.
// Creates a link creation property list.
LinkCreatPropList();
///\brief Returns this class name.
@@ -39,10 +36,18 @@ class H5_DLLCPP LinkCreatPropList : public PropList {
// Copy constructor: same as the original LinkCreatPropList.
LinkCreatPropList(const LinkCreatPropList& original);
// Creates a copy of an existing file access property list
// Creates a copy of an existing link creation property list
// using the property list id.
LinkCreatPropList (const hid_t plist_id);
// Specifies in property list whether to create missing
// intermediate groups
void setCreateIntermediateGroup(bool crt_intmd_group) const;
// Determines whether property is set to enable creating missing
// intermediate groups
bool getCreateIntermediateGroup() const;
// Sets the character encoding of the string.
void setCharEncoding(H5T_cset_t encoding) const;

View File

@@ -26,6 +26,7 @@
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -174,47 +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", "Registrating LinkCreatPropList::deleteConstants failed");
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");
}
//--------------------------------------------------------------------------

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

@@ -28,6 +28,7 @@ using namespace std;
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -903,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)
@@ -936,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));
}
//--------------------------------------------------------------------------
@@ -949,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)
@@ -972,11 +991,14 @@ 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));
}
//--------------------------------------------------------------------------
@@ -1044,7 +1066,7 @@ void H5Location::link(const char *curr_name, const Group& new_loc,
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);
ret_value = H5Lcreate_hard(getId(), curr_name, new_loc_id, new_name, lcpl_id, lapl_id);
if (ret_value < 0)
throwException("link", "creating link failed");
}
@@ -1080,14 +1102,13 @@ void H5Location::link(const H5std_string& curr_name, const Group& new_loc,
/// 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
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);
ret_value = H5Lcreate_hard(getId(), curr_name, same_loc, new_name, lcpl_id, lapl_id);
if (ret_value < 0)
throwException("link", "creating link failed");
@@ -1356,34 +1377,6 @@ void H5Location::move(const H5std_string& src, const H5std_string& dst) const
moveLink(src.c_str(), dst.c_str(), LinkCreatPropList::DEFAULT, LinkAccPropList::DEFAULT);
}
#if 0
//--------------------------------------------------------------------------
// Function: H5Location::deleteLink
///\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::deleteLink(const char* name, const LinkAccPropList& lapl) const
{
herr_t ret_value = H5Ldelete(getId(), name, H5P_DEFAULT);
if (ret_value < 0)
throwException("deleteLink", "H5Ldelete failed");
}
//--------------------------------------------------------------------------
// Function: H5Location::deleteLink
///\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.
// March, 2018
//--------------------------------------------------------------------------
void H5Location::deleteLink(const H5std_string& name, const LinkAccPropList& lapl) const
{
deleteLink(name.c_str());
}
#endif
//--------------------------------------------------------------------------
// Function: H5Location::unlink
///\brief Removes the specified link from this group.
@@ -1410,6 +1403,130 @@ void H5Location::unlink(const H5std_string& name, const LinkAccPropList& lapl) c
unlink(name.c_str(), lapl);
}
//--------------------------------------------------------------------------
// 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::getObjinfo(H5O_info_t& objinfo, unsigned fields) const
{
// 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(inMemFunc("getObjinfo"), "H5Oget_info2 failed");
}
//--------------------------------------------------------------------------
// 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::getObjinfo(const char* name, 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_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
//--------------------------------------------------------------------------
// Function: H5Location::getObjinfo
@@ -1467,6 +1584,7 @@ void H5Location::getObjinfo(const H5std_string& name, H5G_stat_t& statbuf) const
{
getObjinfo(name.c_str(), statbuf);
}
#endif /* H5_NO_DEPRECATED_SYMBOLS */
//--------------------------------------------------------------------------
@@ -1827,7 +1945,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)
@@ -1902,7 +2020,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)
@@ -1944,7 +2062,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)

View File

@@ -105,13 +105,18 @@ 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;
@@ -141,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.
@@ -149,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;

View File

@@ -25,6 +25,7 @@
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -39,9 +40,8 @@
namespace H5 {
#ifndef DOXYGEN_SHOULD_SKIP_THIS
// userAttrOpWrpr simply interfaces between the user's function and the
// C library function H5Aiterate2; used to resolve the different prototype
// problem. May be moved to Iterator later.
// userAttrOpWrpr interfaces between the user's function and the
// C library function H5Aiterate2
extern "C" herr_t userAttrOpWrpr(hid_t loc_id, const char *attr_name,
const H5A_info_t *ainfo, void *op_data)
{
@@ -51,6 +51,17 @@ extern "C" herr_t userAttrOpWrpr(hid_t loc_id, const char *attr_name,
return 0;
}
// userVisitOpWrpr interfaces between the user's function and the
// C library function H5Ovisit2
extern "C" herr_t userVisitOpWrpr(hid_t obj_id, const char *attr_name,
const H5O_info_t *obj_info, void *op_data)
{
H5std_string s_attr_name = H5std_string(attr_name);
UserData4Visit* myData = reinterpret_cast<UserData4Visit *> (op_data);
int status = myData->op(*myData->obj, s_attr_name, obj_info, myData->opData);
return status;
}
//--------------------------------------------------------------------------
// Function: H5Object default constructor (protected)
// Programmer Binh-Minh Ribler - 2000
@@ -196,8 +207,6 @@ 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 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)
@@ -226,6 +235,61 @@ int H5Object::iterateAttrs(attr_operator_t user_op, unsigned *_idx, void *op_dat
throw AttributeIException(inMemFunc("iterateAttrs"), "H5Aiterate2 failed");
}
//--------------------------------------------------------------------------
// Function: H5Object::visit
///\brief Recursively visits all HDF5 objects accessible from this object.
///\param idx_type - IN: Type of index; valid values include:
/// \li \c H5_INDEX_NAME
/// \li \c H5_INDEX_CRT_ORDER
///\param order - IN: Order in which index is traversed; valid values include:
/// \li \c H5_ITER_DEC
/// \li \c H5_ITER_INC
/// \li \c H5_ITER_NATIVE
///\param user_op - IN: Callback function passing data regarding the
/// object to the calling application
///\param *op_data - IN: User-defined pointer to data required by the
/// application for its processing of the object
///\param fields - IN: Flags specifying the fields to be retrieved
/// to the callback op via the H5O_info_t argument.
/// \li \c H5O_INFO_BASIC fileno, addr, type, and rc fields
/// \li \c H5O_INFO_TIME atime, mtime, ctime, and btime fields
/// \li \c H5O_INFO_NUM_ATTRS num_attrs field
/// \li \c H5O_INFO_HDR hdr field
/// \li \c H5O_INFO_META_SIZE meta_size field
/// \li \c H5O_INFO_ALL H5O_INFO_BASIC | H5O_INFO_TIME | H5O_INFO_NUM_ATTRS | H5O_INFO_HDR | H5O_INFO_META_SIZE
///\return
/// \li On success:
/// \li the return value of the first operator that returns a positive value
/// \li zero if all members were processed with no operator returning non-zero
/// \li On failure:
/// \li an exception Exception will be thrown if something went
/// wrong within the library or the operator failed
///\exception H5::Exception
///\par Description
/// For information, please refer to the H5Ovisit2 API in the HDF5
/// C Reference Manual.
// Programmer Binh-Minh Ribler - Feb, 2019
//--------------------------------------------------------------------------
void H5Object::visit(H5_index_t idx_type, H5_iter_order_t order, visit_operator_t user_op, void *op_data, unsigned int fields)
{
// Store the user's function and data
UserData4Visit* userData = new UserData4Visit;
userData->opData = op_data;
userData->op = user_op;
userData->obj = this;
// Call the C API passing in op wrapper and info
herr_t ret_value = H5Ovisit2(getId(), idx_type, order, userVisitOpWrpr, static_cast<void *>(userData), fields);
// Release memory
delete userData;
// Throw exception if H5Ovisit2 failed, which could be a failure in
// the library or in the call back operator
if (ret_value < 0)
throw Exception(inMemFunc("visit"), "H5Ovisit2 failed");
}
//--------------------------------------------------------------------------
// Function: H5Object::objVersion
///\brief Returns the header version of this HDF5 object.
@@ -244,7 +308,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)
@@ -270,7 +334,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));

View File

@@ -40,16 +40,30 @@ namespace H5 {
// Inheritance: H5Location -> IdComponent
// Define the operator function pointer for H5Aiterate().
typedef void (*attr_operator_t)(H5Object& loc/*in*/,
const H5std_string attr_name/*in*/,
void *operator_data/*in,out*/);
typedef void (*attr_operator_t)(H5Object& loc,
const H5std_string attr_name,
void *operator_data);
// Define the operator function pointer for H5Ovisit2().
typedef int (*visit_operator_t)(H5Object& obj,
const H5std_string attr_name,
const H5O_info_t *oinfo,
void *operator_data);
// User data for attribute iteration
class UserData4Aiterate {
public:
attr_operator_t op;
void* opData;
H5Object* location;
H5Object* location; // Consider changing to H5Location
};
// User data for visit iteration
class UserData4Visit {
public:
visit_operator_t op;
void* opData;
H5Object* obj;
};
class H5_DLLCPP H5Object : public H5Location {
@@ -71,6 +85,9 @@ class H5_DLLCPP H5Object : public H5Location {
// Iterate user's function over the attributes of this object.
int iterateAttrs(attr_operator_t user_op, unsigned* idx = NULL, void* op_data = NULL);
// Recursively visit elements reachable from this object.
void visit(H5_index_t idx_type, H5_iter_order_t order, visit_operator_t user_op, void *op_data, unsigned int fields);
// Returns the object header version of an object
unsigned objVersion() const;
@@ -98,6 +115,7 @@ class H5_DLLCPP H5Object : public H5Location {
ssize_t getObjName(H5std_string& obj_name, size_t len = 0) const;
H5std_string getObjName() const;
#ifndef DOXYGEN_SHOULD_SKIP_THIS
protected:

View File

@@ -21,6 +21,7 @@
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -914,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:
@@ -1042,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

@@ -149,8 +149,8 @@ PropList::PropList(const hid_t plist_id) : IdComponent()
case H5I_DATASPACE:
case H5I_DATASET:
case H5I_ATTR:
case H5I_REFERENCE:
case H5I_VFL:
case H5I_VOL:
case H5I_ERROR_CLASS:
case H5I_ERROR_MSG:
case H5I_ERROR_STACK:
@@ -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;

View File

@@ -22,6 +22,7 @@
#include "H5DxferProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -185,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
//--------------------------------------------------------------------------

View File

@@ -21,6 +21,7 @@
#include "H5DcreatProp.h"
#include "H5LcreatProp.h"
#include "H5LaccProp.h"
#include "H5DaccProp.h"
#include "H5Location.h"
#include "H5Object.h"
#include "H5DataType.h"
@@ -132,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

@@ -32,26 +32,28 @@ 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 H5LcreatProp.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 \
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 \
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

View File

@@ -38,7 +38,7 @@ PROJECT_NAME =
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = "1.10.3-snap1, currently under development"
PROJECT_NUMBER = "1.11.6"
# 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
@@ -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

@@ -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.10)
PROJECT (HDF5_CPP_TEST)
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,15 +38,17 @@ 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_C_PROPERTIES (cpp_testhdf5 STATIC " " " ")
target_link_libraries (cpp_testhdf5
${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>"
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
)
if (NOT BUILD_SHARED_LIBS)
TARGET_C_PROPERTIES (cpp_testhdf5 STATIC)
target_link_libraries (cpp_testhdf5 PRIVATE ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
else ()
TARGET_C_PROPERTIES (cpp_testhdf5 SHARED)
target_link_libraries (cpp_testhdf5 PRIVATE ${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ${HDF5_TEST_LIBSH_TARGET})
endif ()
set_target_properties (cpp_testhdf5 PROPERTIES FOLDER test/cpp)
include (CMakeTests.cmake)

View File

@@ -47,55 +47,12 @@ else ()
endif ()
set_tests_properties (CPP_testhdf5 PROPERTIES DEPENDS CPP_testhdf5-clear-objects)
##############################################################################
##############################################################################
### V F D T E S T S ###
##############################################################################
##############################################################################
if (HDF5_TEST_VFD)
set (VFD_LIST
sec2
stdio
core
split
multi
family
)
if (DIRECT_VFD)
set (VFD_LIST ${VFD_LIST} direct)
endif ()
macro (ADD_VFD_TEST vfdname resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}")
add_test (
NAME CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
tattr_basic.h5
tattr_compound.h5
tattr_dtype.h5
tattr_multi.h5
tattr_scalar.h5
tfattrs.h5
titerate.h5
)
add_test (
NAME CPP_VFD-${vfdname}-cpp_testhdf5
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:cpp_testhdf5>"
-D "TEST_ARGS:STRING="
-D "TEST_VFD:STRING=${vfdname}"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_OUTPUT=cpp_testhdf5"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}"
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)
set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects)
set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES TIMEOUT 30)
endif ()
endmacro ()
# Run test with different Virtual File Driver
foreach (vfd ${VFD_LIST})
ADD_VFD_TEST (${vfd} 0)
endforeach ()
include (CMakeVFDTests.cmake)
endif ()

View File

@@ -0,0 +1,65 @@
#
# Copyright by The HDF Group.
# 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.
#
##############################################################################
##############################################################################
### T E S T I N G ###
##############################################################################
##############################################################################
set (VFD_LIST
sec2
stdio
core
split
multi
family
)
if (DIRECT_VFD)
set (VFD_LIST ${VFD_LIST} direct)
endif ()
macro (ADD_VFD_TEST vfdname resultcode)
if (NOT HDF5_ENABLE_USING_MEMCHECKER)
file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}")
add_test (
NAME CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects
COMMAND ${CMAKE_COMMAND}
-E remove
tattr_basic.h5
tattr_compound.h5
tattr_dtype.h5
tattr_multi.h5
tattr_scalar.h5
tfattrs.h5
titerate.h5
)
add_test (
NAME CPP_VFD-${vfdname}-cpp_testhdf5
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:cpp_testhdf5>"
-D "TEST_ARGS:STRING="
-D "TEST_VFD:STRING=${vfdname}"
-D "TEST_EXPECT=${resultcode}"
-D "TEST_OUTPUT=cpp_testhdf5"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/${vfdname}"
-P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
)
set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects)
set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES TIMEOUT ${CTEST_SHORT_TIMEOUT})
endif ()
endmacro ()
# Run test with different Virtual File Driver
foreach (vfd ${VFD_LIST})
ADD_VFD_TEST (${vfd} 0)
endforeach ()

View File

@@ -1114,6 +1114,178 @@ static herr_t test_types(H5File& file)
}
} // test_types
/*-------------------------------------------------------------------------
* Function: test_getObjinfo
*
* Purpose Tests getObjinfo()
*
* 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
*
* 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
@@ -1122,7 +1294,6 @@ static herr_t test_types(H5File& file)
* VDS
*
* Return Success: 0
*
* Failure: number of errors
*
* Programmer Binh-Minh Ribler
@@ -1237,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();

View File

@@ -286,7 +286,7 @@ H5::DataType getArr()
*dims = 5;
H5::ArrayType ret;
ret = H5::ArrayType(H5::PredType::NATIVE_INT, 1, dims);
delete[] dims;
delete dims;
return ret;
}
@@ -371,7 +371,6 @@ static void test_array_info()
s1_t rdata[SPACE1_DIM1][ARRAY1_DIM1]; // Information read in
hsize_t sdims1[] = {SPACE1_DIM1};
hsize_t tdims1[] = {ARRAY1_DIM1};
int nmemb; // Number of compound members
int ii; // counting variables
hsize_t idxi, idxj, idxk; // dimension indicing variables
H5T_class_t mclass; // Datatype class for field

View File

@@ -518,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);
@@ -538,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);
@@ -658,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);
@@ -1695,7 +1712,7 @@ static void test_attr_dense_create(FileCreatPropList& fcpl,
// Close property list
dcpl.close();
// H5O_is_attr_dense_test - un-usable
// H5O__is_attr_dense_test - un-usable
// Add attributes, until just before converting to dense storage
char attr_name[NAME_BUF_SIZE];
@@ -1710,7 +1727,7 @@ static void test_attr_dense_create(FileCreatPropList& fcpl,
attr.write(PredType::NATIVE_UINT, &attr_num);
} // end for
// H5O_is_attr_dense_test - un-usable
// H5O__is_attr_dense_test - un-usable
{ // Add one more attribute, to push into "dense" storage
@@ -1798,8 +1815,8 @@ static void test_attr_corder_create_basic(FileCreatPropList& fcpl,
ds_space.close();
// Check on dataset's attribute storage status.
// NOTE: Wrappers not available yet (H5O_is_attr_empty_test
// and H5O_is_attr_dense_test)
// NOTE: Wrappers not available yet (H5O__is_attr_empty_test
// and H5O__is_attr_dense_test)
// Close dataset
dataset.close();

View File

@@ -76,7 +76,7 @@ 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.
*-------------------------------------------------------------------------
*/
@@ -282,7 +282,7 @@ 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.
*-------------------------------------------------------------------------
*/
@@ -410,6 +410,64 @@ static void test_file_size()
} // test_file_size()
/*-------------------------------------------------------------------------
* Function: test_file_num
*
* Purpose Test file number.
*
* Return None
*
* Programmer Quincey Koziol
* April, 2019
*-------------------------------------------------------------------------
*/
static void test_file_num()
{
// Output message about test being performed
SUBTEST("File Number");
hid_t fapl_id;
fapl_id = h5_fileaccess(); // in h5test.c, returns a file access template
try {
// Use the file access template id to create a file access prop.
// list object to pass in H5File::H5File
FileAccPropList fapl(fapl_id);
// Create two files
H5File file1(FILE1, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
H5File file2(FILE2, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
// Open the first file again
H5File file3(FILE1, H5F_ACC_RDWR);
// Get file numbers
unsigned long file_num1 = file1.getFileNum();
unsigned long file_num2 = file2.getFileNum();
unsigned long file_num3 = file3.getFileNum();
// Check file numbers
if (file_num1 == file_num2)
issue_fail_msg("test_file_num()", __LINE__, __FILE__, "getFileNum() returned wrong value");
if (file_num1 != file_num3)
issue_fail_msg("test_file_num()", __LINE__, __FILE__, "getFileNum() returned wrong value");
PASSED();
} // end of try block
catch (Exception& E)
{
issue_fail_msg("test_file_num()", __LINE__, __FILE__, E.getCDetailMsg());
}
// use C test utility routine to close property list.
herr_t ret = H5Pclose(fapl_id);
if (ret < 0)
issue_fail_msg("test_file_num()", __LINE__, __FILE__, "H5Pclose failed");
} // test_file_num()
/*-------------------------------------------------------------------------
* Function: test_file_name
@@ -657,8 +715,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 +743,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"
/*
@@ -954,6 +1024,7 @@ void test_file()
test_file_create(); // Test file creation (also creation templates)
test_file_open(); // Test file opening
test_file_size(); // Test file size
test_file_num(); // Test file number
test_file_name(); // Test getting file's name
test_file_attribute(); // Test file attribute feature
test_libver_bounds(); // Test format version

View File

@@ -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
@@ -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.
*-------------------------------------------------------------------------
*/
@@ -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.
*-------------------------------------------------------------------------
*/
@@ -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.
*-------------------------------------------------------------------------
*/
@@ -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.
*-------------------------------------------------------------------------
*/
@@ -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.
*-------------------------------------------------------------------------
*/

View File

@@ -31,288 +31,27 @@ using namespace H5;
#include "h5test.h"
#include "h5cpputil.h" // C++ utilility header file
// A lot of the definition inherited from C test links.c is left here until
// the H5L API is implemented and tests are completed - BMR 10/19/2009
/*
* This file needs to access private information from the H5G package.
* This file also needs to access the group testing code.
*/
//#define H5G_FRIEND
//#define H5G_TESTING
//#include "h5test.h"
//#include "H5Gpkg.h" /* Groups */
//#include "H5Iprivate.h" /* IDs */
//#include "H5Lprivate.h" /* Links */
/* File for external link test. Created with gen_udlinks.c */
#define LINKED_FILE "be_extlink2.h5"
#if 0
const char *FILENAME[] = {
"links0",
"links1",
"links2",
"links3",
"links4a", /* 4 */
"links4b", /* 5 */
"links4c", /* 6 */
"links4d", /* 7 */
"links5", /* 8 */
"links6", /* 9 */
"links7", /* 10 */
"links8", /* 11 */
"extlinks0", /* 12: main files */
"tmp/extlinks0", /* 13: */
"extlinks1", /* 14: target files */
"tmp/extlinks1", /* 15: */
"extlinks2", /* 16: */
"tmp/extlinks2", /* 17: */
"extlinks3", /* 18: */
"tmp/extlinks3", /* 19: */
"extlinks4", /* 20: */
"tmp/extlinks4", /* 21: */
"extlinks5", /* 22: */
"tmp/extlinks6", /* 23: */
"extlinks7", /* 24: */
"tmp/extlinks7", /* 25: */
"tmp/extlinks8", /* 26: */
"extlinks9", /* 27: */
"tmp/extlinks9", /* 28: */
"extlinks10", /* 29: */ /* TESTS for windows */
"tmp/extlinks10", /* 30: */
"tmp/extlinks11", /* 31: */
"tmp/extlinks12", /* 32: */
"extlinks13", /* 33: */
"tmp/extlinks13", /* 34: */
"tmp/extlinks14", /* 35: */
"tmp/extlinks15", /* 36: */
"extlinks16A", /* 37: */ /* TESTS for H5P_set_elink_fapl */
"extlinks16B", /* 38: */
"extlinks17", /* 39: */
"extlinks18A", /* 40: */
"extlinks18B", /* 41: */
"extlinks19A", /* 42: */
"extlinks19B", /* 43: */
"extlinks20", /* 44: */
NULL
};
#endif // 0
#define TMPDIR "tmp"
#define FAMILY_SIZE 1024
#define CORE_INCREMENT 1024
#define NUM400 400
/* do not do check_all_closed() for "ext*" files and "tmp/ext*" */
#define EXTSTOP 12
#define LINK_BUF_SIZE 1024
#define NAME_BUF_SIZE 1024
#define MAX_NAME_LEN ((64*1024)+1024)
/* Link type IDs */
#define UD_HARD_TYPE 201
#define UD_CB_TYPE H5L_TYPE_MAX
#define UD_PLIST_TYPE 128
#define UD_CBFAIL_TYPE UD_PLIST_TYPE
#define UD_ERROR_TYPE 189
#define UD_BAD_TYPE1 H5L_TYPE_HARD
#define UD_BAD_TYPE2 (H5L_TYPE_UD_MIN - 5)
#define UD_BAD_VERS (H5L_LINK_CLASS_T_VERS + 1)
#define DEST_PROP_NAME "destination_group"
#define REREG_TARGET_NAME "rereg_target"
#define UD_CB_LINK_NAME "ud_callback_link"
#define NEW_UD_CB_LINK_NAME "ud_callback_link2"
#define UD_CB_TARGET "ud_target"
#define UD_CB_TARGET_LEN 10
#define LE_FILENAME "le_extlink1.h5"
#define BE_FILENAME "be_extlink1.h5"
#define ELINK_CB_FAM_SIZE (hsize_t) 100
#define H5L_DIM1 100
#define H5L_DIM2 100
/* Creation order macros */
#define CORDER_SOFT_GROUP_NAME "corder_soft_group"
#define CORDER_NLINKS 18
/* Timestamp macros */
#define TIMESTAMP_GROUP_1 "timestamp1"
#define TIMESTAMP_GROUP_2 "timestamp2"
/* Link iteration struct */
typedef struct {
H5_iter_order_t order; /* Direction of iteration */
unsigned ncalled; /* # of times callback is entered */
unsigned nskipped; /* # of links skipped */
int stop; /* # of iterations to stop after */
int64_t curr; /* Current creation order value */
size_t max_visit; /* Size of "visited link" flag array */
hbool_t *visited; /* Pointer to array of "visited link" flags */
} link_iter_info_t;
#if 0
/* Link visit structs */
typedef struct {
const char *path; /* Path to link */
H5L_type_t type; /* Type of link */
} link_visit_t;
static const link_visit_t lvisit0[] = {
{"Dataset_zero", H5L_TYPE_HARD},
{"Group1", H5L_TYPE_HARD},
{"Group1/Dataset_one", H5L_TYPE_HARD},
{"Group1/Group2", H5L_TYPE_HARD},
{"Group1/Group2/Dataset_two", H5L_TYPE_HARD},
{"Group1/Group2/Type_two", H5L_TYPE_HARD},
{"Group1/Group2/hard_zero", H5L_TYPE_HARD},
{"Group1/Type_one", H5L_TYPE_HARD},
{"Group1/hard_one", H5L_TYPE_HARD},
{"Type_zero", H5L_TYPE_HARD},
{"ext_dangle", H5L_TYPE_EXTERNAL},
{"ext_one", H5L_TYPE_EXTERNAL},
{"hard_one", H5L_TYPE_HARD},
{"hard_two", H5L_TYPE_HARD},
{"hard_zero", H5L_TYPE_HARD},
{"soft_dangle", H5L_TYPE_SOFT},
{"soft_one", H5L_TYPE_SOFT},
{"soft_two", H5L_TYPE_SOFT}
};
static const link_visit_t lvisit1[] = {
{"Dataset_one", H5L_TYPE_HARD},
{"Group2", H5L_TYPE_HARD},
{"Group2/Dataset_two", H5L_TYPE_HARD},
{"Group2/Type_two", H5L_TYPE_HARD},
{"Group2/hard_zero", H5L_TYPE_HARD},
{"Group2/hard_zero/Dataset_zero", H5L_TYPE_HARD},
{"Group2/hard_zero/Group1", H5L_TYPE_HARD},
{"Group2/hard_zero/Type_zero", H5L_TYPE_HARD},
{"Group2/hard_zero/ext_dangle", H5L_TYPE_EXTERNAL},
{"Group2/hard_zero/ext_one", H5L_TYPE_EXTERNAL},
{"Group2/hard_zero/hard_one", H5L_TYPE_HARD},
{"Group2/hard_zero/hard_two", H5L_TYPE_HARD},
{"Group2/hard_zero/hard_zero", H5L_TYPE_HARD},
{"Group2/hard_zero/soft_dangle", H5L_TYPE_SOFT},
{"Group2/hard_zero/soft_one", H5L_TYPE_SOFT},
{"Group2/hard_zero/soft_two", H5L_TYPE_SOFT},
{"Type_one", H5L_TYPE_HARD},
{"hard_one", H5L_TYPE_HARD}
};
static const link_visit_t lvisit2[] = {
{"Dataset_two", H5L_TYPE_HARD},
{"Type_two", H5L_TYPE_HARD},
{"hard_zero", H5L_TYPE_HARD},
{"hard_zero/Dataset_zero", H5L_TYPE_HARD},
{"hard_zero/Group1", H5L_TYPE_HARD},
{"hard_zero/Group1/Dataset_one", H5L_TYPE_HARD},
{"hard_zero/Group1/Group2", H5L_TYPE_HARD},
{"hard_zero/Group1/Type_one", H5L_TYPE_HARD},
{"hard_zero/Group1/hard_one", H5L_TYPE_HARD},
{"hard_zero/Type_zero", H5L_TYPE_HARD},
{"hard_zero/ext_dangle", H5L_TYPE_EXTERNAL},
{"hard_zero/ext_one", H5L_TYPE_EXTERNAL},
{"hard_zero/hard_one", H5L_TYPE_HARD},
{"hard_zero/hard_two", H5L_TYPE_HARD},
{"hard_zero/hard_zero", H5L_TYPE_HARD},
{"hard_zero/soft_dangle", H5L_TYPE_SOFT},
{"hard_zero/soft_one", H5L_TYPE_SOFT},
{"hard_zero/soft_two", H5L_TYPE_SOFT}
};
typedef struct {
unsigned idx; /* Index in link visit structure */
const link_visit_t *info; /* Pointer to the link visit structure to use */
} lvisit_ud_t;
/* Object visit structs */
// Object visit structs
typedef struct {
const char *path; /* Path to object */
H5O_type_t type; /* Type of object */
} obj_visit_t;
static const obj_visit_t ovisit0_old[] = {
{".", H5O_TYPE_GROUP},
{"Dataset_zero", H5O_TYPE_DATASET},
{"Group1", H5O_TYPE_GROUP},
{"Group1/Dataset_one", H5O_TYPE_DATASET},
{"Group1/Group2", H5O_TYPE_GROUP},
{"Group1/Group2/Dataset_two", H5O_TYPE_DATASET},
{"Group1/Group2/Type_two", H5O_TYPE_NAMED_DATATYPE},
{"Group1/Type_one", H5O_TYPE_NAMED_DATATYPE},
{"Type_zero", H5O_TYPE_NAMED_DATATYPE}
};
static const obj_visit_t ovisit0_new[] = {
{".", H5O_TYPE_GROUP},
{"Dataset_zero", H5O_TYPE_DATASET},
{"Group1", H5O_TYPE_GROUP},
{"Group1/Dataset_one", H5O_TYPE_DATASET},
{"Group1/Group2", H5O_TYPE_GROUP},
{"Group1/Group2/Dataset_two", H5O_TYPE_DATASET},
{"Group1/Group2/Type_two", H5O_TYPE_NAMED_DATATYPE},
{"Group1/Type_one", H5O_TYPE_NAMED_DATATYPE},
{"Type_zero", H5O_TYPE_NAMED_DATATYPE}
};
static const obj_visit_t ovisit1_old[] = {
{".", H5O_TYPE_GROUP},
{"Dataset_one", H5O_TYPE_DATASET},
{"Group2", H5O_TYPE_GROUP},
{"Group2/Dataset_two", H5O_TYPE_DATASET},
{"Group2/Type_two", H5O_TYPE_NAMED_DATATYPE},
{"Group2/hard_zero", H5O_TYPE_GROUP},
{"Group2/hard_zero/Dataset_zero", H5O_TYPE_DATASET},
{"Group2/hard_zero/Type_zero", H5O_TYPE_NAMED_DATATYPE},
{"Type_one", H5O_TYPE_NAMED_DATATYPE}
};
static const obj_visit_t ovisit1_new[] = {
{".", H5O_TYPE_GROUP},
{"Dataset_one", H5O_TYPE_DATASET},
{"Group2", H5O_TYPE_GROUP},
{"Group2/Dataset_two", H5O_TYPE_DATASET},
{"Group2/Type_two", H5O_TYPE_NAMED_DATATYPE},
{"Group2/hard_zero", H5O_TYPE_GROUP},
{"Group2/hard_zero/Dataset_zero", H5O_TYPE_DATASET},
{"Group2/hard_zero/Type_zero", H5O_TYPE_NAMED_DATATYPE},
{"Type_one", H5O_TYPE_NAMED_DATATYPE}
};
static const obj_visit_t ovisit2_old[] = {
{".", H5O_TYPE_GROUP},
{"Dataset_two", H5O_TYPE_DATASET},
{"Type_two", H5O_TYPE_NAMED_DATATYPE},
{"hard_zero", H5O_TYPE_GROUP},
{"hard_zero/Dataset_zero", H5O_TYPE_DATASET},
{"hard_zero/Group1", H5O_TYPE_GROUP},
{"hard_zero/Group1/Dataset_one", H5O_TYPE_DATASET},
{"hard_zero/Group1/Type_one", H5O_TYPE_NAMED_DATATYPE},
{"hard_zero/Type_zero", H5O_TYPE_NAMED_DATATYPE}
};
static const obj_visit_t ovisit2_new[] = {
{".", H5O_TYPE_GROUP},
{"Dataset_two", H5O_TYPE_DATASET},
{"Type_two", H5O_TYPE_NAMED_DATATYPE},
{"hard_zero", H5O_TYPE_GROUP},
{"hard_zero/Dataset_zero", H5O_TYPE_DATASET},
{"hard_zero/Group1", H5O_TYPE_GROUP},
{"hard_zero/Group1/Dataset_one", H5O_TYPE_DATASET},
{"hard_zero/Group1/Type_one", H5O_TYPE_NAMED_DATATYPE},
{"hard_zero/Type_zero", H5O_TYPE_NAMED_DATATYPE}
};
// User data for callback function
typedef struct {
unsigned idx; /* Index in object visit structure */
const obj_visit_t *info; /* Pointer to the object visit structure to use */
} ovisit_ud_t;
#endif
static const char *FILENAME[] = {
"link0",
"link1.h5",
"link2.h5",
"visit",
NULL
};
@@ -515,7 +254,7 @@ test_lcpl(hid_t fapl_id, hbool_t new_format)
} // end of try block
catch (Exception& E)
{
issue_fail_msg("test_num_links()", __LINE__, __FILE__, E.getCDetailMsg());
issue_fail_msg("test_lcpl()", __LINE__, __FILE__, E.getCDetailMsg());
}
} // end test_lcpl()
@@ -657,7 +396,7 @@ test_move(hid_t fapl_id, hbool_t new_format)
} // end of try block
catch (Exception& E)
{
issue_fail_msg("test_num_links()", __LINE__, __FILE__, E.getCDetailMsg());
issue_fail_msg("test_move()", __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_move
@@ -792,7 +531,7 @@ static void test_copy(hid_t fapl_id, hbool_t new_format)
} // end of try block
catch (Exception& E)
{
issue_fail_msg("test_num_links()", __LINE__, __FILE__, E.getCDetailMsg());
issue_fail_msg("test_copy()", __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_copy
@@ -841,6 +580,140 @@ static void test_num_links(hid_t fapl_id, hbool_t new_format)
}
} // test_num_links
// Data for visit on the file
static const obj_visit_t file_visit[] = {
{".", H5O_TYPE_GROUP},
{"Data", H5O_TYPE_GROUP},
{"Data/Compressed_Data", H5O_TYPE_DATASET},
{"Data/Float_Data", H5O_TYPE_DATASET},
};
// Data for visit on the group
static const obj_visit_t group_visit[] = {
{".", H5O_TYPE_GROUP},
{"Compressed_Data", H5O_TYPE_DATASET},
{"Float_Data", H5O_TYPE_DATASET},
};
const H5std_string FILE_NAME("tvisit.h5");
const H5std_string GROUP_NAME("/Data");
const H5std_string DSET1_NAME("/Data/Compressed_Data");
const H5std_string DSET2_NAME("/Data/Float_Data");
const int RANK = 2;
const int DIM1 = 2;
// Operator function
static int visit_obj_cb(H5Object& obj, const H5std_string name, const H5O_info_t *oinfo, void *_op_data)
{
ovisit_ud_t *op_data = static_cast <ovisit_ud_t *>(_op_data);
// Check for correct object information
if(strcmp(op_data->info[op_data->idx].path, name.c_str())) return(H5_ITER_ERROR);
if(op_data->info[op_data->idx].type != oinfo->type) return(H5_ITER_ERROR);
// Advance to next location
op_data->idx++;
return(H5_ITER_CONT);
}
/*-------------------------------------------------------------------------
* Function: test_visit
*
* Purpose Test H5Object::visit
*
* Return None
*
* February 8, 2019
*-------------------------------------------------------------------------
*/
static void test_visit(hid_t fapl_id, hbool_t new_format)
{
hsize_t dims[2];
hsize_t cdims[2];
char filename[NAME_BUF_SIZE];
if(new_format)
SUBTEST("H5Object::visit (w/new group format)")
else
SUBTEST("H5Object::visit")
try
{
// Use the file access template id to create a file access prop. list
FileAccPropList fapl(fapl_id);
// Build the hdf5 file name and create the file
h5_fixname(FILENAME[3], fapl_id, filename, sizeof filename);
H5File *file = new H5File(filename, H5F_ACC_TRUNC, FileCreatPropList::DEFAULT, fapl);
// Create a group
Group* group = new Group(file->createGroup(GROUP_NAME));
// Create a chunked/compressed dataset within this group specified by path
dims[0] = 20;
dims[1] = 2;
cdims[0] = 2;
cdims[1] = 2;
DataSpace *dataspace = new DataSpace(RANK, dims); // create new dspace
DSetCreatPropList ds_creatplist; // create dataset creation prop list
ds_creatplist.setChunk(2, cdims); // then modify it for compression
ds_creatplist.setDeflate(6);
DataSet* dataset = new DataSet(file->createDataSet(DSET1_NAME,
PredType::NATIVE_INT, *dataspace, ds_creatplist));
delete dataset;
delete dataspace;
// Create another dataset
dims[0] = 5;
dims[1] = 2;
dataspace = new DataSpace(RANK, dims); // create second dspace
dataset = new DataSet(file->createDataSet(DSET2_NAME,
PredType::NATIVE_FLOAT, *dataspace));
// Close everything
delete dataset;
delete dataspace;
delete group;
delete file;
// Reopen the file and group in the file.
file = new H5File(filename, H5F_ACC_RDWR);
group = new Group(file->openGroup("Data"));
// Open the group
dataset = new DataSet(group->openDataSet(DSET2_NAME));
delete dataset;
// Visit objects in the file
ovisit_ud_t udata; /* User-data for visiting */
udata.idx = 0;
udata.info = file_visit;
file->visit(H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata, H5O_INFO_BASIC);
// Visit objects in the group
udata.idx = 0;
udata.info = group_visit;
group->visit(H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata, H5O_INFO_BASIC);
// Close the group and file.
delete group;
delete file;
PASSED();
} // end of try block
catch (Exception& E)
{
cerr << "in catch" << endl;
issue_fail_msg("test_visit()", __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_visit()
/*-------------------------------------------------------------------------
* Function: test_links
@@ -857,13 +730,9 @@ void test_links()
{
hid_t fapl_id, fapl2_id; /* File access property lists */
unsigned new_format; /* Whether to use the new format or not */
const char *envval;
envval = HDgetenv("HDF5_DRIVER");
if(envval == NULL)
envval = "nomatch";
fapl_id = h5_fileaccess();
if((fapl_id = h5_fileaccess()) < 0)
throw Exception("test_links", "Unable to get file access property list");
// Output message about test being performed
MESSAGE(5, ("Testing Various Links\n"));
@@ -892,27 +761,22 @@ 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);
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);
test_visit(my_fapl_id, new_format);
} /* end for */
/* Close 2nd FAPL */
H5Pclose(fapl2_id);
h5_clean_files(FILENAME, fapl_id);
/* Test that external links can be used after a library reset. MUST be
* called last so the reset doesn't interfere with the property lists. This
* routine will delete its own file. */
/* nerrors += external_reset_register() < 0 ? 1 : 0;
*/
}
catch (Exception& E)
{
issue_fail_msg("test_links()", __LINE__, __FILE__, E.getCDetailMsg());
}
}
@@ -930,7 +794,3 @@ void cleanup_links()
HDremove(FILENAME[0]);
HDremove(FILENAME[1]);
}

View File

@@ -523,19 +523,217 @@ 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_getobjectinfo_same_file()", __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_getobjectinfo_same_file
/*-------------------------------------------------------------------------
* Function: test_intermediate_groups
*
* Purpose Test that intermediate groups are created as specified by
* the property setting.
*
* Return None
*
* April, 2019
*-------------------------------------------------------------------------
*/
const H5std_string FILE_INTERGRPS("tobject_intergrps.h5");
const H5std_string GROUP10NAME("/group10");
const H5std_string GROUP11NAME("/group10/group11");
const H5std_string GROUP12NAME("/group10/group11/group12");
const H5std_string GROUP13NAME("/group10/group11/group12/group13");
const H5std_string GROUP14NAME("/group10/group11/group12/group13/group14");
const H5std_string GROUP14FROM13NAME("group14");
const H5std_string GROUP20NAME("/group20");
const H5std_string GROUP21NAME("/group20/group21");
const H5std_string GROUP22NAME("group21/group22");
const H5std_string GROUP22FULLNAME("/group20/group21/group22");
static void test_intermediate_groups()
{
// Output message about test being performed
SUBTEST("Group::set/getCreateIntermediateGroup");
try {
// Create a new HDF5 file
H5File file(FILE_INTERGRPS, H5F_ACC_TRUNC);
// Create a link create property list and set the "create
// intermediate groups" flag
LinkCreatPropList lcpl;
lcpl.setCreateIntermediateGroup(true);
// Verify value of create missing groups flag
bool crt_int_grps = lcpl.getCreateIntermediateGroup();
verify_val(crt_int_grps, true, "LinkCreatPropList::getCreateIntermediateGroup", __LINE__, __FILE__);
// Create GROUP12NAME with creating missing groups
Group grp12(file.createGroup(GROUP12NAME, lcpl));
// Missing groups: GROUP10NAME and GROUP11NAME
// Create GROUP14NAME without the use of link create plist, should
// fail because group GROUP13NAME is missing
try {
Group grp14_nopl(file.createGroup(GROUP14NAME));
} catch (FileIException& expected1) {} // Failure is ignored
// Create GROUP14NAME with the flag to create missing groups set
// to FALSE, should fail because group GROUP13NAME is missing
// Reset flag to not create missing groups
lcpl.setCreateIntermediateGroup(false);
// Verify value of create missing groups flag
crt_int_grps = lcpl.getCreateIntermediateGroup();
verify_val(crt_int_grps, false, "LinkCreatPropList::getCreateIntermediateGroup", __LINE__, __FILE__);
try {
Group grp14_false(file.createGroup(GROUP14NAME, lcpl));
} catch (FileIException& expected2) {} // Failure is ignored
// Set the flag to create missing groups set to TRUE
lcpl.setCreateIntermediateGroup(true);
crt_int_grps = lcpl.getCreateIntermediateGroup();
verify_val(crt_int_grps, true, "LinkCreatPropList::getCreateIntermediateGroup", __LINE__, __FILE__);
// Create GROUP14NAME with the use of link create plist
Group grp14(file.createGroup(GROUP14NAME, lcpl));
// Missing groups: GROUP13NAME
// Create group GROUP20NAME
Group grp20(file.createGroup(GROUP20NAME));
// Create group GROUP22NAME with missing group GROUP21NAME
Group grp22(grp20.createGroup(GROUP22NAME, lcpl));
// Close groups and file
grp12.close();
grp14.close();
grp20.close();
grp22.close();
file.close();
// Reopen the file
file.openFile(FILE_INTERGRPS, H5F_ACC_RDWR);
// Open the missing groups and various combinations
Group grp10(file.openGroup(GROUP10NAME));
Group grp11(file.openGroup(GROUP11NAME));
Group grp13(file.openGroup(GROUP13NAME));
Group grp14from13(grp13.openGroup(GROUP14FROM13NAME));
Group grp21(file.openGroup(GROUP21NAME));
Group grp22fromfile(file.openGroup(GROUP22FULLNAME));
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_intermediate_groups()", __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_intermediate_groups
/*-------------------------------------------------------------------------
* Function: test_object
*
* Purpose Tests HDF5 object related functionality
*
* Return Success: 0
* Failure: -1
*
* Programmer Binh-Minh Ribler
* Friday, Mar 4, 2014
* March 4, 2014
*-------------------------------------------------------------------------
*/
extern "C"
@@ -544,13 +742,15 @@ void test_object()
// Output message about test being performed
MESSAGE(5, ("Testing Object Functions\n"));
test_get_objname(); // Test get object name from groups/datasets
test_existance(); // Test check for object existance
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_get_objname(); // Test get object name from groups/datasets
test_existance(); // Test check for object existance
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_intermediate_groups(); // Test intermediate group property
} // test_objects
} // test_object
/*-------------------------------------------------------------------------

View File

@@ -481,6 +481,21 @@ static void test_reference_group()
fname = group.getFileName();
verify_val(fname, FILE1, "H5Group::getFileName",__LINE__,__FILE__);
// Check object type using Group::getObjinfo()
H5O_info_t oinfo;
HDmemset(&oinfo, 0, sizeof(oinfo));
group.getObjinfo(".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, oinfo);
verify_val(oinfo.type, H5O_TYPE_DATASET, "Group::getObjinfo",__LINE__,__FILE__);
// Check for out of bound query by index
try {
HDmemset(&oinfo, 0, sizeof(oinfo));
group.getObjinfo(".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)9, oinfo);
// Should FAIL but didn't, so throw an invalid action exception
throw InvalidActionException("Group::getObjinfo", "Out of bound index.");
} catch (Exception& err) {} // do nothing, failure expected
// Unlink one of the objects in the dereferenced group, and re-check
refgroup.unlink(GROUPNAME2);
nobjs = refgroup.getNumObjs();

View File

@@ -1024,6 +1024,94 @@ static void test_encode_decode()
}
}
/*-------------------------------------------------------------------------
* Function: test_operators
*
* Purpose Test datatype encode/decode functionality.
*
* Return None
*
* Programmer Binh-Minh Ribler (using C version)
* August, 2017
*-------------------------------------------------------------------------
*/
const H5std_string filename4("h5_type_operators.h5");
static void test_operators()
{
short enum_val;
SUBTEST("DataType::operator== and DataType::operator!=");
try {
// Create the file.
H5File file(filename4, H5F_ACC_TRUNC);
//
// Test with CompType
//
// Create a compound datatype
CompType cmptyp(sizeof(src_typ_t));
cmptyp.insertMember("a", HOFFSET(src_typ_t, a), PredType::NATIVE_INT);
cmptyp.insertMember("b", HOFFSET(src_typ_t, b), PredType::NATIVE_FLOAT);
cmptyp.insertMember("c", HOFFSET(src_typ_t, c), PredType::NATIVE_LONG);
cmptyp.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_DOUBLE);
// Copy this compound datatype
CompType clone_cmptyp(cmptyp);
// Verify that operator== and operator!= work properly
verify_val(cmptyp == clone_cmptyp, true, "DataType::operator==", __LINE__, __FILE__);
verify_val(cmptyp != clone_cmptyp, false, "DataType::operator!=", __LINE__, __FILE__);
//
// Test with EnumType
//
// Create an enumerate datatype
EnumType enumtyp(sizeof(short));
enumtyp.insert("RED", (enum_val=0,&enum_val));
enumtyp.insert("GREEN", (enum_val=1,&enum_val));
enumtyp.insert("BLUE", (enum_val=2,&enum_val));
// Verify that operator== and operator!= work properly
verify_val(cmptyp == enumtyp, false, "DataType::operator==", __LINE__, __FILE__);
verify_val(cmptyp != enumtyp, true, "DataType::operator!=", __LINE__, __FILE__);
//
// Test with compound datatype's member
//
// Create random atomic datatypes
IntType inttyp(PredType::NATIVE_INT);
FloatType flttyp(PredType::NATIVE_FLOAT);
// Get the NATIVE_INT member from the compound datatype above
IntType member_inttyp = cmptyp.getMemberIntType(0);
// Test various combinations
verify_val(inttyp == member_inttyp, true, "DataType::operator==", __LINE__, __FILE__);
verify_val(flttyp == member_inttyp, false, "DataType::operator==", __LINE__, __FILE__);
verify_val(flttyp != member_inttyp, true, "DataType::operator==", __LINE__, __FILE__);
// Get the NATIVE_FLOAT member from the compound datatype above
IntType member_flttyp = cmptyp.getMemberIntType(1);
// Test various combinations
verify_val(inttyp == member_flttyp, false, "DataType::operator==", __LINE__, __FILE__);
verify_val(flttyp != member_flttyp, false, "DataType::operator==", __LINE__, __FILE__);
PASSED();
}
catch (Exception& E)
{
issue_fail_msg("test_operators", __LINE__, __FILE__, E.getCDetailMsg());
}
} // test_operators
/*-------------------------------------------------------------------------
* Function: test_types
@@ -1048,6 +1136,7 @@ void test_types()
test_transient();
test_named();
test_encode_decode();
test_operators();
} // test_types()

View File

@@ -39,18 +39,21 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
H5TEST-flush2 #designed to need flush1
H5TEST-error_test #uses runTest.cmake
H5TEST-err_compat #uses runTest.cmake
H5TEST-links_env #uses runTest.cmake
H5TEST-testlibinfo #uses grepTest.cmake
H5TEST-clear-testhdf5-objects
#########
H5TEST-clear-objects
H5TEST-clear-cache-objects
H5TEST-clear-cache_api-objects
H5TEST-clear-cache_image-objects
H5TEST-clear-cache_tagging-objects
H5TEST-clear-del_many_dense_attrs-objects
H5TEST-clear-err_compat-objects
H5TEST-clear-error_test-objects
H5TEST-clear-filenotclosed-objects
H5TEST-clear-flush-objects
H5TEST-clear-links_env-objects
H5TEST-clear-testflushrefresh-objects
H5TEST-clear-testhdf5-objects
H5TEST-clear-ttsafe-objects
PERFORM_h5perform-clear-objects
HL_TOOLS-clear-objects
@@ -60,11 +63,19 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
CPP_testhdf5-clear-objects
######### tools/h5clear #########
H5CLEAR-clearall-objects
H5CLEAR-copy_h5clear_fsm_persist_equal.h5
H5CLEAR-copy_h5clear_fsm_persist_greater.h5
H5CLEAR-copy_h5clear_fsm_persist_less.h5
H5CLEAR-copy_h5clear_fsm_persist_noclose.h5
H5CLEAR-copy_h5clear_fsm_persist_user_equal.h5
H5CLEAR-copy_h5clear_fsm_persist_user_greater.h5
H5CLEAR-copy_h5clear_fsm_persist_user_less.h5
H5CLEAR-copy_h5clear_log_v3.h5
H5CLEAR-copy_h5clear_mdc_image.h5
H5CLEAR-copy_h5clear_sec2_v0.h5
H5CLEAR-copy_h5clear_sec2_v2.h5
H5CLEAR-copy_h5clear_sec2_v3.h5
H5CLEAR-copy_h5clear_status_noclear.h5
H5CLEAR-copy_latest_h5clear_log_v3.h5
H5CLEAR-copy_latest_h5clear_sec2_v3.h5
H5CLEAR-copy_mod_h5clear_mdc_image.h5
@@ -82,6 +93,7 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
H5DUMP_PACKED_BITS-clearall-objects
H5DUMP-XML-clearall-objects
H5DUMP_VDS-clearall-objects
H5DUMP-t128bit_float #uses grepTest.cmake
######### tools/h5format_convert #########
H5FC-clearall-objects
######### tools/h5import #########
@@ -307,6 +319,11 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
H5REPACK_VERIFY_LAYOUT_ALL-layout_short_switches #uses grepTest.cmake
H5REPACK-plugin
H5REPACK_CMP-plugin_zero
#########
ADD_H5_VERIFY_INVALIDBOUNDS-h5repack-latest_latest_invalid-clear-objects
H5REPACK_VERIFY_SUPERBLOCK-SB_IS_0-clear-objects
H5REPACK_VERIFY_SUPERBLOCK-SB_IS_2-clear-objects
H5REPACK_VERIFY_SUPERBLOCK-SB_IS_3-clear-objects
######### tools/h5stat #########
H5STAT-clearall-objects
######### tools/misc #########

0
config/cmake/CTestScript.cmake Executable file → Normal file
View File

View File

@@ -16,7 +16,7 @@ set (HDF_PREFIX "H5")
include (${HDF_RESOURCES_EXT_DIR}/ConfigureChecks.cmake)
if (HDF5_ENABLE_USING_MEMCHECKER)
set (H5_USING_MEMCHECKER 1)
set (${HDF_PREFIX}_USING_MEMCHECKER 1)
endif ()
#-----------------------------------------------------------------------------
@@ -24,19 +24,10 @@ endif ()
#-----------------------------------------------------------------------------
option (HDF5_STRICT_FORMAT_CHECKS "Whether to perform strict file format checks" OFF)
if (HDF5_STRICT_FORMAT_CHECKS)
set (H5_STRICT_FORMAT_CHECKS 1)
set (${HDF_PREFIX}_STRICT_FORMAT_CHECKS 1)
endif ()
MARK_AS_ADVANCED (HDF5_STRICT_FORMAT_CHECKS)
#-----------------------------------------------------------------------------
# Option for --enable-metadata-trace-file
#-----------------------------------------------------------------------------
option (HDF5_METADATA_TRACE_FILE "Enable metadata trace file collection" OFF)
if (HDF5_METADATA_TRACE_FILE)
set (H5_METADATA_TRACE_FILE 1)
endif ()
MARK_AS_ADVANCED (HDF5_METADATA_TRACE_FILE)
# ----------------------------------------------------------------------
# Decide whether the data accuracy has higher priority during data
# conversions. If not, some hard conversions will still be prefered even
@@ -45,7 +36,7 @@ MARK_AS_ADVANCED (HDF5_METADATA_TRACE_FILE)
#
option (HDF5_WANT_DATA_ACCURACY "IF data accuracy is guaranteed during data conversions" ON)
if (HDF5_WANT_DATA_ACCURACY)
set (H5_WANT_DATA_ACCURACY 1)
set (${HDF_PREFIX}_WANT_DATA_ACCURACY 1)
endif ()
MARK_AS_ADVANCED (HDF5_WANT_DATA_ACCURACY)
@@ -57,7 +48,7 @@ MARK_AS_ADVANCED (HDF5_WANT_DATA_ACCURACY)
#
option (HDF5_WANT_DCONV_EXCEPTION "exception handling functions is checked during data conversions" ON)
if (HDF5_WANT_DCONV_EXCEPTION)
set (H5_WANT_DCONV_EXCEPTION 1)
set (${HDF_PREFIX}_WANT_DCONV_EXCEPTION 1)
endif ()
MARK_AS_ADVANCED (HDF5_WANT_DCONV_EXCEPTION)
@@ -66,7 +57,7 @@ MARK_AS_ADVANCED (HDF5_WANT_DCONV_EXCEPTION)
#
option (HDF5_ENABLE_CODESTACK "Enable the function stack tracing (for developer debugging)." OFF)
if (HDF5_ENABLE_CODESTACK)
set (H5_HAVE_CODESTACK 1)
set (${HDF_PREFIX}_HAVE_CODESTACK 1)
endif ()
MARK_AS_ADVANCED (HDF5_ENABLE_CODESTACK)
@@ -79,36 +70,36 @@ if (HDF5_ENABLE_HSIZET)
endif ()
# so far we have no check for this
set (H5_HAVE_TMPFILE 1)
set (${HDF_PREFIX}_HAVE_TMPFILE 1)
# TODO --------------------------------------------------------------------------
# Should the Default Virtual File Driver be compiled?
# This is hard-coded now but option should added to match configure
#
set (H5_DEFAULT_VFD H5FD_SEC2)
set (${HDF_PREFIX}_DEFAULT_VFD H5FD_SEC2)
if (NOT DEFINED "H5_DEFAULT_PLUGINDIR")
if (NOT DEFINED "${HDF_PREFIX}_DEFAULT_PLUGINDIR")
if (WINDOWS)
set (H5_DEFAULT_PLUGINDIR "%ALLUSERSPROFILE%\\\\hdf5\\\\lib\\\\plugin")
set (${HDF_PREFIX}_DEFAULT_PLUGINDIR "%ALLUSERSPROFILE%\\\\hdf5\\\\lib\\\\plugin")
else ()
set (H5_DEFAULT_PLUGINDIR "/usr/local/hdf5/lib/plugin")
set (${HDF_PREFIX}_DEFAULT_PLUGINDIR "/usr/local/hdf5/lib/plugin")
endif ()
endif ()
if (WINDOWS)
set (H5_HAVE_WINDOWS 1)
set (${HDF_PREFIX}_HAVE_WINDOWS 1)
# ----------------------------------------------------------------------
# Set the flag to indicate that the machine has window style pathname,
# that is, "drive-letter:\" (e.g. "C:") or "drive-letter:/" (e.g. "C:/").
# (This flag should be _unset_ for all machines, except for Windows)
set (H5_HAVE_WINDOW_PATH 1)
set (${HDF_PREFIX}_HAVE_WINDOW_PATH 1)
endif ()
# ----------------------------------------------------------------------
# END of WINDOWS Hard code Values
# ----------------------------------------------------------------------
CHECK_FUNCTION_EXISTS (difftime H5_HAVE_DIFFTIME)
CHECK_FUNCTION_EXISTS (difftime ${HDF_PREFIX}_HAVE_DIFFTIME)
# Find the library containing clock_gettime()
if (NOT WINDOWS)
@@ -116,12 +107,12 @@ if (NOT WINDOWS)
CHECK_LIBRARY_EXISTS (rt clock_gettime "" CLOCK_GETTIME_IN_LIBRT)
CHECK_LIBRARY_EXISTS (posix4 clock_gettime "" CLOCK_GETTIME_IN_LIBPOSIX4)
if (CLOCK_GETTIME_IN_LIBC)
set (H5_HAVE_CLOCK_GETTIME 1)
set (${HDF_PREFIX}_HAVE_CLOCK_GETTIME 1)
elseif (CLOCK_GETTIME_IN_LIBRT)
set (H5_HAVE_CLOCK_GETTIME 1)
set (${HDF_PREFIX}_HAVE_CLOCK_GETTIME 1)
list (APPEND LINK_LIBS rt)
elseif (CLOCK_GETTIME_IN_LIBPOSIX4)
set (H5_HAVE_CLOCK_GETTIME 1)
set (${HDF_PREFIX}_HAVE_CLOCK_GETTIME 1)
list (APPEND LINK_LIBS posix4)
endif ()
endif ()
@@ -167,12 +158,17 @@ endif ()
# Check if C has __float128 extension
#-----------------------------------------------------------------------------
CHECK_TYPE_SIZE("__float128" SIZEOF___FLOAT128)
if (${HAVE_SIZEOF___FLOAT128})
set (H5_HAVE_FLOAT128 1)
CHECK_TYPE_SIZE("__float128" ${HDF_PREFIX}_SIZEOF___FLOAT128)
if (${${HDF_PREFIX}_SIZEOF___FLOAT128})
set (${HDF_PREFIX}_HAVE_FLOAT128 1)
else ()
set (H5_HAVE_FLOAT128 0)
set (SIZEOF___FLOAT128 0)
set (${HDF_PREFIX}_HAVE_FLOAT128 0)
set (${HDF_PREFIX}_SIZEOF___FLOAT128 0)
endif ()
CHECK_TYPE_SIZE("_Quad" ${HDF_PREFIX}_SIZEOF__QUAD)
if (NOT ${${HDF_PREFIX}_SIZEOF__QUAD})
set (${HDF_PREFIX}_SIZEOF__QUAD 0)
endif ()
#-----------------------------------------------------------------------------
@@ -222,7 +218,7 @@ endmacro ()
# The machine's conversion gets the correct value. We define the macro and disable
# this kind of test until we figure out what algorithm they use.
#
H5ConversionTests (H5_LDOUBLE_TO_LONG_SPECIAL "Checking IF your system converts long double to (unsigned) long values with special algorithm")
H5ConversionTests (${HDF_PREFIX}_LDOUBLE_TO_LONG_SPECIAL "Checking IF your system converts long double to (unsigned) long values with special algorithm")
# ----------------------------------------------------------------------
# Set the flag to indicate that the machine is using a special algorithm
# to convert some values of '(unsigned) long' to 'long double' values.
@@ -231,7 +227,7 @@ H5ConversionTests (H5_LDOUBLE_TO_LONG_SPECIAL "Checking IF your system converts
# ..., 7fffff..., the compiler uses a unknown algorithm. We define a
# macro and skip the test for now until we know about the algorithm.
#
H5ConversionTests (H5_LONG_TO_LDOUBLE_SPECIAL "Checking IF your system can convert (unsigned) long to long double values with special algorithm")
H5ConversionTests (${HDF_PREFIX}_LONG_TO_LDOUBLE_SPECIAL "Checking IF your system can convert (unsigned) long to long double values with special algorithm")
# ----------------------------------------------------------------------
# Set the flag to indicate that the machine can accurately convert
# 'long double' to '(unsigned) long long' values. (This flag should be set for
@@ -241,7 +237,7 @@ H5ConversionTests (H5_LONG_TO_LDOUBLE_SPECIAL "Checking IF your system can conve
# 0x4351ccf385ebc8a0dfcc... or 0x4351ccf385ebc8a0ffcc... will make the converted
# values wildly wrong. This test detects this wrong behavior and disable the test.
#
H5ConversionTests (H5_LDOUBLE_TO_LLONG_ACCURATE "Checking IF correctly converting long double to (unsigned) long long values")
H5ConversionTests (${HDF_PREFIX}_LDOUBLE_TO_LLONG_ACCURATE "Checking IF correctly converting long double to (unsigned) long long values")
# ----------------------------------------------------------------------
# Set the flag to indicate that the machine can accurately convert
# '(unsigned) long long' to 'long double' values. (This flag should be set for
@@ -249,23 +245,13 @@ H5ConversionTests (H5_LDOUBLE_TO_LLONG_ACCURATE "Checking IF correctly convertin
# 007fff..., 00ffff..., 01ffff..., ..., 7fffff..., the converted values are twice
# as big as they should be.
#
H5ConversionTests (H5_LLONG_TO_LDOUBLE_CORRECT "Checking IF correctly converting (unsigned) long long to long double values")
H5ConversionTests (${HDF_PREFIX}_LLONG_TO_LDOUBLE_CORRECT "Checking IF correctly converting (unsigned) long long to long double values")
# ----------------------------------------------------------------------
# Set the flag to indicate that the machine can accurately convert
# some long double values
#
H5ConversionTests (${HDF_PREFIX}_DISABLE_SOME_LDOUBLE_CONV "Checking IF the cpu is power9 and cannot correctly converting long double values")
# ----------------------------------------------------------------------
# Check if pointer alignments are enforced
#
H5ConversionTests (H5_NO_ALIGNMENT_RESTRICTIONS "Checking IF alignment restrictions are strictly enforced")
# -----------------------------------------------------------------------
# wrapper script variables
#
set (prefix ${CMAKE_INSTALL_PREFIX})
set (exec_prefix "\${prefix}")
set (libdir "${exec_prefix}/lib")
set (includedir "\${prefix}/include")
set (host_os ${CMAKE_HOST_SYSTEM_NAME})
set (CC ${CMAKE_C_COMPILER})
set (CXX ${CMAKE_CXX_COMPILER})
set (FC ${CMAKE_Fortran_COMPILER})
foreach (LINK_LIB ${LINK_LIBS})
set (LIBS "${LIBS} -l${LINK_LIB}")
endforeach ()
H5ConversionTests (${HDF_PREFIX}_NO_ALIGNMENT_RESTRICTIONS "Checking IF alignment restrictions are strictly enforced")

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