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

Merge branch 'develop' of github.com:xianyi/OpenBLAS into develop

This commit is contained in:
Zhang Xianyi 2015-12-05 00:46:42 +08:00
parent 958f0de65e 5d212f66a7
commit 25116788ef
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.install
View File

@ -48,10 +48,10 @@ endif
ifndef NO_LAPACKE ifndef NO_LAPACKE
@echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_INCLUDE_DIR) @echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
@-install -pm644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h
@-install -pm644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_config.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_config.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h
@-install -pm644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_mangling_with_flags.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_mangling_with_flags.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h
@-install -pm644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_utils.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_utils.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h
endif endif
#for install static library #for install static library

8
exports/Makefile
View File

@ -100,9 +100,9 @@ libgoto_hpl.def : gensymbol
ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX)) ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
$(LIBDYNNAME) : ../$(LIBNAME) osx.def $(LIBDYNNAME) : ../$(LIBNAME) osx.def
else else
../$(LIBNAME).renamed : ../$(LIBNAME) objconv.def ../$(LIBNAME).osx.renamed : ../$(LIBNAME) objconv.def
$(OBJCONV) @objconv.def ../$(LIBNAME) ../$(LIBNAME).renamed $(OBJCONV) @objconv.def ../$(LIBNAME) ../$(LIBNAME).osx.renamed
$(LIBDYNNAME) : ../$(LIBNAME).renamed osx.def $(LIBDYNNAME) : ../$(LIBNAME).osx.renamed osx.def
endif endif
ifeq ($(NOFORTRAN), $(filter $(NOFORTRAN),1 2)) ifeq ($(NOFORTRAN), $(filter $(NOFORTRAN),1 2))
#only build without Fortran #only build without Fortran
@ -224,7 +224,7 @@ linktest.c : gensymbol ../Makefile.system ../getarch.c
perl ./gensymbol linktest $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" > linktest.c perl ./gensymbol linktest $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" > linktest.c
clean :: clean ::
@rm -f *.def *.dylib __.SYMDEF* @rm -f *.def *.dylib __.SYMDEF* *.renamed
include ../Makefile.tail include ../Makefile.tail

1
exports/gensymbol
View File

@ -548,7 +548,6 @@
slatmt, slatmt,
sorm22, sorm22,
spotrf2, spotrf2,
xerbla,
zgejsv, zgejsv,
zgesvdx, zgesvdx,
zgesvj, zgesvj,

11
interface/gemv.c
View File

@ -37,6 +37,7 @@
/*********************************************************************/ /*********************************************************************/
#include <stdio.h> #include <stdio.h>
#include <assert.h>
#include "common.h" #include "common.h"
#include "l1param.h" #include "l1param.h"
#ifdef FUNCTION_PROFILE #ifdef FUNCTION_PROFILE
@ -224,13 +225,17 @@ void CNAME(enum CBLAS_ORDER order,
#ifdef ALIGNED_ACCESS #ifdef ALIGNED_ACCESS
stack_alloc_size += 3; stack_alloc_size += 3;
#endif #endif
if(stack_alloc_size < 128) // if(stack_alloc_size < 128)
//dgemv_n.S require a 128 bytes buffer //dgemv_n.S require a 128 bytes buffer
stack_alloc_size = 128; // increasing instead of capping 128
// ABI STACK for windows 288 bytes
stack_alloc_size += 288 / sizeof(FLOAT) ;
if(stack_alloc_size > MAX_STACK_ALLOC / sizeof(FLOAT)) if(stack_alloc_size > MAX_STACK_ALLOC / sizeof(FLOAT))
stack_alloc_size = 0; stack_alloc_size = 0;
// stack overflow check
volatile double stack_check = 3.14159265358979323846;
FLOAT stack_buffer[stack_alloc_size]; FLOAT stack_buffer[stack_alloc_size];
buffer = stack_alloc_size ? stack_buffer : (FLOAT *)blas_memory_alloc(1); buffer = stack_alloc_size ? stack_buffer : (FLOAT *)blas_memory_alloc(1);
// printf("stack_alloc_size=%d\n", stack_alloc_size); // printf("stack_alloc_size=%d\n", stack_alloc_size);
@ -265,6 +270,8 @@ void CNAME(enum CBLAS_ORDER order,
} }
#endif #endif
// stack overflow check
assert(stack_check==3.14159265358979323846);
#ifdef MAX_STACK_ALLOC #ifdef MAX_STACK_ALLOC
if(!stack_alloc_size){ if(!stack_alloc_size){