Skip to content

Commit

Permalink
Merge branch 'xpetra-mv' into zoltan2-tpetra-dep
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Bettencourt committed Jun 9, 2021
2 parents c33766e + a16dc99 commit 04a6171
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 56 deletions.
2 changes: 1 addition & 1 deletion packages/xpetra/src/BlockedCrsMatrix/Xpetra_MapExtractor_def.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ const RCP<Xpetra::Vector<Scalar,LocalOrdinal,GlobalOrdinal,Node> > vv = Xpetra::
// WCMCLEN - ETI: but BlockedMultiVector::setMultiVector() does... should this be using bfull.
full->setMultiVector(block, partial, bThyraMode);
#else
throw std::runtime_error("Xpetra::MultiVector::setMultiVector() doesn't exist.");
throw std::runtime_error("Xpetra::MultiVector::setMultiVector() doesn't exist in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#endif
}
}
Expand Down
72 changes: 36 additions & 36 deletions packages/xpetra/src/CrsMatrix/Xpetra_TpetraBlockCrsMatrix_def.hpp
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions packages/xpetra/src/Map/Xpetra_EpetraMap.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ namespace Xpetra {
using local_map_type = typename Map<LocalOrdinal, GlobalOrdinal, Node>::local_map_type;
/// \brief Get the local Map for Kokkos kernels.
local_map_type getLocalMap () const {
throw std::runtime_error("Xpetra::EpetraMap::getLocalMap is not implemented.");
throw std::runtime_error("Xpetra::EpetraMap::getLocalMap is not implemented in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
}
#else
#ifdef __GNUC__
Expand Down Expand Up @@ -656,7 +656,7 @@ namespace Xpetra {

//! Replace this Map's communicator with a subset communicator.
RCP<const Map<int,GlobalOrdinal,Node> > replaceCommWithSubset(const Teuchos::RCP< const Teuchos::Comm< int > > &/* newComm */) const {
throw std::runtime_error("Xpetra::EpetraMapT::replaceCommWithSubset has not yet been implemented.");
throw std::runtime_error("Xpetra::EpetraMapT::replaceCommWithSubset has not yet been implemented in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
TEUCHOS_UNREACHABLE_RETURN(Teuchos::null);
}

Expand Down Expand Up @@ -698,7 +698,7 @@ namespace Xpetra {
using local_map_type = typename Map<LocalOrdinal, GlobalOrdinal, Node>::local_map_type;
/// \brief Get the local Map for Kokkos kernels.
local_map_type getLocalMap () const {
throw std::runtime_error("Xpetra::EpetraMap::getLocalMap is not implemented.");
throw std::runtime_error("Xpetra::EpetraMap::getLocalMap is not implemented in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
}

private:
Expand Down Expand Up @@ -1092,7 +1092,7 @@ namespace Xpetra {

//! Replace this Map's communicator with a subset communicator.
RCP<const Map<int,GlobalOrdinal,Node> > replaceCommWithSubset(const Teuchos::RCP< const Teuchos::Comm< int > > &/* newComm */) const {
throw std::runtime_error("Xpetra::EpetraMapT::replaceCommWithSubset has not yet been implemented.");
throw std::runtime_error("Xpetra::EpetraMapT::replaceCommWithSubset has not yet been implemented in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
// return Teuchos::null; // unreachable
}

Expand Down Expand Up @@ -1132,7 +1132,7 @@ namespace Xpetra {
using local_map_type = typename Map<LocalOrdinal, GlobalOrdinal, Node>::local_map_type;
/// \brief Get the local Map for Kokkos kernels.
local_map_type getLocalMap () const {
throw std::runtime_error("Xpetra::EpetraMap::getLocalMap is not implemented.");
throw std::runtime_error("Xpetra::EpetraMap::getLocalMap is not implemented in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
}

private:
Expand Down
8 changes: 4 additions & 4 deletions packages/xpetra/src/MultiVector/Xpetra_EpetraIntMultiVector.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,15 +334,15 @@ const Epetra_IntMultiVector & toEpetra(const MultiVector<int, int, GlobalOrdinal
typedef typename Xpetra::MultiVector<Scalar, LocalOrdinal, GlobalOrdinal, Node>::dual_view_type dual_view_type;

typename dual_view_type::t_host_um getHostLocalView () const {
throw std::runtime_error("EpetraIntVector does not support device views! Must be implemented extra...");
throw std::runtime_error("EpetraIntVector does not support device views! Must be implemented extra... in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_host_um ret;
#endif
TEUCHOS_UNREACHABLE_RETURN(ret);
}

typename dual_view_type::t_dev_um getDeviceLocalView() const {
throw std::runtime_error("Epetra does not support device views!");
throw std::runtime_error("Epetra does not support device views! in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_dev_um ret;
#endif
Expand Down Expand Up @@ -756,7 +756,7 @@ const Epetra_IntMultiVector & toEpetra(const MultiVector<int, int, GlobalOrdinal
}

typename dual_view_type::t_dev_um getDeviceLocalView() const {
throw std::runtime_error("Epetra does not support device views!");
throw std::runtime_error("Epetra does not support device views! in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_dev_um ret;
#endif
Expand Down Expand Up @@ -1197,7 +1197,7 @@ const Epetra_IntMultiVector & toEpetra(const MultiVector<int, int, GlobalOrdinal
}

typename dual_view_type::t_dev_um getDeviceLocalView() const {
throw std::runtime_error("Epetra does not support device views!");
throw std::runtime_error("Epetra does not support device views! in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_dev_um ret;
#endif
Expand Down
6 changes: 3 additions & 3 deletions packages/xpetra/src/MultiVector/Xpetra_EpetraMultiVector.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ namespace Xpetra {
}

typename dual_view_type::t_dev_um getDeviceLocalView() const {
throw std::runtime_error("Epetra does not support device views!");
throw std::runtime_error("Epetra does not support device views! in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_dev_um ret;
#endif
Expand Down Expand Up @@ -698,7 +698,7 @@ namespace Xpetra {
}

typename dual_view_type::t_dev_um getDeviceLocalView(Access::ReadWriteStruct) const {
throw std::runtime_error("Epetra does not support device views!");
throw std::runtime_error("Epetra does not support device views! in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_dev_um ret;
#endif
Expand Down Expand Up @@ -1102,7 +1102,7 @@ namespace Xpetra {
}

typename dual_view_type::t_dev_um getDeviceLocalView() const {
throw std::runtime_error("Epetra does not support device views!");
throw std::runtime_error("Epetra does not support device views! in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_dev_um ret;
#endif
Expand Down
8 changes: 4 additions & 4 deletions packages/xpetra/src/Vector/Xpetra_EpetraIntVector.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,15 +312,15 @@ const Epetra_IntVector & toEpetra(const Vector<int, int, GlobalOrdinal, Node> &)
typedef typename Xpetra::MultiVector<Scalar, LocalOrdinal, GlobalOrdinal, Node>::dual_view_type dual_view_type;

typename dual_view_type::t_host_um getHostLocalView () const {
throw std::runtime_error("EpetraIntVector does not support device views! Must be implemented extra...");
throw std::runtime_error("EpetraIntVector does not support device views! Must be implemented extra... in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_host_um ret;
#endif
TEUCHOS_UNREACHABLE_RETURN(ret);
}

typename dual_view_type::t_dev_um getDeviceLocalView() const {
throw std::runtime_error("Epetra does not support device views!");
throw std::runtime_error("Epetra does not support device views! in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_dev_um ret;
#endif
Expand Down Expand Up @@ -730,7 +730,7 @@ const Epetra_IntVector & toEpetra(const Vector<int, int, GlobalOrdinal, Node> &)
}

typename dual_view_type::t_dev_um getDeviceLocalView() const {
throw std::runtime_error("Epetra does not support device views!");
throw std::runtime_error("Epetra does not support device views! in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_dev_um ret;
#endif
Expand Down Expand Up @@ -1168,7 +1168,7 @@ const Epetra_IntVector & toEpetra(const Vector<int, int, GlobalOrdinal, Node> &)
}

typename dual_view_type::t_dev_um getDeviceLocalView() const {
throw std::runtime_error("Epetra does not support device views!");
throw std::runtime_error("Epetra does not support device views! in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_dev_um ret;
#endif
Expand Down
6 changes: 3 additions & 3 deletions packages/xpetra/src/Vector/Xpetra_EpetraVector.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ class EpetraVectorT
}

typename dual_view_type::t_dev_um getDeviceLocalView() const {
throw std::runtime_error("Epetra does not support device views!");
throw std::runtime_error("Epetra does not support device views! in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_dev ret;
#endif
Expand Down Expand Up @@ -401,7 +401,7 @@ class EpetraVectorT<int, EpetraNode>
}

typename dual_view_type::t_dev_um getDeviceLocalView() const {
throw std::runtime_error("Epetra does not support device views!");
throw std::runtime_error("Epetra does not support device views! in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_dev ret;
#endif
Expand Down Expand Up @@ -597,7 +597,7 @@ class EpetraVectorT<long long, EpetraNode>
}

typename dual_view_type::t_dev_um getDeviceLocalView() const {
throw std::runtime_error("Epetra does not support device views!");
throw std::runtime_error("Epetra does not support device views! in "+std::string(__FILE__)+":"+std::to_string(__LINE__));
#ifndef __NVCC__ //prevent nvcc warning
typename dual_view_type::t_dev ret;
#endif
Expand Down

0 comments on commit 04a6171

Please sign in to comment.