diff --git a/control/common.h b/control/common.h index 68bc4937876b89cfb1f582937398283f4210c7e1..f6967be24b6f5ea5b343e9f23318c8490ea594be 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 6a3ff51fe303cc0d2c443bcaf1df516fb11d4815..42412679c7feadfb1c7fc02cc60b97ef4cee7baf 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 a3c4bf49c43d6b41d4f86dba728fc6889a0bbd82..f77dabecd2f9b953480bf0b5caf55cb5922751f6 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 13b4a1909222db2f19d50ddbe03ef755c2d594ac..391a55e78fa6adda8c9fd8993ed252589164e12b 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 017d225eb47cdebae0523357bb2a4302525c1a90..3ede784cbb136dee5eb64d4eb0ecbd040b2d5c72 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 a787ed9328804b1faae98004f764b512c194afcc..1dbcd73438225dc9857dd1357cfcdf6aa27966cf 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 d1c23b2e2f0989386df2b8ac4576f878e664d18b..f65e374483f97a7bb65dcadc02cb87c66e92ef22 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 e79a4934f844a1b4504306aab2a3be1172525596..46b1ead2b7f111ef0a7ff50c2a7bbb8ef44d9c90 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 e83d2896e37d492f7f004d4a7e132b92ccf51e16..0c519fa293fef735483de2159a6df5ec18aa0909 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 389208862c31bc61d0a5e67f4193342b9abaa1c9..97c02b656731e64a0509aa7e736ad490088c1bc5 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 2a3054a29acfcd56f94206bec8e843d0e76e470c..412fa552e75cef6cb7cead905232ff4b65abe889 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 a948f274ceaa5eb2526576523c4b1f26e82a9798..0e98fcec5ca22d044bfd3f946a5bb66d4c7e3df9 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 336fef95c43d703c72620b62a7981537ac163839..09c04229d6c3782ebd63e41e7ecd4f14d76bac6d 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 1d4c40c0a2997883907268d251c7f17c2f5a1319..5338915df9bc3fc4f0b784dbca8d23eff453c7ec 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 5acbb61f05acd0d79962ee60bdeb771cb82324e9..b4e72313523c2f62723cbf44176f876b41e25a19 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 700958a51661a6a2e671360a0c1017a654a7b0aa..23ca3cb1a70d453cf4fbf385eb2199f276c57db5 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 d0f78666f0ec2d136135eed2aaea4b1cb7c69e8b..1da7955bef3d894cfa3b9ff0104bcfe8267633b0 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 41ca83747df2a71705d7cde3ae493c0374f5e1e6..bfad2e7bb880ec1c026f08d73cd677f1cdef5086 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 abb24651f2c63c734a1ad603833a03ac842a6434..8671f31995f0a23392a88562033824a0dc3e7b75 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 1d9c35dc0ff0cb55e6fb2a7de0f2d623adb5493b..8ba2a9383e85fbd153b3bfbb78117df792580204 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 326963312660c001af6f08358ebbb9e6a15b3e7e..a4aca819fcae97ff17155426e2a4dd1eb65560b6 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 2cdb853fcdfd060dc7d8170e3ce04e2039e95239..99a0294500488f954e58333cd8997a974016c204 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 4ab50e820e86540b858a8fe7c294493ad1a37ce7..c2e071dccb64d909bb1dd0b5465159eb1adcd423 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 3f0c671b8b29e43126dbd4a3cbfc231406525be8..915b0d181523f7e70f078df35208b5e53329d413 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 b9cb8dfbbd3a86b7c52b24429ea3271814220f2e..d1ae45edd37775acd67c22f5c1c74339afe478d4 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 d82e8080a09cf64a46a025aebf79a85500ee58a2..e57c9bcbc78391438efcd4c7dc4324edb33af3af 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 b54138ba1df0c32ba7b0fda8f1974e5c627de604..4d2c3596b22606d77dcf175378c0c1ac5e9f6931 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 e16cbc5dbdb7a2f24d65dc1e17f0ffb76ea3a6c7..e38e595f17e398e003c3cc74ed06f76ef070717c 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 84875d05207d0e2ea7b7c889f09f81c845b41e26..83849a1ec9054bda24f9674e29bd4185e908b2ec 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 58e4d943f3772ab7f30cd2fcef98b83ce57356b6..040e49943067dfc3ec3292fb826346f3a201829d 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 eec20131d16f41b2a5ddb37b923573426a58c9b1..cbb51becf23827201058998880c20884a90edd7c 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 4c935e19cfef3992b004921c2d8400052fe9965b..46e0abd6799c1f45b5127c002697289a5fa5e1d6 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 a16431d84bf944aa69f20852ed20169b39a223b4..4c6bfff742729f5f284a2cbb087ebe5281c9c494 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 4afcbeb49da6f1ff73f75b5b02faa781f80ceeac..afd4260c21483742b3e4c19ed815da0a6a9c454a 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 6823fb7fe78c8bb6ddd7db740180c32511e4168c..a0cb4717d8741391f3071dbbcc7839ffba6db003 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 7cc368421c1718d1e37f940ac041d74a909c601e..141e0076bf743908b8170ccc3ca91bdc4b6939c7 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 864fb745fa7bfd46a7cf369e2c711fd52f249099..032171aa4350f92b8ae7fd788c3c41284625af81 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 747ccc5ae39b070070c05d2c75529a738bf77f14..0c283302fa408539bca68495e022fc85c1d0412b 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 700976761658140d8f63b76c270004645334e606..3c7cdc8765272aa622598811142232742728a753 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 bdcb677a77a1a1defd4ffa8026c3f8e956ade2ac..195a8a6680aeb6f5146c9670ef74c274403f3ae0 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 074699f9ef53957526e66ed7254fbba5e53f771f..bb7b29343f38d8bf046ab91a68f8213bdda75287 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 3179f3ad07bb8184927cab8ef74232b025aa6e14..bc45668e3deba7c80a7873035d5df2f1b82a0f49 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 33d265793332d2c5e86e119b8de6aa1df6d216e6..3643caf7d6acc7be5df744852e702de0ecfd347e 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 613e8cf8ef719f1a5dee594c05b2f534efd21ff8..c096170c9090a1968c20ba8f1d8a253161d4e1bc 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 bb5da35846ec14661c210db1c785e48381565db0..9a4560b273ebb6bd9d4fb9dee5862868085802d1 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 f3f0288e37476ff291bee0e4508738b9a748d79b..5f3dd57b3944fe2d5875e3099d2e9085dec62d9e 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 9fbb103be8f8da9e2b02b70fa6edf49f140265b5..c648f8c679d3735b5635bab02c10be0ef9014e81 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 c4fabdab85e0b20941ea033448d3491b84514a3c..bdd15728a7821cc22a718e71520b8e03b522ccee 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 844419eb728719e5f0ce93b7e327c584c8280f27..ac1882ddc3ee18b0b3c3b2e7929fd57ee953eb21 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 4960cdd17863369dd98c58f5ae6c70b10dddf86e..1eb328eeb9256364d90afc78ea97f2e9b60d64a7 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 483ed97a8d9a700a2b35ba35ecc3eedcf19da0fe..ce980a601ebd830017e72d176d91bc44ada51c65 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 ) ;