From 4b1b27347f112ee036e91981986c81ad75403340 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 29 Sep 2016 23:39:35 +0200 Subject: [PATCH 1/8] Remove explicit include of complex.h --- kernel/arm/zdot.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/arm/zdot.c b/kernel/arm/zdot.c index 57f47e58e..57c7795dd 100644 --- a/kernel/arm/zdot.c +++ b/kernel/arm/zdot.c @@ -37,7 +37,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "common.h" #ifndef _MSC_VER -#include FLOAT _Complex CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) #else OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) From 95c245ddb00b86a50062b6cfff3326f4dc9770f2 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 29 Sep 2016 23:40:36 +0200 Subject: [PATCH 2/8] Remove explicit include of complex.h --- kernel/mips/zdot.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/mips/zdot.c b/kernel/mips/zdot.c index da9ec7076..f728d5e9e 100644 --- a/kernel/mips/zdot.c +++ b/kernel/mips/zdot.c @@ -28,7 +28,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "common.h" #ifndef _MSC_VER -#include FLOAT _Complex CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) #else OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) From 3178e4fea0305b624d9b2517d0a65ddf82962f6d Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 29 Sep 2016 23:41:43 +0200 Subject: [PATCH 3/8] Remove explicit include of complex.h --- kernel/mips/zdot_msa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/mips/zdot_msa.c b/kernel/mips/zdot_msa.c index b94509392..bfbc29605 100644 --- a/kernel/mips/zdot_msa.c +++ b/kernel/mips/zdot_msa.c @@ -96,7 +96,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* zdotc - CONJ */ /* zdotu - !CONJ */ #ifndef _MSC_VER -#include FLOAT _Complex CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) #else OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) From a6e9e0b94b87f149b993bfefe99737b5f711f298 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 29 Sep 2016 23:43:28 +0200 Subject: [PATCH 4/8] Remove explicit include of complex.h --- kernel/power/zdot.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/power/zdot.c b/kernel/power/zdot.c index 1205b34b6..bc1a95e22 100644 --- a/kernel/power/zdot.c +++ b/kernel/power/zdot.c @@ -34,7 +34,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. **************************************************************************************/ #include "common.h" -#include #if defined(POWER8) From 16446d1d236c2c00c3bcdda3654a2b6e49765eb9 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 29 Sep 2016 23:45:56 +0200 Subject: [PATCH 5/8] Remove explicit include of complex.h --- kernel/x86_64/zdot.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/x86_64/zdot.c b/kernel/x86_64/zdot.c index 4533d4e88..ff3a8654d 100644 --- a/kernel/x86_64/zdot.c +++ b/kernel/x86_64/zdot.c @@ -27,7 +27,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "common.h" -#include #if defined(BULLDOZER) From 6221d6df5f3fdee8d3f9ef7f7e660dba9794e91e Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 5 Oct 2016 18:57:14 +0200 Subject: [PATCH 6/8] Update zdot.c --- kernel/arm/zdot.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/arm/zdot.c b/kernel/arm/zdot.c index 57c7795dd..733c235c6 100644 --- a/kernel/arm/zdot.c +++ b/kernel/arm/zdot.c @@ -36,11 +36,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "common.h" -#ifndef _MSC_VER -FLOAT _Complex CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) -#else OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) -#endif + { BLASLONG i=0; BLASLONG ix=0,iy=0; From 6e22ecf1023fd6ffad452b4ef14a789228394ed7 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 5 Oct 2016 18:58:03 +0200 Subject: [PATCH 7/8] Update zdot.c --- kernel/mips/zdot.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/mips/zdot.c b/kernel/mips/zdot.c index f728d5e9e..df99bae85 100644 --- a/kernel/mips/zdot.c +++ b/kernel/mips/zdot.c @@ -27,11 +27,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "common.h" -#ifndef _MSC_VER -FLOAT _Complex CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) -#else OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) -#endif { BLASLONG i=0; BLASLONG ix=0,iy=0; From 91610f3835b50aa0b90cc21643ab5cdbbda3cb76 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 5 Oct 2016 18:59:09 +0200 Subject: [PATCH 8/8] Update zdot_msa.c --- kernel/mips/zdot_msa.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/mips/zdot_msa.c b/kernel/mips/zdot_msa.c index bfbc29605..482c0cf05 100644 --- a/kernel/mips/zdot_msa.c +++ b/kernel/mips/zdot_msa.c @@ -95,11 +95,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* return double, x,y double */ /* zdotc - CONJ */ /* zdotu - !CONJ */ -#ifndef _MSC_VER -FLOAT _Complex CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) -#else + OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) -#endif { BLASLONG i = 0; FLOAT dot[2];