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

Merge pull request #2536 from martin-frbg/recurs 

Add "recursive" option for LAPACK builds with ifort or pgfort as well
This commit is contained in:
Martin Kroeker 2020-04-01 20:00:13 +02:00 committed by GitHub
parent c6af9bbb32 e13b6773ee
commit f059e614eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.system
View File

@ -850,6 +850,7 @@ ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -i8 FCOMMON_OPT += -i8
endif endif
endif endif
FCOMMON_OPT += -recursive
ifeq ($(USE_OPENMP), 1) ifeq ($(USE_OPENMP), 1)
FCOMMON_OPT += -fopenmp FCOMMON_OPT += -fopenmp
endif endif
@ -893,6 +894,7 @@ FCOMMON_OPT += -tp p7-64
else else
FCOMMON_OPT += -tp p7 FCOMMON_OPT += -tp p7
endif endif
FCOMMON_OPT += -Mrecursive
ifeq ($(USE_OPENMP), 1) ifeq ($(USE_OPENMP), 1)
FCOMMON_OPT += -mp FCOMMON_OPT += -mp
endif endif

7
cmake/fc.cmake
View File

@ -76,14 +76,12 @@ if (${F_COMPILER} STREQUAL "GFORTRAN")
endif () endif ()
endif () endif ()
if (${F_COMPILER} STREQUAL "IFORT") if (${F_COMPILER} STREQUAL "INTEL")
set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_INTEL") set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_INTEL")
if (MSVC)
set(FCOMMON_OPT "${FCOMMON_OPT} -names:lowercase -assume:underscore")
endif ()
if (INTERFACE64) if (INTERFACE64)
set(FCOMMON_OPT "${FCOMMON_OPT} -i8") set(FCOMMON_OPT "${FCOMMON_OPT} -i8")
endif () endif ()
set(FCOMMON_OPT "${FCOMMON_OPT} -recursive")
if (USE_OPENMP) if (USE_OPENMP)
set(FCOMMON_OPT "${FCOMMON_OPT} -openmp") set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")
endif () endif ()
@ -123,6 +121,7 @@ if (${F_COMPILER} STREQUAL "PGI")
else () else ()
set(FCOMMON_OPT "${FCOMMON_OPT} -tp p7") set(FCOMMON_OPT "${FCOMMON_OPT} -tp p7")
endif () endif ()
set(FCOMMON_OPT "${FCOMMON_OPT} -Mrecursive")
if (USE_OPENMP) if (USE_OPENMP)
set(FCOMMON_OPT "${FCOMMON_OPT} -mp") set(FCOMMON_OPT "${FCOMMON_OPT} -mp")
endif () endif ()