summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2003-11-12 23:03:02 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2003-11-12 23:03:02 (GMT)
commit54434ea95bf99fdcd083153e83685265eee93b5d (patch)
tree38b6bdc0517813a904a5ae4b9146e04cae85a96f /testpar
parent680262645fc936e17571ac43e905b678bc799bb6 (diff)
downloadhdf5-54434ea95bf99fdcd083153e83685265eee93b5d.zip
hdf5-54434ea95bf99fdcd083153e83685265eee93b5d.tar.gz
hdf5-54434ea95bf99fdcd083153e83685265eee93b5d.tar.bz2
[svn-r7839] Purpose:
Update Description: Extensive reworking of the code. More modular now. Tests for almost all of "Phase 1"s requirements. Need to check that data is correct after reopening the file. Platforms tested: Linux (w/ FPHDF5) AIX (w/ and w/o FPHDF5) FPHDF5-specific fixes...No need for H5committest Misc. update:
Diffstat (limited to 'testpar')
-rw-r--r--testpar/t_fphdf5.c461
1 files changed, 324 insertions, 137 deletions
diff --git a/testpar/t_fphdf5.c b/testpar/t_fphdf5.c
index 5bfd661..5a439b6 100644
--- a/testpar/t_fphdf5.c
+++ b/testpar/t_fphdf5.c
@@ -31,21 +31,32 @@
#ifdef H5_HAVE_FPHDF5
-/*===-----------------------------------------------------------------------===
+/*===----------------------------------------------------------------------===
* Local Functions
- *===-----------------------------------------------------------------------===
+ *===----------------------------------------------------------------------===
*/
-static hid_t create_group(hid_t loc, const char *name, size_t size_hint);
-static hid_t create_dset(hid_t loc, const char *name);
-static void access_dset(hid_t loc, const char *dset_name, ...);
+static hid_t create_group(hid_t loc, const char *grp_name, size_t size_hint);
+static hid_t create_dset(hid_t loc, const char *dset_name);
+static void access_dset(hid_t loc, const char *dset_name);
static void slab_set(hssize_t start[], hsize_t count[],
hsize_t stride[], hsize_t block[]);
-static void write_data(hid_t loc, const char *name, int *buf);
-static void create_file(const char *filename);
-
-/*===-----------------------------------------------------------------------===
+static void write_data(hid_t loc, const char *dset_name,
+ hssize_t start[], hsize_t count[],
+ hsize_t stride[], hsize_t block[],
+ int *buf);
+static void verify_dataset(hid_t loc, const char *dset_name, hssize_t start[],
+ hsize_t count[], hsize_t stride[], hsize_t block[],
+ int *original);
+static hid_t create_file(const char *filename);
+static void test_group_creation(hid_t loc);
+static void test_dataset_creation(hid_t loc);
+static void test_dataset_access(hid_t loc);
+static void test_dataset_write(hid_t loc);
+static void usage(const char *prog);
+
+/*===----------------------------------------------------------------------===
* Filenames
- *===-----------------------------------------------------------------------===
+ *===----------------------------------------------------------------------===
* The names of the test files for
*/
static const char *FILENAME[2] = { /* List of files we want to create */
@@ -54,9 +65,9 @@ static const char *FILENAME[2] = { /* List of files we want to create */
};
static char filenames[2][PATH_MAX]; /* "Fixed" filenames */
-/*===-----------------------------------------------------------------------===
+/*===----------------------------------------------------------------------===
* Global Variables
- *===-----------------------------------------------------------------------===
+ *===----------------------------------------------------------------------===
*/
#ifdef RANK
#undef RANK
@@ -82,8 +93,18 @@ static hid_t fapl = -1; /* FPHDF5 file access property list */
static int mpi_rank; /* Rank of this process */
static int mpi_size; /* Size of the COMM passed to FPHDF5 */
-int nerrors; /* Errors count */
-int verbose; /* Verbose, default is no */
+int nerrors = 0; /* Errors count */
+int verbose = 0; /* Verbose, default is no */
+
+static const char *progname = "t_fphdf5";
+
+/* Dataset Name Template */
+static const char *dset_tmpl = "Dataset %d";
+static char dset_name[128];
+
+/* Group Name Template */
+static const char *grp_tmpl = "Process %d's Datasets";
+static char grp_name[128];
/*-------------------------------------------------------------------------
* Function: create_group
@@ -96,15 +117,15 @@ int verbose; /* Verbose, default is no */
* Modifications:
*-------------------------------------------------------------------------
*/
-static hid_t create_group(hid_t loc, const char *name, size_t size_hint)
+static hid_t
+create_group(hid_t loc, const char *grp_name, size_t size_hint)
{
hid_t group;
- printf("%d: Creating group \"%s\"\n", mpi_rank, name);
+ fprintf(stderr, "%d: Creating group \"%s\"\n", mpi_rank, grp_name);
- group = H5Gcreate(loc, name, size_hint);
- VRFY((group >= 0), "H5Gcreate");
- printf("%d: Created group \"%s\"\n", mpi_rank, name);
+ VRFY(((group = H5Gcreate(loc, grp_name, size_hint)) >= 0), "H5Gcreate");
+ fprintf(stderr, "%d: Created group \"%s\"\n", mpi_rank, grp_name);
return group;
}
@@ -119,18 +140,18 @@ static hid_t create_group(hid_t loc, const char *name, size_t size_hint)
* Modifications:
*-------------------------------------------------------------------------
*/
-static hid_t create_dset(hid_t loc, const char *name)
+static hid_t
+create_dset(hid_t loc, const char *dset_name)
{
hsize_t dims[RANK] = { DIM0, DIM1 };
hid_t dset, sid;
- sid = H5Screate_simple(RANK, dims, NULL);
- VRFY((sid >= 0), "H5Screate_simple");
- printf("%d: Created simple dataspace\n", mpi_rank);
+ VRFY(((sid = H5Screate_simple(RANK, dims, NULL)) >= 0), "H5Screate_simple");
+ fprintf(stderr, "%d: Created simple dataspace\n", mpi_rank);
- dset = H5Dcreate(loc, name, H5T_NATIVE_INT, sid, H5P_DEFAULT);
+ dset = H5Dcreate(loc, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT);
VRFY((dset >= 0), "H5Dcreate");
- printf("%d: Created dataset \"%s\"\n", mpi_rank, name);
+ fprintf(stderr, "%d: Created dataset \"%s\"\n", mpi_rank, dset_name);
VRFY((H5Sclose(sid) >= 0), "H5Sclose");
return dset;
@@ -138,41 +159,20 @@ static hid_t create_dset(hid_t loc, const char *name)
/*-------------------------------------------------------------------------
* Function: access_dset
- * Purpose: Quickly check that we can access this dataset.
+ * Purpose: Quickly check to see if we can access this dataset.
* Return: Nothing, but aborts if an error occurs.
* Programmer: Bill Wendling
* 03. November 2003
* Modifications:
*-------------------------------------------------------------------------
*/
-static void access_dset(hid_t loc, const char *dset_name, ...)
+static void
+access_dset(hid_t loc, const char *dset_name)
{
- va_list ap;
hid_t dataset;
- /* Open the dataset */
- dataset = H5Dopen(loc, dset_name);
- VRFY((dataset >= 0), "H5Dopen");
- printf("%d: Opened dataset \"%s\"\n", mpi_rank, dset_name);
-
- /* Close the dataset */
+ VRFY(((dataset = H5Dopen(loc, dset_name)) >= 0), "H5Dopen");
VRFY((H5Dclose(dataset) >= 0), "H5Dclose");
-
- /* Print out a nice message */
- printf("%d: Accessed dataset \"/", mpi_rank);
- va_start(ap, dset_name);
-
- for (;;) {
- const char *str = va_arg(ap, char *);
-
- if (!str)
- break;
-
- printf("%s/", str);
- }
-
- va_end(ap);
- printf("%s\"\n", dset_name);
}
/*-------------------------------------------------------------------------
@@ -184,8 +184,8 @@ static void access_dset(hid_t loc, const char *dset_name, ...)
* Modifications:
*-------------------------------------------------------------------------
*/
-static void slab_set(hssize_t start[], hsize_t count[],
- hsize_t stride[], hsize_t block[])
+static void
+slab_set(hssize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[])
{
/* Each process takes a slab of rows. */
block[0] = DIM0 / mpi_size;
@@ -210,21 +210,18 @@ static void slab_set(hssize_t start[], hsize_t count[],
* Modifications:
*-------------------------------------------------------------------------
*/
-static void write_data(hid_t loc, const char *name, int *buf)
+static void
+write_data(hid_t loc, const char *dset_name, hssize_t start[], hsize_t count[],
+ hsize_t stride[], hsize_t block[], int *buf)
{
herr_t hrc;
hid_t file_dataspace, mem_dataspace;
hid_t dataset, xfer;
hsize_t j, k;
int *dataptr = buf;
- hssize_t start[RANK]; /* for hyperslab setting */
- hsize_t count[RANK]; /* for hyperslab setting */
- hsize_t stride[RANK]; /* for hyperslab setting */
- hsize_t block[RANK]; /* for hyperslab setting */
/* See if dataset is there */
- VRFY(((dataset = H5Dopen(loc, name)) >= 0), "H5Dopen");
- printf("%d: Opened dataset \"%s\"\n", mpi_rank, name);
+ VRFY(((dataset = H5Dopen(loc, dset_name)) >= 0), "H5Dopen");
xfer = H5Pcreate(H5P_DATASET_XFER);
VRFY((xfer >= 0), "H5Pcreate");
@@ -232,8 +229,6 @@ static void write_data(hid_t loc, const char *name, int *buf)
file_dataspace = H5Dget_space(dataset);
VRFY((file_dataspace >= 0), "H5Dget_space");
- slab_set(start, count, stride, block);
-
/* put some trivial data in the buffer */
for (j = 0; j < block[0]; ++j)
for (k = 0; k < block[1]; ++k)
@@ -245,7 +240,7 @@ static void write_data(hid_t loc, const char *name, int *buf)
/* create a memory dataspace independently */
mem_dataspace = H5Screate_simple(RANK, block, NULL);
- VRFY((mem_dataspace >= 0), "");
+ VRFY((mem_dataspace >= 0), "H5Screate_simple");
hrc = H5Dwrite(dataset, H5T_NATIVE_INT, mem_dataspace,
file_dataspace, H5P_DEFAULT, buf);
@@ -258,63 +253,130 @@ static void write_data(hid_t loc, const char *name, int *buf)
}
/*-------------------------------------------------------------------------
- * Function: create_file
- * Purpose: The main function. Creates a file and populates it with
- * groups and datasets so that we can make sure that FPHDF5
- * works.
+ * Function: verify_dataset
+ * Purpose: Verify the data in the dataset is correct.
* Return: Nothing
* Programmer: Bill Wendling
- * 29. October 2003
+ * 10. November 2003
* Modifications:
*-------------------------------------------------------------------------
*/
-static void create_file(const char *filename)
+static void
+verify_dataset(hid_t loc, const char *dset_name, hssize_t start[], hsize_t count[],
+ hsize_t stride[], hsize_t block[], int *original)
{
- hid_t fid = -1, dataset = -1, group = -1;
- int i;
- int *data_array = NULL;
+ hid_t dataset, file_dataspace, mem_dataspace;
+ hsize_t i, j;
+ int *data_array;
+ int vrfyerrs = 0;
+
+ /* Open the dataset */
+ VRFY(((dataset = H5Dopen(loc, dset_name)) >= 0), "H5Dopen");
- /* Dataset Name Template */
- const char *dset_tmpl = "Dataset %d";
- char dset_name[128];
+ /* Create a file dataspace */
+ file_dataspace = H5Dget_space(dataset);
+ VRFY((file_dataspace >= 0), "H5Dget_space");
+ VRFY((H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET,
+ start, stride, count, block) >= 0), "H5Sselect_hyperslab");
- /* Dataset Group Name Template */
- const char *grp_tmpl = "Process %d's Datasets";
- char grp_name[128];
+ /* Create a memory dataspace */
+ mem_dataspace = H5Screate_simple(RANK, block, NULL);
+ VRFY((mem_dataspace >= 0), "H5Screate_simple");
+
+ /* Read the dataset */
+ data_array = (int *)malloc(DIM0 * DIM1 * sizeof(int));
+ VRFY((H5Dread(dataset, H5T_NATIVE_INT, mem_dataspace, file_dataspace,
+ H5P_DEFAULT, data_array) >= 0), "H5Dread");
+
+ /* Verify the contents of the dataset */
+ for (i = 0; i < block[0]; ++i)
+ for (j = 0; j < block[1]; ++j)
+ if (*data_array != *original) {
+ if (vrfyerrs++ < MAX_ERR_REPORT)
+ fprintf(stderr,
+ "Dataset Verify failed at "
+ "[%ld][%ld](row %ld, col %ld): expect %d, got %d\n",
+ (long)i, (long)j, (long)(i + start[0]),
+ (long)(j + start[1]), *original, *data_array);
+
+ ++data_array;
+ ++original;
+ }
+
+ if (vrfyerrs)
+ fprintf(stderr, "%d errors found in verify_dataset\n", vrfyerrs);
+
+ VRFY((H5Sclose(mem_dataspace) >= 0), "H5Sclose");
+ VRFY((H5Sclose(file_dataspace) >= 0), "H5Sclose");
+ VRFY((H5Dclose(dataset) >= 0), "H5Dclose");
+ free(data_array);
+}
+
+/*-------------------------------------------------------------------------
+ * Function: create_file
+ * Purpose: Create a new file with the given filename.
+ * Return: Success: Valid file ID
+ * Failure: -1
+ * Programmer: Bill Wendling
+ * 29. October 2003
+ * Modifications:
+ *-------------------------------------------------------------------------
+ */
+static hid_t
+create_file(const char *filename)
+{
+ hid_t fid = -1;
- /*=========================================================================
- * Create the file
- *=========================================================================
- */
- printf("%d: Creating file %s\n", mpi_rank, filenames[0]);
fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
VRFY((fid >= 0), "H5Fcreate");
- printf("%d: Created file %s\n", mpi_rank, filename);
-
- /*=========================================================================
- * For each non-SAP process:
- * Create datasets in non-root group
- * Access all datasets from all processes
- * Write to all datasets from all processes
- * End
- *=========================================================================
- */
- if (mpi_rank == 0)
+ fprintf(stderr, "%d: Created file %s\n", mpi_rank, filename);
+ return fid;
+}
+
+/*-------------------------------------------------------------------------
+ * Function: test_group_creation
+ * Purpose: Test creation of multiple groups in the file.
+ * Return: Nothing
+ * Programmer: Bill Wendling
+ * 11. November 2003
+ * Modifications:
+ *-------------------------------------------------------------------------
+ */
+static void
+test_group_creation(hid_t loc)
+{
+ if (mpi_rank == 0) {
+ hid_t group;
+ int i;
+
for (i = 0; i < mpi_size; ++i)
if (i != SAP_RANK) {
sprintf(grp_name, grp_tmpl, i);
- group = create_group(fid, grp_name, 4);
+ group = create_group(loc, grp_name, 4);
VRFY((H5Gclose(group) >= 0), "H5Gclose");
}
+ }
SYNC(SAP_Barrier_Comm);
+}
+
+/*-------------------------------------------------------------------------
+ * Function: test_dataset_creation
+ * Purpose: Test simultaneous creation of multiple datasets in a
+ * non-root group.
+ * Return: Nothing
+ * Programmer: Bill Wendling
+ * 11. November 2003
+ * Modifications:
+ *-------------------------------------------------------------------------
+ */
+static void
+test_dataset_creation(hid_t loc)
+{
+ hid_t dataset, group;
- /*===-------------------------------------------------------------------===
- * Each process creates datasets in individual, non-root groups.
- *===-------------------------------------------------------------------===
- */
sprintf(grp_name, grp_tmpl, mpi_rank);
- group = H5Gopen(fid, grp_name);
+ group = H5Gopen(loc, grp_name);
VRFY((group >= 0), "H5Gopen");
sprintf(dset_name, dset_tmpl, 0);
@@ -338,31 +400,78 @@ static void create_file(const char *filename)
VRFY((H5Gclose(group) >= 0), "H5Gclose");
SYNC(SAP_Barrier_Comm);
+}
+
+/*-------------------------------------------------------------------------
+ * Function: test_dataset_access
+ * Purpose: Test that we can access the datasets in the file from all
+ * processes.
+ * Return: Nothing
+ * Programmer: Bill Wendling
+ * 11. November 2003
+ * Modifications:
+ *-------------------------------------------------------------------------
+ */
+static void
+test_dataset_access(hid_t loc)
+{
+ hid_t group;
+ int i;
- /*===-------------------------------------------------------------------===
- * Check that we can access all of the datasets created above
- *===-------------------------------------------------------------------===
- */
for (i = 0; i < mpi_size; ++i)
if (i != SAP_RANK) {
sprintf(grp_name, grp_tmpl, i);
- VRFY(((group = H5Gopen(fid, grp_name)) >= 0), "H5Gopen");
+ VRFY(((group = H5Gopen(loc, grp_name)) >= 0), "H5Gopen");
+
sprintf(dset_name, dset_tmpl, 0);
- access_dset(group, dset_name, grp_name, NULL);
+ fprintf(stderr, "%d: Accessing dataset \"%s/%s\"\n", mpi_rank, grp_name, dset_name);
+ access_dset(group, dset_name);
+
sprintf(dset_name, dset_tmpl, 1);
- access_dset(group, dset_name, grp_name, NULL);
+ fprintf(stderr, "%d: Accessing dataset \"%s/%s\"\n", mpi_rank, grp_name, dset_name);
+ access_dset(group, dset_name);
+
sprintf(dset_name, dset_tmpl, 2);
- access_dset(group, dset_name, grp_name, NULL);
+ fprintf(stderr, "%d: Accessing dataset \"%s/%s\"\n", mpi_rank, grp_name, dset_name);
+ access_dset(group, dset_name);
+
sprintf(dset_name, dset_tmpl, 3);
- access_dset(group, dset_name, grp_name, NULL);
+ fprintf(stderr, "%d: Accessing dataset \"%s/%s\"\n", mpi_rank, grp_name, dset_name);
+ access_dset(group, dset_name);
+
VRFY((H5Gclose(group) >= 0), "H5Gclose");
}
SYNC(SAP_Barrier_Comm);
+}
+
+/*-------------------------------------------------------------------------
+ * Function: test_dataset_write
+ * Purpose: Test that we can write to the datasets in the file from
+ * all processes simultaneously.
+ * Return: Nothing
+ * Programmer: Bill Wendling
+ * 11. November 2003
+ * Modifications:
+ *-------------------------------------------------------------------------
+ */
+static void
+test_dataset_write(hid_t loc)
+{
+ hid_t group;
+ int i, *data_array = NULL;
+
+ /* Hyperslab settings */
+ hssize_t start[RANK];
+ hsize_t count[RANK];
+ hsize_t stride[RANK];
+ hsize_t block[RANK];
data_array = (int *)malloc(DIM0 * DIM1 * sizeof(int));
VRFY((data_array != NULL), "data_array malloc succeeded");
+ slab_set(start, count, stride, block);
+
/*===-------------------------------------------------------------------===
* All processes write to each dataset.
*===-------------------------------------------------------------------===
@@ -370,57 +479,118 @@ static void create_file(const char *filename)
for (i = 0; i < mpi_size; ++i)
if (i != SAP_RANK) {
sprintf(grp_name, grp_tmpl, i);
- VRFY(((group = H5Gopen(fid, grp_name)) >= 0), "H5Gopen");
+ VRFY(((group = H5Gopen(loc, grp_name)) >= 0), "H5Gopen");
/* Write to this dataset */
sprintf(dset_name, dset_tmpl, 0);
- printf("%d: Writing to /%s/%s\n", mpi_rank, grp_name, dset_name);
- write_data(group, dset_name, data_array);
+ fprintf(stderr, "%d: Writing to \"/%s/%s\"\n", mpi_rank, grp_name, dset_name);
+ write_data(group, dset_name, start, count, stride, block, data_array);
+ fprintf(stderr, "%d: Verifying dataset \"/%s/%s\"\n", mpi_rank, grp_name, dset_name);
+ verify_dataset(group, dset_name, start, count, stride, block, data_array);
sprintf(dset_name, dset_tmpl, 1);
- printf("%d: Writing to /%s/%s\n", mpi_rank, grp_name, dset_name);
- write_data(group, dset_name, data_array);
+ fprintf(stderr, "%d: Writing to \"/%s/%s\"\n", mpi_rank, grp_name, dset_name);
+ write_data(group, dset_name, start, count, stride, block, data_array);
+ fprintf(stderr, "%d: Verifying dataset \"/%s/%s\"\n", mpi_rank, grp_name, dset_name);
+ verify_dataset(group, dset_name, start, count, stride, block, data_array);
sprintf(dset_name, dset_tmpl, 2);
- printf("%d: Writing to /%s/%s\n", mpi_rank, grp_name, dset_name);
- write_data(group, dset_name, data_array);
+ fprintf(stderr, "%d: Writing to \"/%s/%s\"\n", mpi_rank, grp_name, dset_name);
+ write_data(group, dset_name, start, count, stride, block, data_array);
+ fprintf(stderr, "%d: Verifying dataset \"/%s/%s\"\n", mpi_rank, grp_name, dset_name);
+ verify_dataset(group, dset_name, start, count, stride, block, data_array);
sprintf(dset_name, dset_tmpl, 3);
- printf("%d: Writing to /%s/%s\n", mpi_rank, grp_name, dset_name);
- write_data(group, dset_name, data_array);
+ fprintf(stderr, "%d: Writing to \"/%s/%s\"\n", mpi_rank, grp_name, dset_name);
+ write_data(group, dset_name, start, count, stride, block, data_array);
+ fprintf(stderr, "%d: Verifying dataset \"/%s/%s\"\n", mpi_rank, grp_name, dset_name);
+ verify_dataset(group, dset_name, start, count, stride, block, data_array);
/* Close the group */
VRFY((H5Gclose(group) >= 0), "H5Gclose");
}
free(data_array);
+}
- if (fid > -1) {
- VRFY((H5Fclose(fid) >= 0), "H5Fclose");
- printf("%d: Closed file\n", mpi_rank);
+/*-------------------------------------------------------------------------
+ * Function: usage
+ * Purpose: Print a usage message.
+ * Return: Nothing
+ * Programmer: Bill Wendling
+ * 11. November 2003
+ * Modifications:
+ *-------------------------------------------------------------------------
+ */
+static void
+usage(const char *prog)
+{
+ if (mpi_rank == 0) {
+ fprintf(stderr, "usage: %s [OPTIONS]\n", prog);
+ fprintf(stderr, " OPTIONS\n");
+ fprintf(stderr, " -h, --help Print a usage message and exit\n");
+ fprintf(stderr, " -v, --verbose Verbose output [default: no]\n");
+ fprintf(stderr, "\n");
+ fflush(stdout);
}
}
-int main(int argc, char *argv[])
+/*-------------------------------------------------------------------------
+ * Function: main
+ * Purpose: Parse the command line variables and run the test
+ * program.
+ * Return: Success: 0
+ * Failure: >0
+ * Programmer: Bill Wendling
+ * 11. November 2003
+ * Modifications:
+ *-------------------------------------------------------------------------
+ */
+int
+main(int argc, char *argv[])
{
+ hid_t fid, fapl2;
herr_t hrc;
+ int nargs;
MPI_Init(&argc, &argv);
MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
H5open();
+
+ for (nargs = argc; nargs > 1; --nargs)
+ if (strcmp(argv[nargs - 1], "-v") == 0 ||
+ strcmp(argv[nargs - 1], "--verbose") == 0 ||
+ strcmp(argv[nargs - 1], "--verbos") == 0 ||
+ strcmp(argv[nargs - 1], "--verbo") == 0 ||
+ strcmp(argv[nargs - 1], "--verb") == 0 ||
+ strcmp(argv[nargs - 1], "--ver") == 0 ||
+ strcmp(argv[nargs - 1], "--ve") == 0) {
+ verbose = 1;
+ } else if (strcmp(argv[nargs - 1], "-h") == 0 ||
+ strcmp(argv[nargs - 1], "--help") == 0 ||
+ strcmp(argv[nargs - 1], "--hel") == 0 ||
+ strcmp(argv[nargs - 1], "--he") == 0) {
+ usage(progname);
+ return 0;
+ } else {
+ fprintf(stderr, "Unknown option: %s\n", argv[nargs - 1]);
+ usage(progname);
+ return 1;
+ }
+
h5_show_hostname();
if (MAINPROCESS) {
- printf("===================================\n");
- printf("FPHDF5 functionality tests\n");
- printf("===================================\n");
+ fprintf(stderr, "===================================\n");
+ fprintf(stderr, "FPHDF5 functionality tests\n");
+ fprintf(stderr, "===================================\n");
}
hrc = H5FPinit(MPI_COMM_WORLD, SAP_RANK, &SAP_Comm, &SAP_Barrier_Comm);
VRFY((hrc == MPI_SUCCESS), "H5FP_init");
- printf("%d: Initialized FPHDF5\n", mpi_rank);
+ fprintf(stderr, "%d: Initialized FPHDF5\n", mpi_rank);
if (mpi_rank != SAP_RANK) {
/*
@@ -436,40 +606,57 @@ int main(int argc, char *argv[])
hrc = H5Pset_fapl_fphdf5(fapl, SAP_Comm, SAP_Barrier_Comm,
MPI_INFO_NULL, (unsigned)SAP_RANK);
VRFY((fapl >= 0), "H5Pset_fapl_fphdf5");
- printf("%d: Set access property list\n", mpi_rank);
+ fprintf(stderr, "%d: Set access property list\n", mpi_rank);
for (i = 0; i < sizeof(FILENAME) / sizeof(FILENAME[0]) - 1; ++i) {
if (h5_fixname(FILENAME[i], fapl, filenames[i], sizeof(filenames[i])) == NULL) {
- printf("h5_fixname failed\n");
+ fprintf(stderr, "h5_fixname failed\n");
++nerrors;
- goto fail;
+ break;
}
- create_file(filenames[i]);
+ fid = create_file(filenames[i]);
+
+ if (fid < 0)
+ break;
+
+ test_group_creation(fid);
+ test_dataset_creation(fid);
+ test_dataset_access(fid);
+ test_dataset_write(fid);
+
+ VRFY((H5Fclose(fid) >= 0), "H5Fclose");
+ SYNC(SAP_Barrier_Comm);
+ fprintf(stderr, "%d: Closed file\n", mpi_rank);
+
+ fid = H5Fopen(filenames[i], H5F_ACC_RDONLY, fapl);
+ VRFY((fid >= 0), "H5Fopen");
+ SYNC(SAP_Barrier_Comm);
+ VRFY((H5Fclose(fid) >= 0), "H5Fclose");
}
if (fapl > -1)
h5_cleanup(FILENAME, fapl);
}
-fail:
VRFY((H5FPfinalize() >= 0), "H5FPfinalize");
- printf("%d: H5FP finalized\n", mpi_rank);
+ fprintf(stderr, "%d: H5FP finalized\n", mpi_rank);
if (MAINPROCESS) { /* only process 0 reports */
- printf("===================================\n");
+ fprintf(stderr, "===================================\n");
if (nerrors)
- printf("***FPHDF5 test detected %d errors***\n", nerrors);
+ fprintf(stderr, "***FPHDF5 test detected %d errors***\n", nerrors);
else
- printf("FPHDF5 test finished with no errors\n");
+ fprintf(stderr, "FPHDF5 test finished with no errors\n");
- printf("===================================\n");
+ fprintf(stderr, "===================================\n");
}
+done:
H5close();
MPI_Finalize();
- return 0;
+ return nerrors;
}
#else
@@ -484,7 +671,7 @@ main(int argc, char *argv[])
MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
if (mpi_rank == 0)
- printf("No t_fphdf5 test because FPHDF5 is not configured in\n");
+ fprintf(stderr, "No t_fphdf5 test because FPHDF5 is not configured in\n");
MPI_Finalize();
return 0;