diff --git a/control/descriptor.c b/control/descriptor.c index ad2d53f2859da764e7156e9872f5898f985214a3..f72312e881eae7e51404a7d8db9a0ae5fe458843 100644 --- a/control/descriptor.c +++ b/control/descriptor.c @@ -113,7 +113,7 @@ int chameleon_getrankof_2d_diag( const CHAM_desc_t *A, int m, int n ) * Number of columns in a tile. * * @param[in] bsiz - * Size in bytes including padding. + * Size in number of elements of each tile, including internal padding. * * @param[in] lm * Number of rows of the entire matrix. @@ -134,10 +134,10 @@ int chameleon_getrankof_2d_diag( const CHAM_desc_t *A, int m, int n ) * Number of columns of the submatrix. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * * @param[in] (*get_blkaddr)( const CHAM_desc_t *A, int m, int n) * A function which return the address of the data corresponding to @@ -406,7 +406,7 @@ int chameleon_desc_check(const CHAM_desc_t *desc) * Number of columns in a tile. * * @param[in] bsiz - * Size in bytes including padding. + * Size in number of elements of each tile, including internal padding. * * @param[in] lm * Number of rows of the entire matrix. @@ -427,10 +427,10 @@ int chameleon_desc_check(const CHAM_desc_t *desc) * Number of columns of the submatrix. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ****************************************************************************** * @@ -469,20 +469,38 @@ int CHAMELEON_Desc_Create( CHAM_desc_t **descptr, void *mat, cham_flttype_t dtyp * @arg ChamComplexFloat: single precision complex (C), * @arg ChamComplexDouble: double precision complex (Z). * + * @param[in] mb + * Number of rows in a tile. + * * @param[in] nb - * Number of rows and columns in a tile. + * Number of columns in a tile. * - * @param[in] m + * @param[in] bsiz + * Size in number of elements of each tile, including internal padding. + * + * @param[in] lm * Number of rows of the entire matrix. * - * @param[in] n + * @param[in] ln * Number of columns of the entire matrix. * + * @param[in] i + * Row index to the beginning of the submatrix. + * + * @param[in] j + * Column indes to the beginning of the submatrix. + * + * @param[in] m + * Number of rows of the submatrix. + * + * @param[in] n + * Number of columns of the submatrix. + * * @param[in] p - * 2d-block cyclic partitioning, number of tiles in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2d-block cyclic partitioning, number of tiles in columns. + * Number of processes columns for the 2D block-cyclic distribution. * * @param[in] (*get_blkaddr)( const CHAM_desc_t *A, int m, int n) * A function which return the address of the data corresponding to @@ -559,20 +577,38 @@ int CHAMELEON_Desc_Create_User( CHAM_desc_t **descptr, void *mat, cham_flttype_t * @arg ChamComplexFloat: single precision complex (C), * @arg ChamComplexDouble: double precision complex (Z). * + * @param[in] mb + * Number of rows in a tile. + * * @param[in] nb - * Number of rows and columns in a tile. + * Number of columns in a tile. * - * @param[in] m + * @param[in] bsiz + * Size in number of elements of each tile, including internal padding. + * + * @param[in] lm * Number of rows of the entire matrix. * - * @param[in] n + * @param[in] ln * Number of columns of the entire matrix. * + * @param[in] i + * Row index to the beginning of the submatrix. + * + * @param[in] j + * Column indes to the beginning of the submatrix. + * + * @param[in] m + * Number of rows of the submatrix. + * + * @param[in] n + * Number of columns of the submatrix. + * * @param[in] p - * 2d-block cyclic partitioning, number of tiles in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2d-block cyclic partitioning, number of tiles in columns. + * Number of processes columns for the 2D block-cyclic distribution. * * @param[in] (*get_rankof)( const CHAM_desc_t *A, int m, int n) * A function that return the MPI rank of the tile A(m,n). @@ -622,20 +658,38 @@ int CHAMELEON_Desc_Create_OOC_User(CHAM_desc_t **descptr, cham_flttype_t dtyp, i * @arg ChamComplexFloat: single precision complex (C), * @arg ChamComplexDouble: double precision complex (Z). * + * @param[in] mb + * Number of rows in a tile. + * * @param[in] nb - * Number of rows and columns in a tile. + * Number of columns in a tile. * - * @param[in] m + * @param[in] bsiz + * Size in number of elements of each tile, including internal padding. + * + * @param[in] lm * Number of rows of the entire matrix. * - * @param[in] n + * @param[in] ln * Number of columns of the entire matrix. * + * @param[in] i + * Row index to the beginning of the submatrix. + * + * @param[in] j + * Column indes to the beginning of the submatrix. + * + * @param[in] m + * Number of rows of the submatrix. + * + * @param[in] n + * Number of columns of the submatrix. + * * @param[in] p - * 2d-block cyclic partitioning, number of tiles in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2d-block cyclic partitioning, number of tiles in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ****************************************************************************** * diff --git a/control/workspace_z.c b/control/workspace_z.c index 9f23af6d2d49de93c8aab417da08644e81a8c266..d4c832401e8e0e9fb9e034ab834ddec29bf8e9fc 100644 --- a/control/workspace_z.c +++ b/control/workspace_z.c @@ -148,10 +148,10 @@ int CHAMELEON_Alloc_Workspace_zgels(int M, int N, CHAM_desc_t **descT, int p, in * T factors required by the tile QR or the tile LQ factorization. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ****************************************************************************** * @@ -181,10 +181,10 @@ int CHAMELEON_Alloc_Workspace_zgels_Tile(int M, int N, CHAM_desc_t **descT, int * required by the tile QR factorization. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ****************************************************************************** * @@ -214,10 +214,10 @@ int CHAMELEON_Alloc_Workspace_zgeqrf(int M, int N, CHAM_desc_t **descT, int p, i * T factors required by the tile QR or the tile LQ factorization. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ****************************************************************************** * @@ -247,10 +247,10 @@ int CHAMELEON_Alloc_Workspace_zgeqrf_Tile(int M, int N, CHAM_desc_t **descT, int * factorization. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ****************************************************************************** * @@ -279,10 +279,10 @@ int CHAMELEON_Alloc_Workspace_zgelqf(int M, int N, CHAM_desc_t **descT, int p, i * T factors required by the tile QR or the tile LQ factorization. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ****************************************************************************** * @@ -370,10 +370,10 @@ int CHAMELEON_Alloc_Workspace_zgesv_incpiv_Tile(int N, CHAM_desc_t **descL, int * On exit, workspace handle for storage of the extra T factors required by the tile BRD. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ******************************************************************************* * @@ -467,10 +467,10 @@ int CHAMELEON_Alloc_Workspace_zgetrf_incpiv_Tile(int N, CHAM_desc_t **descL, int * On exit, workspace handle for storage of the extra T factors required by the tile TRD. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ******************************************************************************* * @@ -498,10 +498,10 @@ int CHAMELEON_Alloc_Workspace_zheev(int M, int N, CHAM_desc_t **descT, int p, in * On exit, workspace handle for storage of the extra T factors required by the tile TRD. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ******************************************************************************* * @@ -529,10 +529,10 @@ int CHAMELEON_Alloc_Workspace_zheevd(int M, int N, CHAM_desc_t **descT, int p, i * On exit, workspace handle for storage of the extra T factors required by the tile TRD. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ******************************************************************************* * @@ -560,10 +560,10 @@ int CHAMELEON_Alloc_Workspace_zhegv(int M, int N, CHAM_desc_t **descT, int p, in * On exit, workspace handle for storage of the extra T factors required by the tile TRD. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ******************************************************************************* * @@ -591,10 +591,10 @@ int CHAMELEON_Alloc_Workspace_zhegvd(int M, int N, CHAM_desc_t **descT, int p, i * On exit, workspace handle for storage of the extra T factors required by the tile TRD. * * @param[in] p - * 2D-block cyclic distribution in rows. + * Number of processes rows for the 2D block-cyclic distribution. * * @param[in] q - * 2D-block cyclic distribution in columns. + * Number of processes columns for the 2D block-cyclic distribution. * ******************************************************************************* *