From 997ba1f379b5c177d0a8a2b6edd104c68d6174c8 Mon Sep 17 00:00:00 2001 From: "M. Scot Breitenfeld" Date: Tue, 24 Oct 2023 17:54:44 -0500 Subject: [PATCH 01/10] added compression tests for subfiling --- configure.ac | 2 +- testpar/t_subfiling_vfd.c | 114 +++++++++++++++++++++++++++++++++++--- 2 files changed, 108 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 44ab43a4664..b8ff31457c3 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ ## ---------------------------------------------------------------------- ## Initialize configure. ## -AC_PREREQ([2.71]) +AC_PREREQ([2.69]) ## AC_INIT takes the name of the package, the version number, and an ## email address to report bugs. AC_CONFIG_SRCDIR takes a unique file diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 7c565997b3d..976d360c6ee 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -82,12 +82,15 @@ static char *config_dir = NULL; int nerrors = 0; int curr_nerrors = 0; +bool enable_compression = false; + /* Function pointer typedef for test functions */ typedef void (*test_func)(void); /* Utility functions */ static hid_t create_subfiling_ioc_fapl(MPI_Comm comm, MPI_Info info, bool custom_config, H5FD_subfiling_params_t *custom_cfg, int32_t thread_pool_size); +static hid_t create_dcpl_id(int rank, const hsize_t dims[], hid_t dxpl_id); /* Test functions */ static void test_create_and_close(void); @@ -182,7 +185,47 @@ create_subfiling_ioc_fapl(MPI_Comm comm, MPI_Info info, bool custom_config, return H5I_INVALID_HID; } + /* --------------------------------------------------------------------------- + * Function: create_dcpl_id + * + * Purpose: Creates dataset creation property list identifier with + * chunking and compression, and enforces the + * required collective IO. + * + * Return: Success: HID Dataset creation property list identifier, + * a non-negative value. + * Failure: H5I_INVALID_HID, a negative value. + * --------------------------------------------------------------------------- + */ +static hid_t +create_dcpl_id(int rank, const hsize_t dset_dims[], hid_t dxpl_id) +{ + hsize_t chunk_dims[1]; + hid_t ret_value = H5I_INVALID_HID; + + if ((ret_value = H5Pcreate(H5P_DATASET_CREATE)) < 0) + TEST_ERROR; + + if(enable_compression) { + if(H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_COLLECTIVE) < 0) + TEST_ERROR; + chunk_dims[0] = dset_dims[0] / 2; + if(H5Pset_chunk(ret_value, rank, chunk_dims) < 0) + TEST_ERROR; + if(H5Pset_deflate(ret_value, 9) < 0) + TEST_ERROR; + } + return ret_value; + +error: + if ((H5I_INVALID_HID != ret_value) && (H5Pclose(ret_value) < 0)) { + H5_FAILED(); + AT(); + } + + return H5I_INVALID_HID; +} /* * A simple test that creates and closes a file with the * subfiling VFD @@ -1060,6 +1103,7 @@ test_read_different_stripe_size(void) hid_t fapl_id = H5I_INVALID_HID; hid_t dset_id = H5I_INVALID_HID; hid_t dxpl_id = H5I_INVALID_HID; + hid_t dcpl_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; char *tmp_filename = NULL; void *buf = NULL; @@ -1106,7 +1150,10 @@ test_read_different_stripe_size(void) fspace_id = H5Screate_simple(1, dset_dims, NULL); VRFY((fspace_id >= 0), "H5Screate_simple succeeded"); - dset_id = H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + dcpl_id = create_dcpl_id(1, dset_dims, dxpl_id); + VRFY((dcpl_id >= 0), "DCPL creation succeeded"); + + dset_id = H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset creation succeeded"); /* Select hyperslab */ @@ -1129,6 +1176,7 @@ test_read_different_stripe_size(void) VRFY((H5Sclose(fspace_id) >= 0), "File dataspace close succeeded"); VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); + VRFY((H5Pclose(dcpl_id) >= 0), "DCPL close succeeded"); VRFY((H5Fclose(file_id) >= 0), "File close succeeded"); /* Ensure all the subfiles are present */ @@ -1271,6 +1319,7 @@ test_subfiling_precreate_rank_0(void) hid_t fapl_id = H5I_INVALID_HID; hid_t dset_id = H5I_INVALID_HID; hid_t dxpl_id = H5I_INVALID_HID; + hid_t dcpl_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; void *buf = NULL; @@ -1331,8 +1380,11 @@ test_subfiling_precreate_rank_0(void) fspace_id = H5Screate_simple(1, dset_dims, NULL); VRFY((fspace_id >= 0), "H5Screate_simple succeeded"); + dcpl_id = create_dcpl_id(1, dset_dims, dxpl_id); + VRFY((dcpl_id >= 0), "DCPL creation succeeded"); + dset_id = - H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset creation succeeded"); buf = malloc(dset_dims[0] * sizeof(SUBF_C_TYPE)); @@ -1350,6 +1402,7 @@ test_subfiling_precreate_rank_0(void) VRFY((H5Sclose(fspace_id) >= 0), "File dataspace close succeeded"); VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded"); + VRFY((H5Pclose(dcpl_id) >= 0), "DCPL close succeeded"); VRFY((H5Fclose(file_id) >= 0), "H5Fclose succeeded"); /* @@ -1470,6 +1523,7 @@ test_subfiling_write_many_read_one(void) hid_t fapl_id = H5I_INVALID_HID; hid_t dset_id = H5I_INVALID_HID; hid_t dxpl_id = H5I_INVALID_HID; + hid_t dcpl_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; void *buf = NULL; @@ -1517,7 +1571,10 @@ test_subfiling_write_many_read_one(void) fspace_id = H5Screate_simple(1, dset_dims, NULL); VRFY((fspace_id >= 0), "H5Screate_simple succeeded"); - dset_id = H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + dcpl_id = create_dcpl_id(1, dset_dims, dxpl_id ); + VRFY((dcpl_id >= 0), "DCPL creation succeeded"); + + dset_id = H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset creation succeeded"); /* Select hyperslab */ @@ -1539,6 +1596,7 @@ test_subfiling_write_many_read_one(void) buf = NULL; VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); + VRFY((H5Pclose(dcpl_id) >= 0), "DCPL close succeeded"); VRFY((H5Fclose(file_id) >= 0), "File close succeeded"); mpi_code_g = MPI_Barrier(comm_g); @@ -1616,6 +1674,7 @@ test_subfiling_write_many_read_few(void) hid_t fapl_id = H5I_INVALID_HID; hid_t dset_id = H5I_INVALID_HID; hid_t dxpl_id = H5I_INVALID_HID; + hid_t dcpl_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; void *buf = NULL; @@ -1673,7 +1732,10 @@ test_subfiling_write_many_read_few(void) fspace_id = H5Screate_simple(1, dset_dims, NULL); VRFY((fspace_id >= 0), "H5Screate_simple succeeded"); - dset_id = H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + dcpl_id = create_dcpl_id(1, dset_dims, dxpl_id); + VRFY((dcpl_id >= 0), "DCPL creation succeeded"); + + dset_id = H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset creation succeeded"); /* Select hyperslab */ @@ -1695,6 +1757,7 @@ test_subfiling_write_many_read_few(void) buf = NULL; VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); + VRFY((H5Pclose(dcpl_id) >= 0), "DCPL close succeeded"); VRFY((H5Fclose(file_id) >= 0), "File close succeeded"); /* @@ -1808,6 +1871,7 @@ test_subfiling_h5fuse(void) hid_t fapl_id = H5I_INVALID_HID; hid_t dset_id = H5I_INVALID_HID; hid_t dxpl_id = H5I_INVALID_HID; + hid_t dcpl_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; void *buf = NULL; int skip_test = 0; @@ -1898,7 +1962,10 @@ test_subfiling_h5fuse(void) fspace_id = H5Screate_simple(1, dset_dims, NULL); VRFY((fspace_id >= 0), "H5Screate_simple succeeded"); - dset_id = H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + dcpl_id = create_dcpl_id(1, dset_dims, dxpl_id); + VRFY((dcpl_id >= 0), "DCPL creation succeeded"); + + dset_id = H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset creation succeeded"); /* Select hyperslab */ @@ -1921,6 +1988,7 @@ test_subfiling_h5fuse(void) VRFY((H5Sclose(fspace_id) >= 0), "File dataspace close succeeded"); VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); + VRFY((H5Pclose(dcpl_id) >= 0), "DCPL close succeeded"); VRFY((H5Fclose(file_id) >= 0), "File close succeeded"); if (MAINPROCESS) { @@ -2413,7 +2481,23 @@ main(int argc, char **argv) num_iocs_g = (ioc_per_node_g > 0) ? (int)ioc_per_node_g * num_nodes_g : num_nodes_g; if (num_iocs_g > mpi_size) num_iocs_g = mpi_size; - +#ifdef H5_HAVE_FILTER_DEFLATE + if (MAINPROCESS) { + printf(" Re-running tests with compression enabled\n"); + } + enable_compression=true; + for (size_t i = 4; i < ARRAY_SIZE(tests); i++) { + if (MPI_SUCCESS == (mpi_code_g = MPI_Barrier(comm_g))) { + (*tests[i])(); + } + else { + if (MAINPROCESS) + MESG("MPI_Barrier failed"); + nerrors++; + } + } + enable_compression=false; +#endif if (MAINPROCESS) { printf("Re-running tests with environment variables set\n"); } @@ -2428,7 +2512,23 @@ main(int argc, char **argv) nerrors++; } } - +#ifdef H5_HAVE_FILTER_DEFLATE + if (MAINPROCESS) { + printf(" Re-running tests with compression enabled\n"); + } + enable_compression=true; + for (size_t i = 5; i < ARRAY_SIZE(tests); i++) { + if (MPI_SUCCESS == (mpi_code_g = MPI_Barrier(comm_g))) { + (*tests[i])(); + } + else { + if (MAINPROCESS) + MESG("MPI_Barrier failed"); + nerrors++; + } + } + enable_compression=false; +#endif if (MAINPROCESS) puts(""); From 7f9659a5529cc6b5a2da3e8cdbb2d874782f2252 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 22:56:51 +0000 Subject: [PATCH 02/10] Committing clang-format changes --- testpar/t_subfiling_vfd.c | 47 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 976d360c6ee..9e1493bdd6c 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -185,7 +185,7 @@ create_subfiling_ioc_fapl(MPI_Comm comm, MPI_Info info, bool custom_config, return H5I_INVALID_HID; } - /* --------------------------------------------------------------------------- +/* --------------------------------------------------------------------------- * Function: create_dcpl_id * * Purpose: Creates dataset creation property list identifier with @@ -206,14 +206,14 @@ create_dcpl_id(int rank, const hsize_t dset_dims[], hid_t dxpl_id) if ((ret_value = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; - if(enable_compression) { - if(H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_COLLECTIVE) < 0) - TEST_ERROR; - chunk_dims[0] = dset_dims[0] / 2; - if(H5Pset_chunk(ret_value, rank, chunk_dims) < 0) - TEST_ERROR; - if(H5Pset_deflate(ret_value, 9) < 0) - TEST_ERROR; + if (enable_compression) { + if (H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_COLLECTIVE) < 0) + TEST_ERROR; + chunk_dims[0] = dset_dims[0] / 2; + if (H5Pset_chunk(ret_value, rank, chunk_dims) < 0) + TEST_ERROR; + if (H5Pset_deflate(ret_value, 9) < 0) + TEST_ERROR; } return ret_value; @@ -1383,8 +1383,7 @@ test_subfiling_precreate_rank_0(void) dcpl_id = create_dcpl_id(1, dset_dims, dxpl_id); VRFY((dcpl_id >= 0), "DCPL creation succeeded"); - dset_id = - H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT); + dset_id = H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset creation succeeded"); buf = malloc(dset_dims[0] * sizeof(SUBF_C_TYPE)); @@ -1571,7 +1570,7 @@ test_subfiling_write_many_read_one(void) fspace_id = H5Screate_simple(1, dset_dims, NULL); VRFY((fspace_id >= 0), "H5Screate_simple succeeded"); - dcpl_id = create_dcpl_id(1, dset_dims, dxpl_id ); + dcpl_id = create_dcpl_id(1, dset_dims, dxpl_id); VRFY((dcpl_id >= 0), "DCPL creation succeeded"); dset_id = H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT); @@ -2485,18 +2484,18 @@ main(int argc, char **argv) if (MAINPROCESS) { printf(" Re-running tests with compression enabled\n"); } - enable_compression=true; + enable_compression = true; for (size_t i = 4; i < ARRAY_SIZE(tests); i++) { - if (MPI_SUCCESS == (mpi_code_g = MPI_Barrier(comm_g))) { - (*tests[i])(); - } - else { - if (MAINPROCESS) - MESG("MPI_Barrier failed"); - nerrors++; - } + if (MPI_SUCCESS == (mpi_code_g = MPI_Barrier(comm_g))) { + (*tests[i])(); + } + else { + if (MAINPROCESS) + MESG("MPI_Barrier failed"); + nerrors++; } - enable_compression=false; + } + enable_compression = false; #endif if (MAINPROCESS) { printf("Re-running tests with environment variables set\n"); @@ -2516,7 +2515,7 @@ main(int argc, char **argv) if (MAINPROCESS) { printf(" Re-running tests with compression enabled\n"); } - enable_compression=true; + enable_compression = true; for (size_t i = 5; i < ARRAY_SIZE(tests); i++) { if (MPI_SUCCESS == (mpi_code_g = MPI_Barrier(comm_g))) { (*tests[i])(); @@ -2527,7 +2526,7 @@ main(int argc, char **argv) nerrors++; } } - enable_compression=false; + enable_compression = false; #endif if (MAINPROCESS) puts(""); From a0b8058d6e74a086c4eb49f82b40ef68c1f3ce91 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Tue, 24 Oct 2023 23:05:15 -0500 Subject: [PATCH 03/10] added parallel compression tests to the subfiling tests --- testpar/t_subfiling_vfd.c | 47 +++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 9e1493bdd6c..9e518f5aeee 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -1201,10 +1201,12 @@ test_read_different_stripe_size(void) VRFY((fclose(subfile_ptr) >= 0), "fclose on subfile succeeded"); /* Check file size */ - VRFY((HDstat(tmp_filename, &subfile_info) >= 0), "HDstat succeeded"); - subfile_size = (h5_stat_size_t)subfile_info.st_size; + if (!enable_compression) { + VRFY((HDstat(tmp_filename, &subfile_info) >= 0), "HDstat succeeded"); + subfile_size = (h5_stat_size_t)subfile_info.st_size; - VRFY((subfile_size >= cfg.stripe_size), "File size verification succeeded"); + VRFY((subfile_size >= cfg.stripe_size), "File size verification succeeded"); + } } } @@ -1319,7 +1321,6 @@ test_subfiling_precreate_rank_0(void) hid_t fapl_id = H5I_INVALID_HID; hid_t dset_id = H5I_INVALID_HID; hid_t dxpl_id = H5I_INVALID_HID; - hid_t dcpl_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; void *buf = NULL; @@ -1380,10 +1381,8 @@ test_subfiling_precreate_rank_0(void) fspace_id = H5Screate_simple(1, dset_dims, NULL); VRFY((fspace_id >= 0), "H5Screate_simple succeeded"); - dcpl_id = create_dcpl_id(1, dset_dims, dxpl_id); - VRFY((dcpl_id >= 0), "DCPL creation succeeded"); - - dset_id = H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT); + dset_id = + H5Dcreate2(file_id, "DSET", SUBF_HDF5_TYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset creation succeeded"); buf = malloc(dset_dims[0] * sizeof(SUBF_C_TYPE)); @@ -1401,7 +1400,6 @@ test_subfiling_precreate_rank_0(void) VRFY((H5Sclose(fspace_id) >= 0), "File dataspace close succeeded"); VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded"); - VRFY((H5Pclose(dcpl_id) >= 0), "DCPL close succeeded"); VRFY((H5Fclose(file_id) >= 0), "H5Fclose succeeded"); /* @@ -1428,10 +1426,12 @@ test_subfiling_precreate_rank_0(void) VRFY((fclose(subfile_ptr) >= 0), "fclose on subfile succeeded"); /* Check file size */ - VRFY((HDstat(tmp_filename, &subfile_info) >= 0), "HDstat succeeded"); - file_size = (h5_stat_size_t)subfile_info.st_size; + if (!enable_compression) { + VRFY((HDstat(tmp_filename, &subfile_info) >= 0), "HDstat succeeded"); + file_size = (h5_stat_size_t)subfile_info.st_size; - VRFY((file_size >= cfg.stripe_size), "File size verification succeeded"); + VRFY((file_size >= cfg.stripe_size), "File size verification succeeded"); + } } /* Verify that there aren't too many subfiles */ @@ -1985,6 +1985,8 @@ test_subfiling_h5fuse(void) free(buf); buf = NULL; + VRFY((H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_INDEPENDENT) >= 0), "H5Pset_dxpl_mpio succeeded"); + VRFY((H5Sclose(fspace_id) >= 0), "File dataspace close succeeded"); VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); VRFY((H5Pclose(dcpl_id) >= 0), "DCPL close succeeded"); @@ -2040,8 +2042,10 @@ test_subfiling_h5fuse(void) } /* Verify the size of the fused file */ - VRFY((HDstat(SUBF_FILENAME, &file_info) >= 0), "HDstat succeeded"); - VRFY(((size_t)file_info.st_size >= target_size), "File size verification succeeded"); + if (!enable_compression) { + VRFY((HDstat(SUBF_FILENAME, &file_info) >= 0), "HDstat succeeded"); + VRFY(((size_t)file_info.st_size >= target_size), "File size verification succeeded"); + } /* Re-open file with sec2 driver and verify the data */ file_id = H5Fopen(SUBF_FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT); @@ -2480,6 +2484,7 @@ main(int argc, char **argv) num_iocs_g = (ioc_per_node_g > 0) ? (int)ioc_per_node_g * num_nodes_g : num_nodes_g; if (num_iocs_g > mpi_size) num_iocs_g = mpi_size; + #ifdef H5_HAVE_FILTER_DEFLATE if (MAINPROCESS) { printf(" Re-running tests with compression enabled\n"); @@ -2496,8 +2501,14 @@ main(int argc, char **argv) } } enable_compression = false; +#else + if (MAINPROCESS) { + TESTING_2("re-running tests with compression enabled"); + SKIPPED(); + } #endif if (MAINPROCESS) { + puts(""); printf("Re-running tests with environment variables set\n"); } @@ -2511,8 +2522,10 @@ main(int argc, char **argv) nerrors++; } } + #ifdef H5_HAVE_FILTER_DEFLATE if (MAINPROCESS) { + puts(""); printf(" Re-running tests with compression enabled\n"); } enable_compression = true; @@ -2527,6 +2540,12 @@ main(int argc, char **argv) } } enable_compression = false; +#else + if (MAINPROCESS) { + puts(""); + TESTING_2("re-running tests with compression enabled"); + SKIPPED(); + } #endif if (MAINPROCESS) puts(""); From e84f0946673db3e415b940b513c8942061b3e989 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Tue, 24 Oct 2023 23:06:26 -0500 Subject: [PATCH 04/10] revert --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b8ff31457c3..44ab43a4664 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ ## ---------------------------------------------------------------------- ## Initialize configure. ## -AC_PREREQ([2.69]) +AC_PREREQ([2.71]) ## AC_INIT takes the name of the package, the version number, and an ## email address to report bugs. AC_CONFIG_SRCDIR takes a unique file From 92ef8be4b63c6d71d47357bb0bdbf9cb6433d274 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 25 Oct 2023 09:14:03 -0500 Subject: [PATCH 05/10] fixed loop range --- testpar/t_subfiling_vfd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 9e518f5aeee..60521b3792f 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -40,6 +40,8 @@ #define PATH_MAX 4096 #endif +#define DEFAULT_DEFLATE_LEVEL 9 + #define ARRAY_SIZE(a) sizeof(a) / sizeof(a[0]) #define CHECK_PASSED() \ @@ -212,7 +214,7 @@ create_dcpl_id(int rank, const hsize_t dset_dims[], hid_t dxpl_id) chunk_dims[0] = dset_dims[0] / 2; if (H5Pset_chunk(ret_value, rank, chunk_dims) < 0) TEST_ERROR; - if (H5Pset_deflate(ret_value, 9) < 0) + if (H5Pset_deflate(ret_value, DEFAULT_DEFLATE_LEVEL) < 0) TEST_ERROR; } @@ -2490,7 +2492,7 @@ main(int argc, char **argv) printf(" Re-running tests with compression enabled\n"); } enable_compression = true; - for (size_t i = 4; i < ARRAY_SIZE(tests); i++) { + for (size_t i = 5; i < ARRAY_SIZE(tests); i++) { if (MPI_SUCCESS == (mpi_code_g = MPI_Barrier(comm_g))) { (*tests[i])(); } From 4f3f970cd862250d4725e3a527f80c3ba1f3c3c4 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 25 Oct 2023 11:52:08 -0500 Subject: [PATCH 06/10] review updates --- configure.ac | 2 +- testpar/t_subfiling_vfd.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 44ab43a4664..b8ff31457c3 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ ## ---------------------------------------------------------------------- ## Initialize configure. ## -AC_PREREQ([2.71]) +AC_PREREQ([2.69]) ## AC_INIT takes the name of the package, the version number, and an ## email address to report bugs. AC_CONFIG_SRCDIR takes a unique file diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 60521b3792f..a5ac5c948d9 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -2487,12 +2487,12 @@ main(int argc, char **argv) if (num_iocs_g > mpi_size) num_iocs_g = mpi_size; -#ifdef H5_HAVE_FILTER_DEFLATE if (MAINPROCESS) { printf(" Re-running tests with compression enabled\n"); } +#ifdef H5_HAVE_FILTER_DEFLATE enable_compression = true; - for (size_t i = 5; i < ARRAY_SIZE(tests); i++) { + for (size_t i = 0; i < ARRAY_SIZE(tests); i++) { if (MPI_SUCCESS == (mpi_code_g = MPI_Barrier(comm_g))) { (*tests[i])(); } @@ -2505,7 +2505,6 @@ main(int argc, char **argv) enable_compression = false; #else if (MAINPROCESS) { - TESTING_2("re-running tests with compression enabled"); SKIPPED(); } #endif @@ -2525,13 +2524,13 @@ main(int argc, char **argv) } } -#ifdef H5_HAVE_FILTER_DEFLATE if (MAINPROCESS) { puts(""); printf(" Re-running tests with compression enabled\n"); } +#ifdef H5_HAVE_FILTER_DEFLATE enable_compression = true; - for (size_t i = 5; i < ARRAY_SIZE(tests); i++) { + for (size_t i = 0; i < ARRAY_SIZE(tests); i++) { if (MPI_SUCCESS == (mpi_code_g = MPI_Barrier(comm_g))) { (*tests[i])(); } @@ -2544,8 +2543,6 @@ main(int argc, char **argv) enable_compression = false; #else if (MAINPROCESS) { - puts(""); - TESTING_2("re-running tests with compression enabled"); SKIPPED(); } #endif From bd6bbe627b1b6ab6dc0bf38ed9313645c2d6b71b Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 25 Oct 2023 11:52:31 -0500 Subject: [PATCH 07/10] review updates --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b8ff31457c3..44ab43a4664 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ ## ---------------------------------------------------------------------- ## Initialize configure. ## -AC_PREREQ([2.69]) +AC_PREREQ([2.71]) ## AC_INIT takes the name of the package, the version number, and an ## email address to report bugs. AC_CONFIG_SRCDIR takes a unique file From 569afe475f371d4bc7500b8102a11e88956a4743 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 25 Oct 2023 11:57:08 -0500 Subject: [PATCH 08/10] review updates --- testpar/t_subfiling_vfd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index a5ac5c948d9..20b09057975 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -2504,9 +2504,8 @@ main(int argc, char **argv) } enable_compression = false; #else - if (MAINPROCESS) { + if (MAINPROCESS) SKIPPED(); - } #endif if (MAINPROCESS) { puts(""); @@ -2542,9 +2541,8 @@ main(int argc, char **argv) } enable_compression = false; #else - if (MAINPROCESS) { + if (MAINPROCESS) SKIPPED(); - } #endif if (MAINPROCESS) puts(""); From ca0deb9f9f86f8c31447192840a165db0f2707d1 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 25 Oct 2023 12:00:09 -0500 Subject: [PATCH 09/10] review updates --- testpar/t_subfiling_vfd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 20b09057975..6fb62729ea6 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -2487,9 +2487,9 @@ main(int argc, char **argv) if (num_iocs_g > mpi_size) num_iocs_g = mpi_size; - if (MAINPROCESS) { + if (MAINPROCESS) printf(" Re-running tests with compression enabled\n"); - } + #ifdef H5_HAVE_FILTER_DEFLATE enable_compression = true; for (size_t i = 0; i < ARRAY_SIZE(tests); i++) { From b1368c97af038416ca55b88e5360c77b05e6bbce Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Wed, 25 Oct 2023 12:03:53 -0500 Subject: [PATCH 10/10] review updates --- testpar/t_subfiling_vfd.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 6fb62729ea6..72613a3bef1 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -2507,10 +2507,8 @@ main(int argc, char **argv) if (MAINPROCESS) SKIPPED(); #endif - if (MAINPROCESS) { - puts(""); - printf("Re-running tests with environment variables set\n"); - } + if (MAINPROCESS) + printf("\nRe-running tests with environment variables set\n"); for (size_t i = 0; i < ARRAY_SIZE(tests); i++) { if (MPI_SUCCESS == (mpi_code_g = MPI_Barrier(comm_g))) { @@ -2523,10 +2521,8 @@ main(int argc, char **argv) } } - if (MAINPROCESS) { - puts(""); - printf(" Re-running tests with compression enabled\n"); - } + if (MAINPROCESS) + printf("\n Re-running tests with compression enabled\n"); #ifdef H5_HAVE_FILTER_DEFLATE enable_compression = true; for (size_t i = 0; i < ARRAY_SIZE(tests); i++) { @@ -2544,14 +2540,11 @@ main(int argc, char **argv) if (MAINPROCESS) SKIPPED(); #endif - if (MAINPROCESS) - puts(""); - if (nerrors) goto exit; if (MAINPROCESS) - puts("All Subfiling VFD tests passed\n"); + puts("\nAll Subfiling VFD tests passed\n"); exit: if (must_unset_stripe_size_env)