Skip to content

Commit

Permalink
Merge Pull Request #9258 from trilinos/Trilinos/tpetra-warnings
Browse files Browse the repository at this point in the history
Automatically Merged using Trilinos Pull Request AutoTester
PR Title: Tpetra warnings
PR Author: bathmatt
  • Loading branch information
trilinos-autotester authored Jun 10, 2021
2 parents a9cd4f1 + 403bb6b commit 64c033e
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ void TpetraVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>::applyImpl(
{
// Try to extract Tpetra objects from X and Y
typedef Tpetra::MultiVector<Scalar,LocalOrdinal,GlobalOrdinal,Node> TMV;
typedef Tpetra::Vector<Scalar,LocalOrdinal,GlobalOrdinal,Node> TV;
Teuchos::RCP<const TMV> X_tpetra = this->getConstTpetraMultiVector(Teuchos::rcpFromRef(X));
Teuchos::RCP<TMV> Y_tpetra = this->getTpetraMultiVector(Teuchos::rcpFromPtr(Y));

Expand Down
2 changes: 0 additions & 2 deletions packages/tpetra/core/src/Tpetra_BlockMultiVector_def.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,6 @@ blockWiseMultiply (const Scalar& alpha,
{
using Kokkos::ALL;
typedef typename device_type::execution_space execution_space;
typedef typename device_type::memory_space memory_space;
const LO lclNumMeshRows = meshMap_.getNodeNumElements ();

if (alpha == STS::zero ()) {
Expand Down Expand Up @@ -857,7 +856,6 @@ blockJacobiUpdate (const Scalar& alpha,
{
using Kokkos::ALL;
using Kokkos::subview;
typedef typename device_type::memory_space memory_space;
typedef impl_scalar_type IST;

const IST alphaImpl = static_cast<IST> (alpha);
Expand Down
1 change: 0 additions & 1 deletion packages/tpetra/core/src/Tpetra_FECrsMatrix_def.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ FECrsMatrix(const Teuchos::RCP<const fe_crs_graph_type>& graph,

{
const char tfecfFuncName[] = "FECrsMatrix(RCP<const FECrsGraph>[, RCP<ParameterList>]): ";
typedef typename local_matrix_device_type::values_type values_type;

TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC
(graph.is_null (), std::runtime_error, "Input graph is null.");
Expand Down
1 change: 0 additions & 1 deletion packages/tpetra/core/src/Tpetra_MultiVector_def.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4675,7 +4675,6 @@ namespace Tpetra {
isSameSize (const MultiVector<Scalar,LocalOrdinal,GlobalOrdinal,Node>& vec) const
{
using ::Tpetra::Details::PackTraits;
using ST = impl_scalar_type;

const size_t l1 = this->getLocalLength();
const size_t l2 = vec.getLocalLength();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,6 @@ auto getLocalView_1d_writeOnly (
Kokkos::ALL (), whichColumn);
}
else {
using vector_t = Tpetra::Vector<SC, LO, GO, NT>;
auto X_whichColumn = X.getVectorNonConst (whichColumn);
return Kokkos::subview(X_whichColumn->getLocalViewDevice(Access::ReadWrite),
Kokkos::ALL (), 0);
Expand All @@ -756,7 +755,6 @@ copy1DViewIntoMultiVectorColumn (
const LO whichColumn,
const Kokkos::View<ViewValueType*, typename NT::device_type>& view)
{
using dev_memory_space = typename NT::device_type::memory_space;
auto X_lcl = getLocalView_1d_writeOnly (X, whichColumn);
Tpetra::Details::copyConvert (X_lcl, view);
}
Expand All @@ -768,7 +766,6 @@ copyMultiVectorColumnInto1DView (
Tpetra::MultiVector<SC, LO, GO, NT>& X,
const LO whichColumn)
{
using dev_memory_space = typename NT::device_type::memory_space;
auto X_lcl = getLocalView_1d_readOnly (X, whichColumn);
Tpetra::Details::copyConvert (view, X_lcl);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ leftAndOrRightScaleCrsMatrix (Tpetra::CrsMatrix<SC, LO, GO, NT>& A,
using device_type = typename NT::device_type;
using dev_memory_space = typename device_type::memory_space;
using mag_type = typename Kokkos::ArithTraits<SC>::mag_type;
using vec_type = Tpetra::Vector<mag_type, LO, GO, NT>;
const char prefix[] = "leftAndOrRightScaleCrsMatrix: ";
const bool debug = ::Tpetra::Details::Behavior::debug ();

Expand Down

0 comments on commit 64c033e

Please sign in to comment.