From 1ea9f7f624a4d32f46c167e832cc24683894383b Mon Sep 17 00:00:00 2001 From: David Wells Date: Sun, 14 Feb 2021 18:32:11 -0500 Subject: [PATCH] Move LA::CommunicationBase -> U::M::CommunicationBase. Things use this outside of linear algebra classes now so we should move it out of LinearAlgebra. While here I changed some default arguments that had gotten rather long. --- doc/news/changes/minor/20210215DavidWells | 4 + .../deal.II/base/communication_pattern_base.h | 75 +++++++++++++++++++ .../base/mpi_noncontiguous_partitioner.h | 4 +- .../mpi_noncontiguous_partitioner.templates.h | 1 - include/deal.II/base/partitioner.h | 4 +- .../deal.II/lac/communication_pattern_base.h | 52 +++---------- include/deal.II/lac/cuda_vector.h | 11 ++- .../deal.II/lac/la_parallel_block_vector.h | 9 +-- .../lac/la_parallel_block_vector.templates.h | 7 +- include/deal.II/lac/la_parallel_vector.h | 10 +-- .../lac/la_parallel_vector.templates.h | 7 +- include/deal.II/lac/la_vector.h | 9 +-- include/deal.II/lac/la_vector.templates.h | 7 +- include/deal.II/lac/read_write_vector.h | 38 ++++------ .../deal.II/lac/read_write_vector.templates.h | 16 ++-- .../trilinos_epetra_communication_pattern.h | 7 +- include/deal.II/lac/trilinos_epetra_vector.h | 9 +-- .../trilinos_tpetra_communication_pattern.h | 4 +- include/deal.II/lac/trilinos_tpetra_vector.h | 9 +-- .../lac/trilinos_tpetra_vector.templates.h | 7 +- include/deal.II/lac/vector_space_vector.h | 11 ++- source/lac/cuda_vector.cu | 7 +- source/lac/read_write_vector.cc | 8 +- source/lac/read_write_vector.cu | 8 +- source/lac/trilinos_epetra_vector.cc | 7 +- 25 files changed, 186 insertions(+), 145 deletions(-) create mode 100644 doc/news/changes/minor/20210215DavidWells create mode 100644 include/deal.II/base/communication_pattern_base.h diff --git a/doc/news/changes/minor/20210215DavidWells b/doc/news/changes/minor/20210215DavidWells new file mode 100644 index 0000000000..906a463c6a --- /dev/null +++ b/doc/news/changes/minor/20210215DavidWells @@ -0,0 +1,4 @@ +Moved: The CommunicationPatternBase class has been moved from the LinearAlgebra +namespace into the more general Utilities::MPI namespace. +
+(David Wells, 2021/02/15) diff --git a/include/deal.II/base/communication_pattern_base.h b/include/deal.II/base/communication_pattern_base.h new file mode 100644 index 0000000000..a2aa4a9288 --- /dev/null +++ b/include/deal.II/base/communication_pattern_base.h @@ -0,0 +1,75 @@ +// --------------------------------------------------------------------- +// +// Copyright (C) 2015 - 2020 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE.md at +// the top level directory of deal.II. +// +// --------------------------------------------------------------------- + +#ifndef dealii_base_communication_pattern_base_h +#define dealii_base_communication_pattern_base_h + +#include + +#include + +DEAL_II_NAMESPACE_OPEN + +// Forward declaration +#ifndef DOXYGEN +class IndexSet; +#endif + +namespace Utilities +{ + namespace MPI + { + /** + * CommunicationPattern is an abstract class that is used to define a + * communication plan that can be called repeatedly to efficiently obtain + * off-processor elements. The idea is to decouple the communication pattern + * from the data that needs to be communicated. The goal is to reuse the + * same communication pattern for different containers. This is similar to + * the way SparseMatrix and SparsityPattern works. + */ + class CommunicationPatternBase + { + public: + /** + * Destructor. + */ + virtual ~CommunicationPatternBase() = default; + + /** + * Reinitialize the communication pattern. The first argument + * `vector_space_vector_index_set` is the index set associated to a + * VectorSpaceVector object. The second argument + * `read_write_vector_index_set` is the index set associated to a + * ReadWriteVector object. + */ + virtual void + reinit(const IndexSet &vector_space_vector_index_set, + const IndexSet &read_write_vector_index_set, + const MPI_Comm &communicator) = 0; + + /** + * Return a constant reference to the underlying MPI communicator. + */ + virtual const MPI_Comm & + get_mpi_communicator() const = 0; + }; + + } // namespace MPI + +} // namespace Utilities + +DEAL_II_NAMESPACE_CLOSE + +#endif diff --git a/include/deal.II/base/mpi_noncontiguous_partitioner.h b/include/deal.II/base/mpi_noncontiguous_partitioner.h index de17fc2d77..22c8045bdf 100644 --- a/include/deal.II/base/mpi_noncontiguous_partitioner.h +++ b/include/deal.II/base/mpi_noncontiguous_partitioner.h @@ -18,11 +18,11 @@ #include +#include #include #include #include -#include #include @@ -37,7 +37,7 @@ namespace Utilities * regarding the order of the underlying index sets. */ class NoncontiguousPartitioner - : public dealii::LinearAlgebra::CommunicationPatternBase + : public Utilities::MPI::CommunicationPatternBase { public: /** diff --git a/include/deal.II/base/mpi_noncontiguous_partitioner.templates.h b/include/deal.II/base/mpi_noncontiguous_partitioner.templates.h index 0b0426e526..275d5b442a 100644 --- a/include/deal.II/base/mpi_noncontiguous_partitioner.templates.h +++ b/include/deal.II/base/mpi_noncontiguous_partitioner.templates.h @@ -23,7 +23,6 @@ #include #include -#include #include diff --git a/include/deal.II/base/partitioner.h b/include/deal.II/base/partitioner.h index 33717041e4..495b39fa6a 100644 --- a/include/deal.II/base/partitioner.h +++ b/include/deal.II/base/partitioner.h @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -26,7 +27,6 @@ #include #include -#include #include #include @@ -190,7 +190,7 @@ namespace Utilities * detect this case and only send the selected indices, taken from the * full array of ghost entries. */ - class Partitioner : public ::dealii::LinearAlgebra::CommunicationPatternBase + class Partitioner : public Utilities::MPI::CommunicationPatternBase { public: /** diff --git a/include/deal.II/lac/communication_pattern_base.h b/include/deal.II/lac/communication_pattern_base.h index 7d0cbe49a0..31462677a0 100644 --- a/include/deal.II/lac/communication_pattern_base.h +++ b/include/deal.II/lac/communication_pattern_base.h @@ -13,57 +13,25 @@ // // --------------------------------------------------------------------- -#ifndef dealii_communication_pattern_base_h -#define dealii_communication_pattern_base_h +#ifndef dealii_lac_communication_pattern_base_h +#define dealii_lac_communication_pattern_base_h -#include - -#include +#include DEAL_II_NAMESPACE_OPEN -// Forward declaration -#ifndef DOXYGEN -class IndexSet; -#endif +DEAL_II_WARNING( + "This file is deprecated. Use deal.II/base/communication_pattern_base.h instead!") namespace LinearAlgebra { /** - * CommunicationPattern is an abstract class that is used to define a - * communication plan that can be called repeatedly to efficiently obtain - * off-processor elements. The idea is to decouple the communication pattern - * from the data that needs to be communicated. The goal is to reuse the same - * communication pattern for different containers. - * This is similar to the way SparseMatrix and SparsityPattern works. + * Alias for Utilities::MPI::CommunicationPatternBase. This class was + * originally defined in the LinearAlgebra namespace but is now used for more + * general purposes. */ - class CommunicationPatternBase - { - public: - /** - * Destructor. - */ - virtual ~CommunicationPatternBase() = default; - - /** - * Reinitialize the communication pattern. The first argument - * `vector_space_vector_index_set` is the index set associated to a - * VectorSpaceVector object. The second argument - * `read_write_vector_index_set` is the index set associated to a - * ReadWriteVector object. - */ - virtual void - reinit(const IndexSet &vector_space_vector_index_set, - const IndexSet &read_write_vector_index_set, - const MPI_Comm &communicator) = 0; - - /** - * Return a constant reference to the underlying MPI communicator. - */ - virtual const MPI_Comm & - get_mpi_communicator() const = 0; - }; - + using CommunicationPatternBase DEAL_II_DEPRECATED_EARLY = + Utilities::MPI::CommunicationPatternBase; } // end of namespace LinearAlgebra DEAL_II_NAMESPACE_CLOSE diff --git a/include/deal.II/lac/cuda_vector.h b/include/deal.II/lac/cuda_vector.h index ac9286e057..8f060dbb71 100644 --- a/include/deal.II/lac/cuda_vector.h +++ b/include/deal.II/lac/cuda_vector.h @@ -18,6 +18,7 @@ #include +#include #include #include @@ -30,7 +31,6 @@ DEAL_II_NAMESPACE_OPEN // Forward declarations # ifndef DOXYGEN -class CommunicationPatternBase; template class ReadWriteVector; # endif @@ -141,11 +141,10 @@ namespace LinearAlgebra * copy a vector to the GPU. */ virtual void - import( - const ReadWriteVector & V, - VectorOperation::values operation, - std::shared_ptr communication_pattern = - std::shared_ptr()) override; + import(const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) override; /** * Sets all elements of the vector to the scalar @p s. This operation is diff --git a/include/deal.II/lac/la_parallel_block_vector.h b/include/deal.II/lac/la_parallel_block_vector.h index 9ededf222c..fab566f3ca 100644 --- a/include/deal.II/lac/la_parallel_block_vector.h +++ b/include/deal.II/lac/la_parallel_block_vector.h @@ -476,11 +476,10 @@ namespace LinearAlgebra * improve performance. */ virtual void - import( - const LinearAlgebra::ReadWriteVector & V, - VectorOperation::values operation, - std::shared_ptr communication_pattern = - std::shared_ptr()) override; + import(const LinearAlgebra::ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) override; /** * Return the scalar product of two vectors. diff --git a/include/deal.II/lac/la_parallel_block_vector.templates.h b/include/deal.II/lac/la_parallel_block_vector.templates.h index 0274c0aa93..508901138a 100644 --- a/include/deal.II/lac/la_parallel_block_vector.templates.h +++ b/include/deal.II/lac/la_parallel_block_vector.templates.h @@ -836,9 +836,10 @@ namespace LinearAlgebra template inline void - BlockVector::import(const LinearAlgebra::ReadWriteVector &, - VectorOperation::values, - std::shared_ptr) + BlockVector::import( + const LinearAlgebra::ReadWriteVector &, + VectorOperation::values, + std::shared_ptr) { AssertThrow(false, ExcNotImplemented()); } diff --git a/include/deal.II/lac/la_parallel_vector.h b/include/deal.II/lac/la_parallel_vector.h index 209de68f5c..cc24098626 100644 --- a/include/deal.II/lac/la_parallel_vector.h +++ b/include/deal.II/lac/la_parallel_vector.h @@ -18,6 +18,7 @@ #include +#include #include #include #include @@ -720,11 +721,10 @@ namespace LinearAlgebra * be moved to the device. */ virtual void - import( - const LinearAlgebra::ReadWriteVector & V, - VectorOperation::values operation, - std::shared_ptr communication_pattern = - std::shared_ptr()) override; + import(const LinearAlgebra::ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) override; /** * Return the scalar product of two vectors. diff --git a/include/deal.II/lac/la_parallel_vector.templates.h b/include/deal.II/lac/la_parallel_vector.templates.h index 28c4330265..b9cfcced07 100644 --- a/include/deal.II/lac/la_parallel_vector.templates.h +++ b/include/deal.II/lac/la_parallel_vector.templates.h @@ -1282,9 +1282,10 @@ namespace LinearAlgebra template void Vector::import( - const ReadWriteVector & V, - VectorOperation::values operation, - std::shared_ptr communication_pattern) + const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern) { // If no communication pattern is given, create one. Otherwise, use the // given one. diff --git a/include/deal.II/lac/la_vector.h b/include/deal.II/lac/la_vector.h index 6029cb6254..67dc707f03 100644 --- a/include/deal.II/lac/la_vector.h +++ b/include/deal.II/lac/la_vector.h @@ -220,11 +220,10 @@ namespace LinearAlgebra * This function is not implemented and will throw an exception. */ virtual void - import( - const ReadWriteVector & V, - VectorOperation::values operation, - std::shared_ptr communication_pattern = - std::shared_ptr()) override; + import(const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) override; /** * Add @p a to all components. Note that @p a is a scalar not a vector. diff --git a/include/deal.II/lac/la_vector.templates.h b/include/deal.II/lac/la_vector.templates.h index 118d16c3d4..c0b304b993 100644 --- a/include/deal.II/lac/la_vector.templates.h +++ b/include/deal.II/lac/la_vector.templates.h @@ -250,9 +250,10 @@ namespace LinearAlgebra template void - Vector::import(const ReadWriteVector &, - VectorOperation::values, - std::shared_ptr) + Vector::import( + const ReadWriteVector &, + VectorOperation::values, + std::shared_ptr) { AssertThrow(false, ExcMessage("This function is not implemented.")); } diff --git a/include/deal.II/lac/read_write_vector.h b/include/deal.II/lac/read_write_vector.h index bb6f47e98d..db11b9cd3d 100644 --- a/include/deal.II/lac/read_write_vector.h +++ b/include/deal.II/lac/read_write_vector.h @@ -18,6 +18,7 @@ #include +#include #include #include #include @@ -46,7 +47,6 @@ DEAL_II_NAMESPACE_OPEN #ifndef DOXYGEN namespace LinearAlgebra { - class CommunicationPatternBase; namespace distributed { template @@ -295,9 +295,8 @@ namespace LinearAlgebra void import(const distributed::Vector &vec, VectorOperation::values operation, - const std::shared_ptr - &communication_pattern = - std::shared_ptr()); + const std::shared_ptr + &communication_pattern = {}); #ifdef DEAL_II_WITH_PETSC /** @@ -311,9 +310,8 @@ namespace LinearAlgebra void import(const PETScWrappers::MPI::Vector &petsc_vec, VectorOperation::values operation, - const std::shared_ptr - &communication_pattern = - std::shared_ptr()); + const std::shared_ptr + &communication_pattern = {}); #endif #ifdef DEAL_II_WITH_TRILINOS @@ -330,9 +328,8 @@ namespace LinearAlgebra void import(const TrilinosWrappers::MPI::Vector &trilinos_vec, VectorOperation::values operation, - const std::shared_ptr - &communication_pattern = - std::shared_ptr()); + const std::shared_ptr + &communication_pattern = {}); # ifdef DEAL_II_WITH_MPI # ifdef DEAL_II_TRILINOS_WITH_TPETRA @@ -347,9 +344,8 @@ namespace LinearAlgebra void import(const TpetraWrappers::Vector &tpetra_vec, VectorOperation::values operation, - const std::shared_ptr - &communication_pattern = - std::shared_ptr()); + const std::shared_ptr + &communication_pattern = {}); # endif /** @@ -363,9 +359,8 @@ namespace LinearAlgebra void import(const EpetraWrappers::Vector &epetra_vec, VectorOperation::values operation, - const std::shared_ptr - &communication_pattern = - std::shared_ptr()); + const std::shared_ptr + &communication_pattern = {}); # endif #endif @@ -379,9 +374,8 @@ namespace LinearAlgebra void import(const CUDAWrappers::Vector &cuda_vec, VectorOperation::values operation, - const std::shared_ptr - &communication_pattern = - std::shared_ptr()); + const std::shared_ptr + &communication_pattern = {}); #endif /** @@ -623,7 +617,7 @@ namespace LinearAlgebra const IndexSet & locally_owned_elements, VectorOperation::values operation, const MPI_Comm & mpi_comm, - const std::shared_ptr + const std::shared_ptr &communication_pattern); # endif @@ -637,7 +631,7 @@ namespace LinearAlgebra const IndexSet & locally_owned_elements, VectorOperation::values operation, const MPI_Comm & mpi_comm, - const std::shared_ptr + const std::shared_ptr &communication_pattern); #endif @@ -693,7 +687,7 @@ namespace LinearAlgebra * CommunicationPattern for the communication between the * source_stored_elements IndexSet and the current vector. */ - std::shared_ptr comm_pattern; + std::shared_ptr comm_pattern; /** * Pointer to the array of local elements of this vector. diff --git a/include/deal.II/lac/read_write_vector.templates.h b/include/deal.II/lac/read_write_vector.templates.h index fc563239d5..6d524c1ad4 100644 --- a/include/deal.II/lac/read_write_vector.templates.h +++ b/include/deal.II/lac/read_write_vector.templates.h @@ -413,7 +413,7 @@ namespace LinearAlgebra ReadWriteVector::import( const distributed::Vector &vec, VectorOperation::values operation, - const std::shared_ptr + const std::shared_ptr &communication_pattern) { // If no communication pattern is given, create one. Otherwise, use the @@ -481,7 +481,7 @@ namespace LinearAlgebra ReadWriteVector::import( const PETScWrappers::MPI::Vector &petsc_vec, VectorOperation::values /*operation*/, - const std::shared_ptr + const std::shared_ptr & /*communication_pattern*/) { // TODO: this works only if no communication is needed. @@ -514,7 +514,7 @@ namespace LinearAlgebra const IndexSet & source_elements, VectorOperation::values operation, const MPI_Comm & mpi_comm, - const std::shared_ptr + const std::shared_ptr &communication_pattern) { std::shared_ptr @@ -631,7 +631,7 @@ namespace LinearAlgebra const IndexSet & source_elements, VectorOperation::values operation, const MPI_Comm & mpi_comm, - const std::shared_ptr + const std::shared_ptr &communication_pattern) { std::shared_ptr @@ -770,7 +770,7 @@ namespace LinearAlgebra ReadWriteVector::import( const TrilinosWrappers::MPI::Vector &trilinos_vec, VectorOperation::values operation, - const std::shared_ptr + const std::shared_ptr &communication_pattern) { // While the import does work with Trilinos 12.8.x, it fails with 12.4.x. To @@ -795,7 +795,7 @@ namespace LinearAlgebra ReadWriteVector::import( const LinearAlgebra::TpetraWrappers::Vector &trilinos_vec, VectorOperation::values operation, - const std::shared_ptr + const std::shared_ptr &communication_pattern) { import(trilinos_vec.trilinos_vector(), @@ -813,7 +813,7 @@ namespace LinearAlgebra ReadWriteVector::import( const LinearAlgebra::EpetraWrappers::Vector &trilinos_vec, VectorOperation::values operation, - const std::shared_ptr + const std::shared_ptr &communication_pattern) { import(trilinos_vec.trilinos_vector(), @@ -832,7 +832,7 @@ namespace LinearAlgebra ReadWriteVector::import( const LinearAlgebra::CUDAWrappers::Vector &cuda_vec, VectorOperation::values operation, - const std::shared_ptr &) + const std::shared_ptr &) { const unsigned int n_elements = stored_elements.n_elements(); if (operation == VectorOperation::insert) diff --git a/include/deal.II/lac/trilinos_epetra_communication_pattern.h b/include/deal.II/lac/trilinos_epetra_communication_pattern.h index 20a08ff3a8..e92996ffab 100644 --- a/include/deal.II/lac/trilinos_epetra_communication_pattern.h +++ b/include/deal.II/lac/trilinos_epetra_communication_pattern.h @@ -23,7 +23,7 @@ # ifdef DEAL_II_WITH_MPI -# include +# include # include @@ -37,9 +37,10 @@ namespace LinearAlgebra { /** * This class implements a wrapper to a Trilinos Epetra_Import object, - * for use in places where a CommunicationPatternBase object is required. + * for use in places where a Utilities::MPI::CommunicationPatternBase object + * is required. */ - class CommunicationPattern : public CommunicationPatternBase + class CommunicationPattern : public Utilities::MPI::CommunicationPatternBase { public: /** diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h index 34ab495165..97fbc2eba7 100644 --- a/include/deal.II/lac/trilinos_epetra_vector.h +++ b/include/deal.II/lac/trilinos_epetra_vector.h @@ -127,11 +127,10 @@ namespace LinearAlgebra * improve performance. */ virtual void - import( - const ReadWriteVector & V, - VectorOperation::values operation, - std::shared_ptr communication_pattern = - std::shared_ptr()) override; + import(const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) override; /** * Multiply the entire vector by a fixed factor. diff --git a/include/deal.II/lac/trilinos_tpetra_communication_pattern.h b/include/deal.II/lac/trilinos_tpetra_communication_pattern.h index 841b57b56b..b8d1e115d8 100644 --- a/include/deal.II/lac/trilinos_tpetra_communication_pattern.h +++ b/include/deal.II/lac/trilinos_tpetra_communication_pattern.h @@ -21,7 +21,7 @@ #if defined(DEAL_II_TRILINOS_WITH_TPETRA) && defined(DEAL_II_WITH_MPI) -# include +# include # include # include @@ -37,7 +37,7 @@ namespace LinearAlgebra /** * This class implements a wrapper to Tpetra::Import and Tpetra::Export. */ - class CommunicationPattern : public CommunicationPatternBase + class CommunicationPattern : public Utilities::MPI::CommunicationPatternBase { public: /** diff --git a/include/deal.II/lac/trilinos_tpetra_vector.h b/include/deal.II/lac/trilinos_tpetra_vector.h index 95fb600629..6dba150bd2 100644 --- a/include/deal.II/lac/trilinos_tpetra_vector.h +++ b/include/deal.II/lac/trilinos_tpetra_vector.h @@ -150,11 +150,10 @@ namespace LinearAlgebra * improve performance. */ virtual void - import( - const ReadWriteVector & V, - VectorOperation::values operation, - std::shared_ptr communication_pattern = - std::shared_ptr()) override; + import(const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) override; /** * Multiply the entire vector by a fixed factor. diff --git a/include/deal.II/lac/trilinos_tpetra_vector.templates.h b/include/deal.II/lac/trilinos_tpetra_vector.templates.h index d75d263d5a..7924dc5850 100644 --- a/include/deal.II/lac/trilinos_tpetra_vector.templates.h +++ b/include/deal.II/lac/trilinos_tpetra_vector.templates.h @@ -165,9 +165,10 @@ namespace LinearAlgebra template void Vector::import( - const ReadWriteVector & V, - VectorOperation::values operation, - std::shared_ptr communication_pattern) + const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern) { // If no communication pattern is given, create one. Otherwise, use the // one given. diff --git a/include/deal.II/lac/vector_space_vector.h b/include/deal.II/lac/vector_space_vector.h index cd05644767..9b8166f9c6 100644 --- a/include/deal.II/lac/vector_space_vector.h +++ b/include/deal.II/lac/vector_space_vector.h @@ -18,6 +18,7 @@ #include +#include #include #include @@ -32,7 +33,6 @@ DEAL_II_NAMESPACE_OPEN class IndexSet; namespace LinearAlgebra { - class CommunicationPatternBase; template class ReadWriteVector; } // namespace LinearAlgebra @@ -107,11 +107,10 @@ namespace LinearAlgebra * performance. */ virtual void - import( - const ReadWriteVector & V, - VectorOperation::values operation, - std::shared_ptr communication_pattern = - std::shared_ptr()) = 0; + import(const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern = {}) = 0; /** * Return the scalar product of two vectors. diff --git a/source/lac/cuda_vector.cu b/source/lac/cuda_vector.cu index d5712fdb66..1c81e54d1b 100644 --- a/source/lac/cuda_vector.cu +++ b/source/lac/cuda_vector.cu @@ -126,9 +126,10 @@ namespace LinearAlgebra template void - Vector::import(const ReadWriteVector &V, - VectorOperation::values operation, - std::shared_ptr) + Vector::import( + const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr) { if (operation == VectorOperation::insert) { diff --git a/source/lac/read_write_vector.cc b/source/lac/read_write_vector.cc index b031eebc92..08149dd141 100644 --- a/source/lac/read_write_vector.cc +++ b/source/lac/read_write_vector.cc @@ -45,27 +45,27 @@ namespace LinearAlgebra ReadWriteVector::import( const distributed::Vector &, VectorOperation::values, - const std::shared_ptr &); + const std::shared_ptr &); template void ReadWriteVector::import( const distributed::Vector &, VectorOperation::values, - const std::shared_ptr &); + const std::shared_ptr &); # ifdef DEAL_II_WITH_COMPLEX_VALUES template void ReadWriteVector>::import( const distributed::Vector, ::dealii::MemorySpace::Host> &, VectorOperation::values, - const std::shared_ptr &); + const std::shared_ptr &); template void ReadWriteVector>::import( const distributed::Vector, ::dealii::MemorySpace::Host> &, VectorOperation::values, - const std::shared_ptr &); + const std::shared_ptr &); # endif #endif } // namespace LinearAlgebra diff --git a/source/lac/read_write_vector.cu b/source/lac/read_write_vector.cu index dd39d52c25..b507fc6745 100644 --- a/source/lac/read_write_vector.cu +++ b/source/lac/read_write_vector.cu @@ -25,23 +25,23 @@ namespace LinearAlgebra ReadWriteVector::import( const CUDAWrappers::Vector &, VectorOperation::values, - const std::shared_ptr &); + const std::shared_ptr &); template void ReadWriteVector::import( const distributed::Vector &, VectorOperation::values, - const std::shared_ptr &); + const std::shared_ptr &); template void ReadWriteVector::import( const CUDAWrappers::Vector &, VectorOperation::values, - const std::shared_ptr &); + const std::shared_ptr &); template void ReadWriteVector::import( const distributed::Vector &, VectorOperation::values, - const std::shared_ptr &); + const std::shared_ptr &); } // namespace LinearAlgebra DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/trilinos_epetra_vector.cc b/source/lac/trilinos_epetra_vector.cc index 54b4587642..4e63d877de 100644 --- a/source/lac/trilinos_epetra_vector.cc +++ b/source/lac/trilinos_epetra_vector.cc @@ -145,9 +145,10 @@ namespace LinearAlgebra void Vector::import( - const ReadWriteVector & V, - VectorOperation::values operation, - std::shared_ptr communication_pattern) + const ReadWriteVector &V, + VectorOperation::values operation, + std::shared_ptr + communication_pattern) { // If no communication pattern is given, create one. Otherwise, use the // one given. -- 2.39.5