From fba65325023010c9e795b01a9d3fa6bcb9ff9478 Mon Sep 17 00:00:00 2001 From: Zhang Xianyi Date: Mon, 30 Nov 2015 11:08:33 -0600 Subject: [PATCH 1/4] Refs #702. Delete redundant xerbla exporting --- exports/gensymbol | 1 - 1 file changed, 1 deletion(-) diff --git a/exports/gensymbol b/exports/gensymbol index f36a7985d..06470516d 100644 --- a/exports/gensymbol +++ b/exports/gensymbol @@ -548,7 +548,6 @@ slatmt, sorm22, spotrf2, - xerbla, zgejsv, zgesvdx, zgesvj, From 640cccc2b159dba6d99b9eea11b7f23f98d6c85d Mon Sep 17 00:00:00 2001 From: Zhang Xianyi Date: Mon, 30 Nov 2015 15:19:45 -0600 Subject: [PATCH 2/4] Refs #697. Fixed gemv bug for Windows. Thank matzeri's patch. --- interface/gemv.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/interface/gemv.c b/interface/gemv.c index 0a222a645..97c68bf2d 100644 --- a/interface/gemv.c +++ b/interface/gemv.c @@ -37,6 +37,7 @@ /*********************************************************************/ #include +#include #include "common.h" #include "l1param.h" #ifdef FUNCTION_PROFILE @@ -224,13 +225,17 @@ void CNAME(enum CBLAS_ORDER order, #ifdef ALIGNED_ACCESS stack_alloc_size += 3; #endif - if(stack_alloc_size < 128) +// if(stack_alloc_size < 128) //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)) stack_alloc_size = 0; +// stack overflow check + volatile double stack_check = 3.14159265358979323846; FLOAT stack_buffer[stack_alloc_size]; buffer = stack_alloc_size ? stack_buffer : (FLOAT *)blas_memory_alloc(1); // printf("stack_alloc_size=%d\n", stack_alloc_size); @@ -265,6 +270,8 @@ void CNAME(enum CBLAS_ORDER order, } #endif +// stack overflow check +assert(stack_check==3.14159265358979323846); #ifdef MAX_STACK_ALLOC if(!stack_alloc_size){ From d22917a58ae4a147c0b6b97706ea89d7ce5ae5c0 Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Mon, 30 Nov 2015 20:16:33 -0800 Subject: [PATCH 3/4] fix makefile warning when renaming symbols use different names for `openblas*.renamed` between osx and other unices, fixes ``` Makefile:121: warning: overriding commands for target `../libopenblas64_p-r0.2.15.a.renamed' Makefile:100: warning: ignoring old commands for target `../libopenblas64_p-r0.2.15.a.renamed' ``` also clean `*.renamed` --- exports/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/exports/Makefile b/exports/Makefile index b549301bf..46d858e14 100644 --- a/exports/Makefile +++ b/exports/Makefile @@ -100,9 +100,9 @@ libgoto_hpl.def : gensymbol ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX)) $(LIBDYNNAME) : ../$(LIBNAME) osx.def else -../$(LIBNAME).renamed : ../$(LIBNAME) objconv.def - $(OBJCONV) @objconv.def ../$(LIBNAME) ../$(LIBNAME).renamed -$(LIBDYNNAME) : ../$(LIBNAME).renamed osx.def +../$(LIBNAME).osx.renamed : ../$(LIBNAME) objconv.def + $(OBJCONV) @objconv.def ../$(LIBNAME) ../$(LIBNAME).osx.renamed +$(LIBDYNNAME) : ../$(LIBNAME).osx.renamed osx.def endif ifeq ($(NOFORTRAN), $(filter $(NOFORTRAN),1 2)) #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 clean :: - @rm -f *.def *.dylib __.SYMDEF* + @rm -f *.def *.dylib __.SYMDEF* *.renamed include ../Makefile.tail From 5d212f66a71a2b904d425ac78c3838b90de5e9dd Mon Sep 17 00:00:00 2001 From: Zhang Xianyi Date: Thu, 3 Dec 2015 01:32:39 +0800 Subject: [PATCH 4/4] Refs #706. Fixed lapacke installation error. --- Makefile.install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.install b/Makefile.install index 9814302b0..66ec3f8bc 100644 --- a/Makefile.install +++ b/Makefile.install @@ -48,10 +48,10 @@ endif ifndef NO_LAPACKE @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_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_utils.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.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_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 endif #for install static library