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

WIP (Do Not Merge!!): Belos Small Dense Matrix Abstraction #11837

Draft
wants to merge 111 commits into
base: develop
Choose a base branch
from
Draft

WIP (Do Not Merge!!): Belos Small Dense Matrix Abstraction #11837

wants to merge 111 commits into from
+12,440 −3,736

Conversation

jennloe
Copy link
Contributor

@jennloe jennloe commented May 1, 2023

Belos small dense matrix refactor in progress...

@jennloe jennloe added pkg: Belos pkg: Anasazi AT: WIP Causes the PR autotester to not test the PR. (Remove to allow testing to occur.) labels May 1, 2023
jennloe
jennloe commented Jun 26, 2023
View reviewed changes
packages/belos/kokkos/example/bcsstk09.mtx Outdated Show resolved Hide resolved
packages/belos/kokkos/example/ex_real_A.cpp Outdated Show resolved Hide resolved
packages/belos/kokkos/example/CMakeLists.txt Outdated Show resolved Hide resolved
packages/belos/kokkos/example/gmres.hpp Outdated Show resolved Hide resolved
@jhux2 jhux2 mentioned this pull request Jul 10, 2023
Closed
@hkthorn hkthorn force-pushed the DenseAbstract branch 2 times, most recently from 109d85a to e15a45e Compare August 7, 2024 18:43
@hkthorn hkthorn force-pushed the DenseAbstract branch 2 times, most recently from 9fe0ad1 to 21240dc Compare September 25, 2024 17:24
@hkthorn hkthorn force-pushed the DenseAbstract branch 2 times, most recently from cc025aa to dc7541f Compare October 6, 2024 19:39
@hkthorn hkthorn added the AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration label Oct 7, 2024
@jennloe @hkthorn
Added DenseMatrix template param to Belos::MultiVecTraits.
3918791 
Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
Add Dense template paramter to solver manager base class and solver f…
24b1046 
…actory classes.

Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
Remove Serial Dense from ICGSOrthoMgr
39e0a9e 
Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
Removed Serial Dense from MatOrthoMgr.
8c1b272 
Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
Removed SerialDense from OrthoMgr.
3646dc8 
Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
Added Dense param to blockGMRESIter.
8d30df4 
Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
Added template param to Gmres iterations.
4f1748e 
Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
Add dense param to GMRES sol mgr and base class.
17ca189 
Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
Added template param to FGmres iter and OrthoMgrFactory.
c077b4c 
Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
First attempt at outlining a few Dense Matrix Traits.
18ff6cb 
Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
Add header file to Belos src needed for Thyra to compile.
f780e33 
Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
Updated DenseMatrixAdapter functions. Wrote a partial Teuchos Serial …
7da2d02 
…Dense adapter and test. It compiles and runs

Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
Expanded MultiVec Traits and corresponding Teuchos adapter, which pas…
38ff04e 
…ses basic tests.

Signed-off-by: Heidi Thornquist <[email protected]>
@jennloe @hkthorn
BlockGmres solver partially running through dense mat traits
8893619 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Consolidates Teuchos::ScalarTraits typedefs
a5aa188 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Corrects use of DMT::Value to DMT::ValueConst.
e71b3b3 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Comments out failing BiCGStab test
15b859f 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Adding new tests to exercise orthogonalization options with GCRODR
b5c457f 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Adding method to debugging output to enable better understanding of p…
36cad14 
…erformance

Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Completes integration of DenseMatrixTraits
0d626f5 
The DenseMatrixTraits have been integrated into GCRODR such that
the solver can use Kokkos::DualView objects for dense matrices.

Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Changes scalar values from SerialDenseMatrix to std::vector<>
ea9fef8 
This will simplify the transition to using the templated dense
matrix type.

Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Moves several dense matrix objects to std::vector objects
c8de5f2 
Coefficient vectors like alpha, beta, and d do not need to be
dense matrix objects.

Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Remove unnecessary header
229faf5 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Code cleanup to remove unnecessary dense matrix views
01501c0 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Final clean up before dense matrix traits transformation of RCG
38f583b 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Convert SerialDenseMatrix objects to dense matrix traits.
cbc66aa 
Only the multiply methods need to be converted to BLAS methods.

Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Cleans up use of MvAddMv to use Assign when more appropriate
49ecb6a 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Finishes migration of GEMM calls to use Teuchos::BLAS class
da718e5 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Removes unused one/zero definitions after MvAddMv -> Assign changes
4a6d9f0 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Fixes RCG solver to be correct with Kokkos::DualView
f3b6150 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Removes unused zero and one definitions
6ea88bd 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Fix deprecated std::random_shuffle call
97ff0f7 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Update pseudo-block solvers for dense matrix abstraction
ed50aea 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Fixes block GCRODR to compile with updated dense matrix traits
9c71f51 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Cleaning up unnecessary examples, per Jennifer's note, before final c…
cc9c739 
…ommit

Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Removes dependence of GmresIteration on Teuchos::SerialDenseMatrix
88a4c2a 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Adds Teuchos_SerialDenseMatrix and Teuchos_SerialDenseVector headers
8997f4b 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Adds some checks to avoid compiler errors on unused variables.
5bad92c 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Adds Teuchos::SerialDenseMatrix as default dense matrix in template
2301a0a 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Adds dense matrix traits to the partial specialization of GenResSubNorm
0b93907 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Removes template argument with default value since default value is b…
801f778 
…eing used.

Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Remove unused local variables
18026cf 
Signed-off-by: Heidi Thornquist <[email protected]>
@hkthorn
Comment out complex GCRODR test temporarily.
bfe6ddf 
Signed-off-by: Heidi Thornquist <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hkthorn hkthorn hkthorn left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration AT: WIP Causes the PR autotester to not test the PR. (Remove to allow testing to occur.) pkg: Anasazi pkg: Belos
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jennloe @hkthorn