Commit da6de70e authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Renaming of the functions working on cblk

parent 581d625d
......@@ -245,12 +245,12 @@ core_zgeadd( pastix_trans_t trans,
*
******************************************************************************/
int
core_zgeaddsp1d( const SolverCblk *cblk1,
SolverCblk *cblk2,
const pastix_complex64_t *L,
pastix_complex64_t *Cl,
const pastix_complex64_t *U,
pastix_complex64_t *Cu )
cpucblk_zgeaddsp1d( const SolverCblk *cblk1,
SolverCblk *cblk2,
const pastix_complex64_t *L,
pastix_complex64_t *Cl,
const pastix_complex64_t *U,
pastix_complex64_t *Cu )
{
SolverBlok *iterblok;
SolverBlok *firstblok;
......
......@@ -207,10 +207,10 @@ core_zgetrfsp( pastix_int_t n,
*
*******************************************************************************/
int
core_zgetrfsp1d_getrf( SolverCblk *cblk,
pastix_complex64_t *L,
pastix_complex64_t *U,
double criteria )
cpucblk_zgetrfsp1d_getrf( SolverCblk *cblk,
pastix_complex64_t *L,
pastix_complex64_t *U,
double criteria )
{
pastix_int_t ncols, stride;
pastix_int_t nbpivot = 0;
......@@ -280,15 +280,15 @@ core_zgetrfsp1d_getrf( SolverCblk *cblk,
*
*******************************************************************************/
int
core_zgetrfsp1d_panel( SolverCblk *cblk,
pastix_complex64_t *L,
pastix_complex64_t *U,
double criteria,
const pastix_lr_t *lowrank )
cpucblk_zgetrfsp1d_panel( SolverCblk *cblk,
pastix_complex64_t *L,
pastix_complex64_t *U,
double criteria,
const pastix_lr_t *lowrank )
{
pastix_int_t nbpivot;
nbpivot = core_zgetrfsp1d_getrf(cblk, L, U, criteria);
nbpivot = cpucblk_zgetrfsp1d_getrf(cblk, L, U, criteria);
/**
* We exploit the fact tha the upper triangle is stored at the top of the L
* column, and by transposition the L part of the diagonal block is
......@@ -333,10 +333,10 @@ core_zgetrfsp1d_panel( SolverCblk *cblk,
*
*******************************************************************************/
int
core_zgetrfsp1d( SolverMatrix *solvmtx,
SolverCblk *cblk,
double criteria,
pastix_complex64_t *work )
cpucblk_zgetrfsp1d( SolverMatrix *solvmtx,
SolverCblk *cblk,
double criteria,
pastix_complex64_t *work )
{
pastix_complex64_t *L = cblk->lcoeftab;
pastix_complex64_t *U = cblk->ucoeftab;
......@@ -344,7 +344,7 @@ core_zgetrfsp1d( SolverMatrix *solvmtx,
SolverBlok *blok, *lblk;
pastix_int_t nbpivot;
nbpivot = core_zgetrfsp1d_panel(cblk, L, U, criteria, &solvmtx->lowrank);
nbpivot = cpucblk_zgetrfsp1d_panel(cblk, L, U, criteria, &solvmtx->lowrank);
blok = cblk->fblokptr + 1; /* this diagonal block */
lblk = cblk[1].fblokptr; /* the next diagonal block */
......
......@@ -220,10 +220,10 @@ core_zhetrfsp( pastix_int_t n,
*
*******************************************************************************/
int
core_zhetrfsp1d_hetrf( SolverCblk *cblk,
pastix_complex64_t *L,
pastix_complex64_t *DLh,
double criteria )
cpucblk_zhetrfsp1d_hetrf( SolverCblk *cblk,
pastix_complex64_t *L,
pastix_complex64_t *DLh,
double criteria )
{
pastix_int_t ncols, stride;
pastix_int_t nbpivot = 0;
......@@ -464,16 +464,16 @@ void core_zhetrfsp1d_gemm( SolverCblk *cblk,
*
*******************************************************************************/
int
core_zhetrfsp1d_panel( SolverCblk *cblk,
pastix_complex64_t *L,
pastix_complex64_t *DLh,
double criteria,
const pastix_lr_t *lowrank )
cpucblk_zhetrfsp1d_panel( SolverCblk *cblk,
pastix_complex64_t *L,
pastix_complex64_t *DLh,
double criteria,
const pastix_lr_t *lowrank )
{
pastix_int_t nbpivot;
(void)lowrank;
nbpivot = core_zhetrfsp1d_hetrf(cblk, L, DLh, criteria );
nbpivot = cpucblk_zhetrfsp1d_hetrf(cblk, L, DLh, criteria );
core_zhetrfsp1d_trsm(cblk, L);
return nbpivot;
}
......@@ -512,11 +512,11 @@ core_zhetrfsp1d_panel( SolverCblk *cblk,
*
*******************************************************************************/
int
core_zhetrfsp1d( SolverMatrix *solvmtx,
SolverCblk *cblk,
double criteria,
pastix_complex64_t *work1,
pastix_complex64_t *work2 )
cpucblk_zhetrfsp1d( SolverMatrix *solvmtx,
SolverCblk *cblk,
double criteria,
pastix_complex64_t *work1,
pastix_complex64_t *work2 )
{
pastix_complex64_t *L = cblk->lcoeftab;
SolverCblk *fcblk;
......@@ -524,7 +524,7 @@ core_zhetrfsp1d( SolverMatrix *solvmtx,
pastix_int_t nbpivot;
/* if there are off-diagonal supernodes in the column */
nbpivot = core_zhetrfsp1d_hetrf(cblk, L, work1, criteria);
nbpivot = cpucblk_zhetrfsp1d_hetrf(cblk, L, work1, criteria);
core_zhetrfsp1d_trsm(cblk, L);
blok = cblk->fblokptr+1; /* this diagonal block */
......
......@@ -217,9 +217,9 @@ core_zpotrfsp( pastix_int_t n,
*
*******************************************************************************/
int
core_zpotrfsp1d_potrf( SolverCblk *cblk,
pastix_complex64_t *L,
double criteria )
cpucblk_zpotrfsp1d_potrf( SolverCblk *cblk,
pastix_complex64_t *L,
double criteria )
{
pastix_int_t ncols, stride;
pastix_int_t nbpivot = 0;
......@@ -275,12 +275,12 @@ core_zpotrfsp1d_potrf( SolverCblk *cblk,
*
*******************************************************************************/
int
core_zpotrfsp1d_panel( SolverCblk *cblk,
pastix_complex64_t *L,
double criteria,
const pastix_lr_t *lowrank )
cpucblk_zpotrfsp1d_panel( SolverCblk *cblk,
pastix_complex64_t *L,
double criteria,
const pastix_lr_t *lowrank )
{
pastix_int_t nbpivot = core_zpotrfsp1d_potrf(cblk, L, criteria);
pastix_int_t nbpivot = cpucblk_zpotrfsp1d_potrf(cblk, L, criteria);
cpucblk_ztrsmsp( PastixLCoef, PastixRight, PastixLower,
PastixConjTrans, PastixNonUnit,
cblk, L, L, lowrank );
......@@ -318,17 +318,17 @@ core_zpotrfsp1d_panel( SolverCblk *cblk,
*
*******************************************************************************/
int
core_zpotrfsp1d( SolverMatrix *solvmtx,
SolverCblk *cblk,
double criteria,
pastix_complex64_t *work )
cpucblk_zpotrfsp1d( SolverMatrix *solvmtx,
SolverCblk *cblk,
double criteria,
pastix_complex64_t *work )
{
pastix_complex64_t *L = cblk->lcoeftab;
SolverCblk *fcblk;
SolverBlok *blok, *lblk;
pastix_int_t nbpivot;
nbpivot = core_zpotrfsp1d_panel(cblk, L, criteria, &solvmtx->lowrank);
nbpivot = cpucblk_zpotrfsp1d_panel(cblk, L, criteria, &solvmtx->lowrank);
blok = cblk->fblokptr + 1; /* First off-diagonal block */
lblk = cblk[1].fblokptr; /* Next diagonal block */
......
......@@ -226,10 +226,10 @@ core_zsytrfsp( pastix_int_t n,
*
*******************************************************************************/
int
core_zsytrfsp1d_sytrf( SolverCblk *cblk,
pastix_complex64_t *L,
pastix_complex64_t *DLt,
double criteria )
cpucblk_zsytrfsp1d_sytrf( SolverCblk *cblk,
pastix_complex64_t *L,
pastix_complex64_t *DLt,
double criteria )
{
pastix_int_t ncols, stride;
pastix_int_t nbpivot = 0;
......@@ -470,16 +470,16 @@ void core_zsytrfsp1d_gemm( SolverCblk *cblk,
*
*******************************************************************************/
int
core_zsytrfsp1d_panel( SolverCblk *cblk,
pastix_complex64_t *L,
pastix_complex64_t *DLt,
double criteria,
const pastix_lr_t *lowrank )
cpucblk_zsytrfsp1d_panel( SolverCblk *cblk,
pastix_complex64_t *L,
pastix_complex64_t *DLt,
double criteria,
const pastix_lr_t *lowrank )
{
pastix_int_t nbpivot;
(void)lowrank;
nbpivot = core_zsytrfsp1d_sytrf(cblk, L, DLt, criteria );
nbpivot = cpucblk_zsytrfsp1d_sytrf(cblk, L, DLt, criteria );
core_zsytrfsp1d_trsm(cblk, L);
return nbpivot;
}
......@@ -518,7 +518,7 @@ core_zsytrfsp1d_panel( SolverCblk *cblk,
*
*******************************************************************************/
int
core_zsytrfsp1d( SolverMatrix *solvmtx,
cpucblk_zsytrfsp1d( SolverMatrix *solvmtx,
SolverCblk *cblk,
double criteria,
pastix_complex64_t *work1,
......@@ -530,7 +530,7 @@ core_zsytrfsp1d( SolverMatrix *solvmtx,
pastix_int_t nbpivot;
/* if there are off-diagonal supernodes in the column */
nbpivot = core_zsytrfsp1d_sytrf(cblk, L, work1, criteria);
nbpivot = cpucblk_zsytrfsp1d_sytrf(cblk, L, work1, criteria);
core_zsytrfsp1d_trsm(cblk, L);
blok = cblk->fblokptr+1; /* this diagonal block */
......
......@@ -130,9 +130,9 @@ int core_zrradd_RRQR_interface( pastix_fixdbl_t tol, pastix_trans_t transA1, co
* level for the numerical factorization step.
*/
int core_zgeaddsp1d( const SolverCblk *cblk1, SolverCblk *cblk2,
const pastix_complex64_t *L1, pastix_complex64_t *L2,
const pastix_complex64_t *U1, pastix_complex64_t *U2 );
int cpucblk_zgeaddsp1d( const SolverCblk *cblk1, SolverCblk *cblk2,
const pastix_complex64_t *L1, pastix_complex64_t *L2,
const pastix_complex64_t *U1, pastix_complex64_t *U2 );
void cpucblk_zgemmsp( pastix_coefside_t sideA, pastix_coefside_t sideB, pastix_trans_t trans,
const SolverCblk *cblk, const SolverBlok *blok, SolverCblk *fcblk,
......@@ -186,35 +186,38 @@ void gpu_zgemmsp_fermi( const SolverMatrix *solvmatr,
cudaStream_t stream );
#endif
int core_zgetrfsp1d_getrf( SolverCblk *cblk, pastix_complex64_t *L, pastix_complex64_t *U, double criteria );
int core_zgetrfsp1d_panel( SolverCblk *cblk, pastix_complex64_t *L, pastix_complex64_t *U, double criteria,
const pastix_lr_t *lowrank );
int core_zgetrfsp1d ( SolverMatrix *solvmtx, SolverCblk *cblk, double criteria, pastix_complex64_t *work );
int cpucblk_zgetrfsp1d_getrf( SolverCblk *cblk, pastix_complex64_t *L, pastix_complex64_t *U, double criteria );
int cpucblk_zgetrfsp1d_panel( SolverCblk *cblk, pastix_complex64_t *L, pastix_complex64_t *U, double criteria,
const pastix_lr_t *lowrank );
int cpucblk_zgetrfsp1d ( SolverMatrix *solvmtx, SolverCblk *cblk, double criteria, pastix_complex64_t *work );
int core_zpotrfsp1d_potrf( SolverCblk *cblk, pastix_complex64_t *L, double criteria );
int core_zpotrfsp1d_panel( SolverCblk *cblk, pastix_complex64_t *L, double criteria,
const pastix_lr_t *lowrank );
int core_zpotrfsp1d ( SolverMatrix *solvmtx, SolverCblk *cblk, double criteria, pastix_complex64_t *work );
int cpucblk_zpotrfsp1d_potrf( SolverCblk *cblk, pastix_complex64_t *L, double criteria );
int cpucblk_zpotrfsp1d_panel( SolverCblk *cblk, pastix_complex64_t *L, double criteria,
const pastix_lr_t *lowrank );
int cpucblk_zpotrfsp1d ( SolverMatrix *solvmtx, SolverCblk *cblk, double criteria, pastix_complex64_t *work );
#if defined(PRECISION_z) || defined(PRECISION_c)
int core_zhetrfsp1d_hetrf( SolverCblk *cblk, pastix_complex64_t *L, pastix_complex64_t *DLh, double criteria );
int core_zhetrfsp1d_panel( SolverCblk *cblk, pastix_complex64_t *L, pastix_complex64_t *DLh, double criteria,
const pastix_lr_t *lowrank );
int core_zhetrfsp1d ( SolverMatrix *solvmtx, SolverCblk *cblk, double criteria,
pastix_complex64_t *work1, pastix_complex64_t *work2 );
int cpucblk_zhetrfsp1d_hetrf( SolverCblk *cblk, pastix_complex64_t *L, pastix_complex64_t *DLh, double criteria );
int cpucblk_zhetrfsp1d_panel( SolverCblk *cblk, pastix_complex64_t *L, pastix_complex64_t *DLh, double criteria,
const pastix_lr_t *lowrank );
int cpucblk_zhetrfsp1d ( SolverMatrix *solvmtx, SolverCblk *cblk, double criteria,
pastix_complex64_t *work1, pastix_complex64_t *work2 );
#endif /*defined(PRECISION_z) || defined(PRECISION_c) */
int cpucblk_zsytrfsp1d_sytrf( SolverCblk *cblk, pastix_complex64_t *L, pastix_complex64_t *DLt, double criteria );
int cpucblk_zsytrfsp1d_panel( SolverCblk *cblk, pastix_complex64_t *L, pastix_complex64_t *DLt, double criteria,
const pastix_lr_t *lowrank );
int cpucblk_zsytrfsp1d ( SolverMatrix *solvmtx, SolverCblk *cblk, double criteria,
pastix_complex64_t *work1, pastix_complex64_t *work2 );
/* To be removed */
#if defined(PRECISION_z) || defined(PRECISION_c)
int core_zhetrfsp1d_trsm( SolverCblk *cblk, pastix_complex64_t *L );
void core_zhetrfsp1d_gemm( SolverCblk *cblk, SolverBlok *blok, SolverCblk *fcblk,
pastix_complex64_t *L, pastix_complex64_t *C,
pastix_complex64_t *work1, pastix_complex64_t *work2 );
#endif /*defined(PRECISION_z) || defined(PRECISION_c) */
int core_zsytrfsp1d_sytrf( SolverCblk *cblk, pastix_complex64_t *L, pastix_complex64_t *DLt, double criteria );
int core_zsytrfsp1d_panel( SolverCblk *cblk, pastix_complex64_t *L, pastix_complex64_t *DLt, double criteria,
const pastix_lr_t *lowrank );
int core_zsytrfsp1d ( SolverMatrix *solvmtx, SolverCblk *cblk, double criteria,
pastix_complex64_t *work1, pastix_complex64_t *work2 );
#endif /* defined(PRECISION_z) || defined(PRECISION_c) */
int core_zsytrfsp1d_trsm( SolverCblk *cblk, pastix_complex64_t *L );
void core_zsytrfsp1d_gemm( SolverCblk *cblk, SolverBlok *blok, SolverCblk *fcblk,
pastix_complex64_t *L, pastix_complex64_t *C,
......
......@@ -61,7 +61,7 @@ RW U <- ( browk0 == browk1 ) ? descA(1, k, 0) : C GEMM1D( 1, lastbrow )
BODY
{
SolverCblk *cblk = datacode->cblktab + k;
core_zgetrfsp1d_panel(cblk, L, U, sopalin_data->diagthreshold, &lowrank );
cpucblk_zgetrfsp1d_panel(cblk, L, U, sopalin_data->diagthreshold, &lowrank );
}
END
......
......@@ -66,7 +66,7 @@ BODY
{
if (!isTwoD) {
SolverCblk *cblk = datacode->cblktab + k;
core_zgetrfsp1d_panel( cblk, L, U, sopalin_data->diagthreshold, &lowrank );
cpucblk_zgetrfsp1d_panel( cblk, L, U, sopalin_data->diagthreshold, &lowrank );
}
else {
/* Compression between 1D and 2D updates */
......
......@@ -61,7 +61,7 @@ BODY
work1 = (pastix_complex64_t *)parsec_private_memory_pop( p_work1 );
core_zhetrfsp1d_panel( cblk, L, sopalin_data->diagthreshold, work1 );
cpucblk_zhetrfsp1d_panel( cblk, L, sopalin_data->diagthreshold, work1 );
parsec_private_memory_push( p_work1, (void *)work1 );
}
......
......@@ -57,7 +57,7 @@ RW L <- ( browk0 == browk1 ) ? descA(0, k, 0) : C GEMM1D( lastbrow )
BODY
{
SolverCblk *cblk = datacode->cblktab + k;
core_zpotrfsp1d_panel( cblk, L, sopalin_data->diagthreshold, &lowrank );
cpucblk_zpotrfsp1d_panel( cblk, L, sopalin_data->diagthreshold, &lowrank );
}
END
......
......@@ -62,7 +62,7 @@ BODY
{
if (!isTwoD) {
SolverCblk *cblk = datacode->cblktab + k;
core_zpotrfsp1d_panel( cblk, L, sopalin_data->diagthreshold, &lowrank );
cpucblk_zpotrfsp1d_panel( cblk, L, sopalin_data->diagthreshold, &lowrank );
}
else {
/* Compression between 1D and 2D updates */
......@@ -243,7 +243,7 @@ BODY
if (isTwoD) {
SolverCblk *cblk = datacode->cblktab + k;
/* pastix_int_t nbpivot = */
core_zpotrfsp1d_potrf( cblk, A, sopalin_data->diagthreshold );
cpucblk_zpotrfsp1d_potrf( cblk, A, sopalin_data->diagthreshold );
}
}
END
......
......@@ -61,7 +61,7 @@ BODY
work1 = (pastix_complex64_t *)parsec_private_memory_pop( p_work1 );
core_zsytrfsp1d_panel( cblk, L, sopalin_data->diagthreshold, work1 );
cpucblk_zsytrfsp1d_panel( cblk, L, sopalin_data->diagthreshold, work1 );
parsec_private_memory_push( p_work1, (void *)work1 );
}
......
......@@ -52,7 +52,7 @@ sequential_zgetrf( pastix_data_t *pastix_data,
break;
/* Compute */
core_zgetrfsp1d( datacode, cblk, threshold, work );
cpucblk_zgetrfsp1d( datacode, cblk, threshold, work );
}
#if defined(PASTIX_DEBUG_FACTO)
......@@ -91,7 +91,7 @@ thread_pzgetrf( isched_thread_t *ctx, void *args )
do {} while( cblk->ctrbcnt );
/* Compute */
core_zgetrfsp1d( datacode, cblk, sopalin_data->diagthreshold, work );
cpucblk_zgetrfsp1d( datacode, cblk, sopalin_data->diagthreshold, work );
}
#if defined(PASTIX_DEBUG_FACTO) && 0
......
......@@ -50,8 +50,8 @@ sequential_zhetrf( pastix_data_t *pastix_data,
break;
/* Compute */
core_zhetrfsp1d( datacode, cblk, threshold,
work1, work2 );
cpucblk_zhetrfsp1d( datacode, cblk, threshold,
work1, work2 );
}
#if defined(PASTIX_DEBUG_FACTO)
......@@ -93,8 +93,8 @@ thread_pzhetrf( isched_thread_t *ctx, void *args )
do {} while( cblk->ctrbcnt );
/* Compute */
core_zhetrfsp1d( datacode, cblk, sopalin_data->diagthreshold,
work1, work2 );
cpucblk_zhetrfsp1d( datacode, cblk, sopalin_data->diagthreshold,
work1, work2 );
}
#if defined(PASTIX_DEBUG_FACTO) && 0
......
......@@ -52,7 +52,7 @@ sequential_zpotrf( pastix_data_t *pastix_data,
break;
/* Compute */
core_zpotrfsp1d( datacode, cblk, threshold, work );
cpucblk_zpotrfsp1d( datacode, cblk, threshold, work );
}
#if defined(PASTIX_DEBUG_FACTO)
......@@ -91,7 +91,7 @@ thread_pzpotrf( isched_thread_t *ctx, void *args )
do {} while( cblk->ctrbcnt );
/* Compute */
core_zpotrfsp1d( datacode, cblk, sopalin_data->diagthreshold, work );
cpucblk_zpotrfsp1d( datacode, cblk, sopalin_data->diagthreshold, work );
}
#if defined(PASTIX_DEBUG_FACTO) && 0
......
......@@ -50,8 +50,8 @@ sequential_zsytrf( pastix_data_t *pastix_data,
break;
/* Compute */
core_zsytrfsp1d( datacode, cblk, threshold,
work1, work2 );
cpucblk_zsytrfsp1d( datacode, cblk, threshold,
work1, work2 );
}
#if defined(PASTIX_DEBUG_FACTO)
......@@ -93,8 +93,8 @@ thread_pzsytrf( isched_thread_t *ctx, void *args )
do {} while( cblk->ctrbcnt );
/* Compute */
core_zsytrfsp1d( datacode, cblk, sopalin_data->diagthreshold,
work1, work2 );
cpucblk_zsytrfsp1d( datacode, cblk, sopalin_data->diagthreshold,
work1, work2 );
}
#if defined(PASTIX_DEBUG_FACTO) && 0
......
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