avoid problem of compatibility with MAGMA with lapack_const

control/common.h

@@ -145,7 +145,7 @@
  *  Global array of LAPACK constants
  **/
 extern char *morse_lapack_constants[];
-#define lapack_const(morse_const) morse_lapack_constants[morse_const][0]
+#define morse_lapack_const(morse_const) morse_lapack_constants[morse_const][0]
 
 #ifdef __cplusplus
 extern "C" {

coreblas/compute/core_zgelqt.c

@@ -136,8 +136,8 @@ int CORE_zgelqt(int M, int N, int IB,
                             &A[LDA*i+i], LDA, &TAU[i], WORK);
 
         LAPACKE_zlarft_work(LAPACK_COL_MAJOR,
-            lapack_const(MorseForward),
-            lapack_const(MorseRowwise),
+            morse_lapack_const(MorseForward),
+            morse_lapack_const(MorseRowwise),
             N-i, sb,
             &A[LDA*i+i], LDA, &TAU[i],
             &T[LDT*i], LDT);
@@ -145,10 +145,10 @@ int CORE_zgelqt(int M, int N, int IB,
         if (M > i+sb) {
             LAPACKE_zlarfb_work(
                 LAPACK_COL_MAJOR,
-                lapack_const(MorseRight),
-                lapack_const(MorseNoTrans),
-                lapack_const(MorseForward),
-                lapack_const(MorseRowwise),
+                morse_lapack_const(MorseRight),
+                morse_lapack_const(MorseNoTrans),
+                morse_lapack_const(MorseForward),
+                morse_lapack_const(MorseRowwise),
                 M-i-sb, N-i, sb,
                 &A[LDA*i+i],      LDA,
                 &T[LDT*i],        LDT,

coreblas/compute/core_zgeqrt.c

@@ -137,8 +137,8 @@ int CORE_zgeqrt(int M, int N, int IB,
                             &A[LDA*i+i], LDA, &TAU[i], WORK);
 
         LAPACKE_zlarft_work(LAPACK_COL_MAJOR,
-            lapack_const(MorseForward),
-            lapack_const(MorseColumnwise),
+            morse_lapack_const(MorseForward),
+            morse_lapack_const(MorseColumnwise),
             M-i, sb,
             &A[LDA*i+i], LDA, &TAU[i],
             &T[LDT*i], LDT);
@@ -146,10 +146,10 @@ int CORE_zgeqrt(int M, int N, int IB,
         if (N > i+sb) {
             LAPACKE_zlarfb_work(
                 LAPACK_COL_MAJOR,
-                lapack_const(MorseLeft),
-                lapack_const(MorseConjTrans),
-                lapack_const(MorseForward),
-                lapack_const(MorseColumnwise),
+                morse_lapack_const(MorseLeft),
+                morse_lapack_const(MorseConjTrans),
+                morse_lapack_const(MorseForward),
+                morse_lapack_const(MorseColumnwise),
                 M-i, N-i-sb, sb,
                 &A[LDA*i+i],      LDA,
                 &T[LDT*i],        LDT,

coreblas/compute/core_zgesplit.c

@@ -101,11 +101,11 @@ int CORE_zgesplit(MORSE_enum side, MORSE_enum diag,
     }
 
     LAPACKE_zlacpy_work(LAPACK_COL_MAJOR,
-                        lapack_const(uplo),
+                        morse_lapack_const(uplo),
                         M, N, A, LDA, B, LDB);
 
     LAPACKE_zlaset_work(LAPACK_COL_MAJOR,
-                        lapack_const(uplo),
+                        morse_lapack_const(uplo),
                         M, N, 0., 1., A, LDA);
 
     return MORSE_SUCCESS;

coreblas/compute/core_zlacpy.c

@@ -43,7 +43,7 @@ void CORE_zlacpy(MORSE_enum uplo, int M, int N,
 {
     LAPACKE_zlacpy_work(
         LAPACK_COL_MAJOR,
-        lapack_const(uplo),
+        morse_lapack_const(uplo),
         M, N, A, LDA, B, LDB);
 }
 

coreblas/compute/core_zlange.c

@@ -84,6 +84,6 @@ void CORE_zlange(int norm, int M, int N,
 {
     *normA = LAPACKE_zlange_work(
         LAPACK_COL_MAJOR,
-        lapack_const(norm),
+        morse_lapack_const(norm),
         M, N, A, LDA, work);
 }

coreblas/compute/core_zlanhe.c

@@ -86,6 +86,6 @@ void CORE_zlanhe(int norm, MORSE_enum uplo, int N,
 {
     *normA = LAPACKE_zlanhe_work(
         LAPACK_COL_MAJOR,
-        lapack_const(norm), lapack_const(uplo),
+        morse_lapack_const(norm), morse_lapack_const(uplo),
         N, A, LDA, work);
 }

coreblas/compute/core_zlansy.c

@@ -86,6 +86,6 @@ void CORE_zlansy(int norm, MORSE_enum uplo, int N,
 {
     *normA = LAPACKE_zlansy_work(
         LAPACK_COL_MAJOR,
-        lapack_const(norm), lapack_const(uplo),
+        morse_lapack_const(norm), morse_lapack_const(uplo),
         N, A, LDA, work);
 }

coreblas/compute/core_zlantr.c

@@ -98,9 +98,9 @@ void CORE_zlantr(MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag,
 #if defined(LAPACKE_CORRECT_DLANTR)
     *normA = LAPACKE_zlantr_work(
         LAPACK_COL_MAJOR,
-        lapack_const(norm),
-        lapack_const(uplo),
-        lapack_const(diag),
+        morse_lapack_const(norm),
+        morse_lapack_const(uplo),
+        morse_lapack_const(diag),
         M, N, A, LDA, work);
 #else
     const MORSE_Complex64_t *tmpA;

coreblas/compute/core_zlaset.c

@@ -73,7 +73,7 @@ void CORE_zlaset(MORSE_enum uplo, int M, int N,
 {
     LAPACKE_zlaset_work(
         LAPACK_COL_MAJOR,
-        lapack_const(uplo),
+        morse_lapack_const(uplo),
         M, N, alpha, beta, A, LDA);
 }
 

coreblas/compute/core_zlaset2.c

@@ -71,19 +71,19 @@ void CORE_zlaset2(MORSE_enum uplo, int M, int N,
     if (uplo == MorseUpper) {
         LAPACKE_zlaset_work(
             LAPACK_COL_MAJOR,
-            lapack_const(uplo),
+            morse_lapack_const(uplo),
             M, N-1, alpha, alpha, A+LDA, LDA);
     }
     else if (uplo == MorseLower) {
         LAPACKE_zlaset_work(
             LAPACK_COL_MAJOR,
-            lapack_const(uplo),
+            morse_lapack_const(uplo),
             M-1, N, alpha, alpha, A+1, LDA);
     }
     else {
         LAPACKE_zlaset_work(
             LAPACK_COL_MAJOR,
-            lapack_const(uplo),
+            morse_lapack_const(uplo),
             M, N, alpha, alpha, A, LDA);
     }
 }

coreblas/compute/core_zlauum.c

@@ -39,7 +39,7 @@
 
 void CORE_zlauum(MORSE_enum uplo, int N, MORSE_Complex64_t *A, int LDA)
 {
-    LAPACKE_zlauum_work(LAPACK_COL_MAJOR, lapack_const(uplo), N, A, LDA );
+    LAPACKE_zlauum_work(LAPACK_COL_MAJOR, morse_lapack_const(uplo), N, A, LDA );
 }
 
 

coreblas/compute/core_zpamm.c

@@ -337,7 +337,7 @@ CORE_zpamm_w(MORSE_enum side, MORSE_enum trans, MORSE_enum uplo,
 
             /* W = A2_2 */
             LAPACKE_zlacpy_work(LAPACK_COL_MAJOR,
-                lapack_const(MorseUpperLower),
+                morse_lapack_const(MorseUpperLower),
                 L, N,
                 &A2[K-L], LDA2, W, LDW);
 
@@ -403,7 +403,7 @@ CORE_zpamm_w(MORSE_enum side, MORSE_enum trans, MORSE_enum uplo,
 
                 /* W = A2_2 */
                 LAPACKE_zlacpy_work(LAPACK_COL_MAJOR,
-                    lapack_const(MorseUpperLower),
+                    morse_lapack_const(MorseUpperLower),
                     M, L,
                     &A2[LDA2*(K-L)], LDA2, W, LDW);
 

coreblas/compute/core_zpotrf.c

@@ -41,7 +41,7 @@ void CORE_zpotrf(MORSE_enum uplo, int N, MORSE_Complex64_t *A, int LDA, int *INF
 {
     *INFO = LAPACKE_zpotrf_work(
         LAPACK_COL_MAJOR,
-        lapack_const(uplo),
+        morse_lapack_const(uplo),
         N, A, LDA );
 }
 

coreblas/compute/core_ztrtri.c

@@ -41,7 +41,7 @@ void CORE_ztrtri(MORSE_enum uplo, MORSE_enum diag, int N, MORSE_Complex64_t *A,
 {
     *info = LAPACKE_ztrtri_work(
         LAPACK_COL_MAJOR,
-        lapack_const(uplo), lapack_const(diag),
+        morse_lapack_const(uplo), morse_lapack_const(diag),
         N, A, LDA);
 }
 

coreblas/compute/core_zunmlq.c

@@ -223,10 +223,10 @@ int CORE_zunmlq(MORSE_enum side, MORSE_enum trans,
          * Apply H or H'
          */
         LAPACKE_zlarfb_work(LAPACK_COL_MAJOR,
-            lapack_const(side),
-            lapack_const(trans),
-            lapack_const(MorseForward),
-            lapack_const(MorseRowwise),
+            morse_lapack_const(side),
+            morse_lapack_const(trans),
+            morse_lapack_const(MorseForward),
+            morse_lapack_const(MorseRowwise),
             mi, ni, kb,
             &A[LDA*i+i], LDA,
             &T[LDT*i], LDT,

coreblas/compute/core_zunmqr.c

@@ -216,10 +216,10 @@ int CORE_zunmqr(MORSE_enum side, MORSE_enum trans,
          * Apply H or H'
          */
         LAPACKE_zlarfb_work(LAPACK_COL_MAJOR,
-            lapack_const(side),
-            lapack_const(trans),
-            lapack_const(MorseForward),
-            lapack_const(MorseColumnwise),
+            morse_lapack_const(side),
+            morse_lapack_const(trans),
+            morse_lapack_const(MorseForward),
+            morse_lapack_const(MorseColumnwise),
             mi, ni, kb,
             &A[LDA*i+i], LDA,
             &T[LDT*i], LDT,

coreblas/include/coreblas.h

@@ -93,7 +93,7 @@ extern "C" {
  *  LAPACK Constants
  **/
 extern char *morse_lapack_constants[];
-#define lapack_const(morse_const) morse_lapack_constants[morse_const][0]
+#define morse_lapack_const(morse_const) morse_lapack_constants[morse_const][0]
 
 #ifdef __cplusplus
 }

runtime/quark/codelets/codelet_zlacpy.c

@@ -69,7 +69,7 @@ void CORE_zlacpy_quark(Quark *quark)
     quark_unpack_args_7(quark, uplo, M, N, A, LDA, B, LDB);
     LAPACKE_zlacpy_work(
         LAPACK_COL_MAJOR,
-        lapack_const(uplo),
+        morse_lapack_const(uplo),
         M, N, A, LDA, B, LDB);
 }
 

runtime/quark/codelets/codelet_zlaset.c

@@ -99,6 +99,6 @@ void CORE_zlaset_quark(Quark *quark)
     quark_unpack_args_7(quark, uplo, M, N, alpha, beta, A, LDA);
     LAPACKE_zlaset_work(
         LAPACK_COL_MAJOR,
-        lapack_const(uplo),
+        morse_lapack_const(uplo),
         M, N, alpha, beta, A, LDA);
 }