From 403bb6baeeb44b0cf1953e81194f6e77844ef8e9 Mon Sep 17 00:00:00 2001 From: Matt Bettencourt Date: Wed, 9 Jun 2021 13:48:39 -0400 Subject: [PATCH] removed unused typedefs to reduce warnings --- packages/thyra/adapters/tpetra/src/Thyra_TpetraVector_def.hpp | 1 - packages/tpetra/core/src/Tpetra_BlockMultiVector_def.hpp | 2 -- packages/tpetra/core/src/Tpetra_FECrsMatrix_def.hpp | 1 - packages/tpetra/core/src/Tpetra_MultiVector_def.hpp | 1 - .../tpetra/core/src/Tpetra_computeRowAndColumnOneNorms_def.hpp | 3 --- .../core/src/Tpetra_leftAndOrRightScaleCrsMatrix_def.hpp | 1 - 6 files changed, 9 deletions(-) diff --git a/packages/thyra/adapters/tpetra/src/Thyra_TpetraVector_def.hpp b/packages/thyra/adapters/tpetra/src/Thyra_TpetraVector_def.hpp index 57bfb80cbdc3..74e8f84a0381 100644 --- a/packages/thyra/adapters/tpetra/src/Thyra_TpetraVector_def.hpp +++ b/packages/thyra/adapters/tpetra/src/Thyra_TpetraVector_def.hpp @@ -471,7 +471,6 @@ void TpetraVector::applyImpl( { // Try to extract Tpetra objects from X and Y typedef Tpetra::MultiVector TMV; - typedef Tpetra::Vector TV; Teuchos::RCP X_tpetra = this->getConstTpetraMultiVector(Teuchos::rcpFromRef(X)); Teuchos::RCP Y_tpetra = this->getTpetraMultiVector(Teuchos::rcpFromPtr(Y)); diff --git a/packages/tpetra/core/src/Tpetra_BlockMultiVector_def.hpp b/packages/tpetra/core/src/Tpetra_BlockMultiVector_def.hpp index 57041f279838..96603bd020b5 100644 --- a/packages/tpetra/core/src/Tpetra_BlockMultiVector_def.hpp +++ b/packages/tpetra/core/src/Tpetra_BlockMultiVector_def.hpp @@ -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 ()) { @@ -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 (alpha); diff --git a/packages/tpetra/core/src/Tpetra_FECrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_FECrsMatrix_def.hpp index 10476a1e23b0..e4111822c5f6 100644 --- a/packages/tpetra/core/src/Tpetra_FECrsMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_FECrsMatrix_def.hpp @@ -57,7 +57,6 @@ FECrsMatrix(const Teuchos::RCP& graph, { const char tfecfFuncName[] = "FECrsMatrix(RCP[, RCP]): "; - 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."); diff --git a/packages/tpetra/core/src/Tpetra_MultiVector_def.hpp b/packages/tpetra/core/src/Tpetra_MultiVector_def.hpp index bdf596511f46..268069247ec0 100644 --- a/packages/tpetra/core/src/Tpetra_MultiVector_def.hpp +++ b/packages/tpetra/core/src/Tpetra_MultiVector_def.hpp @@ -4675,7 +4675,6 @@ namespace Tpetra { isSameSize (const MultiVector& vec) const { using ::Tpetra::Details::PackTraits; - using ST = impl_scalar_type; const size_t l1 = this->getLocalLength(); const size_t l2 = vec.getLocalLength(); diff --git a/packages/tpetra/core/src/Tpetra_computeRowAndColumnOneNorms_def.hpp b/packages/tpetra/core/src/Tpetra_computeRowAndColumnOneNorms_def.hpp index 60c844740590..d5c4a09df5e1 100644 --- a/packages/tpetra/core/src/Tpetra_computeRowAndColumnOneNorms_def.hpp +++ b/packages/tpetra/core/src/Tpetra_computeRowAndColumnOneNorms_def.hpp @@ -742,7 +742,6 @@ auto getLocalView_1d_writeOnly ( Kokkos::ALL (), whichColumn); } else { - using vector_t = Tpetra::Vector; auto X_whichColumn = X.getVectorNonConst (whichColumn); return Kokkos::subview(X_whichColumn->getLocalViewDevice(Access::ReadWrite), Kokkos::ALL (), 0); @@ -756,7 +755,6 @@ copy1DViewIntoMultiVectorColumn ( const LO whichColumn, const Kokkos::View& 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); } @@ -768,7 +766,6 @@ copyMultiVectorColumnInto1DView ( Tpetra::MultiVector& 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); } diff --git a/packages/tpetra/core/src/Tpetra_leftAndOrRightScaleCrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_leftAndOrRightScaleCrsMatrix_def.hpp index d480a9ecccd4..7e29ce882c66 100644 --- a/packages/tpetra/core/src/Tpetra_leftAndOrRightScaleCrsMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_leftAndOrRightScaleCrsMatrix_def.hpp @@ -136,7 +136,6 @@ leftAndOrRightScaleCrsMatrix (Tpetra::CrsMatrix& A, using device_type = typename NT::device_type; using dev_memory_space = typename device_type::memory_space; using mag_type = typename Kokkos::ArithTraits::mag_type; - using vec_type = Tpetra::Vector; const char prefix[] = "leftAndOrRightScaleCrsMatrix: "; const bool debug = ::Tpetra::Details::Behavior::debug ();