diff options
-rw-r--r-- | perform/pio_engine.c | 2 | ||||
-rw-r--r-- | perform/pio_perf.c | 7 | ||||
-rw-r--r-- | perform/pio_perf.h | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/perform/pio_engine.c b/perform/pio_engine.c index c4714fa..65d8d2d 100644 --- a/perform/pio_engine.c +++ b/perform/pio_engine.c @@ -534,7 +534,7 @@ fprintf(stderr, "buffer size=%ld\n", buf_size); } /* end if */ } /* end if */ -#if H5_VERS_MAJOR > 1 || H5_VERS_MINOR > 4 +#ifdef H5_HAVE_NOFILL /* Disable writing fill values if asked */ if(parms->h5_no_fill) { hrc = H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER); diff --git a/perform/pio_perf.c b/perform/pio_perf.c index 4eaf15c..72bfd06 100644 --- a/perform/pio_perf.c +++ b/perform/pio_perf.c @@ -1051,7 +1051,13 @@ parse_command_line(int argc, char *argv[]) cl_opts->num_iters = atoi(opt_arg); break; case 'n': /* Turn off writing fill values */ +#ifdef H5_HAVE_NOFILL cl_opts->h5_no_fill = 1; +#else + fprintf(stderr, "pio_perf: --no-fill not supported\n"); + usage(progname); + exit(1); +#endif break; case 'o': cl_opts->output_file = opt_arg; @@ -1147,7 +1153,6 @@ usage(const char *prog) MPI_Comm_rank(pio_comm_g, &myrank); if (myrank == 0) { - fflush(stdout); print_version(prog); printf("usage: %s [OPTIONS]\n", prog); printf(" OPTIONS\n"); diff --git a/perform/pio_perf.h b/perform/pio_perf.h index 89aa879..efb100d 100644 --- a/perform/pio_perf.h +++ b/perform/pio_perf.h @@ -10,6 +10,11 @@ #include "pio_timer.h" #include "H5private.h" +/* setup the dataset no fill option if this is v1.5 or more */ +#if H5_VERS_MAJOR > 1 || H5_VERS_MINOR > 4 +#define H5_HAVE_NOFILL 1 +#endif + typedef enum iotype_ { POSIXIO, MPIO, |