unit tests adapted to new API
This commit is contained in:
+13
-9
@@ -133,12 +133,6 @@ test_read_data64(h5_file_t file, int step)
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(PARALLEL_IO)
|
||||
TEST("Setting throttle");
|
||||
status = H5SetThrottle(file, 3);
|
||||
RETURN(status, H5_SUCCESS, "H5SetThrottle");
|
||||
#endif
|
||||
|
||||
TEST("Reading 64-bit data");
|
||||
|
||||
for (t=step; t<step+NTIMESTEPS; t++)
|
||||
@@ -246,12 +240,22 @@ void h5b_test_read1(void)
|
||||
h5_file_t file1;
|
||||
|
||||
h5_err_t status;
|
||||
MPI_Comm comm = MPI_COMM_WORLD;
|
||||
|
||||
TEST("Opening file once, read-only");
|
||||
file1 = H5OpenFile(FILENAME, H5_O_RDONLY, MPI_COMM_WORLD);
|
||||
h5_prop_t props = H5CreateFileProp ();
|
||||
status = H5SetPropFileMPIO (props, &comm);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
|
||||
status = H5SetPropFileThrottle (props, 2);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
|
||||
|
||||
file1 = H5OpenFile(FILENAME, H5_O_RDONLY, props);
|
||||
status = H5CheckFile(file1);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
status = H5CloseProp (props);
|
||||
RETURN(status, H5_SUCCESS, "H5CloseProp");
|
||||
|
||||
test_read_data64(file1, 1);
|
||||
|
||||
status = H5CloseFile(file1);
|
||||
@@ -266,11 +270,11 @@ void h5b_test_read2(void)
|
||||
h5_int64_t status;
|
||||
|
||||
TEST("Opening file twice, read-only");
|
||||
file1 = H5OpenFile(FILENAME, H5_O_RDONLY, MPI_COMM_WORLD);
|
||||
file1 = H5OpenFile(FILENAME, H5_O_RDONLY, H5_PROP_DEFAULT);
|
||||
status = H5CheckFile(file1);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
file2 = H5OpenFile(FILENAME, H5_O_RDONLY, MPI_COMM_WORLD);
|
||||
file2 = H5OpenFile(FILENAME, H5_O_RDONLY, H5_PROP_DEFAULT);
|
||||
status = H5CheckFile(file2);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
|
||||
+12
-9
@@ -66,12 +66,6 @@ test_write_data64(h5_file_t file, int step)
|
||||
ez=(double*)malloc(nelems*sizeof(double));
|
||||
id=(h5_int64_t*)malloc(nelems*sizeof(h5_int64_t));
|
||||
|
||||
#if defined(PARALLEL_IO)
|
||||
TEST("Setting throttle");
|
||||
status = H5SetThrottle(file, 2);
|
||||
RETURN(status, H5_SUCCESS, "H5SetThrottle");
|
||||
#endif
|
||||
|
||||
TEST("Writing 64-bit data");
|
||||
|
||||
for (t=step; t<step+NTIMESTEPS; t++)
|
||||
@@ -185,13 +179,22 @@ void h5b_test_write1(void)
|
||||
h5_file_t file1;
|
||||
|
||||
h5_err_t status;
|
||||
MPI_Comm comm = MPI_COMM_WORLD;
|
||||
|
||||
TEST("Opening file once, write-truncate");
|
||||
file1 = H5OpenFile(FILENAME, H5_O_WRONLY, MPI_COMM_WORLD);
|
||||
h5_prop_t props = H5CreateFileProp ();
|
||||
status = H5SetPropFileMPIO (props, &comm);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
|
||||
status = H5SetPropFileThrottle (props, 2);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
|
||||
|
||||
file1 = H5OpenFile(FILENAME, H5_O_WRONLY, props);
|
||||
status = H5CheckFile(file1);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
status = H5CloseProp (props);
|
||||
RETURN(status, H5_SUCCESS, "H5CloseProp");
|
||||
|
||||
test_write_data64(file1, 1);
|
||||
|
||||
status = H5CloseFile(file1);
|
||||
@@ -206,12 +209,12 @@ void h5b_test_write2(void)
|
||||
h5_err_t status;
|
||||
|
||||
TEST("Opening file twice, write-append + read-only");
|
||||
file1 = H5OpenFile(FILENAME, H5_O_APPEND, MPI_COMM_WORLD);
|
||||
file1 = H5OpenFile(FILENAME, H5_O_APPEND, H5_PROP_DEFAULT);
|
||||
|
||||
status = H5CheckFile(file1);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
file2 = H5OpenFile(FILENAME, H5_O_RDONLY, MPI_COMM_WORLD);
|
||||
file2 = H5OpenFile(FILENAME, H5_O_RDONLY, H5_PROP_DEFAULT);
|
||||
|
||||
status = H5CheckFile(file2);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
+16
-12
@@ -146,12 +146,6 @@ test_read_data64(h5_file_t file, int nparticles, int step)
|
||||
else IVALUE(type, H5_FLOAT64_T, "dataset type");
|
||||
}
|
||||
|
||||
#if defined(PARALLEL_IO)
|
||||
TEST("Setting throttle");
|
||||
status = H5SetThrottle(file, 3);
|
||||
RETURN(status, H5_SUCCESS, "H5SetThrottle");
|
||||
#endif
|
||||
|
||||
TEST("Reading 64-bit data");
|
||||
|
||||
for (t=step; t<step+NTIMESTEPS; t++)
|
||||
@@ -441,7 +435,7 @@ void h5u_test_read1(void)
|
||||
h5_int64_t status;
|
||||
|
||||
TEST("Opening file once, read-only");
|
||||
file1 = H5OpenFile(FILENAME, H5_O_RDONLY, MPI_COMM_WORLD);
|
||||
file1 = H5OpenFile(FILENAME, H5_O_RDONLY, H5_PROP_DEFAULT);
|
||||
status = H5CheckFile(file1);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
@@ -460,11 +454,11 @@ void h5u_test_read2(void)
|
||||
h5_int64_t status;
|
||||
|
||||
TEST("Opening file twice, read-only");
|
||||
file1 = H5OpenFile(FILENAME, H5_O_RDONLY, MPI_COMM_WORLD);
|
||||
file1 = H5OpenFile(FILENAME, H5_O_RDONLY, H5_PROP_DEFAULT);
|
||||
status = H5CheckFile(file1);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
file2 = H5OpenFile(FILENAME, H5_O_RDONLY, MPI_COMM_WORLD);
|
||||
file2 = H5OpenFile(FILENAME, H5_O_RDONLY, H5_PROP_DEFAULT);
|
||||
status = H5CheckFile(file2);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
@@ -484,7 +478,7 @@ void h5u_test_read3(void)
|
||||
h5_int64_t status;
|
||||
|
||||
TEST("Opening file once, read-only, MPI-POSIX VFD");
|
||||
file1 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIPOSIX, MPI_COMM_WORLD);
|
||||
file1 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIPOSIX, H5_PROP_DEFAULT);
|
||||
status = H5CheckFile(file1);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
@@ -505,16 +499,26 @@ void h5u_test_read4(void)
|
||||
h5_file_t file2;
|
||||
|
||||
h5_err_t status;
|
||||
MPI_Comm comm = MPI_COMM_WORLD;
|
||||
|
||||
TEST("Opening file twice, read-only, MPI-IO Independent VFD");
|
||||
file1 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIIO_IND, MPI_COMM_WORLD);
|
||||
h5_prop_t props = H5CreateFileProp ();
|
||||
status = H5SetPropFileMPIO (props, &comm);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
|
||||
status = H5SetPropFileThrottle (props, 2);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
|
||||
|
||||
file1 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIIO_IND, props);
|
||||
status = H5CheckFile(file1);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
file2 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIIO_IND, MPI_COMM_WORLD);
|
||||
file2 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIIO_IND, props);
|
||||
status = H5CheckFile(file2);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
status = H5CloseProp (props);
|
||||
RETURN(status, H5_SUCCESS, "H5CloseProp");
|
||||
|
||||
TEST("Redefining step name");
|
||||
status = H5SetStepNameFormat(file1, LONGNAME, 16);
|
||||
RETURN(status, H5_SUCCESS, "H5SetStepNameFormat");
|
||||
|
||||
+46
-19
@@ -86,12 +86,6 @@ test_write_data64(h5_file_t file, int nparticles, int step)
|
||||
pz=(double*)malloc(nparticles*sizeof(double));
|
||||
id=(h5_int64_t*)malloc(nparticles*sizeof(h5_int64_t));
|
||||
|
||||
#if PARALLEL_IO
|
||||
TEST("Setting throttle");
|
||||
status = H5SetThrottle(file, 2);
|
||||
RETURN(status, H5_SUCCESS, "H5SetThrottle");
|
||||
#endif
|
||||
|
||||
TEST("Writing 64-bit data");
|
||||
|
||||
for (t=step; t<step+NTIMESTEPS; t++)
|
||||
@@ -219,11 +213,6 @@ test_write_data32(h5_file_t file, int nparticles, int step)
|
||||
RETURN(status, H5_SUCCESS, "H5PartSetNumParticles");
|
||||
|
||||
#if defined(PARALLEL_IO)
|
||||
/* will generate a warning since we are in MPI-IO Collective mode */
|
||||
TEST("Setting throttle");
|
||||
status = H5SetThrottle(file, 2);
|
||||
RETURN(status, H5_SUCCESS, "H5SetThrottle");
|
||||
|
||||
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
|
||||
MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
|
||||
#else
|
||||
@@ -365,15 +354,23 @@ test_write_strided_data32(h5_file_t file, int nparticles, int step)
|
||||
void h5u_test_write1(void)
|
||||
{
|
||||
h5_file_t file1;
|
||||
|
||||
h5_err_t status;
|
||||
MPI_Comm comm = MPI_COMM_WORLD;
|
||||
|
||||
TEST("Opening file once, write-truncate");
|
||||
file1 = H5OpenFile(FILENAME, H5_O_WRONLY, MPI_COMM_WORLD);
|
||||
h5_prop_t props = H5CreateFileProp ();
|
||||
status = H5SetPropFileMPIO (props, &comm);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
|
||||
status = H5SetPropFileThrottle (props, 2);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
|
||||
|
||||
file1 = H5OpenFile(FILENAME, H5_O_WRONLY, props);
|
||||
status = H5CheckFile(file1);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
status = H5CloseProp (props);
|
||||
RETURN(status, H5_SUCCESS, "H5CloseProp");
|
||||
|
||||
test_write_data32(file1, NPARTICLES, 1);
|
||||
test_write_file_attribs(file1, 0);
|
||||
|
||||
@@ -385,18 +382,27 @@ void h5u_test_write2(void)
|
||||
{
|
||||
h5_file_t file1;
|
||||
h5_file_t file2;
|
||||
|
||||
h5_err_t status;
|
||||
MPI_Comm comm = MPI_COMM_WORLD;
|
||||
|
||||
TEST("Opening file twice, write-append + read-only");
|
||||
file1 = H5OpenFile(FILENAME, H5_O_APPEND, MPI_COMM_WORLD);
|
||||
h5_prop_t props = H5CreateFileProp ();
|
||||
status = H5SetPropFileMPIO (props, &comm);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
|
||||
status = H5SetPropFileThrottle (props, 2);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
|
||||
|
||||
file1 = H5OpenFile(FILENAME, H5_O_APPEND, props);
|
||||
status = H5CheckFile(file1);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
file2 = H5OpenFile(FILENAME, H5_O_RDONLY, MPI_COMM_WORLD);
|
||||
file2 = H5OpenFile(FILENAME, H5_O_RDONLY, props);
|
||||
status = H5CheckFile(file2);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
status = H5CloseProp (props);
|
||||
RETURN(status, H5_SUCCESS, "H5CloseProp");
|
||||
|
||||
test_write_strided_data32(file1, NPARTICLES, NTIMESTEPS+1);
|
||||
test_write_file_attribs(file1, 1);
|
||||
|
||||
@@ -411,13 +417,23 @@ void h5u_test_write3(void)
|
||||
h5_file_t file1;
|
||||
|
||||
h5_err_t status;
|
||||
MPI_Comm comm = MPI_COMM_WORLD;
|
||||
|
||||
TEST("Opening file once, write-truncate, MPI-POSIX VFD");
|
||||
file1 = H5OpenFile(FILENAME, H5_O_WRONLY | H5_VFD_MPIPOSIX, MPI_COMM_WORLD);
|
||||
h5_prop_t props = H5CreateFileProp ();
|
||||
status = H5SetPropFileMPIO (props, &comm);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
|
||||
status = H5SetPropFileThrottle (props, 2);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
|
||||
|
||||
file1 = H5OpenFile(FILENAME, H5_O_WRONLY | H5_VFD_MPIPOSIX, props);
|
||||
|
||||
status = H5CheckFile(file1);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
status = H5CloseProp (props);
|
||||
RETURN(status, H5_SUCCESS, "H5CloseProp");
|
||||
|
||||
TEST("Redefining step name");
|
||||
status = H5SetStepNameFormat(file1, LONGNAME, 16);
|
||||
RETURN(status, H5_SUCCESS, "H5SetStepNameFormat");
|
||||
@@ -435,16 +451,27 @@ void h5u_test_write4(void)
|
||||
h5_file_t file2;
|
||||
|
||||
h5_err_t status;
|
||||
h5_prop_t props;
|
||||
MPI_Comm comm = MPI_COMM_WORLD;
|
||||
|
||||
TEST("Opening file twice, write-append + read-only, MPI-IO Independent VFD");
|
||||
file1 = H5OpenFile(FILENAME, H5_O_APPEND | H5_VFD_MPIIO_IND, MPI_COMM_WORLD);
|
||||
props = H5CreateFileProp ();
|
||||
status = H5SetPropFileMPIO (props, &comm);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIO");
|
||||
status = H5SetPropFileThrottle (props, 2);
|
||||
RETURN(status, H5_SUCCESS, "H5SetPropFileThrottle");
|
||||
|
||||
file1 = H5OpenFile(FILENAME, H5_O_APPEND | H5_VFD_MPIIO_IND, props);
|
||||
status = H5CheckFile(file1);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
file2 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIIO_IND, MPI_COMM_WORLD);
|
||||
file2 = H5OpenFile(FILENAME, H5_O_RDONLY | H5_VFD_MPIIO_IND, props);
|
||||
status = H5CheckFile(file2);
|
||||
RETURN(status, H5_SUCCESS, "H5CheckFile");
|
||||
|
||||
status = H5CloseProp (props);
|
||||
RETURN(status, H5_SUCCESS, "H5CloseProp");
|
||||
|
||||
TEST("Redefining step name");
|
||||
status = H5SetStepNameFormat(file1, LONGNAME, 16);
|
||||
RETURN(status, H5_SUCCESS, "H5SetStepNameFormat");
|
||||
|
||||
Reference in New Issue
Block a user