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

Merge pull request #595 from tanderson92/fixTests 

Fix test execution when USE_OPENMP=0
This commit is contained in:
Zhang Xianyi 2015-06-22 21:54:51 -05:00
parent bdb5c842fc 4f5691e5c0
commit d8f18d32c3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.system
View File

@ -591,7 +591,7 @@ else
FCOMMON_OPT += -m32 FCOMMON_OPT += -m32
endif endif
endif endif
ifdef USE_OPENMP ifeq ($(USE_OPENMP), 1)
FCOMMON_OPT += -fopenmp FCOMMON_OPT += -fopenmp
endif endif
endif endif
@ -603,14 +603,14 @@ ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -i8 FCOMMON_OPT += -i8
endif endif
endif endif
ifdef USE_OPENMP ifeq ($(USE_OPENMP), 1)
FCOMMON_OPT += -openmp FCOMMON_OPT += -openmp
endif endif
endif endif
ifeq ($(F_COMPILER), FUJITSU) ifeq ($(F_COMPILER), FUJITSU)
CCOMMON_OPT += -DF_INTERFACE_FUJITSU CCOMMON_OPT += -DF_INTERFACE_FUJITSU
ifdef USE_OPENMP ifeq ($(USE_OPENMP), 1)
FCOMMON_OPT += -openmp FCOMMON_OPT += -openmp
endif endif
endif endif
@ -628,7 +628,7 @@ endif
else else
FCOMMON_OPT += -q32 FCOMMON_OPT += -q32
endif endif
ifdef USE_OPENMP ifeq ($(USE_OPENMP), 1)
FCOMMON_OPT += -openmp FCOMMON_OPT += -openmp
endif endif
endif endif
@ -646,7 +646,7 @@ FCOMMON_OPT += -tp p7-64
else else
FCOMMON_OPT += -tp p7 FCOMMON_OPT += -tp p7
endif endif
ifdef USE_OPENMP ifeq ($(USE_OPENMP), 1)
FCOMMON_OPT += -mp FCOMMON_OPT += -mp
endif endif
endif endif
@ -675,7 +675,7 @@ FCOMMON_OPT += -mabi=n32
endif endif
endif endif
ifdef USE_OPENMP ifeq ($(USE_OPENMP), 1)
FCOMMON_OPT += -mp FCOMMON_OPT += -mp
endif endif
endif endif
@ -712,7 +712,7 @@ FCOMMON_OPT += -m64
endif endif
endif endif
ifdef USE_OPENMP ifeq ($(USE_OPENMP), 1)
FEXTRALIB += -lstdc++ FEXTRALIB += -lstdc++
FCOMMON_OPT += -mp FCOMMON_OPT += -mp
endif endif
@ -760,14 +760,14 @@ FCOMMON_OPT += -m32
else else
FCOMMON_OPT += -m64 FCOMMON_OPT += -m64
endif endif
ifdef USE_OPENMP ifeq ($(USE_OPENMP), 1)
FCOMMON_OPT += -xopenmp=parallel FCOMMON_OPT += -xopenmp=parallel
endif endif
endif endif
ifeq ($(F_COMPILER), COMPAQ) ifeq ($(F_COMPILER), COMPAQ)
CCOMMON_OPT += -DF_INTERFACE_COMPAQ CCOMMON_OPT += -DF_INTERFACE_COMPAQ
ifdef USE_OPENMP ifeq ($(USE_OPENMP), 1)
FCOMMON_OPT += -openmp FCOMMON_OPT += -openmp
endif endif
endif endif