From 3ca5c222f75e87f89944b9ed771ea334a5a34929 Mon Sep 17 00:00:00 2001 From: Florent Pruvost <florent.pruvost@inria.fr> Date: Wed, 3 Dec 2014 17:31:36 +0000 Subject: [PATCH] avoid problem of compatibility with MAGMA with lapack_const --- control/common.h | 2 +- coreblas/compute/core_zgelqt.c | 12 ++++----- coreblas/compute/core_zgeqrt.c | 12 ++++----- coreblas/compute/core_zgesplit.c | 4 +-- coreblas/compute/core_zlacpy.c | 2 +- coreblas/compute/core_zlange.c | 2 +- coreblas/compute/core_zlanhe.c | 2 +- coreblas/compute/core_zlansy.c | 2 +- coreblas/compute/core_zlantr.c | 6 ++--- coreblas/compute/core_zlaset.c | 2 +- coreblas/compute/core_zlaset2.c | 6 ++--- coreblas/compute/core_zlauum.c | 2 +- coreblas/compute/core_zpamm.c | 4 +-- coreblas/compute/core_zpotrf.c | 2 +- coreblas/compute/core_ztrtri.c | 2 +- coreblas/compute/core_zunmlq.c | 8 +++--- coreblas/compute/core_zunmqr.c | 8 +++--- coreblas/include/coreblas.h | 2 +- runtime/quark/codelets/codelet_zlacpy.c | 2 +- runtime/quark/codelets/codelet_zlaset.c | 2 +- runtime/quark/codelets/codelet_zlauum.c | 2 +- runtime/quark/codelets/codelet_zpotrf.c | 2 +- runtime/quark/codelets/codelet_ztrtri.c | 2 +- runtime/starpu/codelets/codelet_zgemm.c | 2 +- runtime/starpu/codelets/codelet_zhemm.c | 2 +- runtime/starpu/codelets/codelet_zher2k.c | 2 +- runtime/starpu/codelets/codelet_zherk.c | 2 +- runtime/starpu/codelets/codelet_zlacpy.c | 2 +- runtime/starpu/codelets/codelet_zlaset.c | 2 +- runtime/starpu/codelets/codelet_zlauum.c | 2 +- runtime/starpu/codelets/codelet_zpotrf.c | 2 +- runtime/starpu/codelets/codelet_zsymm.c | 2 +- runtime/starpu/codelets/codelet_zsyr2k.c | 2 +- runtime/starpu/codelets/codelet_zsyrk.c | 2 +- runtime/starpu/codelets/codelet_ztrmm.c | 4 +-- runtime/starpu/codelets/codelet_ztrsm.c | 4 +-- runtime/starpu/codelets/codelet_ztrtri.c | 2 +- runtime/starpu/codelets/codelet_ztsmqr.c | 28 ++++++++++----------- testing/testing_zgemm.c | 12 ++++----- testing/testing_zhemm.c | 12 ++++----- testing/testing_zher2k.c | 12 ++++----- testing/testing_zherk.c | 10 ++++---- testing/testing_zlange.c | 10 ++++---- testing/testing_zsymm.c | 12 ++++----- testing/testing_zsyr2k.c | 12 ++++----- testing/testing_zsyrk.c | 10 ++++---- testing/testing_ztrmm.c | 10 ++++---- testing/testing_ztrsm.c | 10 ++++---- timing/time_zlange.c | 2 +- timing/time_zlange_tile.c | 2 +- timing/zauxiliary.c | 32 ++++++++++++------------ 51 files changed, 148 insertions(+), 148 deletions(-) diff --git a/control/common.h b/control/common.h index 68bc49378..f6967be24 100644 --- a/control/common.h +++ b/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" { diff --git a/coreblas/compute/core_zgelqt.c b/coreblas/compute/core_zgelqt.c index 6a3ff51fe..42412679c 100644 --- a/coreblas/compute/core_zgelqt.c +++ b/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, diff --git a/coreblas/compute/core_zgeqrt.c b/coreblas/compute/core_zgeqrt.c index a3c4bf49c..f77dabecd 100644 --- a/coreblas/compute/core_zgeqrt.c +++ b/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, diff --git a/coreblas/compute/core_zgesplit.c b/coreblas/compute/core_zgesplit.c index 13b4a1909..391a55e78 100644 --- a/coreblas/compute/core_zgesplit.c +++ b/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; diff --git a/coreblas/compute/core_zlacpy.c b/coreblas/compute/core_zlacpy.c index 017d225eb..3ede784cb 100644 --- a/coreblas/compute/core_zlacpy.c +++ b/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); } diff --git a/coreblas/compute/core_zlange.c b/coreblas/compute/core_zlange.c index a787ed932..1dbcd7343 100644 --- a/coreblas/compute/core_zlange.c +++ b/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); } diff --git a/coreblas/compute/core_zlanhe.c b/coreblas/compute/core_zlanhe.c index d1c23b2e2..f65e37448 100644 --- a/coreblas/compute/core_zlanhe.c +++ b/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); } diff --git a/coreblas/compute/core_zlansy.c b/coreblas/compute/core_zlansy.c index e79a4934f..46b1ead2b 100644 --- a/coreblas/compute/core_zlansy.c +++ b/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); } diff --git a/coreblas/compute/core_zlantr.c b/coreblas/compute/core_zlantr.c index e83d2896e..0c519fa29 100644 --- a/coreblas/compute/core_zlantr.c +++ b/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; diff --git a/coreblas/compute/core_zlaset.c b/coreblas/compute/core_zlaset.c index 389208862..97c02b656 100644 --- a/coreblas/compute/core_zlaset.c +++ b/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); } diff --git a/coreblas/compute/core_zlaset2.c b/coreblas/compute/core_zlaset2.c index 2a3054a29..412fa552e 100644 --- a/coreblas/compute/core_zlaset2.c +++ b/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); } } diff --git a/coreblas/compute/core_zlauum.c b/coreblas/compute/core_zlauum.c index a948f274c..0e98fcec5 100644 --- a/coreblas/compute/core_zlauum.c +++ b/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 ); } diff --git a/coreblas/compute/core_zpamm.c b/coreblas/compute/core_zpamm.c index 336fef95c..09c04229d 100644 --- a/coreblas/compute/core_zpamm.c +++ b/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); diff --git a/coreblas/compute/core_zpotrf.c b/coreblas/compute/core_zpotrf.c index 1d4c40c0a..5338915df 100644 --- a/coreblas/compute/core_zpotrf.c +++ b/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 ); } diff --git a/coreblas/compute/core_ztrtri.c b/coreblas/compute/core_ztrtri.c index 5acbb61f0..b4e723135 100644 --- a/coreblas/compute/core_ztrtri.c +++ b/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); } diff --git a/coreblas/compute/core_zunmlq.c b/coreblas/compute/core_zunmlq.c index 700958a51..23ca3cb1a 100644 --- a/coreblas/compute/core_zunmlq.c +++ b/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, diff --git a/coreblas/compute/core_zunmqr.c b/coreblas/compute/core_zunmqr.c index d0f78666f..1da7955be 100644 --- a/coreblas/compute/core_zunmqr.c +++ b/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, diff --git a/coreblas/include/coreblas.h b/coreblas/include/coreblas.h index 41ca83747..bfad2e7bb 100644 --- a/coreblas/include/coreblas.h +++ b/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 } diff --git a/runtime/quark/codelets/codelet_zlacpy.c b/runtime/quark/codelets/codelet_zlacpy.c index abb24651f..8671f3199 100644 --- a/runtime/quark/codelets/codelet_zlacpy.c +++ b/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); } diff --git a/runtime/quark/codelets/codelet_zlaset.c b/runtime/quark/codelets/codelet_zlaset.c index 1d9c35dc0..8ba2a9383 100644 --- a/runtime/quark/codelets/codelet_zlaset.c +++ b/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); } diff --git a/runtime/quark/codelets/codelet_zlauum.c b/runtime/quark/codelets/codelet_zlauum.c index 326963312..a4aca819f 100644 --- a/runtime/quark/codelets/codelet_zlauum.c +++ b/runtime/quark/codelets/codelet_zlauum.c @@ -60,5 +60,5 @@ void CORE_zlauum_quark(Quark *quark) int LDA; quark_unpack_args_4(quark, uplo, N, A, 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); } diff --git a/runtime/quark/codelets/codelet_zpotrf.c b/runtime/quark/codelets/codelet_zpotrf.c index 2cdb853fc..99a029450 100644 --- a/runtime/quark/codelets/codelet_zpotrf.c +++ b/runtime/quark/codelets/codelet_zpotrf.c @@ -71,7 +71,7 @@ void CORE_zpotrf_quark(Quark *quark) quark_unpack_args_7(quark, uplo, n, A, lda, sequence, request, iinfo); info = LAPACKE_zpotrf_work( LAPACK_COL_MAJOR, - lapack_const(uplo), + morse_lapack_const(uplo), n, A, lda); if (sequence->status == MORSE_SUCCESS && info != 0) RUNTIME_sequence_flush(quark, sequence, request, iinfo+info); diff --git a/runtime/quark/codelets/codelet_ztrtri.c b/runtime/quark/codelets/codelet_ztrtri.c index 4ab50e820..c2e071dcc 100644 --- a/runtime/quark/codelets/codelet_ztrtri.c +++ b/runtime/quark/codelets/codelet_ztrtri.c @@ -74,7 +74,7 @@ void CORE_ztrtri_quark(Quark *quark) quark_unpack_args_8(quark, uplo, diag, N, A, LDA, sequence, request, iinfo); info = LAPACKE_ztrtri_work( LAPACK_COL_MAJOR, - lapack_const(uplo), lapack_const(diag), + morse_lapack_const(uplo), morse_lapack_const(diag), N, A, LDA); if ((sequence->status == MORSE_SUCCESS) && (info > 0)) RUNTIME_sequence_flush(quark, sequence, request, iinfo + info); diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c index 3f0c671b8..915b0d181 100644 --- a/runtime/starpu/codelets/codelet_zgemm.c +++ b/runtime/starpu/codelets/codelet_zgemm.c @@ -130,7 +130,7 @@ static void cl_zgemm_cuda_func(void *descr[], void *cl_arg) cublasSetKernelStream( stream ); cublasZgemm( - lapack_const(transA), lapack_const(transB), + morse_lapack_const(transA), morse_lapack_const(transB), m, n, k, alpha, A, lda, B, ldb, diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c index b9cb8dfbb..d1ae45edd 100644 --- a/runtime/starpu/codelets/codelet_zhemm.c +++ b/runtime/starpu/codelets/codelet_zhemm.c @@ -126,7 +126,7 @@ static void cl_zhemm_cuda_func(void *descr[], void *cl_arg) cublasSetKernelStream( stream ); cublasZhemm( - lapack_const(side), lapack_const(uplo), + morse_lapack_const(side), morse_lapack_const(uplo), M, N, alpha, A, LDA, B, LDB, diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c index d82e8080a..e57c9bcbc 100644 --- a/runtime/starpu/codelets/codelet_zher2k.c +++ b/runtime/starpu/codelets/codelet_zher2k.c @@ -120,7 +120,7 @@ static void cl_zher2k_cuda_func(void *descr[], void *cl_arg) CUstream stream = starpu_cuda_get_local_stream(); cublasSetKernelStream( stream ); - cublasZher2k( lapack_const(uplo), lapack_const(trans), + cublasZher2k( morse_lapack_const(uplo), morse_lapack_const(trans), n, k, alpha, A, lda, B, ldb, beta, C, ldc); #ifndef STARPU_CUDA_ASYNC diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c index b54138ba1..4d2c3596b 100644 --- a/runtime/starpu/codelets/codelet_zherk.c +++ b/runtime/starpu/codelets/codelet_zherk.c @@ -114,7 +114,7 @@ static void cl_zherk_cuda_func(void *descr[], void *cl_arg) cublasSetKernelStream( stream ); cublasZherk( - lapack_const(uplo), lapack_const(trans), + morse_lapack_const(uplo), morse_lapack_const(trans), n, k, alpha, A, lda, beta, C, ldc); diff --git a/runtime/starpu/codelets/codelet_zlacpy.c b/runtime/starpu/codelets/codelet_zlacpy.c index e16cbc5db..e38e595f1 100644 --- a/runtime/starpu/codelets/codelet_zlacpy.c +++ b/runtime/starpu/codelets/codelet_zlacpy.c @@ -81,7 +81,7 @@ static void cl_zlacpy_cpu_func(void *descr[], void *cl_arg) starpu_codelet_unpack_args(cl_arg, &uplo, &M, &N, &LDA, &LDB); LAPACKE_zlacpy_work( LAPACK_COL_MAJOR, - lapack_const(uplo), + morse_lapack_const(uplo), M, N, A, LDA, B, LDB); } diff --git a/runtime/starpu/codelets/codelet_zlaset.c b/runtime/starpu/codelets/codelet_zlaset.c index 84875d052..83849a1ec 100644 --- a/runtime/starpu/codelets/codelet_zlaset.c +++ b/runtime/starpu/codelets/codelet_zlaset.c @@ -109,7 +109,7 @@ static void cl_zlaset_cpu_func(void *descr[], void *cl_arg) starpu_codelet_unpack_args(cl_arg, &uplo, &M, &N, &alpha, &beta, &LDA); LAPACKE_zlaset_work( LAPACK_COL_MAJOR, - lapack_const(uplo), + morse_lapack_const(uplo), M, N, alpha, beta, A, LDA); } /* diff --git a/runtime/starpu/codelets/codelet_zlauum.c b/runtime/starpu/codelets/codelet_zlauum.c index 58e4d943f..040e49943 100644 --- a/runtime/starpu/codelets/codelet_zlauum.c +++ b/runtime/starpu/codelets/codelet_zlauum.c @@ -70,7 +70,7 @@ static void cl_zlauum_cpu_func(void *descr[], void *cl_arg) A = (MORSE_Complex64_t *)STARPU_MATRIX_GET_PTR(descr[0]); starpu_codelet_unpack_args(cl_arg, &uplo, &N, &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); } #if defined(CHAMELEON_USE_MAGMA) diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c index eec20131d..cbb51becf 100644 --- a/runtime/starpu/codelets/codelet_zpotrf.c +++ b/runtime/starpu/codelets/codelet_zpotrf.c @@ -78,7 +78,7 @@ static void cl_zpotrf_cpu_func(void *descr[], void *cl_arg) starpu_codelet_unpack_args(cl_arg, &uplo, &n, &lda, &iinfo); info = LAPACKE_zpotrf_work( LAPACK_COL_MAJOR, - lapack_const(uplo), + morse_lapack_const(uplo), n, A, lda); } diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c index 4c935e19c..46e0abd67 100644 --- a/runtime/starpu/codelets/codelet_zsymm.c +++ b/runtime/starpu/codelets/codelet_zsymm.c @@ -126,7 +126,7 @@ static void cl_zsymm_cuda_func(void *descr[], void *cl_arg) cublasSetKernelStream( stream ); cublasZsymm( - lapack_const(side), lapack_const(uplo), + morse_lapack_const(side), morse_lapack_const(uplo), M, N, alpha, A, LDA, B, LDB, diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c index a16431d84..4c6bfff74 100644 --- a/runtime/starpu/codelets/codelet_zsyr2k.c +++ b/runtime/starpu/codelets/codelet_zsyr2k.c @@ -120,7 +120,7 @@ static void cl_zsyr2k_cuda_func(void *descr[], void *cl_arg) CUstream stream = starpu_cuda_get_local_stream(); cublasSetKernelStream( stream ); - cublasZsyr2k( lapack_const(uplo), lapack_const(trans), + cublasZsyr2k( morse_lapack_const(uplo), morse_lapack_const(trans), n, k, alpha, A, lda, B, ldb, beta, C, ldc); #ifndef STARPU_CUDA_ASYNC diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c index 4afcbeb49..afd4260c2 100644 --- a/runtime/starpu/codelets/codelet_zsyrk.c +++ b/runtime/starpu/codelets/codelet_zsyrk.c @@ -115,7 +115,7 @@ static void cl_zsyrk_cuda_func(void *descr[], void *cl_arg) cublasSetKernelStream( stream ); cublasZsyrk( - lapack_const(uplo), lapack_const(trans), + morse_lapack_const(uplo), morse_lapack_const(trans), n, k, alpha, A, lda, beta, C, ldc); diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c index 6823fb7fe..a0cb4717d 100644 --- a/runtime/starpu/codelets/codelet_ztrmm.c +++ b/runtime/starpu/codelets/codelet_ztrmm.c @@ -119,8 +119,8 @@ static void cl_ztrmm_cuda_func(void *descr[], void *cl_arg) cublasSetKernelStream( stream ); cublasZtrmm( - lapack_const(side), lapack_const(uplo), - lapack_const(transA), lapack_const(diag), + morse_lapack_const(side), morse_lapack_const(uplo), + morse_lapack_const(transA), morse_lapack_const(diag), M, N, alpha, A, LDA, B, LDB); diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c index 7cc368421..141e0076b 100644 --- a/runtime/starpu/codelets/codelet_ztrsm.c +++ b/runtime/starpu/codelets/codelet_ztrsm.c @@ -119,8 +119,8 @@ static void cl_ztrsm_cuda_func(void *descr[], void *cl_arg) cublasSetKernelStream( stream ); cublasZtrsm( - lapack_const(side), lapack_const(uplo), - lapack_const(transA), lapack_const(diag), + morse_lapack_const(side), morse_lapack_const(uplo), + morse_lapack_const(transA), morse_lapack_const(diag), m, n, alpha, A, lda, B, ldb); diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c index 864fb745f..032171aa4 100644 --- a/runtime/starpu/codelets/codelet_ztrtri.c +++ b/runtime/starpu/codelets/codelet_ztrtri.c @@ -80,7 +80,7 @@ static void cl_ztrtri_cpu_func(void *descr[], void *cl_arg) starpu_codelet_unpack_args(cl_arg, &uplo, &diag, &N, &LDA, &iinfo); info = LAPACKE_ztrtri_work( LAPACK_COL_MAJOR, - lapack_const(uplo), lapack_const(diag), + morse_lapack_const(uplo), morse_lapack_const(diag), N, A, LDA); } diff --git a/runtime/starpu/codelets/codelet_ztsmqr.c b/runtime/starpu/codelets/codelet_ztsmqr.c index 747ccc5ae..0c283302f 100644 --- a/runtime/starpu/codelets/codelet_ztsmqr.c +++ b/runtime/starpu/codelets/codelet_ztsmqr.c @@ -305,7 +305,7 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans, transW = storev == MorseColumnwise ? MagmaConjTrans : MagmaNoTrans; transA2 = storev == MorseColumnwise ? MagmaNoTrans : MagmaConjTrans; - cublasZgemm(lapack_const(transW), lapack_const(MagmaNoTrans), + cublasZgemm(morse_lapack_const(transW), morse_lapack_const(MagmaNoTrans), K, N1, M2, zone, (cuDoubleComplex*)V /* K*M2 */, LDV, @@ -316,8 +316,8 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans, WORKC = NULL; if (WORKC == NULL) { /* W = op(T) * W */ - cublasZtrmm( lapack_const(MagmaLeft), lapack_const(MagmaUpper), - lapack_const(trans), lapack_const(MagmaNonUnit), + cublasZtrmm( morse_lapack_const(MagmaLeft), morse_lapack_const(MagmaUpper), + morse_lapack_const(trans), morse_lapack_const(MagmaNonUnit), K, N2, zone, (cuDoubleComplex*)T, LDT, @@ -332,7 +332,7 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans, } /* A2 = A2 - op(V) * W */ - cublasZgemm(lapack_const(transA2), lapack_const(MagmaNoTrans), + cublasZgemm(morse_lapack_const(transA2), morse_lapack_const(MagmaNoTrans), M2, N2, K, mzone, (cuDoubleComplex*)V /* M2*K */, LDV, @@ -342,21 +342,21 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans, } else { /* Wc = V * op(T) */ - cublasZgemm( lapack_const(transA2), lapack_const(trans), + cublasZgemm( morse_lapack_const(transA2), morse_lapack_const(trans), M2, K, K, zone, V, LDV, T, LDT, zzero, WORKC, LDWORKC ); /* A1 = A1 - opt(T) * W */ - cublasZgemm( lapack_const(trans), lapack_const(MagmaNoTrans), + cublasZgemm( morse_lapack_const(trans), morse_lapack_const(MagmaNoTrans), K, N1, K, mzone, T, LDT, WORK, LDWORK, zone, A1, LDA1 ); /* A2 = A2 - Wc * W */ - cublasZgemm( lapack_const(MagmaNoTrans), lapack_const(MagmaNoTrans), + cublasZgemm( morse_lapack_const(MagmaNoTrans), morse_lapack_const(MagmaNoTrans), M2, N2, K, mzone, WORKC, LDWORKC, WORK, LDWORK, @@ -386,7 +386,7 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans, transW = storev == MorseColumnwise ? MagmaNoTrans : MagmaConjTrans; transA2 = storev == MorseColumnwise ? MagmaConjTrans : MagmaNoTrans; - cublasZgemm(lapack_const(MagmaNoTrans), lapack_const(transW), + cublasZgemm(morse_lapack_const(MagmaNoTrans), morse_lapack_const(transW), M1, K, N2, zone, (cuDoubleComplex*)A2 /* M1*N2 */, LDA2, @@ -397,8 +397,8 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans, WORKC = NULL; if (WORKC == NULL) { /* W = W * op(T) */ - cublasZtrmm( lapack_const(MagmaRight), lapack_const(MagmaUpper), - lapack_const(trans), lapack_const(MagmaNonUnit), + cublasZtrmm( morse_lapack_const(MagmaRight), morse_lapack_const(MagmaUpper), + morse_lapack_const(trans), morse_lapack_const(MagmaNonUnit), M2, K, zone, (cuDoubleComplex*)T, LDT, @@ -413,7 +413,7 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans, } /* A2 = A2 - W * op(V) */ - cublasZgemm(lapack_const(MagmaNoTrans), lapack_const(transA2), + cublasZgemm(morse_lapack_const(MagmaNoTrans), morse_lapack_const(transA2), M2, N2, K, mzone, (cuDoubleComplex*)WORK /* M2*K */, LDWORK, @@ -423,21 +423,21 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans, } else { /* A1 = A1 - W * opt(T) */ - cublasZgemm( lapack_const(MagmaNoTrans), lapack_const(trans), + cublasZgemm( morse_lapack_const(MagmaNoTrans), morse_lapack_const(trans), M1, K, K, mzone, WORK, LDWORK, T, LDT, zone, A1, LDA1 ); /* Wc = op(T) * V */ - cublasZgemm( lapack_const(trans), lapack_const(transA2), + cublasZgemm( morse_lapack_const(trans), morse_lapack_const(transA2), K, N2, K, zone, T, LDT, V, LDV, zzero, WORKC, LDWORKC ); /* A2 = A2 - W * Wc */ - cublasZgemm( lapack_const(MagmaNoTrans), lapack_const(MagmaNoTrans), + cublasZgemm( morse_lapack_const(MagmaNoTrans), morse_lapack_const(MagmaNoTrans), M2, N2, K, mzone, WORK, LDWORK, WORKC, LDWORKC, diff --git a/testing/testing_zgemm.c b/testing/testing_zgemm.c index 700976761..3c7cdc876 100644 --- a/testing/testing_zgemm.c +++ b/testing/testing_zgemm.c @@ -188,19 +188,19 @@ static int check_solution(MORSE_enum transA, MORSE_enum transB, int M, int N, in Bm = N; Bn = K; } - Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), Am, An, A, LDA, work); - Bnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), Bm, Bn, B, LDB, work); - Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cref, LDC, work); - Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cmorse, LDC, work); + Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), Am, An, A, LDA, work); + Bnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), Bm, Bn, B, LDB, work); + Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cref, LDC, work); + Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cmorse, LDC, work); cblas_zgemm(CblasColMajor, (CBLAS_TRANSPOSE)transA, (CBLAS_TRANSPOSE)transB, M, N, K, CBLAS_SADDR(alpha), A, LDA, B, LDB, CBLAS_SADDR(beta), Cref, LDC); - Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cref, LDC, work); + Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cref, LDC, work); cblas_zaxpy(LDC * N, CBLAS_SADDR(beta_const), Cmorse, 1, Cref, 1); - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cref, LDC, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cref, LDC, work); eps = LAPACKE_dlamch_work('e'); if (MORSE_My_Mpi_Rank() == 0) diff --git a/testing/testing_zhemm.c b/testing/testing_zhemm.c index bdcb677a7..195a8a668 100644 --- a/testing/testing_zhemm.c +++ b/testing/testing_zhemm.c @@ -165,18 +165,18 @@ static int check_solution(MORSE_enum side, MORSE_enum uplo, int M, int N, beta_const = (MORSE_Complex64_t)-1.0; NrowA = (side == MorseLeft) ? M : N; - Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), NrowA, NrowA, A, LDA, work); - Bnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, B, LDB, work); - Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cref, LDC, work); - Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cmorse, LDC, work); + Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), NrowA, NrowA, A, LDA, work); + Bnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, B, LDB, work); + Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cref, LDC, work); + Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cmorse, LDC, work); cblas_zhemm(CblasColMajor, (CBLAS_SIDE)side, (CBLAS_UPLO)uplo, M, N, CBLAS_SADDR(alpha), A, LDA, B, LDB, CBLAS_SADDR(beta), Cref, LDC); - Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cref, LDC, work); + Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cref, LDC, work); cblas_zaxpy(LDC * N, CBLAS_SADDR(beta_const), Cmorse, 1, Cref, 1); - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cref, LDC, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cref, LDC, work); eps = LAPACKE_dlamch_work('e'); diff --git a/testing/testing_zher2k.c b/testing/testing_zher2k.c index 074699f9e..bb7b29343 100644 --- a/testing/testing_zher2k.c +++ b/testing/testing_zher2k.c @@ -159,23 +159,23 @@ static int check_solution(MORSE_enum uplo, MORSE_enum trans, int N, int K, double *work = (double *)malloc(max(N, K)* sizeof(double)); beta_const = -1.0; - Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), + Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), (trans == MorseNoTrans) ? N : K, (trans == MorseNoTrans) ? K : N, A, LDA, work); - Bnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), + Bnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), (trans == MorseNoTrans) ? N : K, (trans == MorseNoTrans) ? K : N, B, LDB, work); - Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cref, LDC, work); - Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cmorse, LDC, work); + Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cref, LDC, work); + Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cmorse, LDC, work); cblas_zher2k(CblasColMajor, (CBLAS_UPLO)uplo, (CBLAS_TRANSPOSE)trans, N, K, CBLAS_SADDR(alpha), A, LDA, B, LDB, (beta), Cref, LDC); - Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cref, LDC, work); + Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cref, LDC, work); cblas_zaxpy(LDC*N, CBLAS_SADDR(beta_const), Cmorse, 1, Cref, 1); - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cref, LDC, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cref, LDC, work); eps = LAPACKE_dlamch_work('e'); diff --git a/testing/testing_zherk.c b/testing/testing_zherk.c index 3179f3ad0..bc45668e3 100644 --- a/testing/testing_zherk.c +++ b/testing/testing_zherk.c @@ -152,20 +152,20 @@ static int check_solution(MORSE_enum uplo, MORSE_enum trans, int N, int K, double *work = (double *)malloc(max(N, K)* sizeof(double)); beta_const = -1.0; - Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), + Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), (trans == MorseNoTrans) ? N : K, (trans == MorseNoTrans) ? K : N, A, LDA, work); - Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cref, LDC, work); - Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cmorse, LDC, work); + Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cref, LDC, work); + Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cmorse, LDC, work); cblas_zherk(CblasColMajor, (CBLAS_UPLO)uplo, (CBLAS_TRANSPOSE)trans, N, K, (alpha), A, LDA, (beta), Cref, LDC); - Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cref, LDC, work); + Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cref, LDC, work); cblas_zaxpy(LDC*N, CBLAS_SADDR(beta_const), Cmorse, 1, Cref, 1); - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cref, LDC, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cref, LDC, work); eps = LAPACKE_dlamch_work('e'); diff --git a/testing/testing_zlange.c b/testing/testing_zlange.c index 33d265793..3643caf7d 100644 --- a/testing/testing_zlange.c +++ b/testing/testing_zlange.c @@ -83,7 +83,7 @@ int testing_zlange(int argc, char **argv) /* MORSE ZLANGE */ for(n=0; n<4; n++) { normmorse = MORSE_zlange(norm[n], M, N, A, LDA); - normlapack = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(norm[n]), M, N, A, LDA, work); + normlapack = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(norm[n]), M, N, A, LDA, work); printf("LAPACK %e, CHAMELEON %e\n", normlapack, normmorse); result = fabs(normmorse - normlapack) / (normlapack * eps); @@ -123,8 +123,8 @@ int testing_zlange(int argc, char **argv) int d; for(d=0; d<2; d++) { normmorse = MORSE_zlantr(norm[n], uplo[u], diag[d], M, N, A, LDA); - normlapack = LAPACKE_zlantr_work(LAPACK_COL_MAJOR, lapack_const(norm[n]), lapack_const(uplo[u]), - lapack_const(diag[d]), M, N, A, LDA, work); + normlapack = LAPACKE_zlantr_work(LAPACK_COL_MAJOR, morse_lapack_const(norm[n]), morse_lapack_const(uplo[u]), + morse_lapack_const(diag[d]), M, N, A, LDA, work); printf("LAPACK %e, CHAMELEON %e\n", normlapack, normmorse); result = fabs(normmorse - normlapack) / (normlapack * eps); @@ -165,7 +165,7 @@ int testing_zlange(int argc, char **argv) for(n=0; n<4; n++) { for(u=0; u<2; u++) { normmorse = MORSE_zlansy(norm[n], uplo[u], min(M,N), A, LDA); - normlapack = LAPACKE_zlansy_work(LAPACK_COL_MAJOR, lapack_const(norm[n]), lapack_const(uplo[u]), min(M,N), A, LDA, work); + normlapack = LAPACKE_zlansy_work(LAPACK_COL_MAJOR, morse_lapack_const(norm[n]), morse_lapack_const(uplo[u]), min(M,N), A, LDA, work); printf("LAPACK %e, CHAMELEON %e\n", normlapack, normmorse); result = fabs(normmorse - normlapack) / (normlapack * eps); @@ -210,7 +210,7 @@ int testing_zlange(int argc, char **argv) for(n=0; n<4; n++) { for(u=0; u<2; u++) { normmorse = MORSE_zlanhe(norm[n], uplo[u], min(M,N), A, LDA); - normlapack = LAPACKE_zlanhe_work(LAPACK_COL_MAJOR, lapack_const(norm[n]), lapack_const(uplo[u]), min(M,N), A, LDA, work); + normlapack = LAPACKE_zlanhe_work(LAPACK_COL_MAJOR, morse_lapack_const(norm[n]), morse_lapack_const(uplo[u]), min(M,N), A, LDA, work); printf("LAPACK %e, CHAMELEON %e\n", normlapack, normmorse); result = fabs(normmorse - normlapack) / (normlapack * eps); diff --git a/testing/testing_zsymm.c b/testing/testing_zsymm.c index 613e8cf8e..c096170c9 100644 --- a/testing/testing_zsymm.c +++ b/testing/testing_zsymm.c @@ -165,18 +165,18 @@ static int check_solution(MORSE_enum side, MORSE_enum uplo, int M, int N, beta_const = (MORSE_Complex64_t)-1.0; NrowA = (side == MorseLeft) ? M : N; - Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), NrowA, NrowA, A, LDA, work); - Bnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, B, LDB, work); - Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cref, LDC, work); - Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cmorse, LDC, work); + Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), NrowA, NrowA, A, LDA, work); + Bnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, B, LDB, work); + Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cref, LDC, work); + Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cmorse, LDC, work); cblas_zsymm(CblasColMajor, (CBLAS_SIDE)side, (CBLAS_UPLO)uplo, M, N, CBLAS_SADDR(alpha), A, LDA, B, LDB, CBLAS_SADDR(beta), Cref, LDC); - Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cref, LDC, work); + Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cref, LDC, work); cblas_zaxpy(LDC * N, CBLAS_SADDR(beta_const), Cmorse, 1, Cref, 1); - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cref, LDC, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cref, LDC, work); eps = LAPACKE_dlamch_work('e'); diff --git a/testing/testing_zsyr2k.c b/testing/testing_zsyr2k.c index bb5da3584..9a4560b27 100644 --- a/testing/testing_zsyr2k.c +++ b/testing/testing_zsyr2k.c @@ -158,23 +158,23 @@ static int check_solution(MORSE_enum uplo, MORSE_enum trans, int N, int K, double *work = (double *)malloc(max(N, K)* sizeof(double)); beta_const = -1.0; - Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), + Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), (trans == MorseNoTrans) ? N : K, (trans == MorseNoTrans) ? K : N, A, LDA, work); - Bnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), + Bnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), (trans == MorseNoTrans) ? N : K, (trans == MorseNoTrans) ? K : N, B, LDB, work); - Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cref, LDC, work); - Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cmorse, LDC, work); + Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cref, LDC, work); + Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cmorse, LDC, work); cblas_zsyr2k(CblasColMajor, (CBLAS_UPLO)uplo, (CBLAS_TRANSPOSE)trans, N, K, CBLAS_SADDR(alpha), A, LDA, B, LDB, CBLAS_SADDR(beta), Cref, LDC); - Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cref, LDC, work); + Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cref, LDC, work); cblas_zaxpy(LDC*N, CBLAS_SADDR(beta_const), Cmorse, 1, Cref, 1); - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cref, LDC, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cref, LDC, work); eps = LAPACKE_dlamch_work('e'); diff --git a/testing/testing_zsyrk.c b/testing/testing_zsyrk.c index f3f0288e3..5f3dd57b3 100644 --- a/testing/testing_zsyrk.c +++ b/testing/testing_zsyrk.c @@ -150,20 +150,20 @@ static int check_solution(MORSE_enum uplo, MORSE_enum trans, int N, int K, double *work = (double *)malloc(max(N, K)* sizeof(double)); beta_const = -1.0; - Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), + Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), (trans == MorseNoTrans) ? N : K, (trans == MorseNoTrans) ? K : N, A, LDA, work); - Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cref, LDC, work); - Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cmorse, LDC, work); + Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cref, LDC, work); + Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cmorse, LDC, work); cblas_zsyrk(CblasColMajor, (CBLAS_UPLO)uplo, (CBLAS_TRANSPOSE)trans, N, K, CBLAS_SADDR(alpha), A, LDA, CBLAS_SADDR(beta), Cref, LDC); - Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cref, LDC, work); + Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cref, LDC, work); cblas_zaxpy(LDC*N, CBLAS_SADDR(beta_const), Cmorse, 1, Cref, 1); - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Cref, LDC, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Cref, LDC, work); eps = LAPACKE_dlamch_work('e'); diff --git a/testing/testing_ztrmm.c b/testing/testing_ztrmm.c index 9fbb103be..c648f8c67 100644 --- a/testing/testing_ztrmm.c +++ b/testing/testing_ztrmm.c @@ -166,19 +166,19 @@ static int check_solution(MORSE_enum side, MORSE_enum uplo, MORSE_enum trans, MO Am = N; An = N; } - Anorm = LAPACKE_zlantr_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), lapack_const(uplo), lapack_const(diag), + Anorm = LAPACKE_zlantr_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), morse_lapack_const(uplo), morse_lapack_const(diag), Am, An, A, LDA, work); - Binitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Bref, LDB, work); - Bmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Bmorse, LDB, work); + Binitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Bref, LDB, work); + Bmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Bmorse, LDB, work); cblas_ztrmm(CblasColMajor, (CBLAS_SIDE)side, (CBLAS_UPLO)uplo, (CBLAS_TRANSPOSE)trans, (CBLAS_DIAG)diag, M, N, CBLAS_SADDR(alpha), A, LDA, Bref, LDB); - Blapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Bref, LDB, work); + Blapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Bref, LDB, work); cblas_zaxpy(LDB * N, CBLAS_SADDR(mzone), Bmorse, 1, Bref, 1); - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Bref, LDB, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Bref, LDB, work); eps = LAPACKE_dlamch_work('e'); diff --git a/testing/testing_ztrsm.c b/testing/testing_ztrsm.c index c4fabdab8..bdd15728a 100644 --- a/testing/testing_ztrsm.c +++ b/testing/testing_ztrsm.c @@ -166,19 +166,19 @@ static int check_solution(MORSE_enum side, MORSE_enum uplo, MORSE_enum trans, MO Am = N; An = N; } - Anorm = LAPACKE_zlantr_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), lapack_const(uplo), lapack_const(diag), + Anorm = LAPACKE_zlantr_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), morse_lapack_const(uplo), morse_lapack_const(diag), Am, An, A, LDA, work); - Binitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Bref, LDB, work); - Bmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Bmorse, LDB, work); + Binitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Bref, LDB, work); + Bmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Bmorse, LDB, work); cblas_ztrsm(CblasColMajor, (CBLAS_SIDE)side, (CBLAS_UPLO)uplo, (CBLAS_TRANSPOSE)trans, (CBLAS_DIAG)diag, M, N, CBLAS_SADDR(alpha), A, LDA, Bref, LDB); - Blapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Bref, LDB, work); + Blapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Bref, LDB, work); cblas_zaxpy(LDB * N, CBLAS_SADDR(mzone), Bmorse, 1, Bref, 1); - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Bref, LDB, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Bref, LDB, work); eps = LAPACKE_dlamch_work('e'); diff --git a/timing/time_zlange.c b/timing/time_zlange.c index 844419eb7..ac1882ddc 100644 --- a/timing/time_zlange.c +++ b/timing/time_zlange.c @@ -50,7 +50,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_) if ( check ) { double *work = (double*) malloc(max(M,N)*sizeof(double)); - normlapack = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, A, LDA, work); + normlapack = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, A, LDA, work); result = fabs(normmorse - normlapack); switch(norm[2]) { case MorseMaxNorm: diff --git a/timing/time_zlange_tile.c b/timing/time_zlange_tile.c index 4960cdd17..1eb328eeb 100644 --- a/timing/time_zlange_tile.c +++ b/timing/time_zlange_tile.c @@ -49,7 +49,7 @@ RunTest(int *iparam, double *dparam, morse_time_t *t_) /* Allocate Data */ PASTE_TILE_TO_LAPACK( descA, A, check, MORSE_Complex64_t, M, N ); double *work = (double*) malloc(max(M,N)*sizeof(double)); - normlapack = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, A, LDA, work); + normlapack = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, A, LDA, work); result = fabs(normmorse - normlapack); switch(norm[2]) { case MorseMaxNorm: diff --git a/timing/zauxiliary.c b/timing/zauxiliary.c index 483ed97a8..ce980a601 100644 --- a/timing/zauxiliary.c +++ b/timing/zauxiliary.c @@ -53,7 +53,7 @@ int z_check_orthogonality(int M, int N, int LDQ, MORSE_Complex64_t *Q) else cblas_zherk(CblasColMajor, CblasUpper, CblasNoTrans, M, N, alpha, Q, LDQ, beta, Id, M); - normQ = LAPACKE_zlansy_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), 'u', minMN, Id, minMN, work); + normQ = LAPACKE_zlansy_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), 'u', minMN, Id, minMN, work); printf("============\n"); printf("Checking the orthogonality of Q \n"); @@ -122,8 +122,8 @@ int z_check_QRfactorization(int M, int N, MORSE_Complex64_t *A1, MORSE_Complex64 for (j = 0 ; j < N; j++) Residual[j*M+i] = A1[j*LDA+i]-Ql[j*M+i]; - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Residual, M, work); - Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, A2, LDA, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Residual, M, work); + Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, A2, LDA, work); if (M >= N) { printf("============\n"); @@ -193,8 +193,8 @@ int z_check_LLTfactorization(int N, MORSE_Complex64_t *A1, MORSE_Complex64_t *A2 for (j = 0; j < N; j++) Residual[j*N+i] = L2[j*N+i] - Residual[j*N+i]; - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, Residual, N, work); - Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, N, A1, LDA, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, Residual, N, work); + Anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, N, A1, LDA, work); printf("============\n"); printf("Checking the Cholesky Factorization \n"); @@ -228,17 +228,17 @@ double z_check_gemm(MORSE_enum transA, MORSE_enum transB, int M, int N, int K, double Rnorm; double *work = (double *)malloc(max(K,max(M, N))* sizeof(double)); - *Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cref, LDC, work); - *Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cmorse, LDC, work); + *Cinitnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cref, LDC, work); + *Cmorsenorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cmorse, LDC, work); cblas_zgemm(CblasColMajor, (CBLAS_TRANSPOSE)transA, (CBLAS_TRANSPOSE)transB, M, N, K, CBLAS_SADDR(alpha), A, LDA, B, LDB, CBLAS_SADDR(beta), Cref, LDC); - *Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cref, LDC, work); + *Clapacknorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cref, LDC, work); cblas_zaxpy(LDC * N, CBLAS_SADDR(beta_const), Cmorse, 1, Cref, 1); - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, Cref, LDC, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, Cref, LDC, work); free(work); @@ -293,13 +293,13 @@ double z_check_solution(int M, int N, int NRHS, MORSE_Complex64_t *A, int LDA, MORSE_Complex64_t mzone = -1.0; double *work = (double *)malloc(max(M, N)* sizeof(double)); - *anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, N, A, LDA, work); - *xnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), M, NRHS, X, LDB, work); - *bnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, NRHS, B, LDB, work); + *anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, N, A, LDA, work); + *xnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), M, NRHS, X, LDB, work); + *bnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, NRHS, B, LDB, work); cblas_zgemm(CblasColMajor, CblasNoTrans, CblasNoTrans, M, NRHS, N, CBLAS_SADDR(zone), A, LDA, X, LDB, CBLAS_SADDR(mzone), B, LDB); - Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseInfNorm), N, NRHS, B, LDB, work); + Rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseInfNorm), N, NRHS, B, LDB, work); free(work); @@ -347,9 +347,9 @@ int zcheck_inverse(int N, MORSE_Complex64_t *A1, MORSE_Complex64_t *A2, int LDA, *(workz+i+i*N) = *(workz+i+i*N) + zone; - *rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseOneNorm), N, N, workz, N, workd); - *anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseOneNorm), N, N, A1, LDA, workd); - *ainvnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, lapack_const(MorseOneNorm), N, N, A2, LDA, workd); + *rnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseOneNorm), N, N, workz, N, workd); + *anorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseOneNorm), N, N, A1, LDA, workd); + *ainvnorm = LAPACKE_zlange_work(LAPACK_COL_MAJOR, morse_lapack_const(MorseOneNorm), N, N, A2, LDA, workd); result = *rnorm / ( ((*anorm) * (*ainvnorm))*N*eps ) ; -- GitLab