Skip to content

Commit c757598

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #3394 from xianyi/develop
Merge from develop for 0.3.18
2 parents 686e1f0 + 9549167 commit c757598

File tree

165 files changed

+35968
-974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+35968
-974
lines changed

‎.travis.yml

Lines changed: 167 additions & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,38 @@
11
# XXX: Precise is already deprecated, new default is Trusty.
22
# https://blog.travis-ci.com/2017-07-11-trusty-as-default-linux-is-coming
3-
dist: precise
3+
dist: focal
44
sudo: true
55
language: c
66

77
matrix:
88
include:
99
- &test-ubuntu
10-
os: linux
10+
# os: linux
1111
compiler: gcc
1212
addons:
1313
apt:
1414
packages:
1515
- gfortran
16+
# before_script: &common-before
17+
# - COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=NEHALEM NUM_THREADS=32"
18+
# script:
19+
# - make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
20+
# - make -C test $COMMON_FLAGS $BTYPE
21+
# - make -C ctest $COMMON_FLAGS $BTYPE
22+
# - make -C utest $COMMON_FLAGS $BTYPE
23+
# env:
24+
# - TARGET_BOX=LINUX64
25+
# - BTYPE="BINARY=64"
26+
#
27+
# - <<: *test-ubuntu
28+
os: linux-ppc64le
1629
before_script: &common-before
17-
- COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=NEHALEM NUM_THREADS=32"
30+
- COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=POWER8 NUM_THREADS=32"
1831
script:
1932
- make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
2033
- make -C test $COMMON_FLAGS $BTYPE
2134
- make -C ctest $COMMON_FLAGS $BTYPE
2235
- make -C utest $COMMON_FLAGS $BTYPE
23-
env:
24-
- TARGET_BOX=LINUX64
25-
- BTYPE="BINARY=64"
26-
27-
- <<: *test-ubuntu
28-
os: linux-ppc64le
29-
before_script:
30-
- COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=POWER8 NUM_THREADS=32"
3136
env:
3237
# for matrix annotation only
3338
- TARGET_BOX=PPC64LE_LINUX
@@ -55,38 +60,38 @@ matrix:
5560
- TARGET_BOX=IBMZ_LINUX
5661
- BTYPE="BINARY=64 USE_OPENMP=0 CC=clang"
5762

58-
- <<: *test-ubuntu
59-
env:
60-
- TARGET_BOX=LINUX64
61-
- BTYPE="BINARY=64 USE_OPENMP=1"
62-
63-
- <<: *test-ubuntu
64-
env:
65-
- TARGET_BOX=LINUX64
66-
- BTYPE="BINARY=64 INTERFACE64=1"
67-
68-
- <<: *test-ubuntu
69-
compiler: clang
70-
env:
71-
- TARGET_BOX=LINUX64
72-
- BTYPE="BINARY=64 CC=clang"
73-
74-
- <<: *test-ubuntu
75-
compiler: clang
76-
env:
77-
- TARGET_BOX=LINUX64
78-
- BTYPE="BINARY=64 INTERFACE64=1 CC=clang"
79-
80-
- <<: *test-ubuntu
81-
addons:
82-
apt:
83-
packages:
84-
- gcc-multilib
85-
- gfortran-multilib
86-
env:
87-
- TARGET_BOX=LINUX32
88-
- BTYPE="BINARY=32"
89-
63+
# - <<: *test-ubuntu
64+
# env:
65+
# - TARGET_BOX=LINUX64
66+
# - BTYPE="BINARY=64 USE_OPENMP=1"
67+
#
68+
# - <<: *test-ubuntu
69+
# env:
70+
# - TARGET_BOX=LINUX64
71+
# - BTYPE="BINARY=64 INTERFACE64=1"
72+
#
73+
# - <<: *test-ubuntu
74+
# compiler: clang
75+
# env:
76+
# - TARGET_BOX=LINUX64
77+
# - BTYPE="BINARY=64 CC=clang"
78+
#
79+
# - <<: *test-ubuntu
80+
# compiler: clang
81+
# env:
82+
# - TARGET_BOX=LINUX64
83+
# - BTYPE="BINARY=64 INTERFACE64=1 CC=clang"
84+
#
85+
# - <<: *test-ubuntu
86+
# addons:
87+
# apt:
88+
# packages:
89+
# - gcc-multilib
90+
# - gfortran-multilib
91+
# env:
92+
# - TARGET_BOX=LINUX32
93+
# - BTYPE="BINARY=32"
94+
#
9095
- os: linux
9196
arch: ppc64le
9297
dist: bionic
@@ -121,47 +126,47 @@ matrix:
121126
# for matrix annotation only
122127
- TARGET_BOX=PPC64LE_LINUX_P9
123128

124-
- os: linux
125-
compiler: gcc
126-
addons:
127-
apt:
128-
packages:
129-
- binutils-mingw-w64-x86-64
130-
- gcc-mingw-w64-x86-64
131-
- gfortran-mingw-w64-x86-64
132-
before_script: *common-before
133-
script:
134-
- travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
135-
env:
136-
- TARGET_BOX=WIN64
137-
- BTYPE="BINARY=64 HOSTCC=gcc CC=x86_64-w64-mingw32-gcc FC=x86_64-w64-mingw32-gfortran"
138-
129+
# - os: linux
130+
# compiler: gcc
131+
# addons:
132+
# apt:
133+
# packages:
134+
# - binutils-mingw-w64-x86-64
135+
# - gcc-mingw-w64-x86-64
136+
# - gfortran-mingw-w64-x86-64
137+
# before_script: *common-before
138+
# script:
139+
# - travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
140+
# env:
141+
# - TARGET_BOX=WIN64
142+
# - BTYPE="BINARY=64 HOSTCC=gcc CC=x86_64-w64-mingw32-gcc FC=x86_64-w64-mingw32-gfortran"
143+
#
139144
# Build & test on Alpine Linux inside chroot, i.e. on system with musl libc.
140145
# These jobs needs sudo, so Travis runs them on VM-based infrastructure
141146
# which is slower than container-based infrastructure used for jobs
142147
# that don't require sudo.
143-
- &test-alpine
144-
os: linux
145-
dist: trusty
146-
sudo: true
147-
language: minimal
148-
before_install:
149-
- "wget 'https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/v0.9.0/alpine-chroot-install' \
150-
&& echo 'e5dfbbdc0c4b3363b99334510976c86bfa6cb251 alpine-chroot-install' | sha1sum -c || exit 1"
151-
- alpine() { /alpine/enter-chroot -u "$USER" "$@"; }
152-
install:
153-
- sudo sh alpine-chroot-install -p 'build-base gfortran perl linux-headers'
154-
before_script: *common-before
155-
script:
156-
# XXX: Disable some warnings for now to avoid exceeding Travis limit for log size.
157-
- alpine make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
158-
CFLAGS="-Wno-misleading-indentation -Wno-sign-conversion -Wno-incompatible-pointer-types"
159-
- alpine make -C test $COMMON_FLAGS $BTYPE
160-
- alpine make -C ctest $COMMON_FLAGS $BTYPE
161-
- alpine make -C utest $COMMON_FLAGS $BTYPE
162-
env:
163-
- TARGET_BOX=LINUX64_MUSL
164-
- BTYPE="BINARY=64"
148+
# - &test-alpine
149+
# os: linux
150+
# dist: trusty
151+
# sudo: true
152+
# language: minimal
153+
# before_install:
154+
# - "wget 'https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/v0.9.0/alpine-chroot-install' \
155+
# && echo 'e5dfbbdc0c4b3363b99334510976c86bfa6cb251 alpine-chroot-install' | sha1sum -c || exit 1"
156+
# - alpine() { /alpine/enter-chroot -u "$USER" "$@"; }
157+
# install:
158+
# - sudo sh alpine-chroot-install -p 'build-base gfortran perl linux-headers'
159+
# before_script: *common-before
160+
# script:
161+
# # XXX: Disable some warnings for now to avoid exceeding Travis limit for log size.
162+
# - alpine make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
163+
# CFLAGS="-Wno-misleading-indentation -Wno-sign-conversion -Wno-incompatible-pointer-types"
164+
# - alpine make -C test $COMMON_FLAGS $BTYPE
165+
# - alpine make -C ctest $COMMON_FLAGS $BTYPE
166+
# - alpine make -C utest $COMMON_FLAGS $BTYPE
167+
# env:
168+
# - TARGET_BOX=LINUX64_MUSL
169+
# - BTYPE="BINARY=64"
165170

166171
# XXX: This job segfaults in TESTS OF THE COMPLEX LEVEL 3 BLAS,
167172
# but only on Travis CI, cannot reproduce it elsewhere.
@@ -171,98 +176,98 @@ matrix:
171176
# - TARGET_BOX=LINUX64_MUSL
172177
# - BTYPE="BINARY=64 USE_OPENMP=1"
173178

174-
- <<: *test-alpine
175-
env:
176-
- TARGET_BOX=LINUX64_MUSL
177-
- BTYPE="BINARY=64 INTERFACE64=1"
179+
# - <<: *test-alpine
180+
# env:
181+
# - TARGET_BOX=LINUX64_MUSL
182+
# - BTYPE="BINARY=64 INTERFACE64=1"
183+
#
184+
# # Build with the same flags as Alpine do in OpenBLAS package.
185+
# - <<: *test-alpine
186+
# env:
187+
# - TARGET_BOX=LINUX64_MUSL
188+
# - BTYPE="BINARY=64 NO_AFFINITY=1 USE_OPENMP=0 NO_LAPACK=0 TARGET=CORE2"
178189

179-
# Build with the same flags as Alpine do in OpenBLAS package.
180-
- <<: *test-alpine
181-
env:
182-
- TARGET_BOX=LINUX64_MUSL
183-
- BTYPE="BINARY=64 NO_AFFINITY=1 USE_OPENMP=0 NO_LAPACK=0 TARGET=CORE2"
190+
# - &test-cmake
191+
# os: linux
192+
# compiler: clang
193+
# addons:
194+
# apt:
195+
# packages:
196+
# - gfortran
197+
# - cmake
198+
# dist: trusty
199+
# sudo: true
200+
# before_script:
201+
# - COMMON_ARGS="-DTARGET=NEHALEM -DNUM_THREADS=32"
202+
# script:
203+
# - mkdir build
204+
# - CONFIG=Release
205+
# - cmake -Bbuild -H. $CMAKE_ARGS $COMMON_ARGS -DCMAKE_BUILD_TYPE=$CONFIG
206+
# - cmake --build build --config $CONFIG -- -j2
207+
# env:
208+
# - CMAKE=1
209+
# - <<: *test-cmake
210+
# env:
211+
# - CMAKE=1 CMAKE_ARGS="-DNOFORTRAN=1"
212+
# - <<: *test-cmake
213+
# compiler: gcc
214+
# env:
215+
# - CMAKE=1
184216

185-
- &test-cmake
186-
os: linux
187-
compiler: clang
188-
addons:
189-
apt:
190-
packages:
191-
- gfortran
192-
- cmake
193-
dist: trusty
194-
sudo: true
195-
before_script:
196-
- COMMON_ARGS="-DTARGET=NEHALEM -DNUM_THREADS=32"
197-
script:
198-
- mkdir build
199-
- CONFIG=Release
200-
- cmake -Bbuild -H. $CMAKE_ARGS $COMMON_ARGS -DCMAKE_BUILD_TYPE=$CONFIG
201-
- cmake --build build --config $CONFIG -- -j2
202-
env:
203-
- CMAKE=1
204-
- <<: *test-cmake
205-
env:
206-
- CMAKE=1 CMAKE_ARGS="-DNOFORTRAN=1"
207-
- <<: *test-cmake
208-
compiler: gcc
209-
env:
210-
- CMAKE=1
211-
212-
- &test-macos
213-
os: osx
214-
osx_image: xcode11.5
215-
before_script:
216-
- COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
217-
script:
218-
- travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
219-
env:
220-
- BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-9"
221-
222-
- <<: *test-macos
223-
osx_image: xcode12
224-
before_script:
225-
- COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
226-
- brew update
227-
script:
228-
- travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
229-
env:
230-
- BTYPE="TARGET=HASWELL USE_OPENMP=1 BINARY=64 INTERFACE64=1 CC=gcc-10 FC=gfortran-10"
231-
232-
- <<: *test-macos
233-
osx_image: xcode12
234-
before_script:
235-
- COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
236-
- brew update
237-
script:
238-
- travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
239-
env:
240-
- BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-10"
217+
# - &test-macos
218+
# os: osx
219+
# osx_image: xcode11.5
220+
# before_script:
221+
# - COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
222+
# script:
223+
# - travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
224+
# env:
225+
# - BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-9"
226+
#
227+
# - <<: *test-macos
228+
# osx_image: xcode12
229+
# before_script:
230+
# - COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
231+
# - brew update
232+
# script:
233+
# - travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
234+
# env:
235+
# - BTYPE="TARGET=HASWELL USE_OPENMP=1 BINARY=64 INTERFACE64=1 CC=gcc-10 FC=gfortran-10"
236+
#
237+
# - <<: *test-macos
238+
# osx_image: xcode12
239+
# before_script:
240+
# - COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
241+
# - brew update
242+
# script:
243+
# - travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
244+
# env:
245+
# - BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-10"
241246

242247
# - <<: *test-macos
243248
# osx_image: xcode10
244249
# env:
245250
# - BTYPE="TARGET=NEHALEM BINARY=32 NOFORTRAN=1"
246251

247-
- <<: *test-macos
248-
osx_image: xcode11.5
249-
before_script:
250-
- COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
251-
- brew update
252-
env:
252+
# - <<: *test-macos
253+
# osx_image: xcode11.5
254+
# before_script:
255+
# - COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
256+
# - brew update
257+
# env:
253258
# - CC="/Applications/Xcode-10.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
254259
# - CFLAGS="-O2 -Wno-macro-redefined -isysroot /Applications/Xcode-10.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.1.sdk -arch arm64 -miphoneos-version-min=10.0"
255-
- CC="/Applications/Xcode-11.5.GM.Seed.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
256-
- CFLAGS="-O2 -Wno-macro-redefined -isysroot /Applications/Xcode-11.5.GM.Seed.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.5.sdk -arch arm64 -miphoneos-version-min=10.0"
257-
- BTYPE="TARGET=ARMV8 BINARY=64 HOSTCC=clang NOFORTRAN=1"
258-
- <<: *test-macos
259-
osx_image: xcode11.5
260-
env:
261-
# - CC="/Applications/Xcode-10.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
262-
# - CFLAGS="-O2 -mno-thumb -Wno-macro-redefined -isysroot /Applications/Xcode-10.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.1.sdk -arch armv7 -miphoneos-version-min=5.1"
263-
- CC="/Applications/Xcode-11.5.GM.Seed.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
264-
- 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"
265-
- BTYPE="TARGET=ARMV7 HOSTCC=clang NOFORTRAN=1"
260+
# - CC="/Applications/Xcode-11.5.GM.Seed.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
261+
# - CFLAGS="-O2 -Wno-macro-redefined -isysroot /Applications/Xcode-11.5.GM.Seed.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.5.sdk -arch arm64 -miphoneos-version-min=10.0"
262+
# - BTYPE="TARGET=ARMV8 BINARY=64 HOSTCC=clang NOFORTRAN=1"
263+
# - <<: *test-macos
264+
# osx_image: xcode11.5
265+
# env:
266+
## - CC="/Applications/Xcode-10.1.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
267+
## - CFLAGS="-O2 -mno-thumb -Wno-macro-redefined -isysroot /Applications/Xcode-10.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.1.sdk -arch armv7 -miphoneos-version-min=5.1"
268+
# - CC="/Applications/Xcode-11.5.GM.Seed.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
269+
# - 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"
270+
# - BTYPE="TARGET=ARMV7 HOSTCC=clang NOFORTRAN=1"
266271

267272
- &test-graviton2
268273
os: linux

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ endif ()
132132

133133
if (BUILD_BFLOAT16)
134134
message(STATUS "Building Half Precision")
135-
list(APPEND FLOAT_TYPES "BFLOAT16") # defines nothing
135+
# list(APPEND FLOAT_TYPES "BFLOAT16") # defines nothing
136136
endif ()
137137

138138
if (NOT DEFINED CORE OR "${CORE}" STREQUAL "UNKNOWN")

0 commit comments

Comments
 (0)