H5hut/src_old
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use the H5_HAVE_PARALLEL macro from hdf5 instead of the macro PARALLEL_IO

Browse Source
This commit is contained in:
gsell
2017-07-27 18:31:34 +02:00
parent 3a9e0e4153
commit 2ed8ad093c
28 changed files with 84 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/h5b_read.c
+3 -3
View File
@@ -82,7 +82,7 @@ test_read_data64(h5_file_t file, int step)
TEST("Verifying dataset info");
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
int rank, nprocs;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
@@ -202,7 +202,7 @@ test_read_data32(h5_file_t file, int step)
RETURN(status, H5_SUCCESS, "H5SetStep");
test_read_field_attribs(file, "e", t);
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
status = H5Block3dSetGrid(file, grid[0], grid[1], grid[2]);
RETURN(status, H5_SUCCESS, "H5Block3dSetGrid");
@@ -239,7 +239,7 @@ void h5b_test_read1(void)
TEST("Opening file once, read-only");
h5_prop_t props = H5CreateFileProp ();
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
MPI_Comm comm = MPI_COMM_WORLD;
status = H5SetPropFileMPIOCollective (props, &comm);
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOCollective");
test/h5b_test.c
+5 -5
View File
@@ -18,7 +18,7 @@ void h5b_test_write2(void);
void h5b_test_read1(void);
void h5b_test_read2(void);
#ifdef PARALLEL_IO
#ifdef H5_HAVE_PARALLEL
static int
_nth_root_int_divisor (const int m, const int n)
{
@@ -39,7 +39,7 @@ _nth_root_int_divisor (const int m, const int n)
int main(int argc, char **argv)
{
extern h5_size_t layout[6];
#ifdef PARALLEL_IO
#ifdef H5_HAVE_PARALLEL
MPI_Init(&argc, &argv);
int procs, rank;
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
layout[3] = (j+1)*NBLOCKY - 1;
layout[4] = k*NBLOCKZ;
layout[5] = (k+1)*NBLOCKZ - 1;
#else // PARALLEL_IO
#else // H5_HAVE_PARALLEL
grid[0] = 1;
grid[1] = 1;
grid[2] = 1;
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
/* Tests are generally arranged from least to most complexity... */
AddTest("write1", h5b_test_write1, NULL, "Write 64-bit data", NULL);
AddTest("read1", h5b_test_read1, NULL, "Read 64-bit data", NULL);
#ifdef PARALLEL_IO
#ifdef H5_HAVE_PARALLEL
AddTest("write2", h5b_test_write2, NULL, "Write 32-bit data", NULL);
AddTest("read2", h5b_test_read2, NULL, "Read 32-bit data", NULL);
#endif
@@ -111,7 +111,7 @@ int main(int argc, char **argv)
//if (GetTestCleanup() && !getenv("HDF5_NOCLEANUP"))
// TestCleanup();
#ifdef PARALLEL_IO
#ifdef H5_HAVE_PARALLEL
TestPrintf ("reached end\n");
fflush(stdout);
MPI_Finalize();
test/h5b_write.c
+2 -2
View File
@@ -149,7 +149,7 @@ test_write_data32(h5_file_t file, int step)
if (val == 0) test_write_field_attribs(file, "e", t);
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
extern h5_size_t grid[3];
status = H5Block3dSetGrid(file, grid[0], grid[1], grid[2]);
@@ -181,7 +181,7 @@ void h5b_test_write1(void)
TEST("Opening file once, write-truncate");
h5_prop_t props = H5CreateFileProp ();
#if defined (PARALLEL_IO)
#if defined (H5_HAVE_PARALLEL)
MPI_Comm comm = MPI_COMM_WORLD;
status = H5SetPropFileMPIOCollective (props, &comm);
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOCollective");
test/h5u_read.c
+3 -3
View File
@@ -106,7 +106,7 @@ test_read_data64(h5_file_t file, int nparticles, int step)
TEST("Verifying dataset info");
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
#else
@@ -479,7 +479,7 @@ void h5u_test_read3(void)
TEST("Opening file once, read-only, MPI-POSIX VFD");
h5_prop_t props = H5CreateFileProp ();
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
MPI_Comm comm = MPI_COMM_WORLD;
status = H5SetPropFileMPIOPosix (props, &comm);
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOPosix");
@@ -508,7 +508,7 @@ void h5u_test_read4(void)
TEST("Opening file twice, read-only, MPI-IO Independent VFD");
h5_prop_t props = H5CreateFileProp ();
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
MPI_Comm comm = MPI_COMM_WORLD;
status = H5SetPropFileMPIOIndependent (props, &comm);
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOIndependent");
test/h5u_test.c
+2 -2
View File
@@ -20,7 +20,7 @@ void h5u_test_read4(void);
int main(int argc, char **argv)
{
#ifdef PARALLEL_IO
#ifdef H5_HAVE_PARALLEL
MPI_Init(&argc, &argv);
int procs;
MPI_Comm_size(MPI_COMM_WORLD, &procs);
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
//if (GetTestCleanup() && !getenv("HDF5_NOCLEANUP"))
// TestCleanup();
#ifdef PARALLEL_IO
#ifdef H5_HAVE_PARALLEL
TestPrintf ("reached end\n");
fflush(stdout);
MPI_Finalize();
test/h5u_write.c
+5 -5
View File
@@ -211,7 +211,7 @@ test_write_data32(h5_file_t file, int nparticles, int step)
status = H5PartSetNumParticles(file, nparticles);
RETURN(status, H5_SUCCESS, "H5PartSetNumParticles");
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
int rank, nprocs;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
@@ -358,7 +358,7 @@ void h5u_test_write1(void)
TEST("Opening file once, write-truncate");
h5_prop_t props = H5CreateFileProp ();
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
MPI_Comm comm = MPI_COMM_WORLD;
status = H5SetPropFileMPIOCollective (props, &comm);
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOCollective");
@@ -386,7 +386,7 @@ void h5u_test_write2(void)
TEST("Opening file twice, write-append + read-only");
h5_prop_t props = H5CreateFileProp ();
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
MPI_Comm comm = MPI_COMM_WORLD;
status = H5SetPropFileMPIOCollective (props, &comm);
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOCollective");
@@ -421,7 +421,7 @@ void h5u_test_write3(void)
h5_prop_t props = H5CreateFileProp ();
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
MPI_Comm comm = MPI_COMM_WORLD;
status = H5SetPropFileMPIOPosix (props, &comm);
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOPosix");
@@ -457,7 +457,7 @@ void h5u_test_write4(void)
TEST("Opening file twice, write-append + read-only, MPI-IO Independent VFD");
props = H5CreateFileProp ();
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
MPI_Comm comm = MPI_COMM_WORLD;
status = H5SetPropFileMPIOIndependent (props, &comm);
RETURN(status, H5_SUCCESS, "H5SetPropFileMPIOIndependent");
test/testframe.c
+2 -2
View File
@@ -530,7 +530,7 @@ TestPrintf(const char *format, ...)
va_list arglist;
int ret_value = -1;
#if defined(PARALLEL_IO)
#if defined(H5_HAVE_PARALLEL)
int nproc;
MPI_Comm_rank(MPI_COMM_WORLD, &nproc);
if ( nproc == 0 || VERBOSE_HI ) {
@@ -564,7 +564,7 @@ TestErrPrintf(const char *format, ...)
/* Increment the error count */
num_errs++;
#if PARALLEL_IO
#if H5_HAVE_PARALLEL
int nproc;
MPI_Comm_rank(MPI_COMM_WORLD, &nproc);
if ( nproc == 0 || VERBOSE_HI ) {