Skip to content

Update to new parsec vpmap API (parsec PR 515) #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
abouteiller wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update to new parsec vpmap API (parsec PR 515) #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/dplasmaaux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ dplasma_aux_getGEMMLookahead( parsec_tiled_matrix_t *A )
* look ahead based on the global information to get the same one on all
* nodes.
*/
int nbunits = vpmap_get_nb_total_threads() * A->super.nodes;
int nbunits = parsec_vpmap_get_vp_threads(0) * A->super.nodes;
assert(nbunits > 0);
double alpha = 3. * (double)nbunits / ( A->mt * A->nt );

if ( A->super.nodes == 1 ) {
Expand Down
2 changes: 1 addition & 1 deletion src/zgebrd_ge2gb_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ dplasma_zgebrd_ge2gb_New( int ib,
dplasma_qrtree_t *qrtre0, *qrtree, *lqtree;
int P, Q, cores;

cores = dplasma_imax( vpmap_get_nb_total_threads(), 1 );
cores = dplasma_imax( parsec_vpmap_get_vp_threads(0), 1 );
qrtree = malloc( sizeof(dplasma_qrtree_t) );
lqtree = malloc( sizeof(dplasma_qrtree_t) );

Expand Down
2 changes: 1 addition & 1 deletion src/zgetrf_1d.jdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ descIPIV [type = "parsec_tiled_matrix_t*" hidden = on default = "((dplasma_da

INFO [type = "int*"]

nbmaxthrd [type = "int" hidden=on default="( dplasma_imax( 1, dplasma_imin( vpmap_get_nb_threads_in_vp(0) - 1, 48 ) ) )" ] /* 48 is the actual limit of the kernel */
nbmaxthrd [type = "int" hidden=on default="( dplasma_imax( 1, dplasma_imin( parsec_vpmap_get_vp_threads(0) - 1, 48 ) ) )" ] /* 48 is the actual limit of the kernel */
KT [type = "int" hidden=on default="( dplasma_imin( descA->mt, descA->nt )-1 )" ]

getrfdata [type = "CORE_zgetrf_data_t *" hidden = on default = "NULL"]
Expand Down
2 changes: 1 addition & 1 deletion src/zgetrf_1d_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ dplasma_zgetrf_1d_New( parsec_tiled_matrix_t *A,
int *INFO )
{
parsec_zgetrf_1d_taskpool_t *parsec_getrf_1d;
int nbthreads = dplasma_imax( 1, vpmap_get_nb_threads_in_vp(0) - 1 );
int nbthreads = dplasma_imax( 1, parsec_vpmap_get_vp_threads(0) - 1 );
dplasma_data_collection_t * ddc_A = dplasma_wrap_data_collection((parsec_tiled_matrix_t*)A);
dplasma_data_collection_t * ddc_IPIV = dplasma_wrap_data_collection((parsec_tiled_matrix_t*)IPIV);

Expand Down
2 changes: 1 addition & 1 deletion src/zgetrf_qrf.jdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ INFO [type = "int*"]
param_p [type = int default="((parsec_matrix_block_cyclic_t*)descA)->grid.rows" hidden=on ]
param_q [type = int default="((parsec_matrix_block_cyclic_t*)descA)->grid.cols" hidden=on ]
minMNT [type = int default="dplasma_imin( descA->mt-1, descA->nt-1 )" hidden=on ]
nbmaxthrd [type = "int" default="( dplasma_imax( 1, dplasma_imin( vpmap_get_nb_threads_in_vp(0) - 1, 48 ) ) )" hidden=on] /* 48 is the actual limit of the kernel */
nbmaxthrd [type = "int" default="( dplasma_imax( 1, dplasma_imin( parsec_vpmap_get_vp_threads(0) - 1, 48 ) ) )" hidden=on] /* 48 is the actual limit of the kernel */

getrfdata [type = "CORE_zgetrf_data_t *" hidden = on default = "NULL"]

Expand Down
2 changes: 1 addition & 1 deletion src/zgetrf_qrf_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ dplasma_zgetrf_qrf_New( dplasma_qrtree_t *qrtree,
int ib = TS->mb;
size_t sizeW = 1;
size_t sizeReduceVec = 1;
int nbthreads = dplasma_imax( 1, vpmap_get_nb_threads_in_vp(0) - 1 );
int nbthreads = dplasma_imax( 1, parsec_vpmap_get_vp_threads(0) - 1 );

/*
* Compute W size according to criteria used.
Expand Down