Fix CMake test macros and perform standalone tests
This commit is contained in:
@@ -311,21 +311,21 @@ do_pio(parameters param)
|
||||
/* Need barrier to make sure everyone starts at the same time */
|
||||
MPI_Barrier(pio_comm_g);
|
||||
|
||||
set_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTART);
|
||||
io_time_set(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTART);
|
||||
hrc = do_fopen(¶m, fname, &fd, PIO_CREATE | PIO_WRITE);
|
||||
|
||||
VRFY((hrc == SUCCESS), "do_fopen failed");
|
||||
|
||||
set_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, TSTART);
|
||||
io_time_set(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, TSTART);
|
||||
hrc = do_write(&res, &fd, ¶m, ndsets, nbytes, buf_size, buffer);
|
||||
set_time(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, TSTOP);
|
||||
io_time_set(res.timers, HDF5_FINE_WRITE_FIXED_DIMS, TSTOP);
|
||||
|
||||
VRFY((hrc == SUCCESS), "do_write failed");
|
||||
|
||||
/* Close file for write */
|
||||
hrc = do_fclose(iot, &fd);
|
||||
|
||||
set_time(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTOP);
|
||||
io_time_set(res.timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTOP);
|
||||
VRFY((hrc == SUCCESS), "do_fclose failed");
|
||||
|
||||
if (!param.h5_write_only) {
|
||||
@@ -339,20 +339,20 @@ do_pio(parameters param)
|
||||
MPI_Barrier(pio_comm_g);
|
||||
|
||||
/* Open file for read */
|
||||
set_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS, TSTART);
|
||||
io_time_set(res.timers, HDF5_GROSS_READ_FIXED_DIMS, TSTART);
|
||||
hrc = do_fopen(¶m, fname, &fd, PIO_READ);
|
||||
|
||||
VRFY((hrc == SUCCESS), "do_fopen failed");
|
||||
|
||||
set_time(res.timers, HDF5_FINE_READ_FIXED_DIMS, TSTART);
|
||||
io_time_set(res.timers, HDF5_FINE_READ_FIXED_DIMS, TSTART);
|
||||
hrc = do_read(&res, &fd, ¶m, ndsets, nbytes, buf_size, buffer);
|
||||
set_time(res.timers, HDF5_FINE_READ_FIXED_DIMS, TSTOP);
|
||||
io_time_set(res.timers, HDF5_FINE_READ_FIXED_DIMS, TSTOP);
|
||||
VRFY((hrc == SUCCESS), "do_read failed");
|
||||
|
||||
/* Close file for read */
|
||||
hrc = do_fclose(iot, &fd);
|
||||
|
||||
set_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS, TSTOP);
|
||||
io_time_set(res.timers, HDF5_GROSS_READ_FIXED_DIMS, TSTOP);
|
||||
VRFY((hrc == SUCCESS), "do_fclose failed");
|
||||
}
|
||||
|
||||
@@ -958,7 +958,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
|
||||
} /* end else */
|
||||
|
||||
/* Start "raw data" write timer */
|
||||
set_time(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, TSTART);
|
||||
io_time_set(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, TSTART);
|
||||
|
||||
while (nbytes_xfer < bytes_count){
|
||||
/* Write */
|
||||
@@ -1389,7 +1389,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
|
||||
} /* end while */
|
||||
|
||||
/* Stop "raw data" write timer */
|
||||
set_time(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, TSTOP);
|
||||
io_time_set(res->timers, HDF5_RAW_WRITE_FIXED_DIMS, TSTOP);
|
||||
|
||||
/* Calculate write time */
|
||||
|
||||
@@ -1889,7 +1889,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
|
||||
} /* end else */
|
||||
|
||||
/* Start "raw data" read timer */
|
||||
set_time(res->timers, HDF5_RAW_READ_FIXED_DIMS, TSTART);
|
||||
io_time_set(res->timers, HDF5_RAW_READ_FIXED_DIMS, TSTART);
|
||||
|
||||
while (nbytes_xfer < bytes_count){
|
||||
/* Read */
|
||||
@@ -2344,7 +2344,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
|
||||
} /* end while */
|
||||
|
||||
/* Stop "raw data" read timer */
|
||||
set_time(res->timers, HDF5_RAW_READ_FIXED_DIMS, TSTOP);
|
||||
io_time_set(res->timers, HDF5_RAW_READ_FIXED_DIMS, TSTOP);
|
||||
|
||||
/* Calculate read time */
|
||||
|
||||
@@ -2639,9 +2639,9 @@ int MPI_File_read_at(MPI_File fh, MPI_Offset offset, void *buf,
|
||||
int count, MPI_Datatype datatype, MPI_Status *status)
|
||||
{
|
||||
int err;
|
||||
set_time(timer_g, HDF5_MPI_READ, TSTART);
|
||||
io_time_set(timer_g, HDF5_MPI_READ, TSTART);
|
||||
err=PMPI_File_read_at(fh, offset, buf, count, datatype, status);
|
||||
set_time(timer_g, HDF5_MPI_READ, TSTOP);
|
||||
io_time_set(timer_g, HDF5_MPI_READ, TSTOP);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -2650,9 +2650,9 @@ int MPI_File_read_at_all(MPI_File fh, MPI_Offset offset, void *buf,
|
||||
int count, MPI_Datatype datatype, MPI_Status *status)
|
||||
{
|
||||
int err;
|
||||
set_time(timer_g, HDF5_MPI_READ, TSTART);
|
||||
io_time_set(timer_g, HDF5_MPI_READ, TSTART);
|
||||
err=PMPI_File_read_at_all(fh, offset, buf, count, datatype, status);
|
||||
set_time(timer_g, HDF5_MPI_READ, TSTOP);
|
||||
io_time_set(timer_g, HDF5_MPI_READ, TSTOP);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -2660,9 +2660,9 @@ int MPI_File_write_at(MPI_File fh, MPI_Offset offset, void *buf,
|
||||
int count, MPI_Datatype datatype, MPI_Status *status)
|
||||
{
|
||||
int err;
|
||||
set_time(timer_g, HDF5_MPI_WRITE, TSTART);
|
||||
io_time_set(timer_g, HDF5_MPI_WRITE, TSTART);
|
||||
err=PMPI_File_write_at(fh, offset, buf, count, datatype, status);
|
||||
set_time(timer_g, HDF5_MPI_WRITE, TSTOP);
|
||||
io_time_set(timer_g, HDF5_MPI_WRITE, TSTOP);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -2670,9 +2670,9 @@ int MPI_File_write_at_all(MPI_File fh, MPI_Offset offset, void *buf,
|
||||
int count, MPI_Datatype datatype, MPI_Status *status)
|
||||
{
|
||||
int err;
|
||||
set_time(timer_g, HDF5_MPI_WRITE, TSTART);
|
||||
io_time_set(timer_g, HDF5_MPI_WRITE, TSTART);
|
||||
err=PMPI_File_write_at_all(fh, offset, buf, count, datatype, status);
|
||||
set_time(timer_g, HDF5_MPI_WRITE, TSTOP);
|
||||
io_time_set(timer_g, HDF5_MPI_WRITE, TSTOP);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user