floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable ReLAPACK by default; mention it in final build message if included

This commit is contained in:
Martin Kroeker 2017-07-13 20:53:38 +02:00 committed by GitHub
parent 3381f23709
commit 4e72da0691
3 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -17,7 +17,7 @@ SUBDIRS += lapack
endif endif
RELA = RELA =
ifneq ($(BUILD_RELAPACK), 0) ifeq ($(BUILD_RELAPACK), 1)
RELA = re_lapack RELA = re_lapack
endif endif

4
Makefile.rule
View File

@ -84,7 +84,7 @@ VERSION = 0.2.20.dev
BUILD_LAPACK_DEPRECATED = 1 BUILD_LAPACK_DEPRECATED = 1
# Build RecursiveLAPACK on top of LAPACK # Build RecursiveLAPACK on top of LAPACK
BUILD_RELAPACK = 1 # BUILD_RELAPACK = 1
# If you want to use legacy threaded Level 3 implementation. # If you want to use legacy threaded Level 3 implementation.
# USE_SIMPLE_THREADED_LEVEL3 = 1 # USE_SIMPLE_THREADED_LEVEL3 = 1
@ -100,7 +100,7 @@ BUILD_RELAPACK = 1
NO_WARMUP = 1 NO_WARMUP = 1
# If you want to disable CPU/Memory affinity on Linux. # 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 # if you are compiling for Linux and you have more than 16 numa nodes or more than 256 cpus
# BIGNUMA = 1 # BIGNUMA = 1

35
Makefile.system
View File

@ -414,6 +414,7 @@ CCOMMON_OPT += -fopenmp
endif endif
ifeq ($(C_COMPILER), CLANG) ifeq ($(C_COMPILER), CLANG)
$(error OpenBLAS: Clang didn't support OpenMP yet.)
CCOMMON_OPT += -fopenmp CCOMMON_OPT += -fopenmp
endif endif
@ -452,9 +453,8 @@ DYNAMIC_CORE += HASWELL ZEN
endif endif
endif endif
# If DYNAMIC_CORE is not set, DYNAMIC_ARCH cannot do anything, so force it to empty
ifndef DYNAMIC_CORE ifndef DYNAMIC_CORE
override DYNAMIC_ARCH= DYNAMIC_ARCH =
endif endif
endif endif
@ -482,17 +482,6 @@ endif
ifeq ($(ARCH), arm) ifeq ($(ARCH), arm)
NO_BINARY_MODE = 1 NO_BINARY_MODE = 1
BINARY_DEFINED = 1 BINARY_DEFINED = 1
CCOMMON_OPT += -marm
FCOMMON_OPT += -marm
ifeq ($(ARM_SOFTFP_ABI), 1)
CCOMMON_OPT += -mfloat-abi=softfp -DARM_SOFTFP_ABI
FCOMMON_OPT += -mfloat-abi=softfp -DARM_SOFTFP_ABI
else
CCOMMON_OPT += -mfloat-abi=hard
FCOMMON_OPT += -mfloat-abi=hard
endif
endif endif
ifeq ($(ARCH), arm64) ifeq ($(ARCH), arm64)
@ -594,23 +583,6 @@ endif
# Fortran Compiler dependent settings # Fortran Compiler dependent settings
# #
ifeq ($(F_COMPILER), FLANG)
CCOMMON_OPT += -DF_INTERFACE_FLANG
ifdef BINARY64
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -i8
endif
endif
FCOMMON_OPT += -Wall
else
FCOMMON_OPT += -Wall
endif
ifeq ($(USE_OPENMP), 1)
FCOMMON_OPT += -fopenmp
endif
endif
ifeq ($(F_COMPILER), G77) ifeq ($(F_COMPILER), G77)
CCOMMON_OPT += -DF_INTERFACE_G77 CCOMMON_OPT += -DF_INTERFACE_G77
FCOMMON_OPT += -Wall FCOMMON_OPT += -Wall
@ -1119,6 +1091,9 @@ LIB_COMPONENTS += LAPACK
ifneq ($(NO_LAPACKE), 1) ifneq ($(NO_LAPACKE), 1)
LIB_COMPONENTS += LAPACKE LIB_COMPONENTS += LAPACKE
endif endif
ifeq (${BUILD_RELAPACK}, 1)
LIB_COMPONENTS += ReLAPACK
endif
endif endif
ifeq ($(ONLY_CBLAS), 1) ifeq ($(ONLY_CBLAS), 1)