diff options
Diffstat (limited to 'testpar/t_vfd.c')
-rw-r--r-- | testpar/t_vfd.c | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/testpar/t_vfd.c b/testpar/t_vfd.c index 2072afe..81e4983 100644 --- a/testpar/t_vfd.c +++ b/testpar/t_vfd.c @@ -2196,7 +2196,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer H5FD_mem_t types[1]; haddr_t addrs[1]; size_t sizes[1]; - void * bufs[1]; + const void *bufs[1]; pass = TRUE; @@ -2248,7 +2248,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer types[0] = H5FD_MEM_DRAW; addrs[0] = (haddr_t)mpi_rank * (haddr_t)INTS_PER_RANK * (haddr_t)(sizeof(int32_t)); sizes[0] = (size_t)INTS_PER_RANK * sizeof(int32_t); - bufs[0] = (void *)(&(increasing_fi_buf[mpi_rank * INTS_PER_RANK])); + bufs[0] = (const void *)(&(increasing_fi_buf[mpi_rank * INTS_PER_RANK])); if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { @@ -2395,7 +2395,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer H5FD_mem_t types[1]; haddr_t addrs[1]; size_t sizes[1]; - void * bufs[1]; + const void *bufs[1]; pass = TRUE; @@ -2452,7 +2452,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer types[0] = H5FD_MEM_DRAW; addrs[0] = (haddr_t)mpi_rank * (haddr_t)INTS_PER_RANK * (haddr_t)(sizeof(int32_t)); sizes[0] = (size_t)INTS_PER_RANK * sizeof(int32_t); - bufs[0] = (void *)(&(increasing_fi_buf[mpi_rank * INTS_PER_RANK])); + bufs[0] = (const void *)(&(increasing_fi_buf[mpi_rank * INTS_PER_RANK])); if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { @@ -2493,7 +2493,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer types[0] = H5FD_MEM_DRAW; addrs[0] = (haddr_t)mpi_rank * (haddr_t)INTS_PER_RANK * (haddr_t)(sizeof(int32_t)); sizes[0] = (size_t)INTS_PER_RANK * sizeof(int32_t); - bufs[0] = (void *)(&(negative_fi_buf[mpi_rank * INTS_PER_RANK])); + bufs[0] = (const void *)(&(negative_fi_buf[mpi_rank * INTS_PER_RANK])); if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { @@ -2660,7 +2660,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer H5FD_mem_t types[4]; haddr_t addrs[4]; size_t sizes[4]; - void * bufs[4]; + const void *bufs[4]; pass = TRUE; @@ -2720,22 +2720,22 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer types[0] = H5FD_MEM_DRAW; addrs[0] = base_addr; sizes[0] = bytes_per_write; - bufs[0] = (void *)(&(increasing_fi_buf[mpi_rank * INTS_PER_RANK])); + bufs[0] = (const void *)(&(increasing_fi_buf[mpi_rank * INTS_PER_RANK])); types[1] = H5FD_MEM_DRAW; addrs[1] = addrs[0] + (haddr_t)(bytes_per_write); sizes[1] = bytes_per_write; - bufs[1] = (void *)(&(decreasing_fi_buf[(mpi_rank * INTS_PER_RANK) + (INTS_PER_RANK / 4)])); + bufs[1] = (const void *)(&(decreasing_fi_buf[(mpi_rank * INTS_PER_RANK) + (INTS_PER_RANK / 4)])); types[2] = H5FD_MEM_DRAW; addrs[2] = addrs[1] + (haddr_t)(bytes_per_write); sizes[2] = bytes_per_write; - bufs[2] = (void *)(&(negative_fi_buf[(mpi_rank * INTS_PER_RANK) + (INTS_PER_RANK / 2)])); + bufs[2] = (const void *)(&(negative_fi_buf[(mpi_rank * INTS_PER_RANK) + (INTS_PER_RANK / 2)])); types[3] = H5FD_MEM_DRAW; addrs[3] = addrs[2] + (haddr_t)(bytes_per_write); sizes[3] = bytes_per_write; - bufs[3] = (void *)(&(zero_fi_buf[(mpi_rank * INTS_PER_RANK) + (3 * (INTS_PER_RANK / 4))])); + bufs[3] = (const void *)(&(zero_fi_buf[(mpi_rank * INTS_PER_RANK) + (3 * (INTS_PER_RANK / 4))])); #if 0 /* JRM */ HDfprintf(stdout, "addrs = { %lld, %lld, %lld, %lld}\n", @@ -2942,7 +2942,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer H5FD_mem_t types[4]; haddr_t addrs[4]; size_t sizes[4]; - void * bufs[4]; + const void *bufs[4]; pass = TRUE; @@ -3002,22 +3002,23 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer types[0] = H5FD_MEM_DRAW; addrs[0] = base_addr; sizes[0] = bytes_per_write; - bufs[0] = (void *)(&(zero_fi_buf[mpi_rank * INTS_PER_RANK])); + bufs[0] = (const void *)(&(zero_fi_buf[mpi_rank * INTS_PER_RANK])); types[1] = H5FD_MEM_DRAW; addrs[1] = addrs[0] + (haddr_t)(bytes_per_write); sizes[1] = bytes_per_write; - bufs[1] = (void *)(&(negative_fi_buf[(mpi_rank * INTS_PER_RANK) + (INTS_PER_RANK / 4)])); + bufs[1] = (const void *)(&(negative_fi_buf[(mpi_rank * INTS_PER_RANK) + (INTS_PER_RANK / 4)])); types[2] = H5FD_MEM_DRAW; addrs[2] = addrs[1] + (haddr_t)(bytes_per_write); sizes[2] = bytes_per_write; - bufs[2] = (void *)(&(decreasing_fi_buf[(mpi_rank * INTS_PER_RANK) + (INTS_PER_RANK / 2)])); + bufs[2] = (const void *)(&(decreasing_fi_buf[(mpi_rank * INTS_PER_RANK) + (INTS_PER_RANK / 2)])); types[3] = H5FD_MEM_DRAW; addrs[3] = addrs[2] + (haddr_t)(bytes_per_write); sizes[3] = bytes_per_write; - bufs[3] = (void *)(&(increasing_fi_buf[(mpi_rank * INTS_PER_RANK) + (3 * (INTS_PER_RANK / 4))])); + bufs[3] = + (const void *)(&(increasing_fi_buf[(mpi_rank * INTS_PER_RANK) + (3 * (INTS_PER_RANK / 4))])); #if 0 /* JRM */ HDfprintf(stdout, "addrs = { %lld, %lld, %lld, %lld}\n", @@ -3260,7 +3261,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer H5FD_mem_t types[4]; haddr_t addrs[4]; size_t sizes[4]; - void * bufs[4]; + const void *bufs[4]; pass = TRUE; @@ -3311,7 +3312,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer types[0] = H5FD_MEM_DRAW; addrs[0] = (haddr_t)mpi_rank * (haddr_t)INTS_PER_RANK * (haddr_t)(sizeof(int32_t)); sizes[0] = (size_t)INTS_PER_RANK * sizeof(int32_t); - bufs[0] = (void *)(&(zero_fi_buf[mpi_rank * INTS_PER_RANK])); + bufs[0] = (const void *)(&(zero_fi_buf[mpi_rank * INTS_PER_RANK])); if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { @@ -3374,17 +3375,17 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer types[0] = H5FD_MEM_DRAW; addrs[0] = base_addr + (haddr_t)((size_t)(INTS_PER_RANK / 2) * sizeof(int32_t)); sizes[0] = (size_t)(INTS_PER_RANK / 4) * sizeof(int32_t); - bufs[0] = (void *)(&(negative_fi_buf[base_index + (INTS_PER_RANK / 2)])); + bufs[0] = (const void *)(&(negative_fi_buf[base_index + (INTS_PER_RANK / 2)])); types[1] = H5FD_MEM_DRAW; addrs[1] = base_addr + (haddr_t)((size_t)(INTS_PER_RANK / 4) * sizeof(int32_t)); sizes[1] = (size_t)(INTS_PER_RANK / 8) * sizeof(int32_t); - bufs[1] = (void *)(&(decreasing_fi_buf[base_index + (INTS_PER_RANK / 4)])); + bufs[1] = (const void *)(&(decreasing_fi_buf[base_index + (INTS_PER_RANK / 4)])); types[2] = H5FD_MEM_DRAW; addrs[2] = base_addr + (haddr_t)((size_t)(INTS_PER_RANK / 16) * sizeof(int32_t)); sizes[2] = (size_t)(INTS_PER_RANK / 16) * sizeof(int32_t); - bufs[2] = (void *)(&(increasing_fi_buf[base_index + (INTS_PER_RANK / 16)])); + bufs[2] = (const void *)(&(increasing_fi_buf[base_index + (INTS_PER_RANK / 16)])); } else if ((mpi_rank % 4) == 1) { @@ -3404,12 +3405,12 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer types[0] = H5FD_MEM_DRAW; addrs[0] = base_addr + (haddr_t)(sizeof(int32_t)); sizes[0] = (size_t)((INTS_PER_RANK / 2) - 2) * sizeof(int32_t); - bufs[0] = (void *)(&(increasing_fi_buf[base_index + 1])); + bufs[0] = (const void *)(&(increasing_fi_buf[base_index + 1])); types[1] = H5FD_MEM_DRAW; addrs[1] = base_addr + (haddr_t)((size_t)((INTS_PER_RANK / 2) + 1) * sizeof(int32_t)); sizes[1] = (size_t)((INTS_PER_RANK / 2) - 2) * sizeof(int32_t); - bufs[1] = (void *)(&(decreasing_fi_buf[base_index + (INTS_PER_RANK / 2) + 1])); + bufs[1] = (const void *)(&(decreasing_fi_buf[base_index + (INTS_PER_RANK / 2) + 1])); } else if ((mpi_rank % 4) == 2) { @@ -3425,7 +3426,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer types[0] = H5FD_MEM_DRAW; addrs[0] = base_addr + (haddr_t)((size_t)(INTS_PER_RANK / 2) * sizeof(int32_t)); sizes[0] = sizeof(int32_t); - bufs[0] = (void *)(&(negative_fi_buf[base_index + (INTS_PER_RANK / 2)])); + bufs[0] = (const void *)(&(negative_fi_buf[base_index + (INTS_PER_RANK / 2)])); } else if ((mpi_rank % 4) == 3) { @@ -3692,7 +3693,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer H5FD_mem_t types[(INTS_PER_RANK / 16) + 1]; haddr_t addrs[(INTS_PER_RANK / 16) + 1]; size_t sizes[2]; - void * bufs[(INTS_PER_RANK / 16) + 1]; + const void *bufs[(INTS_PER_RANK / 16) + 1]; pass = TRUE; @@ -3791,7 +3792,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer types[i] = H5FD_MEM_DRAW; addrs[i] = base_addr + ((haddr_t)(16 * i) * (haddr_t)sizeof(int32_t)); - bufs[i] = (void *)(&(increasing_fi_buf[base_index + (i * 16)])); + bufs[i] = (const void *)(&(increasing_fi_buf[base_index + (i * 16)])); } if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { @@ -3914,8 +3915,6 @@ int main(int argc, char **argv) { unsigned nerrs = 0; - MPI_Comm comm = MPI_COMM_WORLD; - MPI_Info info = MPI_INFO_NULL; int mpi_size; int mpi_rank; |