diff options
Diffstat (limited to 'testpar/t_bigio.c')
-rw-r--r-- | testpar/t_bigio.c | 45 |
1 files changed, 28 insertions, 17 deletions
diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c index 70c77c3..e71f936 100644 --- a/testpar/t_bigio.c +++ b/testpar/t_bigio.c @@ -50,7 +50,6 @@ hsize_t space_dim2 = SPACE_DIM2; static void coll_chunktest(const char* filename, int chunk_factor, int select_factor, int api_option, int file_selection, int mem_selection, int mode); -hid_t create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type); /* * Setup the coordinates for point selection. @@ -228,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 mpi_rank, - int mpi_size, +ccslab_set(int my_mpi_rank, + int my_mpi_size, hsize_t start[], hsize_t count[], hsize_t stride[], @@ -247,7 +246,7 @@ ccslab_set(int mpi_rank, stride[1] = 1; count[0] = space_dim1; count[1] = space_dim2; - start[0] = (hsize_t)mpi_rank*count[0]; + start[0] = (hsize_t)my_mpi_rank*count[0]; start[1] = 0; break; @@ -260,7 +259,7 @@ ccslab_set(int 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)mpi_rank; + start[0] = space_dim1*(hsize_t)my_mpi_rank; start[1] = 0; break; @@ -272,9 +271,9 @@ ccslab_set(int mpi_rank, block[1] = 1; stride[0] = 1; stride[1] = 1; - count[0] = ((mpi_rank >= MAX(1,(mpi_size-2)))?0:space_dim1); + count[0] = ((my_mpi_rank >= MAX(1,(my_mpi_size-2)))?0:space_dim1); count[1] = space_dim2; - start[0] = (hsize_t)mpi_rank*count[0]; + start[0] = (hsize_t)my_mpi_rank*count[0]; start[1] = 0; break; @@ -286,13 +285,13 @@ ccslab_set(int mpi_rank, block[0] = 1; count[0] = 2; - stride[0] = (hsize_t)(space_dim1*(hsize_t)mpi_size/4+1); + stride[0] = (hsize_t)(space_dim1*(hsize_t)my_mpi_size/4+1); block[1] = space_dim2; count[1] = 1; start[1] = 0; stride[1] = 1; - 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); + 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); break; case BYROW_SELECTINCHUNK: @@ -300,12 +299,12 @@ ccslab_set(int mpi_rank, block[0] = 1; count[0] = 1; - start[0] = (hsize_t)mpi_rank*space_dim1; + start[0] = (hsize_t)my_mpi_rank*space_dim1; stride[0]= 1; - block[1] = space_dim2; - count[1] = 1; - stride[1]= 1; - start[1] = 0; + block[1] = space_dim2; + count[1] = 1; + stride[1]= 1; + start[1] = 0; break; @@ -1182,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 mpi_rank; /* mpi variables */ + int my_mpi_rank; /* mpi variables */ /* need the rank for error checking macros */ - MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); + MPI_Comm_rank(MPI_COMM_WORLD, &my_mpi_rank); ret_pl = H5Pcreate (H5P_FILE_ACCESS); VRFY((ret_pl >= 0), "H5P_FILE_ACCESS"); @@ -1539,6 +1538,9 @@ coll_chunktest(const char* filename, status = H5Sselect_all(file_dataspace); VRFY((status >= 0), "H5Sselect_all succeeded"); break; + + default: + break; } switch (mem_selection) { @@ -1562,6 +1564,9 @@ 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 */ @@ -1798,6 +1803,9 @@ coll_chunktest(const char* filename, status = H5Sselect_all(file_dataspace); VRFY((status >= 0), "H5Sselect_all succeeded"); break; + + default: + break; } switch (mem_selection) { @@ -1821,6 +1829,9 @@ coll_chunktest(const char* filename, status = H5Sselect_all(mem_dataspace); VRFY((status >= 0), "H5Sselect_all succeeded"); break; + + default: + break; } /* fill dataset with test data */ |