Skip to content

Commit

Permalink
ShyLU - Basker : replace brackes back to parenthesis
Browse files Browse the repository at this point in the history 
Signed-off-by: iyamazaki <[email protected]>
  • Loading branch information
@iyamazaki
iyamazaki committed Oct 26, 2024
1 parent 03b1ab0 commit da3a195
Show file tree
Hide file tree
Showing 14 changed files with 490 additions and 510 deletions.
26 changes: 13 additions & 13 deletions packages/shylu/shylu_node/basker/src/shylubasker_error_manager.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ namespace BaskerNS
{
Int blkcol = thread_array(ti).error_blk;
Int blkUrow = LU_size(blkcol)-1;
if(LL[blkcol][0].nnz >=
LU[blkcol][blkUrow].nnz)
if(LL(blkcol)(0).nnz >=
LU(blkcol)(blkUrow).nnz)
{
resize_U = thread_array(ti).error_info;
}
Expand All @@ -116,7 +116,7 @@ namespace BaskerNS
std::cout << " ++ resize L( tid = " << ti << " ): new size = " << resize_L << std::endl;
}
BASKER_MATRIX &L =
LL[thread_array(ti).error_blk][thread_array(ti).error_subblk];
LL(thread_array(ti).error_blk)(thread_array(ti).error_subblk);
REALLOC_INT_1DARRAY(L.row_idx,
L.nnz,
resize_L);
Expand All @@ -142,7 +142,7 @@ namespace BaskerNS
std::cout << " ++ resize U( tid = " << ti << " ): new size = " << resize_U << std::endl;
}
BASKER_MATRIX &U =
LU[thread_array(ti).error_blk][0];
LU(thread_array(ti).error_blk)(0);
REALLOC_INT_1DARRAY(U.row_idx,
U.nnz,
resize_U);
Expand All @@ -153,7 +153,7 @@ namespace BaskerNS
U.nnz = resize_U;
//Still need to clear pend
BASKER_MATRIX &L =
LL[thread_array(ti).error_blk][0];
LL(thread_array(ti).error_blk)(0);
L.clear_pend();
}

Expand All @@ -167,7 +167,7 @@ namespace BaskerNS
sb++)
{
BASKER_MATRIX &SL =
LL[thread_array(ti).error_blk][sb];
LL(thread_array(ti).error_blk)(sb);
for(Int i = 0; i < SL.iws_size*SL.iws_mult; ++i)
{
SL.iws(i) = (Int) 0;
Expand Down Expand Up @@ -307,7 +307,7 @@ namespace BaskerNS
{
const Int tsb = (-1*thread_array(ti).error_subblk)-1;
BASKER_MATRIX &L =
LL[thread_array(ti).error_blk][tsb];
LL(thread_array(ti).error_blk)(tsb);
REALLOC_INT_1DARRAY(L.row_idx,
L.nnz,
resize_L);
Expand All @@ -324,7 +324,7 @@ namespace BaskerNS
{
const Int tsb = thread_array(ti).error_subblk;
BASKER_MATRIX &U =
LU[thread_array(ti).error_blk][tsb];
LU(thread_array(ti).error_blk)(tsb);
REALLOC_INT_1DARRAY(U.row_idx,
U.nnz,
resize_U);
Expand Down Expand Up @@ -352,7 +352,7 @@ namespace BaskerNS
//Clear workspace, whole column
for(Int sb = 0; sb < LL_size(blk); sb++)
{
BASKER_MATRIX &SL = LL[blk][sb];
BASKER_MATRIX &SL = LL(blk)(sb);
for(Int i = 0; i < SL.iws_size*SL.iws_mult; ++i)
{
SL.iws(i) = (Int) 0;
Expand All @@ -372,7 +372,7 @@ namespace BaskerNS
Int blk = S(error_sep_lvl)(p);
//if(LL(blk)(0).w_fill == BASKER_TRUE)
{
BASKER_MATRIX &TM = LL[blk][0];
BASKER_MATRIX &TM = LL(blk)(0);
//printf( " > p=%d: scol_top = %d, scol = %d, ncol = %d\n",p,scol_top,TM.scol,TM.ncol );
for(Int i = scol_top + TM.scol; i < scol_top + (TM.scol+TM.ncol); i++)
{
Expand All @@ -386,7 +386,7 @@ namespace BaskerNS
//Note, will have to clear the perm in all sep blk in that level
//Clear permuation
BASKER_MATRIX &SL =
LL[thread_array(ti).error_blk][0];
LL(thread_array(ti).error_blk)(0);
//printf( " + scol_top = %d, srow = %d, nrowl = %d\n",scol_top,SL.srow,SL.nrow );
for(Int i = scol_top + SL.srow; i < scol_top + (SL.srow+SL.nrow); i++)
{
Expand Down Expand Up @@ -512,7 +512,7 @@ namespace BaskerNS
}

//Resize L
BASKER_MATRIX &L = (c >= btab ? LBTF[c-btab] : L_D[c]);
BASKER_MATRIX &L = (c >= btab ? LBTF(c-btab) : L_D(c));
L.clear_pend();
REALLOC_INT_1DARRAY(L.row_idx,
L.nnz,
Expand All @@ -533,7 +533,7 @@ namespace BaskerNS
}

//Resize U
BASKER_MATRIX &U = (c >= btab ? UBTF[c-btab] : U_D[c]);
BASKER_MATRIX &U = (c >= btab ? UBTF(c-btab) : U_D(c));
REALLOC_INT_1DARRAY(U.row_idx,
U.nnz,
thread_array(ti).error_info);
Expand Down
94 changes: 47 additions & 47 deletions packages/shylu/shylu_node/basker/src/shylubasker_nfactor_blk.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,14 @@ namespace BaskerNS
const Mag normA_blk = BTF_A.anorm;

Int b = S(0)(kid); //Which blk from schedule
BASKER_MATRIX &L = LL[b][0];
BASKER_MATRIX &U = LU[b][LU_size(b)-1];
BASKER_MATRIX &M = ALM[b][0]; //A->blk
BASKER_MATRIX &L = LL(b)(0);
BASKER_MATRIX &U = LU(b)(LU_size(b)-1);
BASKER_MATRIX &M = ALM(b)(0); //A->blk
#ifdef BASKER_2DL
//printf("Accessing blk: %d kid: %d \n", b, kid);
INT_1DARRAY ws = LL[b][0].iws;
ENTRY_1DARRAY X = LL[b][0].ews;
Int ws_size = LL[b][0].iws_size;
INT_1DARRAY ws = LL(b)(0).iws;
ENTRY_1DARRAY X = LL(b)(0).ews;
Int ws_size = LL(b)(0).iws_size;
#else //else if BASKER_2DL
INT_1DARRAY ws = thread_array(kid).iws;
ENTRY_1DARRAY X = thread_array(kid).ews;
Expand Down Expand Up @@ -983,8 +983,8 @@ namespace BaskerNS
//Setup variables
const Int wsb = S(0)(kid);

INT_1DARRAY ws = LL[wsb][l].iws;
const Int ws_size = LL[wsb][l].iws_size;
INT_1DARRAY ws = LL(wsb)(l).iws;
const Int ws_size = LL(wsb)(l).iws_size;

Int *color = &(ws(0));
Int *pattern = &(ws(ws_size));
Expand Down Expand Up @@ -1014,15 +1014,15 @@ namespace BaskerNS
const Int b = S(lvl)(kid);

//const Int wsb = S(0)(kid);
BASKER_MATRIX &L = LL[b][0];
BASKER_MATRIX &L = LL(b)(0);
const Int U_col = S(lvl)(kid);
Int U_row = LU_size(U_col)-1;
if(lvl > 0)
{
//U_row = (lvl==1)?(kid%2):S(l)(kid)%LU_size(U_col);
}

BASKER_MATRIX &U = LU[U_col][U_row];
BASKER_MATRIX &U = LU(U_col)(U_row);
//const Int brow = L.srow;


Expand Down Expand Up @@ -1130,12 +1130,12 @@ namespace BaskerNS
//Setup variables
const Int b = S(lvl)(kid);
const Int wsb = S(0)(kid);
BASKER_MATRIX &L = LL[b][0];
BASKER_MATRIX &L = LL(b)(0);
const Int scol_top = btf_tabs[btf_top_tabs_offset]; // the first column index of A
const Int brow_g = L.srow + scol_top; // global offset

INT_1DARRAY ws = LL[wsb][l].iws;
const Int ws_size = LL[wsb][l].iws_size;
INT_1DARRAY ws = LL(wsb)(l).iws;
const Int ws_size = LL(wsb)(l).iws_size;

//Int *color = &(ws[0]);
Int *pattern = &(ws(ws_size));
Expand Down Expand Up @@ -1281,10 +1281,10 @@ namespace BaskerNS
//Setup variables
const Int b = S(lvl)(kid);
const Int wsb = S(0)(kid);
BASKER_MATRIX &L = LL[b][0];
BASKER_MATRIX &L = LL(b)(0);
#ifdef BASKER_2DL
INT_1DARRAY ws = LL[wsb][l].iws;
const Int ws_size = LL[wsb][l].iws_size;
INT_1DARRAY ws = LL(wsb)(l).iws;
const Int ws_size = LL(wsb)(l).iws_size;
#else
INT_1DARRAY ws = thread_array(kid).iws;
Int ws_size = thread_array(kid).iws_size;
Expand Down Expand Up @@ -1454,11 +1454,11 @@ namespace BaskerNS
{
const Int b = S(lvl)(kid);
const Int wsb = S(0)(kid);
BASKER_MATRIX &L = LL[b][0];
BASKER_MATRIX &L = LL(b)(0);
#ifdef BASKER_2DL
INT_1DARRAY ws = LL[wsb][l].iws;
ENTRY_1DARRAY X = LL[wsb][l].ews;
Int ws_size = LL[wsb][l].iws_size;
INT_1DARRAY ws = LL(wsb)(l).iws;
ENTRY_1DARRAY X = LL(wsb)(l).ews;
Int ws_size = LL(wsb)(l).iws_size;
#else
INT_1DARRAY ws = thread_array(kid).iws;
ENTRY_1DARRAY X = thread_array(kid).ews;
Expand Down Expand Up @@ -1534,10 +1534,10 @@ namespace BaskerNS
Int X_col, Int X_row,
Int k, Entry pivot)
{
BASKER_MATRIX &L = LL[blkcol][blkrow];
BASKER_MATRIX &L = LL(blkcol)(blkrow);

INT_1DARRAY ws = LL[X_col][X_row].iws;
ENTRY_1DARRAY X = LL[X_col][X_row].ews;
INT_1DARRAY ws = LL(X_col)(X_row).iws;
ENTRY_1DARRAY X = LL(X_col)(X_row).ews;
//const Int ws_size = LL(X_col)(X_row).iws_size;
//const Int p_size = LL(X_col)(X_row).p_size;

Expand Down Expand Up @@ -1607,8 +1607,8 @@ namespace BaskerNS
if (blkcol == 2 && blkrow == 1) printf( " L.colptr(%d) = %d\n",k+1,lnnz );
#endif

//LL[X_col][X_row].p_size = 0;
LL[X_col][X_row].p_size = 0;
//LL(X_col)(X_row).p_size = 0;
LL(X_col)(X_row).p_size = 0;

return 0;
}//end t_dense_offdiag_mov_L()
Expand All @@ -1623,12 +1623,12 @@ namespace BaskerNS
Int X_col, Int X_row,
Int k, Entry pivot)
{
BASKER_MATRIX &L = LL[blkcol][blkrow];
BASKER_MATRIX &L = LL(blkcol)(blkrow);

INT_1DARRAY ws = LL[X_col][X_row].iws;
ENTRY_1DARRAY X = LL[X_col][X_row].ews;
const Int ws_size = LL[X_col][X_row].iws_size;
const Int p_size = LL[X_col][X_row].p_size;
INT_1DARRAY ws = LL(X_col)(X_row).iws;
ENTRY_1DARRAY X = LL(X_col)(X_row).ews;
const Int ws_size = LL(X_col)(X_row).iws_size;
const Int p_size = LL(X_col)(X_row).p_size;


#ifdef BASKER_DEBUG_NFACTOR_BLK
Expand Down Expand Up @@ -1714,7 +1714,7 @@ namespace BaskerNS
}
#endif

LL[X_col][X_row].p_size = 0;
LL(X_col)(X_row).p_size = 0;

return 0;
}//end t_offdiag_mov_L()
Expand All @@ -1733,17 +1733,17 @@ namespace BaskerNS
BASKER_BOOL A_option)
{
//Note: need to add support for offdiag permuation
BASKER_MATRIX &L = LL[blkcol][blkrow];
BASKER_MATRIX &B = ALM[blkcol][blkrow];
BASKER_MATRIX &L = LL(blkcol)(blkrow);
BASKER_MATRIX &B = ALM(blkcol)(blkrow);

INT_1DARRAY ws = LL[X_col][X_row].iws;
ENTRY_1DARRAY X = LL[X_col][X_row].ews;
INT_1DARRAY ws = LL(X_col)(X_row).iws;
ENTRY_1DARRAY X = LL(X_col)(X_row).ews;

Int nnz = LL[X_col][X_row].p_size;
Int nnz = LL(X_col)(X_row).p_size;

//printf( " t_dense_back_solve_offdiag( LL(%d,%d) and ALM(%d,%d)\n", blkcol,blkrow,blkcol,blkrow );
#ifdef BASKER_DEBUG_NFACTOR_BLK
Int ws_size = LL[X_col][X_row].iws_size;
Int ws_size = LL(X_col)(X_row).iws_size;
const Int brow = L.srow;
const Int bcol = L.scol;
printf("\n\n");
Expand Down Expand Up @@ -1831,8 +1831,8 @@ namespace BaskerNS
}//over all nonzero in left

#ifdef BASKER_2DL
//LL[X_col][X_row].p_size = nnz;
LL[X_col][X_row].p_size = nnz;
//LL(X_col)(X_row).p_size = nnz;
LL(X_col)(X_row).p_size = nnz;
#endif

//Debug
Expand Down Expand Up @@ -1878,14 +1878,14 @@ namespace BaskerNS
{
//Note: need to add support for offdiag permuation

BASKER_MATRIX &L = LL[blkcol][blkrow];
BASKER_MATRIX &B = ALM[blkcol][blkrow];
BASKER_MATRIX &L = LL(blkcol)(blkrow);
BASKER_MATRIX &B = ALM(blkcol)(blkrow);

INT_1DARRAY ws = LL[X_col][X_row].iws;
ENTRY_1DARRAY X = LL[X_col][X_row].ews;
INT_1DARRAY ws = LL(X_col)(X_row).iws;
ENTRY_1DARRAY X = LL(X_col)(X_row).ews;

Int ws_size = LL[X_col][X_row].iws_size;
Int nnz = LL[X_col][X_row].p_size;
Int ws_size = LL(X_col)(X_row).iws_size;
Int nnz = LL(X_col)(X_row).p_size;
//const Int brow = L.srow;
//const Int bcol = L.scol;

Expand Down Expand Up @@ -2056,8 +2056,8 @@ namespace BaskerNS
nnz, kid, X_col, X_row);
printf("kid %d Ending nnz: %d \n",kid, nnz);
#endif
//LL[X_col][X_row].p_size = nnz;
LL[X_col][X_row].p_size = nnz;
//LL(X_col)(X_row).p_size = nnz;
LL(X_col)(X_row).p_size = nnz;
#endif

//Debug
Expand Down
Loading

0 comments on commit da3a195

Please sign in to comment.