Skip to content

Commit 86cff4e

Browse files
authored
Merge pull request #1900 from xianyi/develop
Update from develop for 0.3.4
2 parents fd8d186 + b028960 commit 86cff4e

File tree

126 files changed

+7245
-1546
lines changed

Some content is hidden

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

126 files changed

+7245
-1546
lines changed

.travis.yml

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ dist: precise
44
sudo: true
55
language: c
66

7-
jobs:
7+
matrix:
88
include:
99
- &test-ubuntu
1010
os: linux
11-
stage: test
1211
compiler: gcc
1312
addons:
1413
apt:
@@ -59,7 +58,6 @@ jobs:
5958
- BTYPE="BINARY=32"
6059

6160
- os: linux
62-
stage: test
6361
compiler: gcc
6462
addons:
6563
apt:
@@ -80,13 +78,12 @@ jobs:
8078
# that don't require sudo.
8179
- &test-alpine
8280
os: linux
83-
stage: test
8481
dist: trusty
8582
sudo: true
8683
language: minimal
8784
before_install:
88-
- "wget 'https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/v0.6.0/alpine-chroot-install' \
89-
&& echo 'a827a4ba3d0817e7c88bae17fe34e50204983d1e alpine-chroot-install' | sha1sum -c || exit 1"
85+
- "wget 'https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/v0.9.0/alpine-chroot-install' \
86+
&& echo 'e5dfbbdc0c4b3363b99334510976c86bfa6cb251 alpine-chroot-install' | sha1sum -c || exit 1"
9087
- alpine() { /alpine/enter-chroot -u "$USER" "$@"; }
9188
install:
9289
- sudo sh alpine-chroot-install -p 'build-base gfortran perl linux-headers'
@@ -124,7 +121,6 @@ jobs:
124121

125122
- &test-cmake
126123
os: linux
127-
stage: test
128124
compiler: clang
129125
addons:
130126
apt:
@@ -153,7 +149,6 @@ jobs:
153149

154150
- &test-macos
155151
os: osx
156-
stage: test
157152
osx_image: xcode8
158153
before_script:
159154
- COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=NEHALEM NUM_THREADS=32"
@@ -168,6 +163,42 @@ jobs:
168163
env:
169164
- BTYPE="BINARY=32"
170165

166+
- &emulated-arm
167+
dist: trusty
168+
sudo: required
169+
services: docker
170+
env: IMAGE_ARCH=arm32 TARGET_ARCH=ARMV6 COMPILER=gcc
171+
name: "Emulated Build for ARMV6 with gcc"
172+
before_install: sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
173+
script: |
174+
echo "FROM openblas/alpine:${IMAGE_ARCH}
175+
COPY . /tmp/openblas
176+
RUN mkdir /tmp/openblas/build && \
177+
cd /tmp/openblas/build && \
178+
CC=${COMPILER} cmake -D DYNAMIC_ARCH=OFF \
179+
-D TARGET=${TARGET_ARCH} \
180+
-D BUILD_SHARED_LIBS=ON \
181+
-D BUILD_WITHOUT_LAPACK=ON \
182+
-D BUILD_WITHOUT_CBLAS=ON \
183+
-D CMAKE_BUILD_TYPE=Release ../ && \
184+
cmake --build ." > Dockerfile
185+
docker build .
186+
- <<: *emulated-arm
187+
env: IMAGE_ARCH=arm32 TARGET_ARCH=ARMV6 COMPILER=clang
188+
name: "Emulated Build for ARMV6 with clang"
189+
- <<: *emulated-arm
190+
env: IMAGE_ARCH=arm64 TARGET_ARCH=ARMV8 COMPILER=gcc
191+
name: "Emulated Build for ARMV8 with gcc"
192+
- <<: *emulated-arm
193+
env: IMAGE_ARCH=arm64 TARGET_ARCH=ARMV8 COMPILER=clang
194+
name: "Emulated Build for ARMV8 with clang"
195+
196+
allow_failures:
197+
- env: IMAGE_ARCH=arm32 TARGET_ARCH=ARMV6 COMPILER=gcc
198+
- env: IMAGE_ARCH=arm32 TARGET_ARCH=ARMV6 COMPILER=clang
199+
- env: IMAGE_ARCH=arm64 TARGET_ARCH=ARMV8 COMPILER=gcc
200+
- env: IMAGE_ARCH=arm64 TARGET_ARCH=ARMV8 COMPILER=clang
201+
171202
# whitelist
172203
branches:
173204
only:

CMakeLists.txt

Lines changed: 97 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 2.8.5)
66
project(OpenBLAS C ASM)
77
set(OpenBLAS_MAJOR_VERSION 0)
88
set(OpenBLAS_MINOR_VERSION 3)
9-
set(OpenBLAS_PATCH_VERSION 3)
9+
set(OpenBLAS_PATCH_VERSION 4)
1010
set(OpenBLAS_VERSION "${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.${OpenBLAS_PATCH_VERSION}")
1111

1212
# Adhere to GNU filesystem layout conventions
@@ -15,16 +15,21 @@ include(GNUInstallDirs)
1515
include(CMakePackageConfigHelpers)
1616

1717

18-
set(OpenBLAS_LIBNAME openblas)
19-
2018
#######
2119
if(MSVC)
22-
option(BUILD_WITHOUT_LAPACK "Without LAPACK and LAPACKE (Only BLAS or CBLAS)" ON)
20+
option(BUILD_WITHOUT_LAPACK "Do not build LAPACK and LAPACKE (Only BLAS or CBLAS)" ON)
2321
endif()
24-
option(BUILD_WITHOUT_CBLAS "Without CBLAS" OFF)
25-
option(DYNAMIC_ARCH "Build with DYNAMIC_ARCH" OFF)
26-
option(DYNAMIC_OLDER "Support older cpus with DYNAMIC_ARCH" OFF)
27-
option(BUILD_RELAPACK "Build with ReLAPACK (recursive LAPACK" OFF)
22+
option(BUILD_WITHOUT_CBLAS "Do not build the C interface (CBLAS) to the BLAS functions" OFF)
23+
option(DYNAMIC_ARCH "Include support for multiple CPU targets, with automatic selection at runtime (x86/x86_64 only)" OFF)
24+
option(DYNAMIC_OLDER "Include specific support for older cpu models (Penryn,Dunnington,Atom,Nano,Opteron) with DYNAMIC_ARCH" OFF)
25+
option(BUILD_RELAPACK "Build with ReLAPACK (recursive implementation of several LAPACK functions on top of standard LAPACK)" OFF)
26+
27+
# Add a prefix or suffix to all exported symbol names in the shared library.
28+
# Avoids conflicts with other BLAS libraries, especially when using
29+
# 64 bit integer interfaces in OpenBLAS.
30+
31+
set(SYMBOLPREFIX "" CACHE STRING "Add a prefix to all exported symbol names in the shared library to avoid conflicts with other BLAS libraries" )
32+
set(SYMBOLSUFFIX "" CACHE STRING "Add a suffix to all exported symbol names in the shared library, e.g. _64 for INTERFACE64 builds" )
2833
#######
2934
if(BUILD_WITHOUT_LAPACK)
3035
set(NO_LAPACK 1)
@@ -38,11 +43,13 @@ endif()
3843
#######
3944

4045

41-
message(WARNING "CMake support is experimental. This will not produce the same Makefiles that OpenBLAS ships with. Only x86 support is currently available.")
46+
message(WARNING "CMake support is experimental. It does not yet support all build options and may not produce the same Makefiles that OpenBLAS ships with.")
4247

4348
include("${PROJECT_SOURCE_DIR}/cmake/utils.cmake")
4449
include("${PROJECT_SOURCE_DIR}/cmake/system.cmake")
4550

51+
set(OpenBLAS_LIBNAME openblas${SUFFIX64_UNDERSCORE})
52+
4653
set(BLASDIRS interface driver/level2 driver/level3 driver/others)
4754

4855
if (NOT DYNAMIC_ARCH)
@@ -210,15 +217,84 @@ set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES
210217
SOVERSION ${OpenBLAS_MAJOR_VERSION}
211218
)
212219

220+
if (BUILD_SHARED_LIBS AND NOT ${SYMBOLPREFIX}${SYMBOLSUFIX} STREQUAL "")
221+
if (NOT DEFINED ARCH)
222+
set(ARCH_IN "x86_64")
223+
else()
224+
set(ARCH_IN ${ARCH})
225+
endif()
226+
227+
if (${CORE} STREQUAL "generic")
228+
set(ARCH_IN "GENERIC")
229+
endif ()
230+
231+
if (NOT DEFINED EXPRECISION)
232+
set(EXPRECISION_IN 0)
233+
else()
234+
set(EXPRECISION_IN ${EXPRECISION})
235+
endif()
236+
237+
if (NOT DEFINED NO_CBLAS)
238+
set(NO_CBLAS_IN 0)
239+
else()
240+
set(NO_CBLAS_IN ${NO_CBLAS})
241+
endif()
242+
243+
if (NOT DEFINED NO_LAPACK)
244+
set(NO_LAPACK_IN 0)
245+
else()
246+
set(NO_LAPACK_IN ${NO_LAPACK})
247+
endif()
248+
249+
if (NOT DEFINED NO_LAPACKE)
250+
set(NO_LAPACKE_IN 0)
251+
else()
252+
set(NO_LAPACKE_IN ${NO_LAPACKE})
253+
endif()
254+
255+
if (NOT DEFINED NEED2UNDERSCORES)
256+
set(NEED2UNDERSCORES_IN 0)
257+
else()
258+
set(NEED2UNDERSCORES_IN ${NEED2UNDERSCORES})
259+
endif()
260+
261+
if (NOT DEFINED ONLY_CBLAS)
262+
set(ONLY_CBLAS_IN 0)
263+
else()
264+
set(ONLY_CBLAS_IN ${ONLY_CBLAS})
265+
endif()
266+
267+
if (NOT DEFINED BU)
268+
set(BU _)
269+
endif()
270+
271+
if (NOT ${SYMBOLPREFIX} STREQUAL "")
272+
message(STATUS "adding prefix ${SYMBOLPREFIX} to names of exported symbols in ${OpenBLAS_LIBNAME}")
273+
endif()
274+
if (NOT ${SYMBOLSUFFIX} STREQUAL "")
275+
message(STATUS "adding suffix ${SYMBOLSUFFIX} to names of exported symbols in ${OpenBLAS_LIBNAME}")
276+
endif()
277+
add_custom_command(TARGET ${OpenBLAS_LIBNAME} POST_BUILD
278+
COMMAND perl ${PROJECT_SOURCE_DIR}/exports/gensymbol "objcopy" "${ARCH}" "${BU}" "${EXPRECISION_IN}" "${NO_CBLAS_IN}" "${NO_LAPACK_IN}" "${NO_LAPACKE_IN}" "${NEED2UNDERSCORES_IN}" "${ONLY_CBLAS_IN}" \"${SYMBOLPREFIX}\" \"${SYMBOLSUFFIX}\" "${BUILD_LAPACK_DEPRECATED}" > ${PROJECT_BINARY_DIR}/objcopy.def
279+
COMMAND objcopy -v --redefine-syms ${PROJECT_BINARY_DIR}/objcopy.def ${PROJECT_BINARY_DIR}/lib/lib${OpenBLAS_LIBNAME}.so
280+
COMMENT "renaming symbols"
281+
)
282+
endif()
283+
284+
213285
# Install project
214286
215287
# Install libraries
216288
install(TARGETS ${OpenBLAS_LIBNAME}
217-
EXPORT "OpenBLASTargets"
289+
EXPORT "OpenBLAS${SUFFIX64}Targets"
218290
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
219291
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
220292
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
221293
294+
# Install headers
295+
set(CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/openblas${SUFFIX64})
296+
set(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
297+
222298
message(STATUS "Generating openblas_config.h in ${CMAKE_INSTALL_INCLUDEDIR}")
223299
224300
set(OPENBLAS_CONFIG_H ${CMAKE_BINARY_DIR}/openblas_config.h)
@@ -266,29 +342,31 @@ if(NOT NO_LAPACKE)
266342
ADD_CUSTOM_TARGET(genlapacke
267343
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/lapack-netlib/LAPACKE/include/lapacke_mangling_with_flags.h.in "${CMAKE_BINARY_DIR}/lapacke_mangling.h"
268344
)
269-
install (FILES ${CMAKE_BINARY_DIR}/lapacke_mangling.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
345+
install (FILES ${CMAKE_BINARY_DIR}/lapacke_mangling.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openblas${SUFFIX64})
270346
endif()
271347

272348
include(FindPkgConfig QUIET)
273349
if(PKG_CONFIG_FOUND)
274-
configure_file(${PROJECT_SOURCE_DIR}/cmake/openblas.pc.in ${PROJECT_BINARY_DIR}/openblas.pc @ONLY)
275-
install (FILES ${PROJECT_BINARY_DIR}/openblas.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
350+
configure_file(${PROJECT_SOURCE_DIR}/cmake/openblas.pc.in ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc @ONLY)
351+
install (FILES ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
276352
endif()
277353

278354

279355
# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
280356
set(PN OpenBLAS)
281-
set(CMAKECONFIG_INSTALL_DIR "share/cmake/${PN}")
357+
set(CMAKECONFIG_INSTALL_DIR "share/cmake/${PN}${SUFFIX64}")
282358
configure_package_config_file(cmake/${PN}Config.cmake.in
283-
"${CMAKE_CURRENT_BINARY_DIR}/${PN}Config.cmake"
359+
"${CMAKE_CURRENT_BINARY_DIR}/${PN}${SUFFIX64}Config.cmake"
284360
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})
285361
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PN}ConfigVersion.cmake
286362
VERSION ${${PN}_VERSION}
287363
COMPATIBILITY AnyNewerVersion)
288-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PN}Config.cmake
289-
${CMAKE_CURRENT_BINARY_DIR}/${PN}ConfigVersion.cmake
364+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PN}${SUFFIX64}Config.cmake
365+
DESTINATION ${CMAKECONFIG_INSTALL_DIR})
366+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PN}ConfigVersion.cmake
367+
RENAME ${PN}${SUFFIX64}ConfigVersion.cmake
290368
DESTINATION ${CMAKECONFIG_INSTALL_DIR})
291-
install(EXPORT "${PN}Targets"
292-
NAMESPACE "${PN}::"
369+
install(EXPORT "${PN}${SUFFIX64}Targets"
370+
NAMESPACE "${PN}${SUFFIX64}::"
293371
DESTINATION ${CMAKECONFIG_INSTALL_DIR})
294372

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
251251
-@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
252252
-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
253253
-@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
254-
-@echo "ARCH = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
254+
-@echo "override ARCH = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
255255
-@echo "ARCHFLAGS = $(ARFLAGS) -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
256256
-@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
257257
-@echo "LAPACKLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc

Makefile.arm64

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,37 @@ CCOMMON_OPT += -march=armv8-a
44
FCOMMON_OPT += -march=armv8-a
55
endif
66

7+
ifeq ($(CORE), CORTEXA53)
8+
CCOMMON_OPT += -march=armv8-a -mtune=cortex-a53
9+
FCOMMON_OPT += -march=armv8-a -mtune=cortex-a53
10+
endif
11+
712
ifeq ($(CORE), CORTEXA57)
8-
CCOMMON_OPT += -march=armv8-a+crc+crypto+fp+simd -mtune=cortex-a57
9-
FCOMMON_OPT += -march=armv8-a+crc+crypto+fp+simd -mtune=cortex-a57
13+
CCOMMON_OPT += -march=armv8-a -mtune=cortex-a57
14+
FCOMMON_OPT += -march=armv8-a -mtune=cortex-a57
15+
endif
16+
17+
ifeq ($(CORE), CORTEXA72)
18+
CCOMMON_OPT += -march=armv8-a -mtune=cortex-a72
19+
FCOMMON_OPT += -march=armv8-a -mtune=cortex-a72
1020
endif
1121

12-
ifeq ($(CORE), VULCAN)
13-
CCOMMON_OPT += -mtune=vulcan -mcpu=vulcan
14-
FCOMMON_OPT += -mtune=vulcan -mcpu=vulcan
22+
ifeq ($(CORE), CORTEXA73)
23+
CCOMMON_OPT += -march=armv8-a -mtune=cortex-a73
24+
FCOMMON_OPT += -march=armv8-a -mtune=cortex-a73
1525
endif
1626

1727
ifeq ($(CORE), THUNDERX)
18-
CCOMMON_OPT += -mtune=thunderx -mcpu=thunderx
19-
FCOMMON_OPT += -mtune=thunderx -mcpu=thunderx
28+
CCOMMON_OPT += -march=armv8-a -mtune=thunderx
29+
FCOMMON_OPT += -march=armv8-a -mtune=thunderx
30+
endif
31+
32+
ifeq ($(CORE), FALKOR)
33+
CCOMMON_OPT += -march=armv8.1-a -mtune=falkor
34+
FCOMMON_OPT += -march=armv8.1-a -mtune=falkor
2035
endif
2136

2237
ifeq ($(CORE), THUNDERX2T99)
23-
CCOMMON_OPT += -mtune=thunderx2t99 -mcpu=thunderx2t99
24-
FCOMMON_OPT += -mtune=thunderx2t99 -mcpu=thunderx2t99
38+
CCOMMON_OPT += -march=armv8.1-a -mtune=thunderx2t99
39+
FCOMMON_OPT += -march=armv8.1-a -mtune=thunderx2t99
2540
endif

Makefile.install

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ ifndef NO_CBLAS
4848
@sed 's/common/openblas_config/g' cblas.h > "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/cblas.h"
4949
endif
5050

51+
ifneq ($(OSNAME), AIX)
5152
ifndef NO_LAPACKE
5253
@echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
5354
@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"
@@ -72,6 +73,7 @@ ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku))
7273
ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
7374
ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
7475
endif
76+
7577
ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD OpenBSD NetBSD DragonFly))
7678
@cp $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
7779
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
@@ -93,6 +95,33 @@ ifeq ($(OSNAME), CYGWIN_NT)
9395
endif
9496
endif
9597

98+
else
99+
#install on AIX has different options syntax
100+
ifndef NO_LAPACKE
101+
@echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
102+
@-installbsd -c -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"
103+
@-installbsd -c -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_config.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h"
104+
@-installbsd -c -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_mangling_with_flags.h.in "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h"
105+
@-installbsd -c -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_utils.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h"
106+
endif
107+
108+
#for install static library
109+
ifndef NO_STATIC
110+
@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
111+
@installbsd -c -m 644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
112+
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
113+
ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
114+
endif
115+
#for install shared library
116+
ifndef NO_SHARED
117+
@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
118+
@installbsd -c -m 755 $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
119+
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
120+
ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
121+
ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
122+
endif
123+
124+
endif
96125

97126
#Generating openblas.pc
98127
@echo Generating openblas.pc in "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)"

0 commit comments

Comments
 (0)