[clblas] 24/54: Fixed clang build error error: embedding a #pragma directive within macro arguments is not supported

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Thu Jan 14 20:07:35 UTC 2016


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

ghisvail-guest pushed a commit to branch debian/sid
in repository clblas.

commit 767f2a371d5f4799d3c8236d53ef7adea4b81cfa
Author: Cyril Lashkevich <notorca at gmail.com>
Date:   Thu Nov 19 11:18:49 2015 +0300

    Fixed clang build error
     error: embedding a #pragma directive within
          macro arguments is not supported
---
 src/library/blas/trtri/diag_dtrtri_lower_128_16.cpp | 6 +++---
 src/library/blas/trtri/diag_dtrtri_upper_128_16.cpp | 6 +++---
 src/library/blas/trtri/diag_dtrtri_upper_192_12.cpp | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/library/blas/trtri/diag_dtrtri_lower_128_16.cpp b/src/library/blas/trtri/diag_dtrtri_lower_128_16.cpp
index 6037eed..d60b482 100644
--- a/src/library/blas/trtri/diag_dtrtri_lower_128_16.cpp
+++ b/src/library/blas/trtri/diag_dtrtri_lower_128_16.cpp
@@ -62,7 +62,7 @@ __local double Bs[BLOCK_SIZE*BLOCK_SIZE]; \n
 __local double workspace[BLOCK_SIZE]; \n   // workspace used to store the current working column
 
 // load A
-#pragma unroll\n
+_Pragma("unroll")\n
 for (i = 0; i < BLOCK_SIZE; i++)\n
 { \n
     if (tx >= i && gx < na)\n
@@ -138,7 +138,7 @@ for (i = BLOCK_SIZE - 2; i >= 0; i--) {\n
 
 	txw = (tx - i - 1); \n
 
-#pragma unroll\n
+_Pragma("unroll")\n
 	for (j = 0; j < BLOCK_SIZE - i - 1; j++)\n
 		Ystx += switcher*(*(Bw + j*BLOCK_SIZE + txw)*x[j]); \n
 
@@ -163,7 +163,7 @@ for (i = BLOCK_SIZE - 2; i >= 0; i--) {\n
 }\n
 
 // write back A
-#pragma unroll\n
+_Pragma("unroll")\n
 for (i = 0; i < BLOCK_SIZE; i++)\n
 	*(d_dinvA + i*NB + tx) = Bs[i*BLOCK_SIZE + tx]; \n
 }\n
diff --git a/src/library/blas/trtri/diag_dtrtri_upper_128_16.cpp b/src/library/blas/trtri/diag_dtrtri_upper_128_16.cpp
index c31a218..d435d34 100644
--- a/src/library/blas/trtri/diag_dtrtri_upper_128_16.cpp
+++ b/src/library/blas/trtri/diag_dtrtri_upper_128_16.cpp
@@ -59,7 +59,7 @@ uint na)\n
   __local double workspace[BLOCK_SIZE]; \n   // workspace used to store the current working column
 
   // load A
-  #pragma unroll \n
+  _Pragma("unroll")\n
   for( i=0; i < BLOCK_SIZE; i++ )\n
     {\n
       if(tx <= i && i+bx*BLOCK_SIZE < na )\n
@@ -111,7 +111,7 @@ uint na)\n
     workspace[tx] = *(Bs+i*BLOCK_SIZE+tx);\n
     y = Bs+i*BLOCK_SIZE;\n
 
-    #pragma unroll\n
+    _Pragma("unroll")\n
     //for( j=tx; j < i; j++ )
     for( j=0; j < i; j++ )\n
 	{\n
@@ -139,7 +139,7 @@ uint na)\n
   }\n
   
     // write back A
-#pragma unroll\n
+  _Pragma("unroll")\n
   for( i=0; i < BLOCK_SIZE; i++ )\n
   {\n
     *(d_dinvA+i*NB+tx) = Bs[i*BLOCK_SIZE+tx];\n
diff --git a/src/library/blas/trtri/diag_dtrtri_upper_192_12.cpp b/src/library/blas/trtri/diag_dtrtri_upper_192_12.cpp
index dde0776..9ea6708 100644
--- a/src/library/blas/trtri/diag_dtrtri_upper_192_12.cpp
+++ b/src/library/blas/trtri/diag_dtrtri_upper_192_12.cpp
@@ -59,7 +59,7 @@ __local double Bs[BLOCK_SIZE*BLOCK_SIZE]; \n
 __local double workspace[BLOCK_SIZE];\n    // workspace used to store the current working column 
 
 // load A \n
-#pragma unroll\n
+_Pragma("unroll")\n
 for (i = 0; i < BLOCK_SIZE; i++)\n
 { \n
     if (tx <= i && i + bx*BLOCK_SIZE < na)\n
@@ -112,7 +112,7 @@ for (i = 0; i < BLOCK_SIZE; i++) {\n
 	workspace[tx] = *(Bs + i*BLOCK_SIZE + tx); \n
 	y = Bs + i*BLOCK_SIZE; \n
 
-#pragma unroll\n
+_Pragma("unroll")\n
 	//for( j=tx; j < i; j++ )
 	for (j = 0; j < i; j++)\n
 		Ystx += switcher * (*(Bs + j*BLOCK_SIZE + tx)*workspace[j]); \n
@@ -138,7 +138,7 @@ for (i = 0; i < BLOCK_SIZE; i++) {\n
 }\n
 
 // write back A
-#pragma unroll\n
+_Pragma("unroll")\n
 for (i = 0; i < BLOCK_SIZE; i++)\n
 	*(d_dinvA + i*NB + tx) = Bs[i*BLOCK_SIZE + tx]; \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