Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tpetra: restore original ETI types for normImpl #4967

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions packages/tpetra/core/src/Tpetra_Details_normImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,11 @@
#include "Tpetra_Details_normImpl_def.hpp"
#include "TpetraCore_ETIHelperMacros.h"


#if defined(HAVE_TPETRA_INST_INT_INT)
// don't need to do anything; Scalar=int is already added
# define TPETRA_DETAILS_NORMIMPL_INSTANT_INT( NODE )
#else
# define TPETRA_DETAILS_NORMIMPL_INSTANT_INT( NODE ) \
TPETRA_DETAILS_NORMIMPL_INSTANT( int, NODE )
#endif

namespace Tpetra {

TPETRA_ETI_MANGLING_TYPEDEFS()

TPETRA_INSTANTIATE_SN( TPETRA_DETAILS_NORMIMPL_INSTANT )
TPETRA_INSTANTIATE_N( TPETRA_DETAILS_NORMIMPL_INSTANT_INT )

#ifdef HAVE_TPETRA_INST_CUDA

Expand All @@ -76,9 +66,6 @@ namespace Tpetra {
TPETRA_DETAILS_NORMIMPL_INSTANT( S, cuda_host_mirror_device_type )

TPETRA_INSTANTIATE_S( TPETRA_DETAILS_NORMIMPL_INSTANT_CUDAHOSTMIRROR )
#if ! defined(HAVE_TPETRA_INST_INT_INT)
TPETRA_DETAILS_NORMIMPL_INSTANT_CUDAHOSTMIRROR( int )
#endif

#endif // HAVE_TPETRA_INST_CUDA

Expand Down