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

Tpetra: Add missing syncs/modifies in BlockMultiVector unit tests #8499

Merged
merged 3 commits into from
Dec 19, 2020
+7 −12
Merged

Tpetra: Add missing syncs/modifies in BlockMultiVector unit tests #8499

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d385fb
Tpetra: add missing sync/modify in BlockMultiVector MVView unit test
tasmith4 Dec 18, 2020
44d1a31
Tpetra: fix typos and delete unused code in BlockMultiVector Import test
tasmith4 Dec 18, 2020
9a94dab
Tpetra: add missing syncs/modifies in BlockMultiVector Import test
tasmith4 Dec 18, 2020
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
19 changes: 7 additions & 12 deletions packages/tpetra/core/test/Block/BlockMultiVector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ namespace {
//RCP<const map_type> mapPtr = Teuchos::rcpFromRef (map); // nonowning RCP

BMV X (meshMap, blockSize, numVecs);
X.sync_host();

typedef typename BMV::mv_type mv_type;
mv_type X_mv = X.getMultiVectorView ();
Expand Down Expand Up @@ -305,6 +306,7 @@ namespace {
X_5_1(i) = static_cast<Scalar> (i + 1); // all are nonzero
}
TEST_ASSERT( ! equal (X_5_1, zeroLittleVector) && ! equal (zeroLittleVector, X_5_1) );
X.modify_host();

// Make sure that getLocalBlock() returns a read-and-write view,
// not a deep copy. Do this by calling getLocalBlock(5,1) again,
Expand Down Expand Up @@ -413,6 +415,8 @@ namespace {

BMV X (meshMap, blockSize, numVecs);
BMV Y (overlappingMeshMap, blockSize, numVecs);
X.sync_host();
Y.sync_host();

//
// Fill X with meaningful things to test Import with REPLACE combine mode.
Expand All @@ -427,16 +431,6 @@ namespace {
TEST_ASSERT( X_overlap.data () != NULL );
TEST_EQUALITY_CONST( static_cast<size_t> (X_overlap.extent (0)), static_cast<size_t> (blockSize) );

// {
// std::ostringstream os;
// os << "Proc " << myRank
// << ": X_overlap.data() = " << X_overlap.data ()
// << ", X_overlap.getBlockSize() = " << X_overlap.getBlockSize ()
// << ", meshMap.getMinGlobalIndex() = " << meshMap.getMinGlobalIndex ()
// << std::endl;
// std::cerr << os.str ();
// }

{
const int lclOk = (X_overlap.data () != NULL &&
static_cast<size_t> (X_overlap.extent (0)) == static_cast<size_t> (blockSize)) ? 1 : 0;
Expand All @@ -450,11 +444,12 @@ namespace {
for (LO i = 0; i < blockSize; ++i) {
X_overlap(i) = static_cast<Scalar> (i+1);
}
X.modify_host();

{ // BlockMultiVector relies on the point multivector infrastructure
const auto pointMehsMap = BMV::makePointMap(meshMap, blockSize);
const auto pointMeshMap = BMV::makePointMap(meshMap, blockSize);
const auto pointOverlappingMeshMap = BMV::makePointMap(overlappingMeshMap, blockSize);
import_type pointImport (rcpFromRef (pointMehsMap), rcpFromRef (pointOverlappingMeshMap));
import_type pointImport (rcpFromRef (pointMeshMap), rcpFromRef (pointOverlappingMeshMap));
Y.getMultiVectorView().doImport (X.getMultiVectorView(), pointImport, Tpetra::REPLACE);
}

Expand Down