diff options
| author | kmu <kmu@hdfgroup.org> | 2019-11-26 23:23:58 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-05-20 14:20:24 (GMT) |
| commit | 9d8fb46a2c50118ee5162e2437d55bef100da20d (patch) | |
| tree | a5cd736b43628131503daa906f7c054443eab911 /testpar | |
| parent | f2028c7568c2ad8ef91bc78cc8dac9b2d8c8eb1d (diff) | |
| download | hdf5-9d8fb46a2c50118ee5162e2437d55bef100da20d.zip hdf5-9d8fb46a2c50118ee5162e2437d55bef100da20d.tar.gz hdf5-9d8fb46a2c50118ee5162e2437d55bef100da20d.tar.bz2 | |
Revert "fix issues from previous PR comments"
This reverts commit d242a900f420b040e364f6c0976c01593e955db3.
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_mpi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c index 79eda60..2bb2336 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -303,7 +303,7 @@ static int test_mpio_gb_file(char *filename) { mpi_rank, mpi_off, mpi_off); /* set data to some trivial pattern for easy verification */ for (j = 0; j < MB; j++) - ASSIGN_TO_SMALLER_SIZE(*(buf + j), char, i * mpi_size + mpi_rank, int); + *(buf + j) = (char)(i * mpi_size + mpi_rank); if (VERBOSE_MED) HDfprintf(stdout, "proc %d: writing %d bytes at offset %lld\n", @@ -351,7 +351,7 @@ static int test_mpio_gb_file(char *filename) { mrc = MPI_File_read_at(fh, mpi_off, buf, MB, MPI_BYTE, &mpi_stat); INFO((mrc == MPI_SUCCESS), "GB size file read"); - ASSIGN_TO_SMALLER_SIZE(expected, char, i * mpi_size + (mpi_size - mpi_rank - 1), int); + expected = (char)(i * mpi_size + (mpi_size - mpi_rank - 1)); vrfyerrs = 0; for (j = 0; j < MB; j++) { if ((*(buf + j) != expected) @@ -526,7 +526,7 @@ static int test_mpio_1wMr(char *filename, int special_request) { * ==================================================*/ irank = 0; for (i = 0; i < DIMSIZE; i++) - ASSIGN_TO_SMALLER_SIZE(writedata[i], unsigned char, irank * DIMSIZE + i, int) + writedata[i] = (unsigned char)(irank * DIMSIZE + i); mpi_off = irank * DIMSIZE; /* Only one process writes */ @@ -597,7 +597,7 @@ static int test_mpio_1wMr(char *filename, int special_request) { return 1; }; for (i = 0; i < DIMSIZE; i++) { - ASSIGN_TO_SMALLER_SIZE(expect_val, unsigned char, irank * DIMSIZE + i, int); + expect_val = (unsigned char)(irank * DIMSIZE + i); if (readdata[i] != expect_val) { PRINTID; HDprintf("read data[%d:%d] got %02x, expect %02x\n", irank, i, @@ -697,7 +697,7 @@ static int test_mpio_derived_dtype(char *filename) { MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); retcode = 0; for (i = 0; i < 3; i++) - ASSIGN_TO_SMALLER_SIZE(buf[i], char, i + 1, int); + buf[i] = (char)(i + 1); if ((mpi_err = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDWR | MPI_MODE_CREATE, MPI_INFO_NULL, &fh)) |