From 6b07d692f43ce271e42b31a44627a657f47a5e9e Mon Sep 17 00:00:00 2001 From: kmu Date: Mon, 9 Dec 2019 14:08:47 -0600 Subject: more fix and address comments --- test/page_buffer.c | 15 +++------------ testpar/t_shapesame.c | 15 --------------- testpar/t_span_tree.c | 5 ++++- tools/lib/h5diff.c | 4 ++-- 4 files changed, 9 insertions(+), 30 deletions(-) diff --git a/test/page_buffer.c b/test/page_buffer.c index fb22563..92325f3 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -41,9 +41,6 @@ #define FILENAME_LEN 1024 -#define NUM_DSETS 5 -#define NX 100 -#define NY 50 /* helper routines */ #ifndef H5_HAVE_PARALLEL @@ -190,6 +187,7 @@ error: return false; } +#ifndef H5_HAVE_PARALLEL /*------------------------------------------------------------------------- * Function: create_file() @@ -424,6 +422,7 @@ error: } H5E_END_TRY; return 1; } +#endif /* * @@ -485,6 +484,7 @@ error: } +#ifndef H5_HAVE_PARALLEL /*------------------------------------------------------------------------- * Function: test_args() @@ -512,7 +512,6 @@ error: *------------------------------------------------------------------------- */ -#ifndef H5_HAVE_PARALLEL static unsigned test_args(hid_t orig_fapl, const char *env_h5_drvr) { @@ -667,7 +666,6 @@ error: } H5E_END_TRY; return 1; } /* test_args */ -#endif /* @@ -1178,7 +1176,6 @@ error: */ /* Changes due to file space page size has a minimum size of 512 */ -#ifndef H5_HAVE_PARALLEL static unsigned test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, bool vfd_swmr_mode) @@ -1444,7 +1441,6 @@ error: } H5E_END_TRY; return 1; } /* test_raw_data_handling */ -#endif /*------------------------------------------------------------------------- @@ -1472,7 +1468,6 @@ error: *------------------------------------------------------------------------- */ -#ifndef H5_HAVE_PARALLEL static unsigned test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) { @@ -1709,7 +1704,6 @@ error: } H5E_END_TRY; return 1; } /* test_lru_processing */ -#endif /*------------------------------------------------------------------------- @@ -1751,7 +1745,6 @@ error: *------------------------------------------------------------------------- */ -#ifndef H5_HAVE_PARALLEL static unsigned test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) { @@ -2445,7 +2438,6 @@ error: return 1; } /* test_min_threshold */ -#endif /*------------------------------------------------------------------------- @@ -2482,7 +2474,6 @@ error: * *------------------------------------------------------------------------- */ -#ifndef H5_HAVE_PARALLEL static unsigned test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) { diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index abbfbb3..c12cf5a 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -1981,7 +1981,6 @@ contig_hs_dr_pio_test__run_test(const int test_num, #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG const char *fcnName = "contig_hs_dr_pio_test__run_test()"; #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */ - int mpi_rank; struct hs_dr_pio_test_vars_t test_vars = { /* int mpi_size = */ -1, @@ -2049,9 +2048,6 @@ contig_hs_dr_pio_test__run_test(const int test_num, small_rank, large_rank, use_collective_io, dset_type, express_test, tv_ptr); - /* initialize the local copy of mpi_rank */ - mpi_rank = tv_ptr->mpi_rank; - /* initialize skips & max_skips */ tv_ptr->skips = *skips_ptr; tv_ptr->max_skips = max_skips; @@ -3520,7 +3516,6 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t * tv_ptr) const char *fcnName = "ckrbrd_hs_dr_pio_test__m2d_l2s()"; #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG */ hbool_t data_ok = FALSE; - hbool_t mis_match = FALSE; int i, j, k, l; size_t u; size_t start_index; @@ -3768,8 +3763,6 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t * tv_ptr) /* verify that expected data is retrieved */ - mis_match = FALSE; - expected_value = (uint32_t)( (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + @@ -3878,7 +3871,6 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t * tv_ptr) const char *fcnName = "ckrbrd_hs_dr_pio_test__m2d_s2l()"; #endif /* CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG */ hbool_t data_ok = FALSE; - hbool_t mis_match = FALSE; int i, j, k, l; size_t u; size_t start_index; @@ -4138,8 +4130,6 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t * tv_ptr) HDassert( stop_index < tv_ptr->large_ds_size ); - mis_match = FALSE; - data_ok = TRUE; ptr_1 = tv_ptr->large_ds_buf_1; @@ -4235,7 +4225,6 @@ ckrbrd_hs_dr_pio_test__run_test(const int test_num, #if CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG const char *fcnName = "ckrbrd_hs_dr_pio_test__run_test()"; #endif /* CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG */ - int mpi_rank; /* needed by VRFY */ struct hs_dr_pio_test_vars_t test_vars = { /* int mpi_size = */ -1, @@ -4305,10 +4294,6 @@ ckrbrd_hs_dr_pio_test__run_test(const int test_num, tv_ptr); - /* initialize the local copy of mpi_rank */ - mpi_rank = tv_ptr->mpi_rank; - - /* initialize skips & max_skips */ tv_ptr->skips = *skips_ptr; tv_ptr->max_skips = max_skips; diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c index 65ee03d..da6d343 100644 --- a/testpar/t_span_tree.c +++ b/testpar/t_span_tree.c @@ -1560,7 +1560,9 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, size_t small_ds_size; size_t small_ds_slice_size; size_t large_ds_size; +#if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG size_t large_ds_slice_size; +#endif uint32_t expected_value; uint32_t * small_ds_buf_0 = NULL; uint32_t * small_ds_buf_1 = NULL; @@ -1614,9 +1616,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, small_ds_size = (size_t)((mpi_size + 1) * 1 * 1 * 10 * 10); small_ds_slice_size = (size_t) ( 1 * 1 * 10 * 10); large_ds_size = (size_t)((mpi_size + 1) * 10 * 10 * 10 * 10); - large_ds_slice_size = (size_t) (10 * 10 * 10 * 10); #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG + large_ds_slice_size = (size_t) (10 * 10 * 10 * 10); + if ( mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK ) { HDfprintf(stdout, "%s:%d: small ds size / slice size = %d / %d.\n", fcnName, mpi_rank, diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 870c256..7f6f955 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -278,8 +278,8 @@ build_match_list (const char *objname1, trav_info_t *info1, const char *objname2 /* init */ trav_table_init(info1->fid, &table); if (table == NULL) { - H5TOOLS_INFO("Cannot create traverse table"); - H5TOOLS_GOTO_DONE_NO_RET(); + H5TOOLS_INFO(H5E_tools_min_id_g, "Cannot create traverse table"); + goto done; } /* -- cgit v0.12