Correct enum arguments in GLU solver implementation.

ORNL · Oct 31, 2023 · 2284161 · 2284161
1 parent c9c50fa
commit 2284161
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/examples/r_KLU_GLU_matrix_values_update.cpp b/examples/r_KLU_GLU_matrix_values_update.cpp
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
         ReSolve::io::readAndUpdateMatrix(mat_file, A_exp_coo);
       }
       std::cout<<"Updating values of A_coo!"<<std::endl; 
-      A_coo->updateValues(A_exp_coo->getValues("cpu"), "cpu", "cpu");
+      A_coo->updateValues(A_exp_coo->getValues(ReSolve::memory::HOST), "cpu", "cpu");
       //ReSolve::io::readAndUpdateMatrix(mat_file, A_coo);
       ReSolve::io::readAndUpdateRhs(rhs_file, &rhs);
     }

diff --git a/resolve/LinSolverDirectCuSolverGLU.cpp b/resolve/LinSolverDirectCuSolverGLU.cpp
@@ -50,14 +50,14 @@ namespace ReSolve
                                            n,
                                            nnz, 
                                            descr_A_, 
-                                           A_->getRowData("cpu"), //kRowPtr_,
-                                           A_->getColData("cpu"), //jCol_, 
+                                           A_->getRowData(memory::HOST), //kRowPtr_,
+                                           A_->getColData(memory::HOST), //jCol_, 
                                            P, /* base-0 */
                                            Q,   /* base-0 */
                                            M_->getNnz(),           /* nnzM */
                                            descr_M_, 
-                                           M_->getRowData("cpu"), 
-                                           M_->getColData("cpu"), 
+                                           M_->getRowData(memory::HOST), 
+                                           M_->getColData(memory::HOST), 
                                            info_M_);
     error_sum += status_cusolver_; 
     //NOW the buffer 
@@ -93,15 +93,15 @@ namespace ReSolve
   {
 // L and U need to be in CSC format
     index_type n = L->getNumRows();
-    index_type* Lp = L->getColData("cpu"); 
-    index_type* Li = L->getRowData("cpu"); 
-    index_type* Up = U->getColData("cpu"); 
-    index_type* Ui = U->getRowData("cpu"); 
+    index_type* Lp = L->getColData(memory::HOST); 
+    index_type* Li = L->getRowData(memory::HOST); 
+    index_type* Up = U->getColData(memory::HOST); 
+    index_type* Ui = U->getRowData(memory::HOST); 
     index_type nnzM = ( L->getNnz() + U->getNnz() - n );
     M_ = new matrix::Csr(n, n, nnzM);
     M_->allocateMatrixData("cpu");
-    index_type* mia = M_->getRowData("cpu");
-    index_type* mja = M_->getColData("cpu");
+    index_type* mia = M_->getRowData(memory::HOST);
+    index_type* mja = M_->getColData(memory::HOST);
     index_type row;
     for(index_type i = 0; i < n; ++i) {
       // go through EACH COLUMN OF L first