Skip to content

Commit

Permalink
Tpetra,MueLu: Fix another shadowing warning
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Hoemmen committed Jul 3, 2018
1 parent 21fd2d2 commit b1b11f8
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions packages/tpetra/core/ext/TpetraExt_MatrixMatrix_OpenMP.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@

#ifdef HAVE_TPETRA_INST_OPENMP
namespace Tpetra {
namespace MMdetails {
namespace MMdetails {

/*********************************************************************************************************/
/*********************************************************************************************************/
// MMM KernelWrappers for Partial Specialization to OpenMP
template<class Scalar,
class LocalOrdinal,
Expand Down Expand Up @@ -113,14 +113,14 @@ struct KernelWrappers2<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosO
/*********************************************************************************************************/
template<class Scalar,
class LocalOrdinal,
class GlobalOrdinal,
class GlobalOrdinal,
class LocalOrdinalViewType>
void KernelWrappers<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpenMPWrapperNode,LocalOrdinalViewType>::mult_A_B_newmatrix_kernel_wrapper(CrsMatrixStruct<Scalar, LocalOrdinal, GlobalOrdinal, Kokkos::Compat::KokkosOpenMPWrapperNode>& Aview,
CrsMatrixStruct<Scalar, LocalOrdinal, GlobalOrdinal, Kokkos::Compat::KokkosOpenMPWrapperNode>& Bview,
const LocalOrdinalViewType & Acol2Brow,
const LocalOrdinalViewType & Acol2Irow,
const LocalOrdinalViewType & Bcol2Ccol,
const LocalOrdinalViewType & Icol2Ccol,
const LocalOrdinalViewType & Icol2Ccol,
CrsMatrix<Scalar, LocalOrdinal, GlobalOrdinal, Kokkos::Compat::KokkosOpenMPWrapperNode>& C,
Teuchos::RCP<const Import<LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpenMPWrapperNode> > Cimport,
const std::string& label,
Expand All @@ -137,8 +137,7 @@ void KernelWrappers<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpen

// Lots and lots of typedefs
using Teuchos::RCP;
typedef Kokkos::Compat::KokkosOpenMPWrapperNode Node;
typedef typename Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>::local_matrix_type KCRS;
typedef typename Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpenMPWrapperNode>::local_matrix_type KCRS;
typedef typename KCRS::device_type device_t;
typedef typename KCRS::StaticCrsGraphType graph_t;
typedef typename graph_t::row_map_type::non_const_type lno_view_t;
Expand Down Expand Up @@ -168,7 +167,7 @@ void KernelWrappers<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpen
#endif
// KokkosKernelsHandle
typedef KokkosKernels::Experimental::KokkosKernelsHandle<
typename lno_view_t::const_value_type,typename lno_nnz_view_t::const_value_type, typename scalar_view_t::const_value_type,
typename lno_view_t::const_value_type,typename lno_nnz_view_t::const_value_type, typename scalar_view_t::const_value_type,
typename device_t::execution_space, typename device_t::memory_space,typename device_t::memory_space > KernelHandle;

// Grab the Kokkos::SparseCrsMatrices
Expand Down Expand Up @@ -264,14 +263,14 @@ void KernelWrappers<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpen
/*********************************************************************************************************/
template<class Scalar,
class LocalOrdinal,
class GlobalOrdinal,
class GlobalOrdinal,
class LocalOrdinalViewType>
void KernelWrappers<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpenMPWrapperNode,LocalOrdinalViewType>::mult_A_B_reuse_kernel_wrapper(CrsMatrixStruct<Scalar, LocalOrdinal, GlobalOrdinal, Kokkos::Compat::KokkosOpenMPWrapperNode>& Aview,
CrsMatrixStruct<Scalar, LocalOrdinal, GlobalOrdinal, Kokkos::Compat::KokkosOpenMPWrapperNode>& Bview,
const LocalOrdinalViewType & Acol2Brow,
const LocalOrdinalViewType & Acol2Irow,
const LocalOrdinalViewType & Bcol2Ccol,
const LocalOrdinalViewType & Icol2Ccol,
const LocalOrdinalViewType & Icol2Ccol,
CrsMatrix<Scalar, LocalOrdinal, GlobalOrdinal, Kokkos::Compat::KokkosOpenMPWrapperNode>& C,
Teuchos::RCP<const Import<LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpenMPWrapperNode> > Cimport,
const std::string& label,
Expand Down Expand Up @@ -313,7 +312,7 @@ void KernelWrappers<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpen
/*********************************************************************************************************/
template<class Scalar,
class LocalOrdinal,
class GlobalOrdinal,
class GlobalOrdinal,
class LocalOrdinalViewType>
void KernelWrappers2<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpenMPWrapperNode,LocalOrdinalViewType>::jacobi_A_B_newmatrix_kernel_wrapper(Scalar omega,
const Vector<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpenMPWrapperNode> & Dinv,
Expand All @@ -322,7 +321,7 @@ void KernelWrappers2<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpe
const LocalOrdinalViewType & Acol2Brow,
const LocalOrdinalViewType & Acol2Irow,
const LocalOrdinalViewType & Bcol2Ccol,
const LocalOrdinalViewType & Icol2Ccol,
const LocalOrdinalViewType & Icol2Ccol,
CrsMatrix<Scalar, LocalOrdinal, GlobalOrdinal, Kokkos::Compat::KokkosOpenMPWrapperNode>& C,
Teuchos::RCP<const Import<LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpenMPWrapperNode> > Cimport,
const std::string& label,
Expand Down Expand Up @@ -350,7 +349,7 @@ void KernelWrappers2<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpe
if(myalg == "LTG") {
// Use the LTG kernel if requested
::Tpetra::MatrixMatrix::ExtraKernels::jacobi_A_B_newmatrix_LowThreadGustavsonKernel(omega,Dinv,Aview,Bview,Acol2Brow,Acol2Irow,Bcol2Ccol,Icol2Ccol,C,Cimport,label,params);
}
}
else if(myalg == "MSAK") {
::Tpetra::MatrixMatrix::ExtraKernels::jacobi_A_B_newmatrix_MultiplyScaleAddKernel(omega,Dinv,Aview,Bview,Acol2Brow,Acol2Irow,Bcol2Ccol,Icol2Ccol,C,Cimport,label,params);
}
Expand Down Expand Up @@ -380,7 +379,7 @@ void KernelWrappers2<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpe
/*********************************************************************************************************/
template<class Scalar,
class LocalOrdinal,
class GlobalOrdinal,
class GlobalOrdinal,
class LocalOrdinalViewType>
void KernelWrappers2<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpenMPWrapperNode,LocalOrdinalViewType>::jacobi_A_B_reuse_kernel_wrapper(Scalar omega,
const Vector<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpenMPWrapperNode> & Dinv,
Expand All @@ -389,7 +388,7 @@ void KernelWrappers2<Scalar,LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpe
const LocalOrdinalViewType & Acol2Brow,
const LocalOrdinalViewType & Acol2Irow,
const LocalOrdinalViewType & Bcol2Ccol,
const LocalOrdinalViewType & Icol2Ccol,
const LocalOrdinalViewType & Icol2Ccol,
CrsMatrix<Scalar, LocalOrdinal, GlobalOrdinal, Kokkos::Compat::KokkosOpenMPWrapperNode>& C,
Teuchos::RCP<const Import<LocalOrdinal,GlobalOrdinal,Kokkos::Compat::KokkosOpenMPWrapperNode> > Cimport,
const std::string& label,
Expand Down

0 comments on commit b1b11f8

Please sign in to comment.