commit 3dbfaf49b6a9acf68c26fcf6f2da6286bc49ede7
parent 1faa0317faf0a0f539be77743bf7e36e49378c67
Author: Fabian Wermelinger <fabianw@mavt.ethz.ch>
Date: Wed, 25 May 2016 15:55:12 +0000
added cetus and mira machines
Diffstat:
5 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/Makefile.config b/Makefile.config
@@ -28,7 +28,7 @@ zopfli ?=0
#fpzip3 ?= 0 # for wavz + fpz
shuffle3 ?= 0 # for wavz + shuffle3
-INC = -Iinclude -Ithird_party/pngwriter-0.5.4
+INC = -Iinclude -Ithird_party/pngwriter -Ithird_party/libpng
LIB = -Llib
CFLAGS =
@@ -135,14 +135,31 @@ endif
#ifeq "$(fpc3)" "1"
# CPPFLAGS += -D_USE_FPC3_ -I../../../tools/fpc
-# LIBS += -L../../../tools/fpc -lfpc
+# LIB += -L../../../tools/fpc -lfpc
#endif
#ifeq "$(fpzip3)" "1"
# CPPFLAGS += -D_USE_FPZIP3_ -I../../../tools/fpzip/inc
-# LIBS += -L../../../tools/fpzip/lib -lfpzip
+# LIB += -L../../../tools/fpzip/lib -lfpzip
#endif
ifeq "$(shuffle3)" "1"
CPPFLAGS += -D_USE_SHUFFLE3_
endif
+# various machines
+ifneq "$(findstring mira,$(shell hostname))" ""
+ CPPFLAGS += -I${HOME}/usr/zlib/include
+ CFLAGS += -I${HOME}/usr/zlib/include
+ LIB += -L${HOME}/usr/zlib/lib
+ CPPFLAGS += -I/soft/libraries/hdf5/1.8.14/cnk-gcc/current/include
+ LIB += -L/soft/libraries/hdf5/1.8.14/cnk-gcc/current/lib
+endif
+
+ifneq "$(findstring cetus,$(shell hostname))" ""
+ CPPFLAGS += -I${HOME}/usr/zlib/include
+ CFLAGS += -I${HOME}/usr/zlib/include
+ LIB += -L${HOME}/usr/zlib/lib
+ CPPFLAGS += -I/soft/libraries/hdf5/1.8.14/cnk-gcc/current/include
+ LIB += -L/soft/libraries/hdf5/1.8.14/cnk-gcc/current/lib
+endif
+
CPPFLAGS += -Wall -Wextra -Wno-deprecated -D_ALIGNBYTES_=$(align) -D_BLOCKSIZE_=$(bs)
diff --git a/third_party/Makefile b/third_party/Makefile
@@ -18,10 +18,10 @@ libpng.a: $(OBJLib2) $(OBJLib3)
ranlib ../lib/libpng.a
.c.o:
- gcc -c $(CFLAGS) -o $@ $<
+ mpicc -c $(CFLAGS) -o $@ $<
.cc.o:
- g++ -c $(CPPFLAGS) $(INC) -o $@ $<
+ mpic++ -c $(CPPFLAGS) $(INC) -o $@ $<
clean:
rm -rf $(OBJLib2) $(OBJLib3) ../lib/libpng.a
diff --git a/third_party/Makefile.cubismz b/third_party/Makefile.cubismz
@@ -1,5 +1,19 @@
include CubismZ/CubismApps/Makefile.config
+ifneq "$(findstring mira,$(shell hostname))" ""
+ CPPFLAGS += -I${HOME}/usr/zlib/include
+ LIBS += -L${HOME}/usr/zlib/lib
+ CPPFLAGS += -I/soft/libraries/hdf5/current/cnk-xl/current/include
+ LIBS += -L/soft/libraries/hdf5/current/cnk-xl/current/lib
+endif
+
+ifneq "$(findstring cetus,$(shell hostname))" ""
+ CPPFLAGS += -I${HOME}/usr/zlib/include
+ LIBS += -L${HOME}/usr/zlib/lib
+ CPPFLAGS += -I/soft/libraries/hdf5/current/cnk-xl/current/include
+ LIBS += -L/soft/libraries/hdf5/current/cnk-xl/current/lib
+endif
+
CubismZ_SRC = CubismZ/CubismApps/Compressor/source/WaveletCompressor.cpp
OBJLib1 = ${CubismZ_SRC:.cpp=.o}
@@ -8,7 +22,7 @@ all: $(OBJLib1)
ranlib ../lib/libCubismZ.a
.cpp.o:
- g++ -c $(CPPFLAGS) $(INC) -o $@ $<
+ mpic++ -c $(CPPFLAGS) $(INC) -o $@ $<
clean:
rm -f $(OBJLib1) ../lib/libCubismZ.a
diff --git a/third_party/libpng b/third_party/libpng
@@ -0,0 +1 @@
+libpng-1.2.51
+\ No newline at end of file
diff --git a/third_party/pngwriter b/third_party/pngwriter
@@ -0,0 +1 @@
+pngwriter-0.5.4/
+\ No newline at end of file
