summaryrefslogtreecommitdiffstats
path: root/tools/h5dump
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-02-27 12:50:38 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-02-27 12:50:38 (GMT)
commit7462a7ef1c3542b8812c8da86e79b15ce22d21cb (patch)
tree7f231cb842e7d2f17f25d6b84c7a0fa07c0496dc /tools/h5dump
parent7b7f0eafc57c083298d87a09df70a33f93e4760d (diff)
downloadhdf5-7462a7ef1c3542b8812c8da86e79b15ce22d21cb.zip
hdf5-7462a7ef1c3542b8812c8da86e79b15ce22d21cb.tar.gz
hdf5-7462a7ef1c3542b8812c8da86e79b15ce22d21cb.tar.bz2
[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
Diffstat (limited to 'tools/h5dump')
-rw-r--r--tools/h5dump/Makefile.in5
-rw-r--r--tools/h5dump/h5dumpgentest.c18
-rw-r--r--tools/h5dump/testh5dump.sh.in6
-rw-r--r--tools/h5dump/testh5dumppbits.sh.in4
4 files changed, 5 insertions, 28 deletions
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index fb8cc9b..aee2a6c 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -471,7 +471,6 @@ FCFLAGS_f90 = @FCFLAGS_f90@
FCLIBS = @FCLIBS@
FC_VERSION = @FC_VERSION@
FGREP = @FGREP@
-FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
@@ -559,10 +558,6 @@ TR = @TR@
TRACE_API = @TRACE_API@
UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
-USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
-USE_FILTER_NBIT = @USE_FILTER_NBIT@
-USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
-USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
USE_FILTER_SZIP = @USE_FILTER_SZIP@
USINGMEMCHECKER = @USINGMEMCHECKER@
VERSION = @VERSION@
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 82273a3..36c9642 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -5433,7 +5433,7 @@ static void gent_filters(void)
* shuffle
*-------------------------------------------------------------------------
*/
-#if defined (H5_HAVE_FILTER_SHUFFLE)
+
/* remove the filters from the dcpl */
ret = H5Premove_filter(dcpl,H5Z_FILTER_ALL);
HDassert(ret >= 0);
@@ -5444,14 +5444,13 @@ static void gent_filters(void)
ret=make_dset(fid,"shuffle",sid,H5T_NATIVE_INT,dcpl,buf1);
HDassert(ret >= 0);
-#endif
/*-------------------------------------------------------------------------
* checksum
*-------------------------------------------------------------------------
*/
-#if defined (H5_HAVE_FILTER_FLETCHER32)
+
/* remove the filters from the dcpl */
ret = H5Premove_filter(dcpl,H5Z_FILTER_ALL);
HDassert(ret >= 0);
@@ -5462,13 +5461,12 @@ static void gent_filters(void)
ret=make_dset(fid,"fletcher32",sid,H5T_NATIVE_INT,dcpl,buf1);
HDassert(ret >= 0);
-#endif
/*-------------------------------------------------------------------------
* nbit
*-------------------------------------------------------------------------
*/
-#if defined (H5_HAVE_FILTER_NBIT)
+
/* remove the filters from the dcpl */
ret = H5Premove_filter(dcpl,H5Z_FILTER_ALL);
HDassert(ret >= 0);
@@ -5481,13 +5479,12 @@ static void gent_filters(void)
H5Tset_precision(tid,H5Tget_size(tid)-1);
ret=make_dset(fid,"nbit",sid,tid,dcpl,buf1);
HDassert(ret >= 0);
-#endif
/*-------------------------------------------------------------------------
* scaleoffset
*-------------------------------------------------------------------------
*/
-#if defined (H5_HAVE_FILTER_SCALEOFFSET)
+
/* remove the filters from the dcpl */
ret = H5Premove_filter(dcpl,H5Z_FILTER_ALL);
HDassert(ret >= 0);
@@ -5498,7 +5495,6 @@ static void gent_filters(void)
ret=make_dset(fid,"scaleoffset",sid,H5T_NATIVE_INT,dcpl,buf1);
HDassert(ret >= 0);
-#endif
/*-------------------------------------------------------------------------
* all filters
@@ -5508,11 +5504,9 @@ static void gent_filters(void)
ret = H5Premove_filter(dcpl,H5Z_FILTER_ALL);
HDassert(ret >= 0);
-#if defined (H5_HAVE_FILTER_SHUFFLE)
/* set the shuffle filter */
ret = H5Pset_shuffle(dcpl);
HDassert(ret >= 0);
-#endif
#ifdef H5_HAVE_FILTER_SZIP
if(h5tools_can_encode(H5Z_FILTER_SZIP) == 1) {
@@ -5529,17 +5523,13 @@ static void gent_filters(void)
HDassert(ret >= 0);
#endif
-#if defined (H5_HAVE_FILTER_FLETCHER32)
/* set the checksum filter */
ret = H5Pset_fletcher32(dcpl);
HDassert(ret >= 0);
-#endif
-#if defined (H5_HAVE_FILTER_NBIT)
/* set the nbit filter */
ret = H5Pset_nbit(dcpl);
HDassert(ret >= 0);
-#endif
ret=make_dset(fid,"all",sid,H5T_NATIVE_INT,dcpl,buf1);
HDassert(ret >= 0);
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index 0c72a8d..36f12a0 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -19,10 +19,6 @@ srcdir=@srcdir@
USE_FILTER_SZIP="@USE_FILTER_SZIP@"
USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
-USE_FILTER_SHUFFLE="@USE_FILTER_SHUFFLE@"
-USE_FILTER_FLETCHER32="@USE_FILTER_FLETCHER32@"
-USE_FILTER_NBIT="@USE_FILTER_NBIT@"
-USE_FILTER_SCALEOFFSET="@USE_FILTER_SCALEOFFSET@"
TESTNAME=h5dump
EXIT_SUCCESS=0
@@ -1184,7 +1180,7 @@ TOOLTEST tallfilters.ddl --enable-error-stack -H -p -d all tfilters.h5
# user defined
TOOLTEST tuserfilter.ddl --enable-error-stack -H -p -d myfilter tfilters.h5
-if test $USE_FILTER_DEFLATE = "yes" -a $USE_FILTER_SHUFFLE = "yes" -a $USE_FILTER_FLETCHER32 = "yes" -a $USE_FILTER_NBIT = "yes" -a $USE_FILTER_SCALEOFFSET = "yes" ; then
+if test $USE_FILTER_DEFLATE = "yes" ; then
# data read internal filters
TOOLTEST treadintfilter.ddl --enable-error-stack -d deflate -d shuffle -d fletcher32 -d nbit -d scaleoffset tfilters.h5
if test $USE_FILTER_SZIP = "yes"; then
diff --git a/tools/h5dump/testh5dumppbits.sh.in b/tools/h5dump/testh5dumppbits.sh.in
index 0f6503d..6556ff5 100644
--- a/tools/h5dump/testh5dumppbits.sh.in
+++ b/tools/h5dump/testh5dumppbits.sh.in
@@ -20,10 +20,6 @@ srcdir=@srcdir@
# Determine which filters are available
USE_FILTER_SZIP="@USE_FILTER_SZIP@"
USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
-USE_FILTER_SHUFFLE="@USE_FILTER_SHUFFLE@"
-USE_FILTER_FLETCHER32="@USE_FILTER_FLETCHER32@"
-USE_FILTER_NBIT="@USE_FILTER_NBIT@"
-USE_FILTER_SCALEOFFSET="@USE_FILTER_SCALEOFFSET@"
TESTNAME=h5dump
EXIT_SUCCESS=0