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

Fix placement of CRAY Fortran options block

This commit is contained in:
Martin Kroeker 2022-08-04 17:43:37 +02:00 committed by GitHub
parent 78412c392f
commit bc7cedb8b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Makefile.system
View File

@ -263,7 +263,6 @@ ifeq ($(ARCH), x86_64)
SMALL_MATRIX_OPT = 1 SMALL_MATRIX_OPT = 1
else ifeq ($(ARCH), power) else ifeq ($(ARCH), power)
SMALL_MATRIX_OPT = 1 SMALL_MATRIX_OPT = 1
BUILD_BFLOAT16 = 1
endif endif
ifeq ($(SMALL_MATRIX_OPT), 1) ifeq ($(SMALL_MATRIX_OPT), 1)
CCOMMON_OPT += -DSMALL_MATRIX_OPT CCOMMON_OPT += -DSMALL_MATRIX_OPT
@ -680,10 +679,6 @@ ifeq ($(ARCH), mips64)
DYNAMIC_CORE = LOONGSON3R3 LOONGSON3R4 DYNAMIC_CORE = LOONGSON3R3 LOONGSON3R4
endif endif
ifeq ($(ARCH), loongarch64)
DYNAMIC_CORE = LOONGSON3R5 LOONGSON2K1000 LOONGSONGENERIC
endif
ifeq ($(ARCH), zarch) ifeq ($(ARCH), zarch)
DYNAMIC_CORE = ZARCH_GENERIC DYNAMIC_CORE = ZARCH_GENERIC
@ -1190,20 +1185,6 @@ FCOMMON_OPT += -i8
endif endif
endif endif
endif endif
ifeq ($(F_COMPILER), CRAY)
CCOMMON_OPT += -DF_INTERFACE_INTEL
FCOMMON_OPT += -hnopattern
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -s integer64
endif
endif
ifneq ($(USE_OPENMP), 1)
FCOMMON_OPT += -O noomp
endif
endif
ifeq ($(ARCH), $(filter $(ARCH),mips64 mips)) ifeq ($(ARCH), $(filter $(ARCH),mips64 mips))
ifndef BINARY64 ifndef BINARY64
FCOMMON_OPT += -n32 FCOMMON_OPT += -n32
@ -1213,11 +1194,9 @@ endif
ifeq ($(CORE), LOONGSON3R3) ifeq ($(CORE), LOONGSON3R3)
FCOMMON_OPT += -loongson3 -static FCOMMON_OPT += -loongson3 -static
endif endif
ifeq ($(CORE), LOONGSON3R4) ifeq ($(CORE), LOONGSON3R4)
FCOMMON_OPT += -loongson3 -static FCOMMON_OPT += -loongson3 -static
endif endif
else else
ifndef BINARY64 ifndef BINARY64
FCOMMON_OPT += -m32 FCOMMON_OPT += -m32
@ -1225,7 +1204,6 @@ else
FCOMMON_OPT += -m64 FCOMMON_OPT += -m64
endif endif
endif endif
ifeq ($(USE_OPENMP), 1) ifeq ($(USE_OPENMP), 1)
FEXTRALIB += -lstdc++ FEXTRALIB += -lstdc++
FCOMMON_OPT += -mp FCOMMON_OPT += -mp
@ -1233,7 +1211,6 @@ endif
endif endif
ifeq ($(C_COMPILER), OPEN64) ifeq ($(C_COMPILER), OPEN64)
ifeq ($(ARCH), $(filter $(ARCH),mips64 mips)) ifeq ($(ARCH), $(filter $(ARCH),mips64 mips))
ifndef BINARY64 ifndef BINARY64
CCOMMON_OPT += -n32 CCOMMON_OPT += -n32
@ -1243,13 +1220,10 @@ endif
ifeq ($(CORE), LOONGSON3R3) ifeq ($(CORE), LOONGSON3R3)
CCOMMON_OPT += -loongson3 -static CCOMMON_OPT += -loongson3 -static
endif endif
ifeq ($(CORE), LOONGSON3R4) ifeq ($(CORE), LOONGSON3R4)
CCOMMON_OPT += -loongson3 -static CCOMMON_OPT += -loongson3 -static
endif endif
else else
ifndef BINARY64 ifndef BINARY64
CCOMMON_OPT += -m32 CCOMMON_OPT += -m32
else else
@ -1295,6 +1269,19 @@ FCOMMON_OPT += -openmp
endif endif
endif endif
ifeq ($(F_COMPILER), CRAY)
CCOMMON_OPT += -DF_INTERFACE_INTEL
FCOMMON_OPT += -hnopattern
ifdef INTERFACE64
ifneq ($(INTERFACE64), 0)
FCOMMON_OPT += -s integer64
endif
endif
ifneq ($(USE_OPENMP), 1)
FCOMMON_OPT += -O noomp
endif
endif
ifdef BINARY64 ifdef BINARY64
ifdef INTERFACE64 ifdef INTERFACE64
ifneq ($(INTERFACE64), 0) ifneq ($(INTERFACE64), 0)
@ -1580,10 +1567,6 @@ ifeq ($(F_COMPILER),NAG)
LAPACK_FFLAGS := $(filter-out -msse3 -mssse3 -msse4.1 -mavx -mavx2 -mskylake-avx512 ,$(FFLAGS)) LAPACK_FFLAGS := $(filter-out -msse3 -mssse3 -msse4.1 -mavx -mavx2 -mskylake-avx512 ,$(FFLAGS))
endif endif
ifeq ($(F_COMPILER),CRAY)
LAPACK_FFLAGS := $(filter-out -msse3 -mssse3 -msse4.1 -mavx -mavx2 -mskylake-avx512 ,$(FFLAGS))
endif
LAPACK_CFLAGS = $(CFLAGS) LAPACK_CFLAGS = $(CFLAGS)
LAPACK_CFLAGS += -DHAVE_LAPACK_CONFIG_H LAPACK_CFLAGS += -DHAVE_LAPACK_CONFIG_H
ifdef INTERFACE64 ifdef INTERFACE64