Skip to content
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

Jump to bottom

Add chebyshev Iteration #1289

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
+1,791 −59
Open

Add chebyshev Iteration #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b2a0aae
init chebyshev
yhmtsai Feb 22, 2023
5bac351
add the check for kept data and remove lend
yhmtsai Mar 21, 2023
1a25917
core test
yhmtsai Mar 21, 2023
677dc12
change to foci
yhmtsai Mar 21, 2023
ae8a263
use iteration from stop criterion and update doc
yhmtsai Aug 3, 2023
7e06d5c
extract the split residual update and update test
yhmtsai Aug 8, 2023
7d4ba1a
use preconditioner not inner_solver for chebyshev
yhmtsai Aug 8, 2023
e9812c3
add chebyshev test and fix the number of generated
yhmtsai Aug 9, 2023
666b6da
use scalar from ws and move some local variables
yhmtsai Sep 12, 2023
b46103b
review update
yhmtsai Jan 11, 2024
d408177
update with new format
yhmtsai Jan 11, 2024
fb78c1c
update format
yhmtsai Jun 28, 2024
46d7df3
add config for chebyshev
yhmtsai Jun 28, 2024
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
3 changes: 2 additions & 1 deletion core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ target_sources(${ginkgo_core}
matrix/scaled_permutation.cpp
matrix/sellp.cpp
matrix/sparsity_csr.cpp
multigrid/pgm.cpp
multigrid/fixed_coarsening.cpp
multigrid/pgm.cpp
preconditioner/batch_jacobi.cpp
preconditioner/gauss_seidel.cpp
preconditioner/sor.cpp
Expand All @@ -105,6 +105,7 @@ target_sources(${ginkgo_core}
solver/cb_gmres.cpp
solver/cg.cpp
solver/cgs.cpp
solver/chebyshev.cpp
solver/direct.cpp
solver/fcg.cpp
solver/gcr.cpp
Expand Down
8 changes: 4 additions & 4 deletions core/config/config_helper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ namespace gko {
namespace config {


#define GKO_INVALID_CONFIG_VALUE(_entry, _value) \
GKO_INVALID_STATE(std::string("The value >" + _value + \
"< is invalid for the entry >" + _entry + \
"<"))
#define GKO_INVALID_CONFIG_VALUE(_entry, _value) \
GKO_INVALID_STATE(std::string("The value >") + _value + \
"< is invalid for the entry >" + _entry + "<")


#define GKO_MISSING_CONFIG_ENTRY(_entry) \
Expand All @@ -52,6 +51,7 @@ enum class LinOpFactoryType : int {
Direct,
LowerTrs,
UpperTrs,
Chebyshev,
Factorization_Ic,
Factorization_Ilu,
Cholesky,
Expand Down
1 change: 1 addition & 0 deletions core/config/registry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ configuration_map generate_config_map()
{"solver::Direct", parse<LinOpFactoryType::Direct>},
{"solver::LowerTrs", parse<LinOpFactoryType::LowerTrs>},
{"solver::UpperTrs", parse<LinOpFactoryType::UpperTrs>},
{"solver::Chebyshev", parse<LinOpFactoryType::Chebyshev>},
{"factorization::Ic", parse<LinOpFactoryType::Factorization_Ic>},
{"factorization::Ilu", parse<LinOpFactoryType::Factorization_Ilu>},
{"factorization::Cholesky", parse<LinOpFactoryType::Cholesky>},
Expand Down
2 changes: 2 additions & 0 deletions core/config/solver_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <ginkgo/core/solver/cb_gmres.hpp>
#include <ginkgo/core/solver/cg.hpp>
#include <ginkgo/core/solver/cgs.hpp>
#include <ginkgo/core/solver/chebyshev.hpp>
#include <ginkgo/core/solver/direct.hpp>
#include <ginkgo/core/solver/fcg.hpp>
#include <ginkgo/core/solver/gcr.hpp>
Expand Down Expand Up @@ -43,6 +44,7 @@ GKO_PARSE_VALUE_TYPE(CbGmres, gko::solver::CbGmres);
GKO_PARSE_VALUE_AND_INDEX_TYPE(Direct, gko::experimental::solver::Direct);
GKO_PARSE_VALUE_AND_INDEX_TYPE(LowerTrs, gko::solver::LowerTrs);
GKO_PARSE_VALUE_AND_INDEX_TYPE(UpperTrs, gko::solver::UpperTrs);
GKO_PARSE_VALUE_TYPE(Chebyshev, gko::solver::Chebyshev);


template <>
Expand Down
Loading
Loading