Skip to content

Enhancement: remove unnecessary second analyze #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelesh merged 4 commits into from
May 8, 2025
Merged

Enhancement: remove unnecessary second analyze #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8e4735
junk
shakedregev May 8, 2025
37adbcd
fixed sysRefactor to use glu
shakedregev May 8, 2025
fdd0256
removed unnecessary or commented out code
shakedregev May 8, 2025
2750b3e
Fix bug in SystemSolver class.
pelesh May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions examples/gpuRefactor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,17 +193,18 @@ int gpuRefactor(int argc, char *argv[])

int status = 0;

if (i < 2) {
if (i == 0) {
RESOLVE_RANGE_PUSH("KLU");

// Setup factorization solver
KLU.setup(A);
matrix_handler.setValuesChanged(true, memory::DEVICE);

// Analysis (symbolic factorization)
status = KLU.analyze();
std::cout << "KLU analysis status: " << status << std::endl;
}

if (i < 2) {
// Numeric factorization
status = KLU.factorize();
std::cout << "KLU factorization status: " << status << std::endl;
Expand All @@ -227,8 +228,6 @@ int gpuRefactor(int argc, char *argv[])
index_type* Q = KLU.getQOrdering();

Rf.setup(A, L, U, P, Q, vec_rhs);
// Refactorization
Rf.refactorize();

// Setup iterative refinement solver
if (is_iterative_refinement) {
Expand Down
10 changes: 4 additions & 6 deletions examples/kluRefactor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,18 +134,16 @@ int main(int argc, char *argv[])
mat_file.close();
rhs_file.close();

// Update data.
if (i < 2) {
vec_rhs->setDataUpdated(ReSolve::memory::HOST);
}
std::cout<<"COO to CSR completed. Expanded NNZ: "<< A->getNnz()<<std::endl;
//Now call direct solver
int status;

if (i < 2){
if (i==0) {
vec_rhs->setDataUpdated(ReSolve::memory::HOST);
KLU->setup(A);
status = KLU->analyze();
std::cout<<"KLU analysis status: "<<status<<std::endl;
}
if (i < 2){
status = KLU->factorize();
std::cout<<"KLU factorization status: "<<status<<std::endl;
} else {
Expand Down
13 changes: 8 additions & 5 deletions examples/sysRefactor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ int main(int argc, char *argv[])
else if (opt->second == "cpu")
{
sysRefactor<ReSolve::LinAlgWorkspaceCpu>(argc, argv);
}
}
else
{
std::cout << "Re::Solve is not built with support for " << opt->second;
Expand Down Expand Up @@ -108,6 +108,12 @@ int sysRefactor(int argc, char *argv[])
CliOptions options(argc, argv);
CliOptions::Option* opt = nullptr;

bool is_help = options.hasKey("-h");
if (is_help) {
printHelpInfo();
return 0;
}

bool is_iterative_refinement = options.hasKey("-i");

index_type num_systems = 0;
Expand Down Expand Up @@ -171,7 +177,7 @@ int sysRefactor(int argc, char *argv[])
// Create system solver
std::string refactor("none");
if (hw_backend == "CUDA") {
refactor = "cusolverrf";
refactor = "glu";
} else if (hw_backend == "HIP") {
refactor = "rocsolverrf";
} else {
Expand Down Expand Up @@ -276,9 +282,6 @@ int sysRefactor(int argc, char *argv[])
status = solver.refactorizationSetup();
std::cout << "Refactorization setup status: " << status << std::endl;

// Refactorize on the device
status = solver.refactorize();
std::cout << "Refactorization on the device status: " << status << std::endl;
} else {
// Refactorize on the device
status = solver.refactorize();
Expand Down
22 changes: 12 additions & 10 deletions resolve/SystemSolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ namespace ReSolve
int SystemSolver::factorize()
{
if (factorizationMethod_ == "klu") {
is_solve_on_device_ = false;
return factorizationSolver_->factorize();
}
return 1;
Expand All @@ -346,7 +347,8 @@ namespace ReSolve
if (refactorizationMethod_ == "glu" ||
refactorizationMethod_ == "cusolverrf" ||
refactorizationMethod_ == "rocsolverrf") {
return refactorizationSolver_->refactorize();
is_solve_on_device_ = true;
return refactorizationSolver_->refactorize();
}

return 1;
Expand Down Expand Up @@ -385,7 +387,7 @@ namespace ReSolve

#ifdef RESOLVE_USE_CUDA
if (refactorizationMethod_ == "glu") {
isSolveOnDevice_ = true;
is_solve_on_device_ = true;
status += refactorizationSolver_->setup(A_, L_, U_, P_, Q_);
}
if (refactorizationMethod_ == "cusolverrf") {
Expand All @@ -394,13 +396,13 @@ namespace ReSolve
LinSolverDirectCuSolverRf* Rf = dynamic_cast<LinSolverDirectCuSolverRf*>(refactorizationSolver_);
Rf->setNumericalProperties(1e-14, 1e-1);

isSolveOnDevice_ = true;
is_solve_on_device_ = false;
}
#endif

#ifdef RESOLVE_USE_HIP
if (refactorizationMethod_ == "rocsolverrf") {
isSolveOnDevice_ = true;
is_solve_on_device_ = false;
auto* Rf = dynamic_cast<LinSolverDirectRocSolverRf*>(refactorizationSolver_);
Rf->setSolveMode(1);
status += refactorizationSolver_->setup(A_, L_, U_, P_, Q_, resVector_);
Expand Down Expand Up @@ -444,15 +446,15 @@ namespace ReSolve
}

if (solveMethod_ == "glu" || solveMethod_ == "cusolverrf" || solveMethod_ == "rocsolverrf") {
if (isSolveOnDevice_) {
if (is_solve_on_device_) {
status += refactorizationSolver_->solve(rhs, x);
} else {
status += factorizationSolver_->solve(rhs, x);
}
}

if (irMethod_ == "fgmres") {
if (isSolveOnDevice_) {
if (is_solve_on_device_) {
status += refine(rhs, x);
}
}
Expand All @@ -465,7 +467,7 @@ namespace ReSolve
if (precondition_method_ == "ilu0") {
status += preconditioner_->setup(A_);
if (memspace_ != "cpu") {
isSolveOnDevice_ = true;
is_solve_on_device_ = true;
}
iterativeSolver_->setupPreconditioner("LU", preconditioner_);
}
Expand Down Expand Up @@ -632,7 +634,7 @@ namespace ReSolve
norm_b = std::sqrt(vectorHandler_->dot(rhs, rhs, memory::HOST));
#if defined(RESOLVE_USE_HIP) || defined(RESOLVE_USE_CUDA)
} else if (memspace_ == "cuda" || memspace_ == "hip") {
if (isSolveOnDevice_) {
if (is_solve_on_device_) {
norm_b = std::sqrt(vectorHandler_->dot(rhs, rhs, memory::DEVICE));
} else {
norm_b = std::sqrt(vectorHandler_->dot(rhs, rhs, memory::HOST));
Expand All @@ -657,7 +659,7 @@ namespace ReSolve
norm_b = std::sqrt(vectorHandler_->dot(resVector_, resVector_, memory::HOST));
#if defined(RESOLVE_USE_HIP) || defined(RESOLVE_USE_CUDA)
} else if (memspace_ == "cuda" || memspace_ == "hip") {
if (isSolveOnDevice_) {
if (is_solve_on_device_) {
resVector_->copyDataFrom(rhs, memory::DEVICE, memory::DEVICE);
norm_b = std::sqrt(vectorHandler_->dot(resVector_, resVector_, memory::DEVICE));
} else {
Expand Down Expand Up @@ -689,7 +691,7 @@ namespace ReSolve
resVector_->copyDataFrom(rhs, memory::HOST, memory::HOST);
#if defined(RESOLVE_USE_HIP) || defined(RESOLVE_USE_CUDA)
} else if (memspace_ == "cuda" || memspace_ == "hip") {
if (isSolveOnDevice_) {
if (is_solve_on_device_) {
resVector_->copyDataFrom(rhs, memory::DEVICE, memory::DEVICE);
} else {
resVector_->copyDataFrom(rhs, memory::HOST, memory::DEVICE);
Expand Down
2 changes: 1 addition & 1 deletion resolve/SystemSolver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ namespace ReSolve
MatrixHandler* matrixHandler_{nullptr};
VectorHandler* vectorHandler_{nullptr};

bool isSolveOnDevice_{false};
bool is_solve_on_device_{false};

matrix_type* L_{nullptr};
matrix_type* U_{nullptr};
Expand Down