Skip to content

Commit 085cf23

Browse files
sva-imgsva-img
committed
conflict resolved by syncing with 'xianyi:develop'
Signed-off-by: Shivraj Patil <[email protected]>
2 parents b7b3d8e + 0d1c695 commit 085cf23

Some content is hidden

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

61 files changed

+8446
-800
lines changed

‎CONTRIBUTORS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,5 +151,9 @@ In chronological order:
151151
* [2016-03-20] Fix compiler error in VisualStudio with CMake
152152
* [2016-03-22] Fix access violation on Windows while static linking
153153

154+
* Paul Mustière <https://github.com/buffer51/>
155+
* [2016-02-04] Fix Android build on ARMV7
156+
* [2016-04-26] Android build with LAPACK for ARMV7 & ARMV8
157+
154158
* Shivraj Patil <https://github.com/sva-img/>
155159
* [2016-05-03] DGEMM optimization for MIPS P5600 and I6400 using MSA

‎Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ endif
108108

109109
tests :
110110
ifndef NOFORTRAN
111-
ifndef TARGET
112-
ifndef CROSS
113111
touch $(LIBNAME)
114112
ifndef NO_FBLAS
115113
$(MAKE) -C test all
@@ -119,8 +117,6 @@ ifndef NO_CBLAS
119117
$(MAKE) -C ctest all
120118
endif
121119
endif
122-
endif
123-
endif
124120

125121
libs :
126122
ifeq ($(CORE), UNKOWN)

‎Makefile.install

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -20,110 +20,110 @@ lib.grd :
2020
$(error OpenBLAS: Please run "make" firstly)
2121

2222
install : lib.grd
23-
@-mkdir -p $(DESTDIR)$(PREFIX)
24-
@-mkdir -p $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
25-
@-mkdir -p $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
26-
@-mkdir -p $(DESTDIR)$(OPENBLAS_BINARY_DIR)
27-
@-mkdir -p $(DESTDIR)$(OPENBLAS_CMAKE_DIR)
23+
@-mkdir -p "$(DESTDIR)$(PREFIX)"
24+
@-mkdir -p "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)"
25+
@-mkdir -p "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
26+
@-mkdir -p "$(DESTDIR)$(OPENBLAS_BINARY_DIR)"
27+
@-mkdir -p "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)"
2828
@echo Generating openblas_config.h in $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
2929
#for inc
30-
@echo \#ifndef OPENBLAS_CONFIG_H > $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h
31-
@echo \#define OPENBLAS_CONFIG_H >> $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h
32-
@$(AWK) 'NF {print $$1, "OPENBLAS_"$$2, $$3}' config_last.h >> $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h
33-
@echo \#define OPENBLAS_VERSION \" OpenBLAS $(VERSION) \" >> $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h
34-
@cat openblas_config_template.h >> $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h
35-
@echo \#endif \/\* OPENBLAS_CONFIG_H \*\/ >> $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h
30+
@echo \#ifndef OPENBLAS_CONFIG_H > "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h"
31+
@echo \#define OPENBLAS_CONFIG_H >> "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h"
32+
@$(AWK) 'NF {print $$1, "OPENBLAS_"$$2, $$3}' config_last.h >> "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h"
33+
@echo \#define OPENBLAS_VERSION \" OpenBLAS $(VERSION) \" >> "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h"
34+
@cat openblas_config_template.h >> "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h"
35+
@echo \#endif \/\* OPENBLAS_CONFIG_H \*\/ >> "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/openblas_config.h"
3636

3737
@echo Generating f77blas.h in $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
38-
@echo \#ifndef OPENBLAS_F77BLAS_H > $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/f77blas.h
39-
@echo \#define OPENBLAS_F77BLAS_H >> $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/f77blas.h
40-
@echo \#include \"openblas_config.h\" >> $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/f77blas.h
41-
@cat common_interface.h >> $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/f77blas.h
42-
@echo \#endif >> $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/f77blas.h
38+
@echo \#ifndef OPENBLAS_F77BLAS_H > "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/f77blas.h"
39+
@echo \#define OPENBLAS_F77BLAS_H >> "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/f77blas.h"
40+
@echo \#include \"openblas_config.h\" >> "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/f77blas.h"
41+
@cat common_interface.h >> "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/f77blas.h"
42+
@echo \#endif >> "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/f77blas.h"
4343

4444
ifndef NO_CBLAS
4545
@echo Generating cblas.h in $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
46-
@sed 's/common/openblas_config/g' cblas.h > $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/cblas.h
46+
@sed 's/common/openblas_config/g' cblas.h > "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/cblas.h"
4747
endif
4848

4949
ifndef NO_LAPACKE
5050
@echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
51-
@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h
52-
@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_config.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h
53-
@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_mangling_with_flags.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h
54-
@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_utils.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h
51+
@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"
52+
@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_config.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h"
53+
@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_mangling_with_flags.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h"
54+
@-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_utils.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h"
5555
endif
5656

5757
#for install static library
5858
ifndef NO_STATIC
5959
@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
60-
@install -pm644 $(LIBNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
61-
@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
60+
@install -pm644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
61+
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
6262
ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
6363
endif
6464
#for install shared library
6565
ifndef NO_SHARED
6666
@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
6767
ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS))
68-
@install -pm755 $(LIBSONAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
69-
@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
68+
@install -pm755 $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
69+
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
7070
ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
7171
ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
7272
endif
7373
ifeq ($(OSNAME), FreeBSD)
74-
@cp $(LIBSONAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
75-
@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
74+
@cp $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
75+
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
7676
ln -fs $(LIBSONAME) $(LIBPREFIX).so
7777
endif
7878
ifeq ($(OSNAME), NetBSD)
79-
@cp $(LIBSONAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
80-
@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
79+
@cp $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
80+
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
8181
ln -fs $(LIBSONAME) $(LIBPREFIX).so
8282
endif
8383
ifeq ($(OSNAME), Darwin)
84-
@-cp $(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
85-
@-install_name_tool -id $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)
86-
@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
84+
@-cp $(LIBDYNNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
85+
@-install_name_tool -id "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)" "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)"
86+
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
8787
ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
8888
endif
8989
ifeq ($(OSNAME), WINNT)
90-
@-cp $(LIBDLLNAME) $(DESTDIR)$(OPENBLAS_BINARY_DIR)
91-
@-cp $(LIBDLLNAME).a $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
90+
@-cp $(LIBDLLNAME) "$(DESTDIR)$(OPENBLAS_BINARY_DIR)"
91+
@-cp $(LIBDLLNAME).a "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
9292
endif
9393
ifeq ($(OSNAME), CYGWIN_NT)
9494
@-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR)
9595
endif
9696
endif
9797
#Generating OpenBLASConfig.cmake
9898
@echo Generating $(OPENBLAS_CMAKE_CONFIG) in $(DESTDIR)$(OPENBLAS_CMAKE_DIR)
99-
@echo "SET(OpenBLAS_VERSION \"${VERSION}\")" > $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
100-
@echo "SET(OpenBLAS_INCLUDE_DIRS ${OPENBLAS_INCLUDE_DIR})" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
99+
@echo "SET(OpenBLAS_VERSION \"${VERSION}\")" > "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"
100+
@echo "SET(OpenBLAS_INCLUDE_DIRS ${OPENBLAS_INCLUDE_DIR})" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"
101101

102102
ifndef NO_SHARED
103103
#ifeq logical or
104104
ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD NetBSD))
105-
@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX).so)" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
105+
@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX).so)" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"
106106
endif
107107
ifeq ($(OSNAME), $(filter $(OSNAME),WINNT CYGWIN_NT))
108-
@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_BINARY_DIR}/$(LIBDLLNAME))" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
108+
@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_BINARY_DIR}/$(LIBDLLNAME))" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"
109109
endif
110110
ifeq ($(OSNAME), Darwin)
111-
@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX).dylib)" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
111+
@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX).dylib)" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"
112112
endif
113113
else
114114
#only static
115-
@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX).$(LIBSUFFIX))" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
115+
@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX).$(LIBSUFFIX))" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"
116116
endif
117117
#Generating OpenBLASConfigVersion.cmake
118118
@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)
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)"
128128
@echo Install OK!
129129

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ Please read GotoBLAS_01Readme.txt
8282
- **MingWin or Visual Studio(CMake)/Windows**: Please read <https://github.com/xianyi/OpenBLAS/wiki/How-to-use-OpenBLAS-in-Microsoft-Visual-Studio>.
8383
- **Darwin/Mac OS X**: Experimental. Although GotoBLAS2 supports Darwin, we are the beginner on Mac OS X.
8484
- **FreeBSD**: Supported by community. We didn't test the library on this OS.
85+
- **Android**: Supported by community. Please read <https://github.com/xianyi/OpenBLAS/wiki/How-to-build-OpenBLAS-for-Android>.
8586

8687
## Usages
8788
Link with libopenblas.a or -lopenblas for shared library.

‎c_check

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/perl
22

3+
use File::Basename;
4+
35
# Checking cross compile
46
$hostos = `uname -s | sed -e s/\-.*//`; chop($hostos);
57
$hostarch = `uname -m | sed -e s/i.86/x86/`;chop($hostarch);
@@ -26,14 +28,12 @@ if ($?) {
2628

2729
$cross_suffix = "";
2830

29-
if ($ARGV[0] =~ /(.*)(-[.\d]+)/) {
30-
if ($1 =~ /(.*-)(.*)/) {
31-
$cross_suffix = $1;
32-
}
33-
} else {
34-
if ($ARGV[0] =~ /([^\/]*-)([^\/]*$)/) {
35-
$cross_suffix = $1;
36-
}
31+
if (dirname($compiler_name) ne ".") {
32+
$cross_suffix .= dirname($compiler_name) . "/";
33+
}
34+
35+
if (basename($compiler_name) =~ /(.*-)(.*)/) {
36+
$cross_suffix .= $1;
3737
}
3838

3939
$compiler = "";
@@ -243,7 +243,7 @@ print MAKEFILE "BINARY64=\n" if $binformat ne bin64;
243243
print MAKEFILE "BINARY32=1\n" if $binformat eq bin32;
244244
print MAKEFILE "BINARY64=1\n" if $binformat eq bin64;
245245
print MAKEFILE "FU=$need_fu\n" if $need_fu ne "";
246-
print MAKEFILE "CROSS_SUFFIX=$cross_suffix\n" if $cross_suffix ne "";
246+
print MAKEFILE "CROSS_SUFFIX=$cross_suffix\n" if $cross != 0 && $cross_suffix ne "";
247247
print MAKEFILE "CROSS=1\n" if $cross != 0;
248248
print MAKEFILE "CEXTRALIB=$linker_L $linker_l $linker_a\n";
249249

‎ctest/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ ztestl3o_3m = c_zblas3_3m.o c_z3chke_3m.o auxiliary.o c_xerbla.o constant.o
4242
all :: all1 all2 all3
4343

4444
all1: xscblat1 xdcblat1 xccblat1 xzcblat1
45+
ifndef CROSS
4546
ifeq ($(USE_OPENMP), 1)
4647
OMP_NUM_THREADS=2 ./xscblat1
4748
OMP_NUM_THREADS=2 ./xdcblat1
@@ -53,8 +54,10 @@ else
5354
OPENBLAS_NUM_THREADS=2 ./xccblat1
5455
OPENBLAS_NUM_THREADS=2 ./xzcblat1
5556
endif
57+
endif
5658

5759
all2: xscblat2 xdcblat2 xccblat2 xzcblat2
60+
ifndef CROSS
5861
ifeq ($(USE_OPENMP), 1)
5962
OMP_NUM_THREADS=2 ./xscblat2 < sin2
6063
OMP_NUM_THREADS=2 ./xdcblat2 < din2
@@ -66,8 +69,10 @@ else
6669
OPENBLAS_NUM_THREADS=2 ./xccblat2 < cin2
6770
OPENBLAS_NUM_THREADS=2 ./xzcblat2 < zin2
6871
endif
72+
endif
6973

7074
all3: xscblat3 xdcblat3 xccblat3 xzcblat3
75+
ifndef CROSS
7176
ifeq ($(USE_OPENMP), 1)
7277
OMP_NUM_THREADS=2 ./xscblat3 < sin3
7378
OMP_NUM_THREADS=2 ./xdcblat3 < din3
@@ -88,6 +93,7 @@ else
8893
OPENBLAS_NUM_THREADS=2 ./xccblat3_3m < cin3_3m
8994
OPENBLAS_NUM_THREADS=2 ./xzcblat3_3m < zin3_3m
9095
endif
96+
endif
9197

9298

9399

‎driver/others/dynamic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ static gotoblas_t *force_coretype(char *coretype){
439439
char message[128];
440440
//char mname[20];
441441

442-
for ( i=1 ; i <= 21; i++)
442+
for ( i=1 ; i <= 22; i++)
443443
{
444444
if (!strncasecmp(coretype,corename[i],20))
445445
{

0 commit comments

Comments
 (0)