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

Template TrilinosWrappers::Vector on memory space #16565

Merged
merged 2 commits into from
Jan 31, 2024
Merged

Template TrilinosWrappers::Vector on memory space #16565

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18b2d1f
Template TrilinosWrappers::Vector on memory space
masterleinad Jan 30, 2024
0c40265
Provide a default template parameter for VectorReference's MemorySpace
masterleinad Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/deal.II/base/template_constraints.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ namespace LinearAlgebra
# ifdef DEAL_II_TRILINOS_WITH_TPETRA
namespace TpetraWrappers
{
template <typename Number>
template <typename Number, typename MemorySpace>
class Vector;

template <typename Number, typename MemorySpace>
Expand Down
12 changes: 8 additions & 4 deletions include/deal.II/lac/trilinos_tpetra_sparse_matrix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,8 @@ namespace LinearAlgebra
* of the matrix.
*/
void
vmult(Vector<Number> &dst, const Vector<Number> &src) const;
vmult(Vector<Number, MemorySpace> &dst,
const Vector<Number, MemorySpace> &src) const;

/*
* Matrix-vector multiplication: let <i>dst = M<sup>T</sup>*src</i> with
Expand All @@ -474,7 +475,8 @@ namespace LinearAlgebra
* Source and destination must not be the same vector.
*/
void
Tvmult(Vector<Number> &dst, const Vector<Number> &src) const;
Tvmult(Vector<Number, MemorySpace> &dst,
const Vector<Number, MemorySpace> &src) const;

/**
* Adding matrix-vector multiplication. Add <i>M*src</i> on <i>dst</i>
Expand All @@ -483,7 +485,8 @@ namespace LinearAlgebra
* Source and destination must not be the same vector.
*/
void
vmult_add(Vector<Number> &dst, const Vector<Number> &src) const;
vmult_add(Vector<Number, MemorySpace> &dst,
const Vector<Number, MemorySpace> &src) const;


/**
Expand All @@ -494,7 +497,8 @@ namespace LinearAlgebra
* Source and destination must not be the same vector.
*/
void
Tvmult_add(Vector<Number> &dst, const Vector<Number> &src) const;
Tvmult_add(Vector<Number, MemorySpace> &dst,
const Vector<Number, MemorySpace> &src) const;
/** @} */

/**
Expand Down
18 changes: 10 additions & 8 deletions include/deal.II/lac/trilinos_tpetra_sparse_matrix.templates.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,8 +585,9 @@ namespace LinearAlgebra

template <typename Number, typename MemorySpace>
void
SparseMatrix<Number, MemorySpace>::vmult(Vector<Number> &dst,
const Vector<Number> &src) const
SparseMatrix<Number, MemorySpace>::vmult(
Vector<Number, MemorySpace> &dst,
const Vector<Number, MemorySpace> &src) const
{
Assert(&src != &dst, ExcSourceEqualsDestination());
Assert(matrix->isFillComplete(), ExcMatrixNotCompressed());
Expand All @@ -601,8 +602,9 @@ namespace LinearAlgebra

template <typename Number, typename MemorySpace>
void
SparseMatrix<Number, MemorySpace>::Tvmult(Vector<Number> &dst,
const Vector<Number> &src) const
SparseMatrix<Number, MemorySpace>::Tvmult(
Vector<Number, MemorySpace> &dst,
const Vector<Number, MemorySpace> &src) const
{
Assert(&src != &dst, ExcSourceEqualsDestination());
Assert(matrix->isFillComplete(), ExcMatrixNotCompressed());
Expand All @@ -618,8 +620,8 @@ namespace LinearAlgebra
template <typename Number, typename MemorySpace>
void
SparseMatrix<Number, MemorySpace>::vmult_add(
Vector<Number> &dst,
const Vector<Number> &src) const
Vector<Number, MemorySpace> &dst,
const Vector<Number, MemorySpace> &src) const
{
Assert(&src != &dst, ExcSourceEqualsDestination());
Assert(matrix->isFillComplete(), ExcMatrixNotCompressed());
Expand All @@ -639,8 +641,8 @@ namespace LinearAlgebra
template <typename Number, typename MemorySpace>
void
SparseMatrix<Number, MemorySpace>::Tvmult_add(
Vector<Number> &dst,
const Vector<Number> &src) const
Vector<Number, MemorySpace> &dst,
const Vector<Number, MemorySpace> &src) const
{
Assert(&src != &dst, ExcSourceEqualsDestination());
Assert(matrix->isFillComplete(), ExcMatrixNotCompressed());
Expand Down