Skip to content

Bring in Ruiz scaling implementation #1

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
jsandham merged 3 commits into from
Jul 30, 2026
Merged

Bring in Ruiz scaling implementation #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8bdb03
Add ruiz scaling to csr_matrix
jsandham Jul 25, 2026
fda3c59
Add GPU ruiz symmetric scaling
jsandham Jul 29, 2026
ca147ea
Add missing limits and cmath includes
jsandham Jul 30, 2026
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
8 changes: 4 additions & 4 deletions clients/examples/rsamg_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ int main()
control.rel_tol = 1e-08;
control.abs_tol = 1e-08;

// int cycles = linalg::amg_solve(hierachy, x.data(), b.data(), 10, 10, Cycle::Vcycle, Smoother::Gauss_Seidel, control);
// int cycles = linalg::amg_solve(hierachy, x.data(), b.data(), 2, 2, Cycle::Wcycle, Smoother::Gauss_Seidel, control);
// int cycles = linalg::amg_solve(hierachy, x.data(), b.data(), 2, 2, Cycle::Wcycle, Smoother::SOR, control);
// int cycles = linalg::amg_solve(hierachy, x.data(), b.data(), 10, 10, cycle::vcycle, smoother::gauss_seidel, control);
// int cycles = linalg::amg_solve(hierachy, x.data(), b.data(), 2, 2, cycle::wcycle, smoother::gauss_seidel, control);
// int cycles = linalg::amg_solve(hierachy, x.data(), b.data(), 2, 2, cycle::wcycle, smoother::SOR, control);

// // Print solution
// std::cout << "x" << std::endl;
Expand All @@ -63,4 +63,4 @@ int main()
// std::cout << "" << std::endl;

return 0;
}
}
9 changes: 5 additions & 4 deletions clients/examples/saamg_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ int main()
control.rel_tol = 1e-08;
control.abs_tol = 1e-08;

int cycles = linalg::amg_solve(hierachy, x, b, 2, 1, linalg::Cycle::Vcycle, linalg::Smoother::Gauss_Seidel, control);
//int cycles = linalg::amg_solve(hierachy, x, b, 2, 1, linalg::Cycle::Wcycle, linalg::Smoother::Gauss_Seidel, control);
//int cycles = linalg::amg_solve(hierachy, x, b, 2, 1, linalg::Cycle::Wcycle, linalg::Smoother::Gauss_Seidel, control);
int cycles = linalg::amg_solve(
hierachy, x, b, 2, 1, linalg::cycle::vcycle, linalg::smoother::gauss_seidel, control);
//int cycles = linalg::amg_solve(hierachy, x, b, 2, 1, linalg::cycle::wcycle, linalg::smoother::gauss_seidel, control);
//int cycles = linalg::amg_solve(hierachy, x, b, 2, 1, linalg::cycle::wcycle, linalg::smoother::gauss_seidel, control);

// // Print solution
// std::cout << "x" << std::endl;
Expand All @@ -63,4 +64,4 @@ int main()
// std::cout << "" << std::endl;

return 0;
}
}
5 changes: 3 additions & 2 deletions clients/examples/uaamg_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ int main()
control.rel_tol = 1e-08;
control.abs_tol = 1e-08;

int cycles = linalg::amg_solve(hierachy, x, b, 2, 2, linalg::Cycle::Wcycle, linalg::Smoother::Gauss_Seidel, control);
int cycles = linalg::amg_solve(
hierachy, x, b, 2, 2, linalg::cycle::wcycle, linalg::smoother::gauss_seidel, control);

// // Print solution
// std::cout << "x" << std::endl;
Expand All @@ -61,4 +62,4 @@ int main()
// std::cout << "" << std::endl;

return 0;
}
}
2 changes: 2 additions & 0 deletions clients/testing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ target_sources(test_main
test_functions_spgeam.cpp
test_functions_transpose.cpp
test_functions_transpose_dense.cpp
test_functions_ruiz_scaling.cpp
test_functions_symmetric_ruiz_scaling.cpp
test_functions_csric0.cpp
test_functions_csrilu0.cpp
test_functions_tridiagonal_solver.cpp
Expand Down
14 changes: 7 additions & 7 deletions clients/testing/test_arguments.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ namespace testing
struct Arguments
{
testing::category category; // iterative_solvers, math, primitive
testing::fixture fixture; // Jacobi, CG, SpMV, ExclusiveScan, etc
testing::fixture fixture; // jacobi, CG, SpMV, exclusive_scan, etc
std::string group; // small, medium, large, etc
std::string filename; // bmwcra_1.mtx, shipsec1.mtx, etc
testing::backend backend; // CPU, GPU
testing::uplo uplo; // Lower, Upper
testing::uplo uplo; // lower, upper
testing::preconditioner precond_type;
testing::cycle_type cycle_type;
testing::smoother_type smoother_type;
Expand All @@ -62,23 +62,23 @@ namespace testing
{
name += "_" + backend_to_string(this->backend);
}
if(this->uplo != uplo::Lower)
if(this->uplo != uplo::lower)
{
name += "_" + uplo_to_string(this->uplo);
}
if(this->precond_type != preconditioner::None)
if(this->precond_type != preconditioner::none)
{
name += "_" + preconditioner_to_string(this->precond_type);
}
if(this->cycle_type != cycle_type::None)
if(this->cycle_type != cycle_type::none)
{
name += "_" + cycle_type_to_string(this->cycle_type);
}
if(this->smoother_type != smoother_type::None)
if(this->smoother_type != smoother_type::none)
{
name += "_" + smoother_type_to_string(this->smoother_type);
}
if(this->pivoting_strategy != pivoting_strategy::None)
if(this->pivoting_strategy != pivoting_strategy::none)
{
name += "_" + pivoting_strategy_to_string(this->pivoting_strategy);
}
Expand Down
Loading
Loading