summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-06-24 15:37:24 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-06-24 15:37:24 (GMT)
commit600a17154606f6b1b91873f70eb215e43d85edaa (patch)
treea644e1b19a159594db2b241121a89886878c466a
parent30ede4622e7493e481254af2d63fd8ecb814c1b3 (diff)
downloadhdf5-600a17154606f6b1b91873f70eb215e43d85edaa.zip
hdf5-600a17154606f6b1b91873f70eb215e43d85edaa.tar.gz
hdf5-600a17154606f6b1b91873f70eb215e43d85edaa.tar.bz2
[svn-r7091] Purpose:
Code cleanup Description: Remove the fill-value option entirely, since the 1.5.x library's default behavior is now the same as the 1.4.x behavior and also there is no corresponding code for implementing fill-values with the POSIX or MPI-I/O tests. Platforms tested: FreeBSD 4.8 (sleipnir) w/parallel too small to need h5committest
-rw-r--r--perform/pio_engine.c11
-rw-r--r--perform/pio_perf.c21
-rw-r--r--perform/pio_perf.h1
3 files changed, 0 insertions, 33 deletions
diff --git a/perform/pio_engine.c b/perform/pio_engine.c
index 88a90e5..ff39399 100644
--- a/perform/pio_engine.c
+++ b/perform/pio_engine.c
@@ -685,17 +685,6 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
} /* end if */
} /* end if */
-#ifdef H5_HAVE_NOFILL
- /* Disable writing fill values if asked */
- if(parms->h5_no_fill) {
- hrc = H5Pset_fill_time(h5dcpl, H5D_FILL_TIME_NEVER);
- if (hrc < 0) {
- fprintf(stderr, "HDF5 Property List Set failed\n");
- GOTOERROR(FAIL);
- } /* end if */
- } /* end if */
-#endif
-
sprintf(dname, "Dataset_%ld", ndset);
h5ds_id = H5Dcreate(fd->h5fd, dname, ELMT_H5_TYPE,
h5dset_space_id, h5dcpl);
diff --git a/perform/pio_perf.c b/perform/pio_perf.c
index 0ec76b3..2389b54 100644
--- a/perform/pio_perf.c
+++ b/perform/pio_perf.c
@@ -217,12 +217,6 @@ static struct long_options l_opts[] = {
{ "mpi-", no_arg, 'm' },
{ "mpi", no_arg, 'm' },
{ "mp", no_arg, 'm' },
- { "no-fill", no_arg, 'n' },
- { "no-fil", no_arg, 'n' },
- { "no-fi", no_arg, 'n' },
- { "no-f", no_arg, 'n' },
- { "no-", no_arg, 'n' },
- { "no", no_arg, 'n' },
{ "num-bytes", require_arg, 'e' },
{ "num-byte", require_arg, 'e' },
{ "num-byt", require_arg, 'e' },
@@ -291,7 +285,6 @@ struct options {
off_t h5_alignment; /* alignment in HDF5 file */
off_t h5_threshold; /* threshold for alignment in HDF5 file */
int h5_use_chunks; /* Make HDF5 dataset chunked */
- int h5_no_fill; /* Disable HDF5 writing fill values */
int h5_write_only; /* Perform the write tests only */
unsigned h5_use_mpi_posix; /* Use MPI-posix VFD for HDF5 I/O (instead of MPI-I/O VFD) */
int verify; /* Verify data correctness */
@@ -433,7 +426,6 @@ run_test_loop(struct options *opts)
parms.h5_align = opts->h5_alignment;
parms.h5_thresh = opts->h5_threshold;
parms.h5_use_chunks = opts->h5_use_chunks;
- parms.h5_no_fill = opts->h5_no_fill;
parms.h5_write_only = opts->h5_write_only;
parms.h5_use_mpi_posix = opts->h5_use_mpi_posix;
parms.verify = opts->verify;
@@ -1117,7 +1109,6 @@ parse_command_line(int argc, char *argv[])
cl_opts->h5_alignment = 1; /* No alignment for HDF5 objects by default */
cl_opts->h5_threshold = 1; /* No threshold for aligning HDF5 objects by default */
cl_opts->h5_use_chunks = FALSE; /* Don't chunk the HDF5 dataset by default */
- cl_opts->h5_no_fill = TRUE; /* Write fill values by default */
cl_opts->h5_write_only = FALSE; /* Do both read and write by default */
cl_opts->h5_use_mpi_posix = FALSE; /* Don't use MPI-posix VFD for HDF5 I/O by default */
cl_opts->verify = FALSE; /* No Verify data correctness by default */
@@ -1253,15 +1244,6 @@ parse_command_line(int argc, char *argv[])
/* Turn on MPI-posix VFL driver for HDF5 I/O */
cl_opts->h5_use_mpi_posix = TRUE;
break;
- case 'n': /* Turn off writing fill values */
-#ifdef H5_HAVE_NOFILL
- cl_opts->h5_no_fill = TRUE;
-#else
- fprintf(stderr, "pio_perf: --no-fill not supported\n");
- usage(progname);
- exit(EXIT_FAILURE);
-#endif
- break;
case 'o':
cl_opts->output_file = opt_arg;
break;
@@ -1408,9 +1390,6 @@ usage(const char *prog)
printf(" [default: Contiguous block I/O]\n");
printf(" -m, --mpi-posix Use MPI-posix driver for HDF5 I/O\n");
printf(" [default: use MPI-I/O driver]\n");
- printf(" -n, --no-fill Don't write fill values to HDF5 dataset\n");
- printf(" (Supported in HDF5 library v1.5 only)\n");
- printf(" [default: off (i.e. write fill values)]\n");
printf(" -o F, --output=F Output raw data into file F [default: none]\n");
printf(" -p N, --min-num-processes=N Minimum number of processes to use [default: 1]\n");
printf(" -P N, --max-num-processes=N Maximum number of processes to use\n");
diff --git a/perform/pio_perf.h b/perform/pio_perf.h
index 05b5b15..b7fd92c 100644
--- a/perform/pio_perf.h
+++ b/perform/pio_perf.h
@@ -45,7 +45,6 @@ typedef struct parameters_ {
hsize_t h5_align; /* HDF5 object alignment */
hsize_t h5_thresh; /* HDF5 object alignment threshold */
int h5_use_chunks; /* Make HDF5 dataset chunked */
- int h5_no_fill; /* Disable HDF5 writing fill values */
int h5_write_only; /* Perform the write tests only */
unsigned h5_use_mpi_posix; /* Use MPI-posix VFD for HDF5 I/O (instead of MPI-I/O VFD) */
int verify; /* Verify data correctness */