Skip to content

Commit

Permalink
ShyLU - Basker : replace std::vector with SequentialHostInit
Browse files Browse the repository at this point in the history
  • Loading branch information
@iyamazaki
iyamazaki committed Oct 25, 2024
1 parent 9359149 commit e545ea4
Show file tree
Hide file tree
Showing 12 changed files with 513 additions and 553 deletions.
150 changes: 75 additions & 75 deletions packages/shylu/shylu_node/basker/src/shylubasker_error_manager.hpp
View file

Large diffs are not rendered by default.

74 changes: 37 additions & 37 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 @@ -149,7 +149,7 @@ namespace BaskerNS
const Mag normA = BTF_A.gnorm;
const Mag normA_blk = BTF_A.anorm;

Int b = S[0][kid]; //Which blk from schedule
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
Expand All @@ -159,9 +159,9 @@ namespace BaskerNS
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;
Int ws_size = thread_array[kid].iws_size;
INT_1DARRAY ws = thread_array(kid).iws;
ENTRY_1DARRAY X = thread_array(kid).ews;
Int ws_size = thread_array(kid).iws_size;
#endif
//Int bcol = L.scol; //begining col //NOT UD
Int scol_top = btf_tabs[btf_top_tabs_offset]; // the first column index of A
Expand Down Expand Up @@ -577,11 +577,11 @@ namespace BaskerNS
}
}
if (!explicit_pivot) {
thread_array[kid].error_type =
thread_array(kid).error_type =
BASKER_ERROR_SINGULAR;
thread_array[kid].error_blk = b;
thread_array[kid].error_subblk = 0;
thread_array[kid].error_info = k;
thread_array(kid).error_blk = b;
thread_array(kid).error_subblk = 0;
thread_array(kid).error_info = k;
return BASKER_ERROR;
}
}
Expand Down Expand Up @@ -676,17 +676,17 @@ namespace BaskerNS
(int)kid, (long)b, (long)llnnz, (long)lnnz, (long)lcnt, (int)lnnz, (int)M.nrow, (long)newsize);
}

thread_array[kid].error_blk = b;
thread_array[kid].error_subblk = 0;
thread_array(kid).error_blk = b;
thread_array(kid).error_subblk = 0;
if(Options.realloc == BASKER_FALSE)
{
thread_array[kid].error_type = BASKER_ERROR_NOMALLOC;
thread_array(kid).error_type = BASKER_ERROR_NOMALLOC;
return BASKER_ERROR;
}
else
{
thread_array[kid].error_type = BASKER_ERROR_REMALLOC;
thread_array[kid].error_info = newsize;
thread_array(kid).error_type = BASKER_ERROR_REMALLOC;
thread_array(kid).error_info = newsize;
return BASKER_ERROR;
}

Expand All @@ -701,17 +701,17 @@ namespace BaskerNS
(int)kid, (long)b, (long)uunnz, (long)unnz+ucnt, (long)k, (int)uunnz, (int)M.nrow, (int)newsize);
}

thread_array[kid].error_blk = b;
thread_array[kid].error_subblk = -1;
thread_array(kid).error_blk = b;
thread_array(kid).error_subblk = -1;
if(Options.realloc == BASKER_FALSE)
{
thread_array[kid].error_type = BASKER_ERROR_NOMALLOC;
thread_array(kid).error_type = BASKER_ERROR_NOMALLOC;
return BASKER_ERROR;
}
else
{
thread_array[kid].error_type = BASKER_ERROR_REMALLOC;
thread_array[kid].error_info = newsize;
thread_array(kid).error_type = BASKER_ERROR_REMALLOC;
thread_array(kid).error_info = newsize;
return BASKER_ERROR;
}

Expand Down Expand Up @@ -981,7 +981,7 @@ namespace BaskerNS
)
{
//Setup variables
const Int wsb = S[0][kid];
const Int wsb = S(0)(kid);

INT_1DARRAY ws = LL[wsb][l].iws;
const Int ws_size = LL[wsb][l].iws_size;
Expand Down Expand Up @@ -1011,11 +1011,11 @@ namespace BaskerNS
)
{
const Int scol_top = btf_tabs[btf_top_tabs_offset]; // the first column index of A
const Int b = S[lvl][kid];
const Int b = S(lvl)(kid);

//const Int wsb = S(0)(kid);
BASKER_MATRIX &L = LL[b][0];
const Int U_col = S[lvl][kid];
const Int U_col = S(lvl)(kid);
Int U_row = LU_size(U_col)-1;
if(lvl > 0)
{
Expand Down Expand Up @@ -1128,8 +1128,8 @@ namespace BaskerNS
{

//Setup variables
const Int b = S[lvl][kid];
const Int wsb = S[0][kid];
const Int b = S(lvl)(kid);
const Int wsb = S(0)(kid);
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
Expand Down Expand Up @@ -1279,15 +1279,15 @@ namespace BaskerNS
{

//Setup variables
const Int b = S[lvl][kid];
const Int wsb = S[0][kid];
const Int b = S(lvl)(kid);
const Int wsb = S(0)(kid);
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;
#else
INT_1DARRAY ws = thread_array[kid].iws;
Int ws_size = thread_array[kid].iws_size;
INT_1DARRAY ws = thread_array(kid).iws;
Int ws_size = thread_array(kid).iws_size;
#endif

const Int scol_top = btf_tabs[btf_top_tabs_offset]; // the first column index of A
Expand Down Expand Up @@ -1452,17 +1452,17 @@ namespace BaskerNS
Int k, Int top,
Int xnnz)
{
const Int b = S[lvl][kid];
const Int wsb = S[0][kid];
const Int b = S(lvl)(kid);
const Int wsb = S(0)(kid);
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;
#else
INT_1DARRAY ws = thread_array[kid].iws;
ENTRY_1DARRAY X = thread_array[kid].ews;
Int ws_size = thread_array[kid].iws_size;
INT_1DARRAY ws = thread_array(kid).iws;
ENTRY_1DARRAY X = thread_array(kid).ews;
Int ws_size = thread_array(kid).iws_size;
#endif

const Entry zero (0.0);
Expand Down Expand Up @@ -1658,17 +1658,17 @@ namespace BaskerNS
(long)blkcol, (long)blkrow, (long)kid, (long)llnnz, (long)lnnz, (long)p_size );
}

thread_array[kid].error_blk = blkcol;
thread_array[kid].error_subblk = blkrow;
thread_array(kid).error_blk = blkcol;
thread_array(kid).error_subblk = blkrow;
if(Options.realloc == BASKER_FALSE)
{
thread_array[kid].error_type = BASKER_ERROR_NOMALLOC;
thread_array(kid).error_type = BASKER_ERROR_NOMALLOC;
return BASKER_ERROR;
}
else
{
thread_array[kid].error_type = BASKER_ERROR_REMALLOC;
thread_array[kid].error_info = newsize;
thread_array(kid).error_type = BASKER_ERROR_REMALLOC;
thread_array(kid).error_info = newsize;
return BASKER_ERROR;
}
//BASKER_ASSERT(0==1, "REALLOC LOWER BLOCK\n");
Expand Down
Loading

0 comments on commit e545ea4

Please sign in to comment.