Skip to content

Commit

Permalink
Tpetra: Fix #387 (Get rid of Tpetra::DistObjectKA)
Browse files Browse the repository at this point in the history
Build/Test Cases Summary
Enabled Packages: Ifpack2, TeuchosNumerics, TpetraCore
Disabled Packages: FEI,PyTrilinos,Moertel,STK,SEACAS,ThreadPool,OptiPack,Rythmos
0) MPI_DEBUG => passed: passed=133,notpassed=0 (5.44 min)
1) SERIAL_RELEASE => passed: passed=106,notpassed=0 (3.66 min)
Other local commits for this build/test group: a12c0b0, 9e4b37a
  • Loading branch information
Mark Hoemmen committed Jun 5, 2016
1 parent a12c0b0 commit 8b1d148
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 1,417 deletions.
8 changes: 7 additions & 1 deletion packages/tpetra/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,15 @@ TRIBITS_ADD_OPTION_AND_DEFINE(
TRIBITS_ADD_OPTION_AND_DEFINE(
Tpetra_ENABLE_Kokkos_DistObject
TPETRA_ENABLE_KOKKOS_DISTOBJECT
"Experimental option to access alternate DistObject interface, DistObjectKA."
"Experimental option to access alternate DistObject interface, DistObjectKA. This option has been DEPRECATED and must no longer be set. See Github Issue #387. Do NOT set this option."
OFF
)
IF (DEFINED Tpetra_ENABLE_Kokkos_DistObject)
IF (Tpetra_ENABLE_Kokkos_DistObject)
MESSAGE(FATAL_ERROR "The Tpetra_ENABLE_Kokkos_DistObject option has been DEPRECATED and must no longer be set. See Github Issue #387.")
ENDIF ()
ENDIF ()


TRIBITS_ADD_OPTION_AND_DEFINE(
Tpetra_ENABLE_MMM_Timings
Expand Down
12 changes: 0 additions & 12 deletions packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6976,18 +6976,6 @@ namespace Tpetra {
}

// Pack & Prepare w/ owning PIDs
//
// FIXME (mfh 15 May 2014) This should work fine if CrsMatrix
// inherits from DistObject (in which case all arrays that get
// passed in here are Teuchos::Array), but it won't work if
// CrsMatrix inherits from DistObjectKA (in which case all arrays
// that get passed in here are Kokkos::View). In the latter case,
// exports_ and numExportPacketsPerLID_ each have only a device
// view.
//
// Currently, CrsMatrix inherits from DistObject, not
// DistObjectKA, so the code below should be fine for the Kokkos
// refactor version of CrsMatrix.
#ifdef HAVE_TPETRA_DEBUG
{
using Teuchos::outArg;
Expand Down
66 changes: 0 additions & 66 deletions packages/tpetra/core/src/Tpetra_DistObjectKA.cpp

This file was deleted.

Loading

0 comments on commit 8b1d148

Please sign in to comment.