diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-07-27 20:43:30 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-27 20:43:30 (GMT) |
commit | 1e91d96fa02466ffe451319bdac1005f84dc7993 (patch) | |
tree | 4de04ef502c313dfd766497b20235188761146c0 /testpar/t_pread.c | |
parent | 95e5349089b95dfb95f0f8ce2d6db1bc04ba6c82 (diff) | |
download | hdf5-1e91d96fa02466ffe451319bdac1005f84dc7993.zip hdf5-1e91d96fa02466ffe451319bdac1005f84dc7993.tar.gz hdf5-1e91d96fa02466ffe451319bdac1005f84dc7993.tar.bz2 |
Brings over most of the HD prefix removal (#3293)
Diffstat (limited to 'testpar/t_pread.c')
-rw-r--r-- | testpar/t_pread.c | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/testpar/t_pread.c b/testpar/t_pread.c index d05ec46..3f8f5b2 100644 --- a/testpar/t_pread.c +++ b/testpar/t_pread.c @@ -111,7 +111,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) pass = TRUE; - HDassert(comm != MPI_COMM_NULL); + assert(comm != MPI_COMM_NULL); if ((MPI_Comm_rank(comm, &group_rank)) != MPI_SUCCESS) { pass = FALSE; @@ -125,7 +125,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) if (mpi_rank == 0) { - HDfprintf(stdout, "Constructing test files..."); + fprintf(stdout, "Constructing test files..."); } /* Setup the file names @@ -151,7 +151,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) * need to worry that we reassign it for each file! */ group_filename = FILENAMES[file_index]; - HDassert(group_filename); + assert(group_filename); /* Assign the 'data_filename' */ if (h5_fixname(group_filename, H5P_DEFAULT, data_filename, sizeof(data_filename)) == NULL) { @@ -162,7 +162,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) /* setup data to write */ if (pass) { - if ((data_slice = (float *)HDmalloc(COUNT * sizeof(float))) == NULL) { + if ((data_slice = (float *)malloc(COUNT * sizeof(float))) == NULL) { pass = FALSE; failure_mssg = "malloc of data_slice failed.\n"; } @@ -429,17 +429,17 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) /* report results */ if (mpi_rank == 0) { if (pass) { - HDfprintf(stdout, "Done.\n"); + fprintf(stdout, "Done.\n"); } else { - HDfprintf(stdout, "FAILED.\n"); - HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg); + fprintf(stdout, "FAILED.\n"); + fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg); } } /* free data_slice if it has been allocated */ if (data_slice != NULL) { - HDfree(data_slice); + free(data_slice); data_slice = NULL; } @@ -513,7 +513,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) pass = TRUE; - HDassert(comm != MPI_COMM_NULL); + assert(comm != MPI_COMM_NULL); if ((MPI_Comm_rank(comm, &group_rank)) != MPI_SUCCESS) { pass = FALSE; @@ -536,7 +536,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* allocate space for the data_slice array */ if (pass) { - if ((data_slice = (float *)HDmalloc(COUNT * sizeof(float))) == NULL) { + if ((data_slice = (float *)malloc(COUNT * sizeof(float))) == NULL) { pass = FALSE; failure_mssg = "malloc of data_slice failed.\n"; } @@ -555,7 +555,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) else /* test 2 group 1 */ group_filename = FILENAMES[2]; - HDassert(group_filename); + assert(group_filename); if (h5_fixname(group_filename, H5P_DEFAULT, reloc_data_filename, sizeof(reloc_data_filename)) == NULL) { @@ -670,7 +670,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* free data_slice if it has been allocated */ if (data_slice != NULL) { - HDfree(data_slice); + free(data_slice); data_slice = NULL; } @@ -710,7 +710,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) failure_mssg = "H5Tclose failed.\n"; }; - if ((data_slice = (float *)HDmalloc((size_t)dset_size * filetype_size)) == NULL) { + if ((data_slice = (float *)malloc((size_t)dset_size * filetype_size)) == NULL) { pass = FALSE; failure_mssg = "malloc of data_slice failed.\n"; } @@ -861,7 +861,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* free data_slice if it has been allocated */ if (data_slice != NULL) { - HDfree(data_slice); + free(data_slice); data_slice = NULL; } @@ -869,7 +869,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) * Read an H5S_ALL filespace into a hyperslab defined memory space */ - if ((data_slice = (float *)HDmalloc((size_t)(dset_size * 2) * filetype_size)) == NULL) { + if ((data_slice = (float *)malloc((size_t)(dset_size * 2) * filetype_size)) == NULL) { pass = FALSE; failure_mssg = "malloc of data_slice failed.\n"; } @@ -958,7 +958,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* free data_slice if it has been allocated */ if (data_slice != NULL) { - HDfree(data_slice); + free(data_slice); data_slice = NULL; } @@ -1023,7 +1023,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) } else { H5_FAILED(); - HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg); } HDremove(reloc_data_filename); } @@ -1077,34 +1077,34 @@ main(int argc, char **argv) test_argv0 = HDstrdup(argv[0]); if ((MPI_Init(&argc, &argv)) != MPI_SUCCESS) { - HDfprintf(stderr, "FATAL: Unable to initialize MPI\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "FATAL: Unable to initialize MPI\n"); + exit(EXIT_FAILURE); } if ((MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank)) != MPI_SUCCESS) { - HDfprintf(stderr, "FATAL: MPI_Comm_rank returned an error\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "FATAL: MPI_Comm_rank returned an error\n"); + exit(EXIT_FAILURE); } if ((MPI_Comm_size(MPI_COMM_WORLD, &mpi_size)) != MPI_SUCCESS) { - HDfprintf(stderr, "FATAL: MPI_Comm_size returned an error\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "FATAL: MPI_Comm_size returned an error\n"); + exit(EXIT_FAILURE); } H5open(); if (mpi_rank == 0) { - HDfprintf(stdout, "========================================\n"); - HDfprintf(stdout, "Collective file open optimization tests\n"); - HDfprintf(stdout, " mpi_size = %d\n", mpi_size); - HDfprintf(stdout, "========================================\n"); + fprintf(stdout, "========================================\n"); + fprintf(stdout, "Collective file open optimization tests\n"); + fprintf(stdout, " mpi_size = %d\n", mpi_size); + fprintf(stdout, "========================================\n"); } if (mpi_size < 3) { if (mpi_rank == 0) { - HDprintf(" Need at least 3 processes. Exiting.\n"); + printf(" Need at least 3 processes. Exiting.\n"); } goto finish; } @@ -1121,8 +1121,8 @@ main(int argc, char **argv) if ((MPI_Comm_split(MPI_COMM_WORLD, which_group, 0, &group_comm)) != MPI_SUCCESS) { - HDfprintf(stderr, "FATAL: MPI_Comm_split returned an error\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "FATAL: MPI_Comm_split returned an error\n"); + exit(EXIT_FAILURE); } /* ------ Generate all files ------ */ @@ -1132,7 +1132,7 @@ main(int argc, char **argv) if (nerrs > 0) { if (mpi_rank == 0) { - HDprintf(" Test(1) file construction failed -- skipping tests.\n"); + printf(" Test(1) file construction failed -- skipping tests.\n"); } goto finish; } @@ -1142,7 +1142,7 @@ main(int argc, char **argv) if (nerrs > 0) { if (mpi_rank == 0) { - HDprintf(" Test(2) file construction failed -- skipping tests.\n"); + printf(" Test(2) file construction failed -- skipping tests.\n"); } goto finish; } @@ -1152,15 +1152,15 @@ main(int argc, char **argv) if (nerrs > 0) { if (mpi_rank == 0) { - HDprintf(" Parallel read test(1) failed -- skipping tests.\n"); + printf(" Parallel read test(1) failed -- skipping tests.\n"); } goto finish; } /* Update the user on our progress so far. */ if (mpi_rank == 0) { - HDprintf(" Test 1 of 2 succeeded\n"); - HDprintf(" -- Starting multi-group parallel read test.\n"); + printf(" Test 1 of 2 succeeded\n"); + printf(" -- Starting multi-group parallel read test.\n"); } /* run the 2nd set of tests */ @@ -1168,19 +1168,19 @@ main(int argc, char **argv) if (nerrs > 0) { if (mpi_rank == 0) { - HDprintf(" Multi-group read test(2) failed\n"); + printf(" Multi-group read test(2) failed\n"); } goto finish; } if (mpi_rank == 0) { - HDprintf(" Test 2 of 2 succeeded\n"); + printf(" Test 2 of 2 succeeded\n"); } finish: if ((group_comm != MPI_COMM_NULL) && (MPI_Comm_free(&group_comm)) != MPI_SUCCESS) { - HDfprintf(stderr, "MPI_Comm_free failed!\n"); + fprintf(stderr, "MPI_Comm_free failed!\n"); } /* make sure all processes are finished before final report, cleanup @@ -1191,19 +1191,19 @@ finish: if (mpi_rank == 0) { /* only process 0 reports */ const char *header = "Collective file open optimization tests"; - HDfprintf(stdout, "===================================\n"); + fprintf(stdout, "===================================\n"); if (nerrs > 0) { - HDfprintf(stdout, "***%s detected %d failures***\n", header, nerrs); + fprintf(stdout, "***%s detected %d failures***\n", header, nerrs); } else { - HDfprintf(stdout, "%s finished with no failures\n", header); + fprintf(stdout, "%s finished with no failures\n", header); } - HDfprintf(stdout, "===================================\n"); + fprintf(stdout, "===================================\n"); } /* close HDF5 library */ if (H5close() != SUCCEED) { - HDfprintf(stdout, "H5close() failed. (Ignoring)\n"); + fprintf(stdout, "H5close() failed. (Ignoring)\n"); } /* MPI_Finalize must be called AFTER H5close which may use MPI calls */ |