diff options
| author | Leon Arber <larber@ncsa.uiuc.edu> | 2005-02-02 23:01:42 (GMT) |
|---|---|---|
| committer | Leon Arber <larber@ncsa.uiuc.edu> | 2005-02-02 23:01:42 (GMT) |
| commit | 8af13859397ca1030dda5668017664692669d7e6 (patch) | |
| tree | d938619dd7e386fa443986cea5700551925ee618 /tools/lib/ph5diff.h | |
| parent | d0ced67f526acb4491269e8e66799e9fb81115ac (diff) | |
| download | hdf5-8af13859397ca1030dda5668017664692669d7e6.zip hdf5-8af13859397ca1030dda5668017664692669d7e6.tar.gz hdf5-8af13859397ca1030dda5668017664692669d7e6.tar.bz2 | |
[svn-r9925] Purpose:
Bug Fix
Description:
Permanent fix for the incompatibilities between h5diff and h5repack.
Solution:
h5diff now contains the code to run both parallel and serial diffs.
Depending on how the binary is called, it will run either the serial or
the parallel versions respectively.
Platforms tested:
heping(serial + parallel), copper.
Misc. update:
Diffstat (limited to 'tools/lib/ph5diff.h')
| -rw-r--r-- | tools/lib/ph5diff.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/lib/ph5diff.h b/tools/lib/ph5diff.h index 320b39a..8a9510e 100644 --- a/tools/lib/ph5diff.h +++ b/tools/lib/ph5diff.h @@ -31,6 +31,7 @@ #define MPI_TAG_PARALLEL 7 extern int g_nTasks; +extern unsigned char g_Parallel; extern char outBuff[OUTBUFF_SIZE]; extern unsigned int outBuffOffset; @@ -41,14 +42,7 @@ struct diff_args diff_opt_t options; }; -/* temporary disabled. AKC 1/31/2005 */ -#if 0 #ifdef H5_HAVE_PARALLEL -#define H5_HAVE_PH5DIFF 1 -#endif -#endif - -#ifdef H5_HAVE_PH5DIFF #include <mpi.h> #endif |