diff --git a/Makefile b/Makefile index 8f34653..c3bd372 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,8 @@ include ./etc/make/emacs.mk include ./etc/config/$(CONFIG).mk include ./bench/config.mk +$(info using configuration CONFIG=$(CONFIG)) + MAIN = README.org OBJ_FILES = $(patsubst %.cxx,%.o,$(filter-out %.hpp,$(SOURCES))) DEP_FILES = $(patsubst %.o,%.d,$(OBJ_FILES)) diff --git a/bench/config.mk b/bench/config.mk index 6ce132a..602acc2 100644 --- a/bench/config.mk +++ b/bench/config.mk @@ -3,7 +3,6 @@ BENCH_TARGETS = $(patsubst %.cxx,%,$(BENCH_SOURCES)) $(BENCH_TARGETS): CXXFLAGS += -I. $(BENCH_TARGETS): CXXFLAGS += -fopenmp -$(BENCH_TARGETS): lib bench-clean: -rm -v $(BENCH_TARGETS) diff --git a/etc/config/gcc.mk b/etc/config/gcc.mk index cac00cb..d57e353 100644 --- a/etc/config/gcc.mk +++ b/etc/config/gcc.mk @@ -2,6 +2,8 @@ include etc/make/ctf.mk CXX = mpic++ +bench: lib + CXXFLAGS += -I$(ATRIP_ROOT)/include CXXFLAGS += -I$(CTF_INCLUDE_PATH) diff --git a/etc/config/icc.mk b/etc/config/icc.mk new file mode 100644 index 0000000..e1e568c --- /dev/null +++ b/etc/config/icc.mk @@ -0,0 +1,25 @@ +include etc/make/ctf.mk + +CXX = mpic++ + +bench: static + +CTF_CONFIG_FLAGS = CXX=$(CXX) \ + CXXFLAGS="-O3" \ + LIBS="-lmkl" \ + --no-dynamic + +CXXFLAGS += -I$(ATRIP_ROOT)/include + +CXXFLAGS += -I$(CTF_INCLUDE_PATH) +CXXFLAGS += -fPIC +CXXFLAGS += -O3 + +MKL_LIB = -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64 +LDFLAGS += -qopenmp -mkl +LDFLAGS += -lpthread -std=c++11 +LDFLAGS += $(MKL_LIB) +LDFLAGS += -L$(CTF_BUILD_PATH)/lib -lctf + +bench: CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS)) +bench: LDFLAGS += -Llib/ -latrip diff --git a/etc/env/vsc4/icc.sh b/etc/env/vsc4/icc.sh new file mode 100644 index 0000000..2b18e3c --- /dev/null +++ b/etc/env/vsc4/icc.sh @@ -0,0 +1,7 @@ +module load gcc/9.1.0-gcc-4.8.5-mj7s6dg +module load intel/19.0.5 +module load intel-mkl/2019.5 +module load openmpi/3.1.4-intel-19.0.5.281-lzrjnd7 +module load boost/1.70.0-intel-19.0.5.281-u62owfy +module load cmake/3.15.1-intel-19.0.5.281-zbb4n77 +module load emacs