Skip to content

Commit 964ee14

Browse files
Merge Pull Request trilinos#13563 from ndellingwood/Trilinos/shylubasker-fixes
Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'shylubasker: remove unused code' PR Author: ndellingwood
2 parents c710c1c + 6555e68 commit 964ee14

File tree

4 files changed

+1
-62
lines changed

4 files changed

+1
-62
lines changed

packages/shylu/shylu_node/basker/src/shylubasker_decl.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -1160,8 +1160,6 @@ namespace BaskerNS
11601160
void printMTX(std::string fname, BASKER_MATRIX &M);
11611161
void printMTX(std::string fname, BASKER_MATRIX &M, BASKER_BOOL off);
11621162
void readMTX(std::string fname, BASKER_MATRIX &M);
1163-
int printRHS();
1164-
int printSOL();
11651163
void printTree();
11661164

11671165
BASKER_INLINE

packages/shylu/shylu_node/basker/src/shylubasker_def.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -2307,10 +2307,6 @@ namespace BaskerNS
23072307
printU();
23082308
printUMTX();
23092309
std::cout << "U printed" << std::endl;
2310-
//printRHS();
2311-
std::cout << "RHS printed" << std::endl;
2312-
//printSOL();
2313-
std::cout << "SOL printed" << std::endl;
23142310
//printTree();
23152311
std::cout << "Tree printed" << std::endl;
23162312

packages/shylu/shylu_node/basker/src/shylubasker_thread.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ namespace BaskerNS
272272
BASKER_INLINE
273273
void atomic_barrier_fanout(volatile Int &value, const Int l_size)
274274
{
275-
Kokkos::atomic_inc(&(value))
275+
Kokkos::atomic_inc(&(value));
276276
while(value < l_size)
277277
{
278278
BASKER_NO_OP;

packages/shylu/shylu_node/basker/src/shylubasker_util.hpp

-55
Original file line numberDiff line numberDiff line change
@@ -1472,61 +1472,6 @@ namespace BaskerNS
14721472
}//end readMTX()
14731473

14741474

1475-
//Print out RHS RHS.txt
1476-
template<class Int, class Entry, class Exe_Space>
1477-
int Basker<Int,Entry,Exe_Space>::printRHS()
1478-
{
1479-
if(solve_flag == false)
1480-
{return -1;}
1481-
1482-
FILE *fp;
1483-
fp = fopen("RHS.txt", "w");
1484-
1485-
//over each row
1486-
for(Int r = 0; r < A.nrow; r++)
1487-
{
1488-
//over each column NOTE: come back to
1489-
//for(Int k = 0; k < rhs.size(); k++)
1490-
for(Int k = 0; k < 1; k++)
1491-
{
1492-
//fprintf(fp, "%ld %ld %f, ", (long)r, (long)gperm[r], rhs[k][r]);
1493-
fprintf(fp, "%ld %ld %.16e, ", (long)r, (long)gperm[r], rhs[k][r]);
1494-
}//end over each column
1495-
fprintf(fp, "\n");
1496-
}//end over each row
1497-
1498-
fclose(fp);
1499-
1500-
return 0;
1501-
}//end printRHS()
1502-
1503-
//Print solution SOL.txt
1504-
template <class Int, class Entry, class Exe_Space>
1505-
int Basker<Int,Entry,Exe_Space>::printSOL()
1506-
{
1507-
if(solve_flag == false)
1508-
{return -1;}
1509-
1510-
FILE *fp;
1511-
fp = fopen("SOL.txt", "w");
1512-
1513-
//over each row
1514-
for(Int r = 0; r < A.nrow; r++)
1515-
{
1516-
//over each column Note: come back to
1517-
//for(Int k = 0; k < rhs.size(); k++)
1518-
for(Int k = 0 ; k < 1; k++)
1519-
{
1520-
fprintf(fp, "%ld %ld %f, ", (long)r, (long)gperm[r], sol[k][r]);
1521-
}//end over each column
1522-
fprintf(fp, "\n");
1523-
}//end over each row
1524-
1525-
fclose(fp);
1526-
1527-
return 0;
1528-
}//end printSOL()
1529-
15301475
//Prints the given tree into a file to analyze
15311476
template<class Int, class Entry, class Exe_Space>
15321477
void Basker<Int,Entry,Exe_Space>::printTree()

0 commit comments

Comments
 (0)