Commit 313aeb54 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Replace the descriptors in the calls

parent ecbee0df
......@@ -125,10 +125,13 @@ int MORSE_zbuild( MORSE_enum uplo, int M, int N,
/* Set NT */
NB = MORSE_NB;
morse_sequence_create(morse, &sequence);
morse_zdesc_alloc(descA, NB, NB, LDA, N, 0, 0, M, N, morse_desc_mat_free(&descA));
/* Submit the matrix conversion */
morse_zlap2tile( morse, &descAl, &descAt, uplo,
A, NB, NB, LDA, N, M, N, sequence, &request );
/* Call the tile interface */
MORSE_zbuild_Tile_Async(uplo, &descA, user_data, user_build_callback, sequence, &request );
MORSE_zbuild_Tile_Async( uplo, &descAt, user_data, user_build_callback, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......
......@@ -161,8 +161,7 @@ int MORSE_zgeadd(MORSE_enum trans, int M, int N,
B, NB, NB, LDB, N, M, N, sequence, &request );
/* Call the tile interface */
MORSE_zgeadd_Tile_Async(
trans, alpha, &descA, beta, &descB, sequence, &request);
MORSE_zgeadd_Tile_Async( trans, alpha, &descAt, beta, &descBt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descBl, &descBt,
......@@ -242,7 +241,7 @@ int MORSE_zgeadd_Tile(MORSE_enum trans,
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgeadd_Tile_Async(trans, alpha, A, beta, B, sequence, &request);
MORSE_zgeadd_Tile_Async( trans, alpha, A, beta, B, sequence, &request );
RUNTIME_desc_flush( A, sequence );
RUNTIME_desc_flush( B, sequence );
......
......@@ -127,7 +127,7 @@ int MORSE_zgelqf(int M, int N,
A, NB, NB, LDA, N, M, N, sequence, &request );
/* Call the tile interface */
MORSE_zgelqf_Tile_Async(&descA, descT, sequence, &request);
MORSE_zgelqf_Tile_Async( &descAt, descT, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -195,7 +195,7 @@ int MORSE_zgelqf_Tile(MORSE_desc_t *A, MORSE_desc_t *T)
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgelqf_Tile_Async(A, T, sequence, &request);
MORSE_zgelqf_Tile_Async( A, T, sequence, &request );
RUNTIME_desc_flush( A, sequence );
morse_sequence_wait(morse, sequence);
......
......@@ -124,7 +124,7 @@ int MORSE_zgelqf_param(const libhqr_tree_t *qrtree, int M, int N,
A, NB, NB, LDA, N, M, N, sequence, &request );
/* Call the tile interface */
MORSE_zgelqf_param_Tile_Async(qrtree, &descA, descTS, descTT, sequence, &request);
MORSE_zgelqf_param_Tile_Async( qrtree, &descAt, descTS, descTT, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -192,7 +192,7 @@ int MORSE_zgelqf_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgelqf_param_Tile_Async(qrtree, A, TS, TT, sequence, &request);
MORSE_zgelqf_param_Tile_Async( qrtree, A, TS, TT, sequence, &request );
RUNTIME_desc_flush( A, sequence );
morse_sequence_wait(morse, sequence);
......
......@@ -145,7 +145,7 @@ int MORSE_zgelqs(int M, int N, int NRHS,
B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
/* Call the tile interface */
MORSE_zgelqs_Tile_Async(&descA, descT, &descB, sequence, &request);
MORSE_zgelqs_Tile_Async( &descAt, descT, &descBt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -216,7 +216,7 @@ int MORSE_zgelqs_Tile(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *B)
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgelqs_Tile_Async(A, T, B, sequence, &request);
MORSE_zgelqs_Tile_Async( A, T, B, sequence, &request );
RUNTIME_desc_flush( A, sequence );
RUNTIME_desc_flush( B, sequence );
......
......@@ -147,7 +147,7 @@ int MORSE_zgelqs_param(const libhqr_tree_t *qrtree, int M, int N, int NRHS,
B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
/* Call the tile interface */
MORSE_zgelqs_param_Tile_Async(qrtree, &descA, descTS, descTT, &descB, sequence, &request);
MORSE_zgelqs_param_Tile_Async( qrtree, &descAt, descTS, descTT, &descBt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -221,7 +221,7 @@ int MORSE_zgelqs_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgelqs_param_Tile_Async(qrtree, A, TS, TT, B, sequence, &request);
MORSE_zgelqs_param_Tile_Async( qrtree, A, TS, TT, B, sequence, &request );
RUNTIME_desc_flush( A, sequence );
RUNTIME_desc_flush( B, sequence );
......
......@@ -187,7 +187,7 @@ int MORSE_zgels(MORSE_enum trans, int M, int N, int NRHS,
}
/* Call the tile interface */
MORSE_zgels_Tile_Async(MorseNoTrans, &descA, descT, &descB, sequence, &request);
MORSE_zgels_Tile_Async( MorseNoTrans, &descAt, descT, &descBt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -274,7 +274,7 @@ int MORSE_zgels_Tile(MORSE_enum trans, MORSE_desc_t *A,
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgels_Tile_Async(trans, A, T, B, sequence, &request);
MORSE_zgels_Tile_Async( trans, A, T, B, sequence, &request );
RUNTIME_desc_flush( A, sequence );
RUNTIME_desc_flush( B, sequence );
......
......@@ -188,7 +188,7 @@ int MORSE_zgels_param(const libhqr_tree_t *qrtree, MORSE_enum trans, int M, int
}
/* Call the tile interface */
MORSE_zgels_param_Tile_Async(qrtree, MorseNoTrans, &descA, descTS, descTT, &descB, sequence, &request);
MORSE_zgels_param_Tile_Async( qrtree, MorseNoTrans, &descAt, descTS, descTT, &descBt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -278,7 +278,7 @@ int MORSE_zgels_param_Tile(const libhqr_tree_t *qrtree, MORSE_enum trans, MORSE_
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgels_param_Tile_Async(qrtree, trans, A, TS, TT, B, sequence, &request);
MORSE_zgels_param_Tile_Async( qrtree, trans, A, TS, TT, B, sequence, &request );
RUNTIME_desc_flush( A, sequence );
RUNTIME_desc_flush( B, sequence );
......
......@@ -221,8 +221,7 @@ int MORSE_zgemm(MORSE_enum transA, MORSE_enum transB, int M, int N, int K,
C, NB, NB, LDC, N, M, N, sequence, &request );
/* Call the tile interface */
MORSE_zgemm_Tile_Async(
transA, transB, alpha, &descA, &descB, beta, &descC, sequence, &request);
MORSE_zgemm_Tile_Async( transA, transB, alpha, &descAt, &descBt, beta, &descCt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descCl, &descCt,
......@@ -312,7 +311,7 @@ int MORSE_zgemm_Tile(MORSE_enum transA, MORSE_enum transB,
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgemm_Tile_Async(transA, transB, alpha, A, B, beta, C, sequence, &request);
MORSE_zgemm_Tile_Async( transA, transB, alpha, A, B, beta, C, sequence, &request );
RUNTIME_desc_flush( A, sequence );
RUNTIME_desc_flush( B, sequence );
RUNTIME_desc_flush( C, sequence );
......
......@@ -126,7 +126,7 @@ int MORSE_zgeqrf(int M, int N,
A, NB, NB, LDA, N, M, N, sequence, &request );
/* Call the tile interface */
MORSE_zgeqrf_Tile_Async(&descA, descT, sequence, &request);
MORSE_zgeqrf_Tile_Async( &descAt, descT, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -194,7 +194,7 @@ int MORSE_zgeqrf_Tile(MORSE_desc_t *A, MORSE_desc_t *T)
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgeqrf_Tile_Async(A, T, sequence, &request);
MORSE_zgeqrf_Tile_Async( A, T, sequence, &request );
RUNTIME_desc_flush( A, sequence );
morse_sequence_wait(morse, sequence);
......
......@@ -129,7 +129,7 @@ int MORSE_zgeqrf_param(const libhqr_tree_t *qrtree, int M, int N,
A, NB, NB, LDA, N, M, N, sequence, &request );
/* Call the tile interface */
MORSE_zgeqrf_param_Tile_Async(qrtree, &descA, descTS, descTT, sequence, &request);
MORSE_zgeqrf_param_Tile_Async( qrtree, &descAt, descTS, descTT, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -201,7 +201,7 @@ int MORSE_zgeqrf_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgeqrf_param_Tile_Async(qrtree, A, TS, TT, sequence, &request);
MORSE_zgeqrf_param_Tile_Async( qrtree, A, TS, TT, sequence, &request );
RUNTIME_desc_flush( A, sequence );
morse_sequence_wait(morse, sequence);
......
......@@ -145,7 +145,7 @@ int MORSE_zgeqrs(int M, int N, int NRHS,
B, NB, NB, LDB, NRHS, M, NRHS, sequence, &request );
/* Call the tile interface */
MORSE_zgeqrs_Tile_Async(&descA, descT, &descB, sequence, &request);
MORSE_zgeqrs_Tile_Async( &descAt, descT, &descBt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -215,7 +215,7 @@ int MORSE_zgeqrs_Tile(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *B)
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgeqrs_Tile_Async(A, T, B, sequence, &request);
MORSE_zgeqrs_Tile_Async( A, T, B, sequence, &request );
RUNTIME_desc_flush( A, sequence );
RUNTIME_desc_flush( T, sequence );
RUNTIME_desc_flush( B, sequence );
......
......@@ -140,7 +140,7 @@ int MORSE_zgeqrs_param(const libhqr_tree_t *qrtree, int M, int N, int NRHS,
B, NB, NB, LDB, NRHS, M, NRHS, sequence, &request );
/* Call the tile interface */
MORSE_zgeqrs_param_Tile_Async(qrtree, &descA, descTS, descTT, &descB, sequence, &request);
MORSE_zgeqrs_param_Tile_Async( qrtree, &descAt, descTS, descTT, &descBt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -210,7 +210,7 @@ int MORSE_zgeqrs_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgeqrs_param_Tile_Async(qrtree, A, TS, TT, B, sequence, &request);
MORSE_zgeqrs_param_Tile_Async( qrtree, A, TS, TT, B, sequence, &request );
RUNTIME_desc_flush( A, sequence );
RUNTIME_desc_flush( TS, sequence );
RUNTIME_desc_flush( TT, sequence );
......
......@@ -144,7 +144,7 @@ int MORSE_zgesv_incpiv(int N, int NRHS,
B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
/* Call the tile interface */
MORSE_zgesv_incpiv_Tile_Async(&descA, descL, IPIV, &descB, sequence, &request);
MORSE_zgesv_incpiv_Tile_Async( &descAt, descL, IPIV, &descBt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -220,7 +220,7 @@ int MORSE_zgesv_incpiv_Tile(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, MORSE_d
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgesv_incpiv_Tile_Async(A, L, IPIV, B, sequence, &request);
MORSE_zgesv_incpiv_Tile_Async( A, L, IPIV, B, sequence, &request );
RUNTIME_desc_flush( A, sequence );
RUNTIME_desc_flush( B, sequence );
......
......@@ -143,7 +143,7 @@ int MORSE_zgesv_nopiv(int N, int NRHS,
B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
/* Call the tile interface */
MORSE_zgesv_nopiv_Tile_Async(&descA, &descB, sequence, &request);
MORSE_zgesv_nopiv_Tile_Async( &descAt, &descBt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -212,7 +212,7 @@ int MORSE_zgesv_nopiv_Tile(MORSE_desc_t *A, MORSE_desc_t *B)
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgesv_nopiv_Tile_Async(A, B, sequence, &request);
MORSE_zgesv_nopiv_Tile_Async( A, B, sequence, &request );
RUNTIME_desc_flush( A, sequence );
RUNTIME_desc_flush( B, sequence );
......
......@@ -219,7 +219,7 @@ int MORSE_zgesvd(MORSE_enum jobu, MORSE_enum jobvt,
A, NB, NB, LDA, N, M, N, sequence, &request );
/* Call the tile interface */
MORSE_zgesvd_Tile_Async(jobu, jobvt, &descA, S, descT, U, LDU, VT, LDVT, sequence, &request);
MORSE_zgesvd_Tile_Async( jobu, jobvt, &descAt, S, descT, U, LDU, VT, LDVT, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -353,7 +353,7 @@ int MORSE_zgesvd_Tile(MORSE_enum jobu, MORSE_enum jobvt,
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgesvd_Tile_Async(jobu, jobvt, A, S, T, U, LDU, VT, LDVT, sequence, &request);
MORSE_zgesvd_Tile_Async( jobu, jobvt, A, S, T, U, LDU, VT, LDVT, sequence, &request );
morse_sequence_wait(morse, sequence);
......@@ -400,11 +400,11 @@ int MORSE_zgesvd_Tile_Async(MORSE_enum jobu, MORSE_enum jobvt,
MORSE_Complex64_t *VT, int LDVT,
MORSE_sequence_t *sequence, MORSE_request_t *request)
{
MORSE_desc_t descAl, descAt;
MORSE_desc_t descTl, descTt;
MORSE_desc_t descUl, descUt;
MORSE_desc_t descVTl, descVTt;
MORSE_desc_t descABl, descABt;
MORSE_desc_t descA;
MORSE_desc_t descT;
MORSE_desc_t descU;
MORSE_desc_t descVT;
MORSE_desc_t descAB;
MORSE_desc_t D, *Dptr = NULL;
MORSE_desc_t *subA, *subT, *subUVT;
double *E;
......@@ -549,14 +549,14 @@ int MORSE_zgesvd_Tile_Async(MORSE_enum jobu, MORSE_enum jobvt,
fprintf(stderr, "MORSE_zgesvd_Tile_Async: LAPACKE_zgbbrd = %d\n", info );
}
#endif /* !defined(CHAMELEON_SIMULATION) */
morse_ztile2lap_cleanup( morse, &descABl, &descABt );
morse_desc_mat_free( &descAB );
/* Transform U and Vt into tile format */
if ( jobu != MorseNoVec ) {
morse_zooplap2tile( descU, U, NB, NB, LDU, M, 0, 0, M, M, sequence, request, morse_desc_mat_free(&(descU)) );
//morse_zooplap2tile( descU, U, NB, NB, LDU, M, 0, 0, M, M, sequence, request, morse_desc_mat_free(&(descU)) );
}
if ( jobvt != MorseNoVec ) {
morse_zooplap2tile( descVT, VT, NB, NB, LDVT, N, 0, 0, N, N, sequence, request, morse_desc_mat_free(&(descVT)) );
//morse_zooplap2tile( descVT, VT, NB, NB, LDVT, N, 0, 0, N, N, sequence, request, morse_desc_mat_free(&(descVT)) );
}
morse_sequence_wait(morse, sequence);
......@@ -598,10 +598,10 @@ int MORSE_zgesvd_Tile_Async(MORSE_enum jobu, MORSE_enum jobvt,
/* Transform U and VT into lapack layout */
if ( jobu != MorseNoVec ) {
morse_zooptile2lap( descU, U, NB, NB, LDU, M, sequence, request );
//morse_zooptile2lap( descU, U, NB, NB, LDU, M, sequence, request );
}
if ( jobvt != MorseNoVec ) {
morse_zooptile2lap( descVT, VT, NB, NB, LDVT, N, sequence, request );
//morse_zooptile2lap( descVT, VT, NB, NB, LDVT, N, sequence, request );
}
morse_sequence_wait(morse, sequence);
......
......@@ -128,7 +128,7 @@ int MORSE_zgetrf_incpiv(int M, int N,
A, NB, NB, LDA, N, M, N, sequence, &request );
/* Call the tile interface */
MORSE_zgetrf_incpiv_Tile_Async(&descA, descL, IPIV, sequence, &request);
MORSE_zgetrf_incpiv_Tile_Async( &descAt, descL, IPIV, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -199,7 +199,7 @@ int MORSE_zgetrf_incpiv_Tile(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV)
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgetrf_incpiv_Tile_Async(A, L, IPIV, sequence, &request);
MORSE_zgetrf_incpiv_Tile_Async( A, L, IPIV, sequence, &request );
RUNTIME_desc_flush( A, sequence );
morse_sequence_wait(morse, sequence);
......
......@@ -121,7 +121,7 @@ int MORSE_zgetrf_nopiv(int M, int N,
A, NB, NB, LDA, N, N, N, sequence, &request );
/* Call the tile interface */
MORSE_zgetrf_nopiv_Tile_Async(&descA, sequence, &request);
MORSE_zgetrf_nopiv_Tile_Async( &descAt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descAl, &descAt,
......@@ -185,7 +185,7 @@ int MORSE_zgetrf_nopiv_Tile(MORSE_desc_t *A)
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgetrf_nopiv_Tile_Async(A, sequence, &request);
MORSE_zgetrf_nopiv_Tile_Async( A, sequence, &request );
RUNTIME_desc_flush( A, sequence );
morse_sequence_wait(morse, sequence);
......
......@@ -150,7 +150,7 @@ int MORSE_zgetrs_incpiv(MORSE_enum trans, int N, int NRHS,
B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
/* Call the tile interface */
MORSE_zgetrs_incpiv_Tile_Async(&descA, descL, IPIV, &descB, sequence, &request);
MORSE_zgetrs_incpiv_Tile_Async( &descAt, descL, IPIV, &descBt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descBl, &descBt,
......@@ -222,7 +222,7 @@ int MORSE_zgetrs_incpiv_Tile(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, MORSE_
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgetrs_incpiv_Tile_Async(A, L, IPIV, B, sequence, &request);
MORSE_zgetrs_incpiv_Tile_Async( A, L, IPIV, B, sequence, &request );
RUNTIME_desc_flush( A, sequence );
RUNTIME_desc_flush( B, sequence );
......
......@@ -144,7 +144,7 @@ int MORSE_zgetrs_nopiv(MORSE_enum trans, int N, int NRHS,
B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
/* Call the tile interface */
MORSE_zgetrs_nopiv_Tile_Async(&descA, &descB, sequence, &request);
MORSE_zgetrs_nopiv_Tile_Async( &descAt, &descBt, sequence, &request );
/* Submit the matrix conversion back */
morse_ztile2lap( morse, &descBl, &descBt,
......@@ -210,7 +210,7 @@ int MORSE_zgetrs_nopiv_Tile(MORSE_desc_t *A, MORSE_desc_t *B)
return MORSE_ERR_NOT_INITIALIZED;
}
morse_sequence_create(morse, &sequence);
MORSE_zgetrs_nopiv_Tile_Async(A, B, sequence, &request);
MORSE_zgetrs_nopiv_Tile_Async( A, B, sequence, &request );
RUNTIME_desc_flush( A, sequence );
RUNTIME_desc_flush( B, sequence );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment