Skip to content

Commit 94b1252

Browse files
xianyixianyi
committed
Merge branch 'develop' into cmake
Conflicts: driver/others/memory.c
2 parents 17ee223 + 3684706 commit 94b1252

131 files changed

Lines changed: 2366 additions & 1229 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ lapack-netlib/make.inc
1515
lapack-netlib/lapacke/include/lapacke_mangling.h
1616
lapack-netlib/TESTING/testing_results.txt
1717
*.so
18+
*.so.*
1819
*.a
1920
.svn
2021
*~

‎.travis.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
language: c
2+
3+
notifications:
4+
webhooks:
5+
urls:
6+
- https://webhooks.gitter.im/e/8a6e4470a0cebd090344
7+
on_success: change # options: [always|never|change] default: always
8+
on_failure: always # options: [always|never|change] default: always
9+
on_start: never # options: [always|never|change] default: always
10+
211
compiler:
312
- gcc
413

‎CONTRIBUTORS.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,5 +127,8 @@ In chronological order:
127127
* Ton van den Heuvel <https://github.com/ton>
128128
* [2015-03-18] Fix race condition during shutdown causing a crash in gotoblas_set_affinity().
129129

130+
* Martin Koehler <https://github.com/grisuthedragon/>
131+
* [2015-09-07] Improved imatcopy
132+
130133
* [Your name or handle] <[email or website]>
131134
* [Date] [Brief summary of your changes]

‎Makefile.arm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ endif
2626

2727

2828
ifeq ($(CORE), ARMV5)
29-
CCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6
30-
FCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6
29+
CCOMMON_OPT += -marm -march=armv5
30+
FCOMMON_OPT += -marm -march=armv5
3131
endif
3232

3333

‎Makefile.install‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ OPENBLAS_BINARY_DIR := $(PREFIX)/bin
1111
OPENBLAS_BUILD_DIR := $(CURDIR)
1212
OPENBLAS_CMAKE_DIR := $(OPENBLAS_LIBRARY_DIR)/cmake/openblas
1313
OPENBLAS_CMAKE_CONFIG := OpenBLASConfig.cmake
14+
OPENBLAS_CMAKE_CONFIG_VERSION := OpenBLASConfigVersion.cmake
1415

1516
.PHONY : install
1617
.NOTPARALLEL : install
@@ -97,6 +98,7 @@ endif
9798
@echo Generating $(OPENBLAS_CMAKE_CONFIG) in $(DESTDIR)$(OPENBLAS_CMAKE_DIR)
9899
@echo "SET(OpenBLAS_VERSION \"${VERSION}\")" > $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
99100
@echo "SET(OpenBLAS_INCLUDE_DIRS ${OPENBLAS_INCLUDE_DIR})" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
101+
100102
ifndef NO_SHARED
101103
#ifeq logical or
102104
ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD NetBSD))
@@ -112,5 +114,16 @@ else
112114
#only static
113115
@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX).$(LIBSUFFIX))" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
114116
endif
117+
#Generating OpenBLASConfigVersion.cmake
118+
@echo Generating $(OPENBLAS_CMAKE_CONFIG_VERSION) in $(DESTDIR)$(OPENBLAS_CMAKE_DIR)
119+
@echo "set (PACKAGE_VERSION \"${VERSION}\")" > $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG_VERSION)
120+
@echo "if (PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG_VERSION)
121+
@echo " set (PACKAGE_VERSION_COMPATIBLE FALSE)" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG_VERSION)
122+
@echo "else ()" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG_VERSION)
123+
@echo " set (PACKAGE_VERSION_COMPATIBLE TRUE)" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG_VERSION)
124+
@echo " if (PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG_VERSION)
125+
@echo " set (PACKAGE_VERSION_EXACT TRUE)" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG_VERSION)
126+
@echo " endif ()" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG_VERSION)
127+
@echo "endif ()" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG_VERSION)
115128
@echo Install OK!
116129

‎Makefile.rule‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ COMMON_PROF = -pg
169169
# 64 bit integer interfaces in OpenBLAS.
170170
# For details, https://github.com/xianyi/OpenBLAS/pull/459
171171
#
172+
# The same prefix and suffix are also added to the library name,
173+
# i.e. you get lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX) rather than libopenblas
174+
#
172175
# SYMBOLPREFIX=
173176
# SYMBOLSUFFIX=
174177

‎Makefile.system‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -880,12 +880,6 @@ ifdef USE_SIMPLE_THREADED_LEVEL3
880880
CCOMMON_OPT += -DUSE_SIMPLE_THREADED_LEVEL3
881881
endif
882882

883-
ifndef LIBNAMESUFFIX
884-
LIBPREFIX = libopenblas
885-
else
886-
LIBPREFIX = libopenblas_$(LIBNAMESUFFIX)
887-
endif
888-
889883
ifndef SYMBOLPREFIX
890884
SYMBOLPREFIX =
891885
endif
@@ -894,6 +888,12 @@ ifndef SYMBOLSUFFIX
894888
SYMBOLSUFFIX =
895889
endif
896890

891+
ifndef LIBNAMESUFFIX
892+
LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)
893+
else
894+
LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
895+
endif
896+
897897
KERNELDIR = $(TOPDIR)/kernel/$(ARCH)
898898

899899
include $(TOPDIR)/Makefile.$(ARCH)

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# OpenBLAS
22

3+
[![Join the chat at https://gitter.im/xianyi/OpenBLAS](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/xianyi/OpenBLAS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
4+
35
[![Build Status](https://travis-ci.org/xianyi/OpenBLAS.png?branch=develop)](https://travis-ci.org/xianyi/OpenBLAS)
46

57
## Introduction

‎TargetList.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ NANO
4444
POWER4
4545
POWER5
4646
POWER6
47+
POWER7
48+
POWER8
4749
PPCG4
4850
PPC970
4951
PPC970MP

‎c_check‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if ($ARGV[0] =~ /(.*)(-[.\d]+)/) {
3030
$cross_suffix = $1;
3131
}
3232
} else {
33-
if ($ARGV[0] =~ /(.*-)(.*)/) {
33+
if ($ARGV[0] =~ /([^\/]*-)([^\/]*$)/) {
3434
$cross_suffix = $1;
3535
}
3636
}

0 commit comments

Comments
 (0)