diff options
| author | Leon Arber <larber@ncsa.uiuc.edu> | 2005-01-27 23:21:05 (GMT) |
|---|---|---|
| committer | Leon Arber <larber@ncsa.uiuc.edu> | 2005-01-27 23:21:05 (GMT) |
| commit | 839f1092da94c17b5f541acdd899e00bc13ef31f (patch) | |
| tree | 6e3bae867ebceee26ba4c196bee86973456e5858 /tools/lib/h5diff.h | |
| parent | 046fe35568d6393cf887b9d6e9e95ccd36917b4a (diff) | |
| download | hdf5-839f1092da94c17b5f541acdd899e00bc13ef31f.zip hdf5-839f1092da94c17b5f541acdd899e00bc13ef31f.tar.gz hdf5-839f1092da94c17b5f541acdd899e00bc13ef31f.tar.bz2 | |
[svn-r9877] Purpose:
Bug fix: Temporary fix for h5repack failures in all parallel builds.
Description:
The parallel additions to h5diff interfered with h5repack.
Solution:
Added a second set of "parallel" functions to h5diff.c. h5repack uses the serial versions, whereas h5diff will use the parallel versions.
Also, h5diff will now be smart about when to enter parallel mode. If is run with mpirun with more than 1 task, it will enter parallel mode. Otherwise, it will stay in serial mode as before.
Platforms tested:
heping (serial and parallel)
Misc. update:
Diffstat (limited to 'tools/lib/h5diff.h')
| -rw-r--r-- | tools/lib/h5diff.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h index f69719f..5b351ba 100644 --- a/tools/lib/h5diff.h +++ b/tools/lib/h5diff.h @@ -82,6 +82,13 @@ hsize_t h5diff(const char *fname1, const char *objname2, diff_opt_t *options); +hsize_t h5diff_parallel(const char *fname1, + const char *fname2, + const char *objname1, + const char *objname2, + diff_opt_t *options); + + #ifdef __cplusplus } @@ -134,6 +141,14 @@ hsize_t diff_match( hid_t file1_id, trav_info_t *info2, diff_opt_t *options ); +hsize_t diff_match_parallel( hid_t file1_id, + int nobjects1, + trav_info_t *info1, + hid_t file2_id, + int nobjects2, + trav_info_t *info2, + diff_opt_t *options ); + hsize_t diff_array( void *_mem1, void *_mem2, hsize_t nelmts, |