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

Issue 4283: Amesos2 staticprofile #4350

Merged
merged 3 commits into from
Feb 10, 2019
Merged

Issue 4283: Amesos2 staticprofile #4350

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
0969b4d
updating amesos2 unit test to use static profile outside of matrix ma…
GeoffDanielson Feb 8, 2019
2589d61
update Solver and Adapter tests to use StaticProfile for CrsMatrices
GeoffDanielson Feb 8, 2019
06ebb30
identity matrix confusion
GeoffDanielson Feb 8, 2019
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
4 changes: 2 additions & 2 deletions packages/amesos2/test/adapters/Tpetra_CrsMatrix_Adapter_UnitTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ namespace {
// create a Map
const size_t numLocal = 10;
RCP<Map<LO,GO,Node> > map = rcp( new Map<LO,GO,Node>(INVALID,numLocal,0,comm) );
RCP<MAT> eye = rcp( new MAT(map,1) );
RCP<MAT> eye = rcp( new MAT(map,1,Tpetra::StaticProfile) );
GO base = numLocal*rank;
for( size_t i = 0; i < numLocal; ++i ){
eye->insertGlobalValues(base+i,tuple<GO>(base+i),tuple<Scalar>(ST::one()));
Expand Down Expand Up @@ -227,7 +227,7 @@ namespace {
// create a Map
const size_t numLocal = 10;
RCP<Map<LO,GO,Node> > map = rcp( new Map<LO,GO,Node>(INVALID,numLocal,0,comm) );
RCP<MAT> eye = rcp( new MAT(map,1) );
RCP<MAT> eye = rcp( new MAT(map,1,Tpetra::StaticProfile) );
GO base = numLocal*rank;
for( size_t i = 0; i < numLocal; ++i ){
eye->insertGlobalValues(base+i,tuple<GO>(base+i),tuple<Scalar>(ST::one()));
Expand Down
2 changes: 1 addition & 1 deletion packages/amesos2/test/solvers/SolverFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ namespace {
const size_t maxNumEntPerRow = 3;
const SC two = static_cast<SC> (2.0);
const SC minusOne = static_cast<SC> (-1.0);
RCP<MAT> A (new MAT (rowMap, maxNumEntPerRow, Tpetra::DynamicProfile));
RCP<MAT> A (new MAT (rowMap, maxNumEntPerRow, Tpetra::StaticProfile));

if (rowMap->getNodeNumElements () != 0) {
for (LO lclRow = rowMap->getMinLocalIndex ();
Expand Down