[svn-r26329] Merge of r26069, r26070, and r26072 from the features/autotools_rework

branch.

Removed the configure option that allows selective disabling of individual
internal filters (fletcher32, shuffle, etc.).

This feature mucked up the code with a lot of #ifdefs, saved very little space,
and was not scalable to a general scheme for library size reduction. We've
decided to remove the feature while we investigate a more general scheme for
decreasing the library size.

Part of: HDFFV-9086

Tested on: h5committest

1 files changed, 14 insertions, 16 deletions

diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index e27cddc..ae022fb 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -2502,7 +2502,6 @@ extend_readAll(void)
  * Example of using the parallel HDF5 library to read a compressed
  * dataset in an HDF5 file with collective parallel access support.
  */
-
 #ifdef H5_HAVE_FILTER_DEFLATE
 void
 compress_readAll(void)
@@ -3451,7 +3450,6 @@ actual_io_mode_tests(void) {
 #define DSET_NOCOLCAUSE "nocolcause"
 #define NELM          2
 #define FILE_EXTERNAL "nocolcause_extern.data"
-#undef H5_HAVE_FILTER_FLETCHER32
 static void 
 test_no_collective_cause_mode(int selection_mode) 
 {
@@ -3487,9 +3485,9 @@ test_no_collective_cause_mode(int selection_mode)
     hid_t       file_space = -1;
     hsize_t     chunk_dims[RANK];
     herr_t      ret;
-#ifdef H5_HAVE_FILTER_FLETCHER32            
+#ifdef LATER /* fletcher32 */
     H5Z_filter_t filter_info;
-#endif    
+#endif /* LATER */
     /* set to global value as default */
     int l_facc_type = facc_type;   
     char message[256];
@@ -3521,7 +3519,7 @@ test_no_collective_cause_mode(int selection_mode)
         is_chunked = 0;
     }
 
-#ifdef H5_HAVE_FILTER_FLETCHER32
+#ifdef LATER /* fletcher32 */
     if (selection_mode & TEST_FILTERS) {
         ret = H5Zfilter_avail(H5Z_FILTER_FLETCHER32);
         VRFY ((ret >=0 ), "Fletcher32 filter is available.\n");
@@ -3532,7 +3530,7 @@ test_no_collective_cause_mode(int selection_mode)
         ret = H5Pset_fletcher32(dcpl);
         VRFY((ret >= 0),"set filter (flecher32) succeeded");
     }
-#endif /* H5_HAVE_FILTER_FLETCHER32 */
+#endif /* LATER */
 
     if (selection_mode & TEST_NOT_SIMPLE_OR_SCALAR_DATASPACES) {
         sid = H5Screate(H5S_NULL);
@@ -3613,13 +3611,13 @@ test_no_collective_cause_mode(int selection_mode)
         no_collective_cause_global_expected |= H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET;
     }
 
-#ifdef H5_HAVE_FILTER_FLETCHER32            
+#ifdef LATER /* fletcher32 */
     if (selection_mode & TEST_FILTERS) {
         test_name = "Broken Collective I/O - Filter is required";
         no_collective_cause_local_expected |= H5D_MPIO_FILTERS;
         no_collective_cause_global_expected |= H5D_MPIO_FILTERS;
     }
-#endif /* H5_HAVE_FILTER_FLETCHER32 */
+#endif /* LATER */
 
     if (selection_mode & TEST_COLLECTIVE) {
         test_name = "Broken Collective I/O - Not Broken";
@@ -3808,9 +3806,9 @@ test_no_collective_cause_mode_filter(int selection_mode)
     hid_t       file_space = -1;
     hsize_t     chunk_dims[RANK];
     herr_t      ret;
-#ifdef H5_HAVE_FILTER_FLETCHER32            
+#ifdef LATER /* fletcher32 */
     H5Z_filter_t filter_info;
-#endif    
+#endif /* LATER */
     char message[256];
 
     /* Set up MPI parameters */
@@ -3829,7 +3827,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
     VRFY((dcpl >= 0), "dataset creation plist created successfully");
 
     if (selection_mode == TEST_FILTERS_READ )  {
-#ifdef H5_HAVE_FILTER_FLETCHER32            
+#ifdef LATER /* fletcher32 */
             ret = H5Zfilter_avail(H5Z_FILTER_FLETCHER32);
             VRFY ((ret >=0 ), "Fletcher32 filter is available.\n");
 
@@ -3838,7 +3836,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
 
             ret = H5Pset_fletcher32(dcpl);
             VRFY((ret >= 0),"set filter (flecher32) succeeded");
-#endif /* H5_HAVE_FILTER_FLETCHER32 */
+#endif /* LATER */
     }
     else  {
         VRFY(0, "Unexpected mode, only test for TEST_FILTERS_READ.");
@@ -3876,12 +3874,12 @@ test_no_collective_cause_mode_filter(int selection_mode)
             dcpl, H5P_DEFAULT);
     VRFY((dataset >= 0), "H5Dcreate2() dataset succeeded");
 
-#ifdef H5_HAVE_FILTER_FLETCHER32            
+#ifdef LATER /* fletcher32 */
     /* Set expected cause */
     test_name = "Broken Collective I/O - Filter is required";
     no_collective_cause_local_expected = H5D_MPIO_FILTERS;
     no_collective_cause_global_expected = H5D_MPIO_FILTERS;
-#endif
+#endif /* LATER */
 
     /* Get the file dataspace */
     file_space = H5Dget_space(dataset);
@@ -4010,13 +4008,13 @@ no_collective_cause_tests(void)
     test_no_collective_cause_mode (TEST_NOT_SIMPLE_OR_SCALAR_DATASPACES);
     test_no_collective_cause_mode (TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_COMPACT);
     test_no_collective_cause_mode (TEST_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_EXTERNAL);
-#ifdef H5_HAVE_FILTER_FLETCHER32            
+#ifdef LATER /* fletcher32 */
    /* TODO: use this instead of below TEST_FILTERS_READ when H5Dcreate and 
     * H5Dwrite is ready for mpio + filter feature.
     */
     /* test_no_collective_cause_mode (TEST_FILTERS); */
     test_no_collective_cause_mode_filter (TEST_FILTERS_READ);
-#endif    
+#endif /* LATER */ 
 
     /* 
      * Test combined causes