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.

Sign up for GitHub

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

Stokhos: Purge use of Tpetra::DefaultPlatform from tests & examples #3113

Merged
merged 1 commit into from
Jul 16, 2018
Merged

Stokhos: Purge use of Tpetra::DefaultPlatform from tests & examples #3113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion packages/stokhos/example/experimental/linear2d_diffusion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#include "BelosTpetraAdapter.hpp"
#include "BelosPseudoBlockCGSolMgr.hpp"
#include "BelosPseudoBlockGmresSolMgr.hpp"
#include "Tpetra_Core.hpp"
#include "MatrixMarket_Tpetra.hpp"

// Stokhos Stochastic Galerkin
Expand All @@ -69,7 +70,7 @@ int main(int argc, char *argv[]) {
typedef double BasisScalar;
typedef int LocalOrdinal;
typedef int GlobalOrdinal;
typedef Tpetra::DefaultPlatform::DefaultPlatformType::NodeType Node;
typedef Tpetra::Map<>::node_type Node;

using Teuchos::RCP;
using Teuchos::rcp;
Expand Down
2 changes: 1 addition & 1 deletion packages/stokhos/example/experimental/linear2d_diffusion_pce.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ void PrintMatrix(Teuchos::FancyOStream &fos, Teuchos::RCP<Xpetra_Matrix> const &
int main(int argc, char *argv[]) {
typedef double MeshScalar;
typedef double BasisScalar;
typedef Tpetra::DefaultPlatform::DefaultPlatformType::NodeType Node;
typedef Tpetra::Map<>::node_type Node;
typedef Teuchos::ScalarTraits<Scalar>::magnitudeType magnitudeType;

using Teuchos::RCP;
Expand Down
2 changes: 1 addition & 1 deletion packages/stokhos/example/experimental/linear2d_diffusion_pce_ifpack2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ const char *prec_option_names[] = { "full", "linear"};
int main(int argc, char *argv[]) {
typedef double MeshScalar;
typedef double BasisScalar;
typedef Tpetra::DefaultPlatform::DefaultPlatformType::NodeType Node;
typedef Tpetra::Map<>::node_type Node;
typedef Teuchos::ScalarTraits<Scalar>::magnitudeType magnitudeType;

using Teuchos::RCP;
Expand Down
1 change: 0 additions & 1 deletion packages/stokhos/example/experimental/twoD_diffusion_problem_tpetra.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
#include "Teuchos_Array.hpp"
#include "Teuchos_Comm.hpp"

#include "Tpetra_DefaultPlatform.hpp"
#include "Tpetra_Map.hpp"
#include "Tpetra_Vector.hpp"
#include "Tpetra_Import.hpp"
Expand Down
4 changes: 2 additions & 2 deletions packages/stokhos/src/belos/BelosPCETpetraAdapter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ namespace Belos {
#endif
// create local map
Teuchos::SerialComm<int> scomm;
Tpetra::Map<LO,GO,Node> LocalMap(B.numRows(), 0, Teuchos::rcpFromRef< const Teuchos::Comm<int> >(scomm), Tpetra::LocallyReplicated, A.getMap()->getNode());
Tpetra::Map<LO,GO,Node> LocalMap(B.numRows(), 0, Teuchos::rcpFromRef< const Teuchos::Comm<int> >(scomm), Tpetra::LocallyReplicated);
// encapsulate Teuchos::SerialDenseMatrix data in ArrayView
Teuchos::ArrayView<const Scalar> Bvalues(B.values(),B.stride()*B.numCols());
// create locally replicated MultiVector with a copy of this data
Expand Down Expand Up @@ -336,7 +336,7 @@ namespace Belos {
strideC = C.stride();
Teuchos::SerialComm<int> scomm;
// create local map with serial comm
Tpetra::Map<LO,GO,Node> LocalMap(numRowsC, 0, Teuchos::rcpFromRef< const Teuchos::Comm<int> >(scomm), Tpetra::LocallyReplicated, A.getMap()->getNode());
Tpetra::Map<LO,GO,Node> LocalMap(numRowsC, 0, Teuchos::rcpFromRef< const Teuchos::Comm<int> >(scomm), Tpetra::LocallyReplicated);
// create local multivector to hold the result
const bool INIT_TO_ZERO = true;
Tpetra::MultiVector<Scalar,LO,GO,Node> C_mv(Teuchos::rcpFromRef(LocalMap),numColsC, INIT_TO_ZERO);
Expand Down
45 changes: 15 additions & 30 deletions packages/stokhos/test/UnitTest/Stokhos_TpetraCrsMatrixMPVectorUnitTest.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
// Tpetra
#include "Stokhos_Tpetra_MP_Vector.hpp"
#include "Stokhos_Tpetra_Utilities_MP_Vector.hpp"
#include "Tpetra_ConfigDefs.hpp"
#include "Tpetra_DefaultPlatform.hpp"
#include "Tpetra_Core.hpp"
#include "Tpetra_Map.hpp"
#include "Tpetra_MultiVector.hpp"
#include "Tpetra_Vector.hpp"
Expand Down Expand Up @@ -147,8 +146,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
Kokkos::initialize();

// Comm
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();

// Map
GlobalOrdinal nrow = 10;
Expand Down Expand Up @@ -227,8 +225,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
Kokkos::initialize();

// Comm
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();

// Map
GlobalOrdinal nrow = 10;
Expand Down Expand Up @@ -329,8 +326,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
Kokkos::initialize();

// Comm
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();

// Map
GlobalOrdinal nrow = 10;
Expand Down Expand Up @@ -418,8 +414,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
Kokkos::initialize();

// Comm
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();

// Map
GlobalOrdinal nrow = 10;
Expand Down Expand Up @@ -534,8 +529,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
Kokkos::initialize();

// Comm
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();

// Map
GlobalOrdinal nrow = 10;
Expand Down Expand Up @@ -661,8 +655,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(

// Build banded matrix
GlobalOrdinal nrow = 10;
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -783,8 +776,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(

// Build banded matrix
GlobalOrdinal nrow = 10;
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -921,8 +913,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(

// Build banded matrix
GlobalOrdinal nrow = 10;
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -1043,8 +1034,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
// 1-D Laplacian matrix
GlobalOrdinal nrow = 50;
BaseScalar h = 1.0 / static_cast<BaseScalar>(nrow-1);
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -1189,8 +1179,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
// 1-D Laplacian matrix
GlobalOrdinal nrow = 50;
BaseScalar h = 1.0 / static_cast<BaseScalar>(nrow-1);
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -1345,8 +1334,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(

// Build banded matrix
GlobalOrdinal nrow = 10;
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -1498,8 +1486,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(

// Build banded matrix
GlobalOrdinal nrow = 10;
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -1661,8 +1648,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
// 1-D Laplacian matrix
GlobalOrdinal nrow = 50;
BaseScalar h = 1.0 / static_cast<BaseScalar>(nrow-1);
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -1849,8 +1835,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
// 1-D Laplacian matrix
GlobalOrdinal nrow = 50;
BaseScalar h = 1.0 / static_cast<BaseScalar>(nrow-1);
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down
45 changes: 15 additions & 30 deletions packages/stokhos/test/UnitTest/Stokhos_TpetraCrsMatrixUQPCEUnitTest.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@
#include "Stokhos_Tpetra_UQ_PCE.hpp"
#include "Stokhos_Tpetra_Utilities.hpp"
#include "Stokhos_Tpetra_Utilities_UQ_PCE.hpp"
#include "Tpetra_ConfigDefs.hpp"
#include "Tpetra_DefaultPlatform.hpp"
#include "Tpetra_Core.hpp"
#include "Tpetra_Map.hpp"
#include "Tpetra_MultiVector.hpp"
#include "Tpetra_Vector.hpp"
Expand Down Expand Up @@ -210,8 +209,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
LocalOrdinal pce_size = cijk.dimension();

// Comm
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();

// Map
GlobalOrdinal nrow = 10;
Expand Down Expand Up @@ -299,8 +297,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
LocalOrdinal pce_size = cijk.dimension();

// Comm
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();

// Map
GlobalOrdinal nrow = 10;
Expand Down Expand Up @@ -388,8 +385,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
LocalOrdinal pce_size = cijk.dimension();

// Comm
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();

// Map
GlobalOrdinal nrow = 10;
Expand Down Expand Up @@ -486,8 +482,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
LocalOrdinal pce_size = cijk.dimension();

// Comm
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();

// Map
GlobalOrdinal nrow = 10;
Expand Down Expand Up @@ -587,8 +582,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
LocalOrdinal pce_size = cijk.dimension();

// Comm
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();

// Map
GlobalOrdinal nrow = 10;
Expand Down Expand Up @@ -698,8 +692,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(

// Build banded matrix
GlobalOrdinal nrow = 13;
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -845,8 +838,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(

// Build banded matrix
GlobalOrdinal nrow = 10;
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -1003,8 +995,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(

// Build banded matrix
GlobalOrdinal nrow = 10;
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -1159,8 +1150,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
// 1-D Laplacian matrix
GlobalOrdinal nrow = 10;
BaseScalar h = 1.0 / static_cast<BaseScalar>(nrow-1);
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -1334,8 +1324,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
// 1-D Laplacian matrix
GlobalOrdinal nrow = 10;
BaseScalar h = 1.0 / static_cast<BaseScalar>(nrow-1);
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -1534,8 +1523,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(

// Build banded matrix
GlobalOrdinal nrow = 10;
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -1708,8 +1696,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(

// Build banded matrix
GlobalOrdinal nrow = 10;
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -1893,8 +1880,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
// 1-D Laplacian matrix
GlobalOrdinal nrow = 10;
BaseScalar h = 1.0 / static_cast<BaseScalar>(nrow-1);
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -2116,8 +2102,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(
// 1-D Laplacian matrix
GlobalOrdinal nrow = 10;
BaseScalar h = 1.0 / static_cast<BaseScalar>(nrow-1);
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down
8 changes: 3 additions & 5 deletions packages/stokhos/test/UnitTest/tpetra_mat_vec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "Teuchos_GlobalMPISession.hpp"

// Tpetra
#include "Tpetra_DefaultPlatform.hpp"
#include "Tpetra_Core.hpp"
#include "Tpetra_Map.hpp"
#include "Tpetra_Vector.hpp"
#include "Tpetra_CrsGraph.hpp"
Expand Down Expand Up @@ -36,8 +36,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(

// Build banded matrix
GlobalOrdinal nrow = 10;
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down Expand Up @@ -131,8 +130,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(

// Build banded matrix
GlobalOrdinal nrow = 10;
RCP<const Tpetra_Comm> comm =
Tpetra::DefaultPlatform::getDefaultPlatform().getComm();
RCP<const Tpetra_Comm> comm = Tpetra::getDefaultComm();
RCP<const Tpetra_Map> map =
Tpetra::createUniformContigMapWithNode<LocalOrdinal,GlobalOrdinal,Node>(
nrow, comm);
Expand Down