From 912410f2140da59c0b639110fd6ac6ed495e8bec Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 28 Jun 2017 18:15:21 +0200 Subject: [PATCH] Add ReLAPACK to Makefiles --- Makefile | 20 ++++++++++++++------ Makefile.rule | 5 ++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 27923aa..499732d 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,11 @@ ifneq ($(NO_LAPACK), 1) SUBDIRS += lapack endif +RELA = +ifneq ($(BUILD_RELAPACK), 0) +RELA = re_lapack +endif + LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS)) SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench @@ -23,7 +28,7 @@ SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench .PHONY : all libs netlib test ctest shared install .NOTPARALLEL : all libs prof lapack-test install blas-test -all :: libs netlib tests shared +all :: libs netlib $(RELA) tests shared @echo @echo " OpenBLAS build complete. ($(LIB_COMPONENTS))" @echo @@ -215,6 +220,14 @@ ifndef NO_LAPACKE endif endif +ifeq ($(NO_LAPACK), 1) +re_lapack : + +else +re_lapack : + @$(MAKE) -C relapack +endif + prof_lapack : lapack_prebuild @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof @@ -329,8 +342,3 @@ endif @rm -f *.grd Makefile.conf_last config_last.h @(cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out testing_results.txt) @echo Done. - -# Makefile debugging trick: -# call print-VARIABLE to see the runtime value of any variable -print-%: - @echo '$*=$($*)' diff --git a/Makefile.rule b/Makefile.rule index b6c22f7..2866699 100644 --- a/Makefile.rule +++ b/Makefile.rule @@ -83,6 +83,9 @@ VERSION = 0.2.20.dev # Build LAPACK Deprecated functions since LAPACK 3.6.0 BUILD_LAPACK_DEPRECATED = 1 +# Build RecursiveLAPACK on top of LAPACK +BUILD_RELAPACK = 1 + # If you want to use legacy threaded Level 3 implementation. # USE_SIMPLE_THREADED_LEVEL3 = 1 @@ -97,7 +100,7 @@ BUILD_LAPACK_DEPRECATED = 1 NO_WARMUP = 1 # If you want to disable CPU/Memory affinity on Linux. -NO_AFFINITY = 1 +#NO_AFFINITY = 1 # if you are compiling for Linux and you have more than 16 numa nodes or more than 256 cpus # BIGNUMA = 1 -- 2.7.4