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/ph5diff.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/ph5diff.h')
| -rw-r--r-- | tools/lib/ph5diff.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/lib/ph5diff.h b/tools/lib/ph5diff.h index cb28001..68450df 100644 --- a/tools/lib/ph5diff.h +++ b/tools/lib/ph5diff.h @@ -34,7 +34,6 @@ int g_nTasks; char outBuff[OUTBUFF_SIZE]; unsigned int outBuffOffset; - struct diff_args { char name[256]; @@ -45,12 +44,9 @@ struct diff_args #ifdef H5_HAVE_PARALLEL #define H5_HAVE_PH5DIFF 1 #endif + #ifdef H5_HAVE_PH5DIFF -#define PARALLEL 1 #include <mpi.h> - -#else -#define PARALLEL 0 #endif |