commit 66aa652249c64052c8f018a4fca6b3c4937d8b0f parent 1b42cb706511384eaa06459804ddfc89d7d44f02 Author: Fabian Wermelinger <fabianw@mavt.ethz.ch> Date: Fri, 29 Apr 2016 17:08:33 +0200 makefile mods Diffstat:
| M | Makefile.config | | | 104 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| M | third_party/Makefile | | | 2 | +- |
2 files changed, 105 insertions(+), 1 deletion(-)
diff --git a/Makefile.config b/Makefile.config @@ -6,6 +6,28 @@ hdf ?= 1 cubismz ?= 1 prec ?= float +#compression stage-1 (floating point) +wavz ?= 1 +fpc ?= 0 +fpzip ?= 0 +shuffle ?= 0 +zerobits ?= 0 +drain ?= 0 + +#compression stage-2 (encoding) +zlib ?= 1 +lz4 ?= 0 +lzf ?= 0 +lzma ?= 0 +zopfli ?=0 +#fpc2 ?= 0 # this works but I do not know what we compress (mix below) +#fpzip2 ?= 0 # this does not seem to work when the stream is a mix of integers and floats +# + +#fpc3 ?= 0 # for wavz + fpc +#fpzip3 ?= 0 # for wavz + fpz +shuffle3 ?= 0 # for wavz + shuffle3 + INC = -Iinclude -Ithird_party/pngwriter-0.5.4 LIB = -Llib @@ -41,4 +63,86 @@ else CPPFLAGS += -O3 -DNDEBUG endif +# Compression Options +ifeq "$(wavz)" "1" + CPPFLAGS += -D_USE_WAVZ_ +endif + +ifeq "$(fpc)" "1" + CPPFLAGS += -D_USE_FPC_ +endif + +ifeq "$(fpzip)" "1" + CPPFLAGS += -D_USE_FPZIP_ +endif + +ifeq "$(drain)" "1" + CPPFLAGS += -D_USE_DRAIN_ +endif + +ifeq "$(shuffle)" "1" + CPPFLAGS += -D_USE_SHUFFLE_ +endif + +ifeq "$(zerobits)" "4" + CPPFLAGS += -D_USE_ZEROBITS_ + CPPFLAGS += -D_ZEROBITS_=4 +endif +ifeq "$(zerobits)" "8" + CPPFLAGS += -D_USE_ZEROBITS_ + CPPFLAGS += -D_ZEROBITS_=8 +endif +ifeq "$(zerobits)" "12" + CPPFLAGS += -D_USE_ZEROBITS_ + CPPFLAGS += -D_ZEROBITS_=12 +endif +ifeq "$(zerobits)" "16" + CPPFLAGS += -D_USE_ZEROBITS_ + CPPFLAGS += -D_ZEROBITS_=16 +endif + + +# Encoding Options +ifeq "$(zlib)" "1" + CPPFLAGS += -D_USE_ZLIB_ +endif + +ifeq "$(lz4)" "1" + CPPFLAGS += -D_USE_LZ4_ +endif + +ifeq "$(lzf)" "1" + CPPFLAGS += -D_USE_LZF_ +endif + +ifeq "$(lzma)" "1" + CPPFLAGS += -D_USE_LZMA_ +endif + +ifeq "$(zopfli)" "1" + CPPFLAGS += -D_USE_ZOPFLI_ +endif + +ifeq "$(fpc2)" "1" + CPPFLAGS += -D_USE_FPC2_ +endif + +ifeq "$(fpzip2)" "1" + CPPFLAGS += -D_USE_FPZIP2_ +endif + +# Extensions to the Wavelet-based Compression (wavz) + +#ifeq "$(fpc3)" "1" +# CPPFLAGS += -D_USE_FPC3_ -I../../../tools/fpc +# LIBS += -L../../../tools/fpc -lfpc +#endif +#ifeq "$(fpzip3)" "1" +# CPPFLAGS += -D_USE_FPZIP3_ -I../../../tools/fpzip/inc +# LIBS += -L../../../tools/fpzip/lib -lfpzip +#endif +ifeq "$(shuffle3)" "1" + CPPFLAGS += -D_USE_SHUFFLE3_ +endif + CPPFLAGS += -Wall -Wextra -Wno-deprecated -D_ALIGNBYTES_=$(align) -D_BLOCKSIZE_=$(bs) diff --git a/third_party/Makefile b/third_party/Makefile @@ -11,7 +11,7 @@ OBJLib3 = ${PNGWRTR_SRC:.cc=.o} all: libCubismZ.a libpng.a libCubismZ.a: - $(MAKE) -f Makefile.cubismz config=$(config) bs=$(bs) ap=$(prec) align=$(align) omp=1 + $(MAKE) -e -f Makefile.cubismz config=$(config) bs=$(bs) ap=$(prec) align=$(align) omp=1 libpng.a: $(OBJLib2) $(OBJLib3) ar rcs ../lib/libpng.a $(OBJLib2) $(OBJLib3)