Commit 42d91f60 authored by Mathieu Faverge's avatar Mathieu Faverge

Remove unused fields

parent 34b5619c
......@@ -56,8 +56,6 @@ typedef struct hqr_subpiv_s hqr_subpiv_t;
* @brief Argument structure to store the high and low level trees used in the hierarchical reduction tree
*/
struct hqr_args_s {
int domino; /**< Switch to enable/disable the domino tree linking high and lw level reduction trees */
int tsrr; /**< Switch to enable/disable round-robin on TS to optimise pipelining between TS and local tree */
hqr_subpiv_t *llvl; /**< Pointer to the low level tree data structure (shared memory) */
hqr_subpiv_t *hlvl; /**< Pointer to the high level tree data structure (distributed memory) */
};
......
......@@ -389,7 +389,7 @@ hqr_nextpiv(const libhqr_tree_t *qrtree, int k, int pivot, int start)
case LIBHQR_KILLED_BY_TS:
/* If the tile is over the diagonal of step k, skip directly to type 2 */
if ( arg->domino && lpivot < k ) {
if ( qrtree->domino && lpivot < k ) {
goto next_2;
}
......@@ -413,7 +413,7 @@ hqr_nextpiv(const libhqr_tree_t *qrtree, int k, int pivot, int start)
case LIBHQR_KILLED_BY_LOCALTREE:
/* If the tile is over the diagonal of step k, skip directly to type 2 */
if ( arg->domino && (lpivot < k) ) {
if ( qrtree->domino && (lpivot < k) ) {
goto next_2;
}
......@@ -443,7 +443,7 @@ hqr_nextpiv(const libhqr_tree_t *qrtree, int k, int pivot, int start)
}
/* Type 2 are killed only once if they are strictly in the band */
if ( arg->domino &&
if ( qrtree->domino &&
(start == gmt) &&
(lpivot < k) &&
(pivot+p < gmt) )
......@@ -535,7 +535,7 @@ hqr_prevpiv(const libhqr_tree_t *qrtree, int k, int pivot, int start)
case LIBHQR_KILLED_BY_DOMINO:
/* If the tile is over the diagonal of step k, process it as type 2 */
if ( arg->domino && lpivot < k ) {
if ( qrtree->domino && lpivot < k ) {
if ( ( start == pivot ) &&
(start+p < gmt ) )
......@@ -557,7 +557,7 @@ hqr_prevpiv(const libhqr_tree_t *qrtree, int k, int pivot, int start)
case LIBHQR_KILLED_BY_LOCALTREE:
/* If the tile is over the diagonal of step k and is of type 2,
it cannot annihilate type 0 or 1 */
if ( arg->domino && lpivot < k ) {
if ( qrtree->domino && lpivot < k ) {
return gmt;
}
......@@ -725,12 +725,12 @@ int
libhqr_initfct_hqr( libhqr_tree_t *qrtree,
libhqr_facto_e trans, libhqr_matrix_t *A,
int type_llvl, int type_hlvl,
int a, int p,
int domino, int tsrr )
int a, int p, int domino, int tsrr )
{
double ratio = 0.0;
int low_mt, minMN;
hqr_args_t *arg;
(void)tsrr;
if (qrtree == NULL) {
fprintf(stderr, "libhqr_initfct_hqr, illegal value of qrtree");
......@@ -806,9 +806,6 @@ libhqr_initfct_hqr( libhqr_tree_t *qrtree,
qrtree->args = NULL;
arg = (hqr_args_t*) malloc( sizeof(hqr_args_t) );
arg->domino = domino;
arg->tsrr = tsrr;
arg->llvl = (hqr_subpiv_t*) malloc( sizeof(hqr_subpiv_t) );
arg->hlvl = NULL;
......
......@@ -623,8 +623,6 @@ libhqr_initfct_svd( libhqr_tree_t *qrtree,
qrtree->args = NULL;
arg = (hqr_args_t*) malloc( sizeof(hqr_args_t) );
arg->domino = 0;
arg->tsrr = 0;
arg->llvl = (hqr_subpiv_t*) malloc( sizeof(hqr_subpiv_t) );
arg->hlvl = NULL;
......
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