[clblas] 41/67: fix linux build

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Tue Oct 27 08:02:14 UTC 2015


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository clblas.

commit 4067d14d9b5e844a1422dc251b2956fad88aedff
Author: Timmy <timmy.liu at amd.com>
Date:   Mon Sep 21 15:35:59 2015 -0500

    fix linux build
---
 .../blas/trtri/triple_dgemm_update_128_16_R.cpp    | 32 +++++++++++-----------
 .../trtri/triple_dgemm_update_128_32_PART1_R.cpp   | 32 +++++++++++-----------
 .../trtri/triple_dgemm_update_128_64_PART1_R.cpp   | 32 +++++++++++-----------
 .../triple_dgemm_update_128_ABOVE64_PART1_R.cpp    | 32 +++++++++++-----------
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/src/library/blas/trtri/triple_dgemm_update_128_16_R.cpp b/src/library/blas/trtri/triple_dgemm_update_128_16_R.cpp
index 5fdad0a..7026563 100644
--- a/src/library/blas/trtri/triple_dgemm_update_128_16_R.cpp
+++ b/src/library/blas/trtri/triple_dgemm_update_128_16_R.cpp
@@ -98,10 +98,10 @@ int PagesPerNB = NB / (blk * 2); \n
 
 	do {\n
 		double a[4]; \n
-		a[0] = READA; incA += lda; \n
-		a[1] = READA; incA += lda; \n
-		a[2] = READA; incA += lda; \n
-		a[3] = READA; incA += lda; \n
+		a[0] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 
 		bs[inx][iny] = B[0 * ldb]; \n
 		bs[inx][iny + 4] = B[4 * ldb]; \n
@@ -122,20 +122,20 @@ int PagesPerNB = NB / (blk * 2); \n
 		//__syncthreads();
 		barrier(CLK_LOCAL_MEM_FENCE); \n
 
-		daxpy(a[0], &bs[0][0], c);  a[0] = READA; incA += lda; \n
-		daxpy(a[1], &bs[1][0], c);  a[1] = READA; incA += lda; \n
-		daxpy(a[2], &bs[2][0], c);  a[2] = READA; incA += lda; \n
-		daxpy(a[3], &bs[3][0], c);  a[3] = READA; incA += lda; \n
+		daxpy(a[0], &bs[0][0], c);  a[0] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[1], &bs[1][0], c);  a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[2], &bs[2][0], c);  a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[3], &bs[3][0], c);  a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 
-		daxpy(a[0], &bs[4][0], c);  a[0] = READA; incA += lda; \n
-		daxpy(a[1], &bs[5][0], c);  a[1] = READA; incA += lda; \n
-		daxpy(a[2], &bs[6][0], c);  a[2] = READA; incA += lda; \n
-		daxpy(a[3], &bs[7][0], c);  a[3] = READA; incA += lda; \n
+		daxpy(a[0], &bs[4][0], c);  a[0] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[1], &bs[5][0], c);  a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[2], &bs[6][0], c);  a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[3], &bs[7][0], c);  a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 
-		daxpy(a[0], &bs[8][0], c);  a[0] = READA; incA += lda; \n
-		daxpy(a[1], &bs[9][0], c);  a[1] = READA; incA += lda; \n
-		daxpy(a[2], &bs[10][0], c);  a[2] = READA; incA += lda; \n
-		daxpy(a[3], &bs[11][0], c);  a[3] = READA; incA += lda; \n
+		daxpy(a[0], &bs[8][0], c);  a[0] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[1], &bs[9][0], c);  a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[2], &bs[10][0], c);  a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[3], &bs[11][0], c);  a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 
 		daxpy(a[0], &bs[12][0], c); \n
 		daxpy(a[1], &bs[13][0], c); \n
diff --git a/src/library/blas/trtri/triple_dgemm_update_128_32_PART1_R.cpp b/src/library/blas/trtri/triple_dgemm_update_128_32_PART1_R.cpp
index a3823d0..06a9b73 100644
--- a/src/library/blas/trtri/triple_dgemm_update_128_32_PART1_R.cpp
+++ b/src/library/blas/trtri/triple_dgemm_update_128_32_PART1_R.cpp
@@ -96,10 +96,10 @@ int PagesPerNB = NB / (blk * 2); \n
 
 	do {\n
 		double a[4]; \n
-		a[0] = READA; incA += lda; \n
-		a[1] = READA; incA += lda; \n
-		a[2] = READA; incA += lda; \n
-		a[3] = READA; incA += lda; \n
+		a[0] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 
 		bs[inx][iny] = B[0 * ldb]; \n
 		bs[inx][iny + 4] = B[4 * ldb]; \n
@@ -112,20 +112,20 @@ int PagesPerNB = NB / (blk * 2); \n
 		//__syncthreads();
 		barrier(CLK_LOCAL_MEM_FENCE); \n
 
-		daxpy(a[0], &bs[0][0], c);  a[0] = READA; incA += lda; \n
-		daxpy(a[1], &bs[1][0], c);  a[1] = READA; incA += lda; \n
-		daxpy(a[2], &bs[2][0], c);  a[2] = READA; incA += lda; \n
-		daxpy(a[3], &bs[3][0], c);  a[3] = READA; incA += lda; \n
+		daxpy(a[0], &bs[0][0], c);  a[0] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[1], &bs[1][0], c);  a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[2], &bs[2][0], c);  a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[3], &bs[3][0], c);  a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 															   \n
-		daxpy(a[0], &bs[4][0], c);  a[0] = READA; incA += lda; \n
-		daxpy(a[1], &bs[5][0], c);  a[1] = READA; incA += lda; \n
-		daxpy(a[2], &bs[6][0], c);  a[2] = READA; incA += lda; \n
-		daxpy(a[3], &bs[7][0], c);  a[3] = READA; incA += lda; \n
+		daxpy(a[0], &bs[4][0], c);  a[0] = ( (incA < maxA ) ? Ain[incA] : 0 ) ; incA += lda; \n
+		daxpy(a[1], &bs[5][0], c);  a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[2], &bs[6][0], c);  a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[3], &bs[7][0], c);  a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 															   \n
-		daxpy(a[0], &bs[8][0], c);  a[0] = READA; incA += lda; \n
-		daxpy(a[1], &bs[9][0], c);  a[1] = READA; incA += lda; \n
-		daxpy(a[2], &bs[10][0], c);  a[2] = READA; incA += lda; \n
-		daxpy(a[3], &bs[11][0], c);  a[3] = READA; incA += lda; \n
+		daxpy(a[0], &bs[8][0], c);  a[0] = ( (incA < maxA ) ? Ain[incA] : 0 ) ; incA += lda; \n
+		daxpy(a[1], &bs[9][0], c);  a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[2], &bs[10][0], c);  a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[3], &bs[11][0], c);  a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 
 		daxpy(a[0], &bs[12][0], c);\n
 		daxpy(a[1], &bs[13][0], c);\n
diff --git a/src/library/blas/trtri/triple_dgemm_update_128_64_PART1_R.cpp b/src/library/blas/trtri/triple_dgemm_update_128_64_PART1_R.cpp
index a5245ed..92361d4 100644
--- a/src/library/blas/trtri/triple_dgemm_update_128_64_PART1_R.cpp
+++ b/src/library/blas/trtri/triple_dgemm_update_128_64_PART1_R.cpp
@@ -96,10 +96,10 @@ int PagesPerNB = NB / (blk * 2); \n
 
 	do {\n
 		double a[4]; \n
-		a[0] = READA; incA += lda; \n
-		a[1] = READA; incA += lda; \n
-	    a[2] = READA; incA += lda; \n
-		a[3] = READA; incA += lda; \n
+		a[0] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 
 		bs[inx][iny] = B[0 * ldb]; \n
 		bs[inx][iny + 4] = B[4 * ldb]; \n
@@ -108,20 +108,20 @@ int PagesPerNB = NB / (blk * 2); \n
 		//__syncthreads();
 		barrier(CLK_LOCAL_MEM_FENCE); \n
 
-		daxpy(a[0], &bs[0][0], c);  a[0] = READA; incA += lda;\n
-		daxpy(a[1], &bs[1][0], c);  a[1] = READA; incA += lda;\n
-		daxpy(a[2], &bs[2][0], c);  a[2] = READA; incA += lda;\n
-		daxpy(a[3], &bs[3][0], c);  a[3] = READA; incA += lda;\n
+		daxpy(a[0], &bs[0][0], c);  a[0] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[1], &bs[1][0], c);  a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[2], &bs[2][0], c);  a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[3], &bs[3][0], c);  a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 															  \n
-		daxpy(a[0], &bs[4][0], c);  a[0] = READA; incA += lda;\n
-		daxpy(a[1], &bs[5][0], c);  a[1] = READA; incA += lda;\n
-		daxpy(a[2], &bs[6][0], c);  a[2] = READA; incA += lda;\n
-		daxpy(a[3], &bs[7][0], c);  a[3] = READA; incA += lda;\n
+		daxpy(a[0], &bs[4][0], c);  a[0] = ( (incA < maxA ) ? Ain[incA] : 0 ); incA += lda;\n
+		daxpy(a[1], &bs[5][0], c);  a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[2], &bs[6][0], c);  a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[3], &bs[7][0], c);  a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 															  \n
-		daxpy(a[0], &bs[8][0], c);  a[0] = READA; incA += lda;\n
-		daxpy(a[1], &bs[9][0], c);  a[1] = READA; incA += lda;\n
-		daxpy(a[2], &bs[10][0], c);  a[2] = READA; incA += lda; \n
-		daxpy(a[3], &bs[11][0], c);  a[3] = READA; incA += lda; \n
+		daxpy(a[0], &bs[8][0], c);  a[0] = ( (incA < maxA ) ? Ain[incA] : 0 ); incA += lda;\n
+		daxpy(a[1], &bs[9][0], c);  a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[2], &bs[10][0], c);  a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[3], &bs[11][0], c);  a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 
 		daxpy(a[0], &bs[12][0], c);\n
 		daxpy(a[1], &bs[13][0], c);\n
diff --git a/src/library/blas/trtri/triple_dgemm_update_128_ABOVE64_PART1_R.cpp b/src/library/blas/trtri/triple_dgemm_update_128_ABOVE64_PART1_R.cpp
index 13d0233..a7bf4e6 100644
--- a/src/library/blas/trtri/triple_dgemm_update_128_ABOVE64_PART1_R.cpp
+++ b/src/library/blas/trtri/triple_dgemm_update_128_ABOVE64_PART1_R.cpp
@@ -96,10 +96,10 @@ int PagesPerNB = NB / (blk * 2); \n
 
 	do {\n
 		double a[4]; \n
-		a[0] = READA; incA += lda; \n
-		a[1] = READA; incA += lda; \n
-		a[2] = READA; incA += lda; \n
-		a[3] = READA; incA += lda; \n
+		a[0] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 
 		bs[inx][iny] = B[0 * ldb]; \n
 		bs[inx][iny + 4] = B[4 * ldb]; \n
@@ -108,20 +108,20 @@ int PagesPerNB = NB / (blk * 2); \n
 		//__syncthreads();
 		barrier(CLK_LOCAL_MEM_FENCE); \n
 
-		daxpy(a[0], &bs[0][0], c);  a[0] = READA; incA += lda; \n
-		daxpy(a[1], &bs[1][0], c);  a[1] = READA; incA += lda; \n
-		daxpy(a[2], &bs[2][0], c);  a[2] = READA; incA += lda; \n
-		daxpy(a[3], &bs[3][0], c);  a[3] = READA; incA += lda; \n
+		daxpy(a[0], &bs[0][0], c);  a[0] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[1], &bs[1][0], c);  a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[2], &bs[2][0], c);  a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[3], &bs[3][0], c);  a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 
-		daxpy(a[0], &bs[4][0], c);  a[0] = READA; incA += lda; \n
-		daxpy(a[1], &bs[5][0], c);  a[1] = READA; incA += lda; \n
-		daxpy(a[2], &bs[6][0], c);  a[2] = READA; incA += lda; \n
-		daxpy(a[3], &bs[7][0], c);  a[3] = READA; incA += lda; \n
+		daxpy(a[0], &bs[4][0], c);  a[0] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[1], &bs[5][0], c);  a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[2], &bs[6][0], c);  a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[3], &bs[7][0], c);  a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 
-		daxpy(a[0], &bs[8][0], c);  a[0] = READA; incA += lda; \n
-		daxpy(a[1], &bs[9][0], c);  a[1] = READA; incA += lda; \n
-		daxpy(a[2], &bs[10][0], c);  a[2] = READA; incA += lda; \n
-		daxpy(a[3], &bs[11][0], c);  a[3] = READA; incA += lda; \n
+		daxpy(a[0], &bs[8][0], c);  a[0] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[1], &bs[9][0], c);  a[1] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[2], &bs[10][0], c);  a[2] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
+		daxpy(a[3], &bs[11][0], c);  a[3] = ((incA < maxA) ? Ain[incA] : 0); incA += lda; \n
 
 		daxpy(a[0], &bs[12][0], c); \n
 		daxpy(a[1], &bs[13][0], c); \n

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clblas.git



More information about the debian-science-commits mailing list