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

Merge branch 'develop' into nofort

This commit is contained in:
Martin Kroeker 2018-06-27 00:07:32 +02:00 committed by GitHub
parent 8396e9e777 bfad307ed7
commit 2aba1b1658
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -21,17 +21,6 @@ ifeq ($(BUILD_RELAPACK), 1)
RELA = re_lapack RELA = re_lapack
endif endif
ifeq ($(NO_FORTRAN), 1)
define NOFORTRAN
1
endef
define NO_LAPACK
1
endef
export NOFORTRAN
export NO_LAPACK
endif
LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS)) LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS))
SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench
@ -242,9 +231,6 @@ prof_lapack : lapack_prebuild
@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
lapack_prebuild : lapack_prebuild :
$(info filter value of x$(NOFORTRAN)x is:)
$(info x$(filter 0,$(NOFORTRAN))x)
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
-@echo "FORTRAN = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc -@echo "FORTRAN = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
-@echo "OPTS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "OPTS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc

8
kernel/arm/cdot_vfp.S
View File

@ -215,11 +215,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cmp N, #0 cmp N, #0
ble cdot_kernel_L999 ble cdot_kernel_L999
cmp INC_X, #0 # cmp INC_X, #0
beq cdot_kernel_L999 # beq cdot_kernel_L999
cmp INC_Y, #0 # cmp INC_Y, #0
beq cdot_kernel_L999 # beq cdot_kernel_L999
cmp INC_X, #1 cmp INC_X, #1
bne cdot_kernel_S_BEGIN bne cdot_kernel_S_BEGIN

8
kernel/arm/ddot_vfp.S
View File

@ -164,11 +164,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cmp N, #0 cmp N, #0
ble ddot_kernel_L999 ble ddot_kernel_L999
cmp INC_X, #0 # cmp INC_X, #0
beq ddot_kernel_L999 # beq ddot_kernel_L999
cmp INC_Y, #0 # cmp INC_Y, #0
beq ddot_kernel_L999 # beq ddot_kernel_L999
cmp INC_X, #1 cmp INC_X, #1
bne ddot_kernel_S_BEGIN bne ddot_kernel_S_BEGIN

8
kernel/arm/sdot_vfp.S
View File

@ -253,11 +253,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cmp N, #0 cmp N, #0
ble sdot_kernel_L999 ble sdot_kernel_L999
cmp INC_X, #0 # cmp INC_X, #0
beq sdot_kernel_L999 # beq sdot_kernel_L999
cmp INC_Y, #0 # cmp INC_Y, #0
beq sdot_kernel_L999 # beq sdot_kernel_L999
cmp INC_X, #1 cmp INC_X, #1
bne sdot_kernel_S_BEGIN bne sdot_kernel_S_BEGIN

8
kernel/arm/zdot_vfp.S
View File

@ -218,11 +218,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
cmp N, #0 cmp N, #0
ble zdot_kernel_L999 ble zdot_kernel_L999
cmp INC_X, #0 # cmp INC_X, #0
beq zdot_kernel_L999 # beq zdot_kernel_L999
cmp INC_Y, #0 # cmp INC_Y, #0
beq zdot_kernel_L999 # beq zdot_kernel_L999
cmp INC_X, #1 cmp INC_X, #1
bne zdot_kernel_S_BEGIN bne zdot_kernel_S_BEGIN