Merge pull request #3614 from martin-frbg/clapackfix

Makefile fixes related to C_LAPACK, plus Travis CI fixes
This commit is contained in:
Martin Kroeker 2022-04-30 20:35:17 +02:00 committed by GitHub
commit d502326e54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions

View File

@ -25,7 +25,8 @@ matrix:
# - BTYPE="BINARY=64"
#
# - <<: *test-ubuntu
os: linux-ppc64le
os: linux
arch: ppc64le
before_script: &common-before
- COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=POWER8 NUM_THREADS=32"
script:
@ -43,6 +44,7 @@ matrix:
arch: s390x
before_script:
- COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=Z13 NUM_THREADS=32"
- sudo apt-get install --only-upgrade binutils
env:
# for matrix annotation only
- TARGET_BOX=IBMZ_LINUX
@ -55,6 +57,7 @@ matrix:
compiler: clang
before_script:
- COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=Z13 NUM_THREADS=32"
- sudo apt-get install --only-upgrade binutils
env:
# for matrix annotation only
- TARGET_BOX=IBMZ_LINUX
@ -269,9 +272,9 @@ matrix:
# - CFLAGS="-O2 -mno-thumb -Wno-macro-redefined -isysroot /Applications/Xcode-11.5.GM.Seed.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.5.sdk -arch armv7 -miphoneos-version-min=5.1"
# - BTYPE="TARGET=ARMV7 HOSTCC=clang NOFORTRAN=1"
- &test-graviton2
- &test-neoversen1
os: linux
arch: arm64-graviton2
arch: arm64
dist: focal
group: edge
virt: lxd

View File

@ -163,7 +163,7 @@ ifeq ($(CORE), UNKNOWN)
$(error OpenBLAS: Detecting CPU failed. Please set TARGET explicitly, e.g. make TARGET=your_cpu_target. Please read README for the detail.)
endif
ifeq ($(NOFORTRAN), 1)
$(info OpenBLAS: Detecting fortran compiler failed. Cannot compile LAPACK. Only compile BLAS.)
$(info OpenBLAS: Detecting fortran compiler failed. Can only compile BLAS and f2c-converted LAPACK.)
endif
ifeq ($(NO_STATIC), 1)
ifeq ($(NO_SHARED), 1)

View File

@ -1041,9 +1041,11 @@ FCOMMON_OPT += -frecursive
# work around ABI problem with passing single-character arguments
FCOMMON_OPT += -fno-optimize-sibling-calls
#Don't include -lgfortran, when NO_LAPACK=1 or lsbcc
ifneq ($(NOFORTRAN), 1)
ifneq ($(NO_LAPACK), 1)
EXTRALIB += -lgfortran
endif
endif
ifdef NO_BINARY_MODE
ifeq ($(ARCH), $(filter $(ARCH),mips64))
ifdef BINARY64

View File

@ -58,7 +58,6 @@ TOPSRCDIR = ..
include $(TOPSRCDIR)/make.inc
ifneq ($(C_LAPACK), 1)
$(info fortran... C_LAPACK ist $(C_LAPACK))
.SUFFIXES:
.SUFFIXES: .f .o
.f.o:
@ -67,7 +66,6 @@ $(info fortran... C_LAPACK ist $(C_LAPACK))
.F.o:
$(FC) $(FFLAGS) -c -o $@ $<
else
$(info C_LAPACK ist $(C_LAPACK))
.SUFFIXES: .c .o
.c.o:
$(CC) $(CFLAGS) -c -o $@ $<