summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmu <kmu@hdfgroup.org>2020-01-27 17:38:20 (GMT)
committerkmu <kmu@hdfgroup.org>2020-01-27 17:38:20 (GMT)
commit54610a7c47598bcef057e2c26fb8390a9800a03d (patch)
tree2f7dcd349fbf5af7782b331b25d1a49fed309d79
parent5163a7e1cf75edecc2d9e198a68ef00e8c124d00 (diff)
downloadhdf5-54610a7c47598bcef057e2c26fb8390a9800a03d.zip
hdf5-54610a7c47598bcef057e2c26fb8390a9800a03d.tar.gz
hdf5-54610a7c47598bcef057e2c26fb8390a9800a03d.tar.bz2
leave Wswitch-default for later fix
-rw-r--r--testpar/t_bigio.c38
-rw-r--r--testpar/t_coll_chunk.c12
2 files changed, 13 insertions, 37 deletions
diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c
index e71f936..64fb543 100644
--- a/testpar/t_bigio.c
+++ b/testpar/t_bigio.c
@@ -43,7 +43,7 @@ int facc_type = FACC_MPIO; /*Test file access type */
int dxfer_coll_type = DXFER_COLLECTIVE_IO;
size_t bigcount = (size_t)DXFER_BIGCOUNT;
int nerrors = 0;
-int mpi_size, mpi_rank;
+int mpi_size_g, mpi_rank_g;
hsize_t space_dim1 = SPACE_DIM1 * 256; // 4096
hsize_t space_dim2 = SPACE_DIM2;
@@ -227,8 +227,8 @@ verify_data(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[],
/* Set up the selection */
static void
-ccslab_set(int my_mpi_rank,
- int my_mpi_size,
+ccslab_set(int mpi_rank,
+ int mpi_size,
hsize_t start[],
hsize_t count[],
hsize_t stride[],
@@ -246,7 +246,7 @@ ccslab_set(int my_mpi_rank,
stride[1] = 1;
count[0] = space_dim1;
count[1] = space_dim2;
- start[0] = (hsize_t)my_mpi_rank*count[0];
+ start[0] = (hsize_t)mpi_rank*count[0];
start[1] = 0;
break;
@@ -259,7 +259,7 @@ ccslab_set(int my_mpi_rank,
stride[1] = 3;
count[0] = space_dim1/(stride[0]*block[0]);
count[1] = (space_dim2)/(stride[1]*block[1]);
- start[0] = space_dim1*(hsize_t)my_mpi_rank;
+ start[0] = space_dim1*(hsize_t)mpi_rank;
start[1] = 0;
break;
@@ -271,9 +271,9 @@ ccslab_set(int my_mpi_rank,
block[1] = 1;
stride[0] = 1;
stride[1] = 1;
- count[0] = ((my_mpi_rank >= MAX(1,(my_mpi_size-2)))?0:space_dim1);
+ count[0] = ((mpi_rank >= MAX(1,(mpi_size-2)))?0:space_dim1);
count[1] = space_dim2;
- start[0] = (hsize_t)my_mpi_rank*count[0];
+ start[0] = (hsize_t)mpi_rank*count[0];
start[1] = 0;
break;
@@ -285,13 +285,13 @@ ccslab_set(int my_mpi_rank,
block[0] = 1;
count[0] = 2;
- stride[0] = (hsize_t)(space_dim1*(hsize_t)my_mpi_size/4+1);
+ stride[0] = (hsize_t)(space_dim1*(hsize_t)mpi_size/4+1);
block[1] = space_dim2;
count[1] = 1;
start[1] = 0;
stride[1] = 1;
- if((my_mpi_rank *3)<(my_mpi_size*2)) start[0] = (hsize_t)my_mpi_rank;
- else start[0] = 1 + space_dim1*(hsize_t)my_mpi_size/2 + (hsize_t)(my_mpi_rank-2*my_mpi_size/3);
+ if((mpi_rank *3)<(mpi_size*2)) start[0] = (hsize_t)mpi_rank;
+ else start[0] = 1 + space_dim1*(hsize_t)mpi_size/2 + (hsize_t)(mpi_rank-2*mpi_size/3);
break;
case BYROW_SELECTINCHUNK:
@@ -299,7 +299,7 @@ ccslab_set(int my_mpi_rank,
block[0] = 1;
count[0] = 1;
- start[0] = (hsize_t)my_mpi_rank*space_dim1;
+ start[0] = (hsize_t)mpi_rank*space_dim1;
stride[0]= 1;
block[1] = space_dim2;
count[1] = 1;
@@ -1181,10 +1181,10 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
{
hid_t ret_pl = -1;
herr_t ret; /* generic return value */
- int my_mpi_rank; /* mpi variables */
+ int mpi_rank; /* mpi variables */
/* need the rank for error checking macros */
- MPI_Comm_rank(MPI_COMM_WORLD, &my_mpi_rank);
+ MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
ret_pl = H5Pcreate (H5P_FILE_ACCESS);
VRFY((ret_pl >= 0), "H5P_FILE_ACCESS");
@@ -1538,9 +1538,6 @@ coll_chunktest(const char* filename,
status = H5Sselect_all(file_dataspace);
VRFY((status >= 0), "H5Sselect_all succeeded");
break;
-
- default:
- break;
}
switch (mem_selection) {
@@ -1564,9 +1561,6 @@ coll_chunktest(const char* filename,
status = H5Sselect_all(mem_dataspace);
VRFY((status >= 0), "H5Sselect_all succeeded");
break;
-
- default:
- break;
}
/* set up the collective transfer property list */
@@ -1803,9 +1797,6 @@ coll_chunktest(const char* filename,
status = H5Sselect_all(file_dataspace);
VRFY((status >= 0), "H5Sselect_all succeeded");
break;
-
- default:
- break;
}
switch (mem_selection) {
@@ -1829,9 +1820,6 @@ coll_chunktest(const char* filename,
status = H5Sselect_all(mem_dataspace);
VRFY((status >= 0), "H5Sselect_all succeeded");
break;
-
- default:
- break;
}
/* fill dataset with test data */
diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c
index 20c119f..e950015 100644
--- a/testpar/t_coll_chunk.c
+++ b/testpar/t_coll_chunk.c
@@ -710,9 +710,6 @@ coll_chunktest(const char* filename,
status = H5Sselect_all(file_dataspace);
VRFY((status >= 0), "H5Sselect_all succeeded");
break;
-
- default:
- break;
}
switch (mem_selection) {
@@ -736,9 +733,6 @@ coll_chunktest(const char* filename,
status = H5Sselect_all(mem_dataspace);
VRFY((status >= 0), "H5Sselect_all succeeded");
break;
-
- default:
- break;
}
/* set up the collective transfer property list */
@@ -971,9 +965,6 @@ coll_chunktest(const char* filename,
status = H5Sselect_all(file_dataspace);
VRFY((status >= 0), "H5Sselect_all succeeded");
break;
-
- default:
- break;
}
switch (mem_selection) {
@@ -997,9 +988,6 @@ coll_chunktest(const char* filename,
status = H5Sselect_all(mem_dataspace);
VRFY((status >= 0), "H5Sselect_all succeeded");
break;
-
- default:
- break;
}
/* fill dataset with test data */