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

Merge trilinos/develop into e3sm-project/develop #113

Merged
merged 3 commits into from
Mar 8, 2024
Merged

Merge trilinos/develop into e3sm-project/develop #113

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e69578e
Panzer MiniEM interpolation: Fix memory spaces
cgcgcg Mar 7, 2024
e612049
Merge Pull Request #12803 from cgcgcg/Trilinos/miniemInterpolationFix
trilinos-autotester Mar 7, 2024
8a2a231
Merge remote-tracking branch 'upstream/develop' into develop
bartgol Mar 8, 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
9 changes: 4 additions & 5 deletions packages/panzer/mini-em/src/solvers/MiniEM_Interpolation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,8 @@ Teko::LinearOp buildInterpolation(const Teuchos::RCP<const panzer::LinearObjFact

// estimate number of entries per row
// This is an upper bound, as we are counting dofs that are on shared nodes, edges, faces more than once.
// Kokkos::View<size_t*,HostSpace> numEntriesPerRow("numEntriesPerRow", tp_rowmap->getLocalNumElements());
Kokkos::DualView<size_t*, DeviceSpace> numEntriesPerRow("numEntriesPerRow", tp_rowmap->getLocalNumElements());

using dv = Kokkos::DualView<size_t*, typename tp_graph::device_type>;
dv numEntriesPerRow("numEntriesPerRow", tp_rowmap->getLocalNumElements());
{
auto numEntriesPerRow_d = numEntriesPerRow.view_device();

Expand Down Expand Up @@ -220,8 +219,8 @@ Teko::LinearOp buildInterpolation(const Teuchos::RCP<const panzer::LinearObjFact
} //end HO LID loop
});
} // blocks loop
numEntriesPerRow.template modify<DeviceSpace>();
numEntriesPerRow.template sync<HostSpace>();
numEntriesPerRow.template modify<typename dv::t_dev>();
numEntriesPerRow.template sync<typename dv::t_host>();
}

// Set up graph
Expand Down
Loading