From 646a650db3650570bbf798602ff5a098662e108d Mon Sep 17 00:00:00 2001 From: "K. Devine" Date: Mon, 14 Feb 2022 16:58:22 -0700 Subject: [PATCH] tpetra: Deprecating getNodeNumElements in favor of getLocalNumElements #9799 --- .../lesson03_power_method.cpp | 2 +- .../lesson05_redistribution.cpp | 2 +- .../lesson06_custom_operator.cpp | 2 +- .../Benchmarks/CrsMatrixDenseRowUnpack.cpp | 6 +- .../advanced/Benchmarks/CrsMatrixMatVec.cpp | 2 +- .../Benchmarks/blockCrsMatrixMatVec.cpp | 6 +- .../core/ext/TpetraExt_MatrixMatrix_Cuda.hpp | 10 +-- ...petraExt_MatrixMatrix_ExtraKernels_def.hpp | 12 ++-- .../core/ext/TpetraExt_MatrixMatrix_HIP.hpp | 10 +-- .../ext/TpetraExt_MatrixMatrix_OpenMP.hpp | 6 +- .../core/ext/TpetraExt_MatrixMatrix_SYCL.hpp | 10 +-- .../core/ext/TpetraExt_MatrixMatrix_def.hpp | 68 +++++++++---------- .../TpetraExt_TripleMatrixMultiply_def.hpp | 58 ++++++++-------- .../src/Examples/SourceCode/data_redist_1.cpp | 2 +- .../Examples/SourceCode/power_method_1.cpp | 2 +- .../tpetra/core/inout/MatrixMarket_Tpetra.hpp | 12 ++-- .../core/inout/MatrixMarket_TpetraNew.hpp | 4 +- ...petra_DistributionLowerTriangularBlock.hpp | 2 +- .../tpetra/core/inout/Tpetra_MatrixIO_def.hpp | 6 +- .../src/Tpetra_BlockCrsMatrix_Helpers_def.hpp | 6 +- .../core/src/Tpetra_BlockCrsMatrix_def.hpp | 2 +- .../core/src/Tpetra_BlockMultiVector_def.hpp | 4 +- .../core/src/Tpetra_ComputeGatherMap.hpp | 2 +- .../src/Tpetra_CrsGraphTransposer_def.hpp | 2 +- .../tpetra/core/src/Tpetra_CrsGraph_def.hpp | 36 +++++----- .../tpetra/core/src/Tpetra_CrsMatrix_def.hpp | 48 ++++++------- .../core/src/Tpetra_Details_LocalMap.hpp | 2 +- .../core/src/Tpetra_Details_Transfer_def.hpp | 16 ++--- ..._Details_getDiagCopyWithoutOffsets_def.hpp | 4 +- ...Tpetra_Details_getGraphDiagOffsets_def.hpp | 2 +- ...tra_Details_localDeepCopyRowMatrix_def.hpp | 2 +- .../src/Tpetra_Details_makeColMap_def.hpp | 12 ++-- .../Tpetra_Details_makeOptimizedColMap.hpp | 4 +- .../core/src/Tpetra_Details_residual.hpp | 36 +++++----- .../core/src/Tpetra_DirectoryImpl_def.hpp | 6 +- .../tpetra/core/src/Tpetra_Directory_def.hpp | 4 +- .../core/src/Tpetra_EpetraRowMatrix.hpp | 2 +- .../tpetra/core/src/Tpetra_FECrsGraph_def.hpp | 8 +-- .../tpetra/core/src/Tpetra_Import_Util.hpp | 6 +- .../tpetra/core/src/Tpetra_Import_Util2.hpp | 4 +- .../tpetra/core/src/Tpetra_Import_def.hpp | 12 ++-- packages/tpetra/core/src/Tpetra_Map_decl.hpp | 12 +++- packages/tpetra/core/src/Tpetra_Map_def.hpp | 28 ++++---- .../core/src/Tpetra_MultiVector_def.hpp | 42 ++++++------ .../tpetra/core/src/Tpetra_RowMatrix_def.hpp | 6 +- .../tpetra/core/src/Tpetra_Vector_def.hpp | 2 +- ...Tpetra_applyDirichletBoundaryCondition.hpp | 16 ++--- ...Tpetra_computeRowAndColumnOneNorms_def.hpp | 22 +++--- .../Tpetra_createDeepCopy_CrsMatrix_def.hpp | 2 +- ...petra_leftAndOrRightScaleCrsMatrix_def.hpp | 2 +- .../tpetra/core/test/Block/BlockCrsMatrix.cpp | 10 +-- packages/tpetra/core/test/Block/BlockMap.cpp | 20 +++--- .../core/test/Block/BlockMultiVector.cpp | 8 +-- .../test/CrsGraph/CrsGraph_ReindexColumns.cpp | 16 ++--- .../CrsGraph/CrsGraph_StaticImportExport.cpp | 2 +- .../tpetra/core/test/CrsMatrix/Bug6069_1.cpp | 2 +- .../tpetra/core/test/CrsMatrix/Bug6069_2.cpp | 2 +- .../tpetra/core/test/CrsMatrix/Bug8794.cpp | 6 +- .../CrsMatrix/CrsMatrix_ReindexColumns.cpp | 10 +-- .../CrsMatrix/CrsMatrix_ReplaceDiagonal.cpp | 4 +- .../CrsMatrix_ReplaceLocalValues.cpp | 20 +++--- .../CrsMatrix_StaticImportExport.cpp | 2 +- .../CrsMatrix/CrsMatrix_TransformValues.cpp | 20 +++--- .../CrsMatrix_removeEmptyProcesses.cpp | 2 +- .../core/test/CrsMatrix/Equilibration.cpp | 12 ++-- .../test/CrsMatrix/Regression/Albany182.cpp | 4 +- .../core/test/CrsMatrix/applyDirichlet.cpp | 8 +-- .../core/test/Distributor/Issue1752.cpp | 4 +- .../Distributor/createfromsendsandrecvs.cpp | 2 +- .../test/FECrsGraph/FECrsGraph_UnitTests.cpp | 4 +- .../FECrsMatrix/FECrsMatrix_UnitTests.cpp | 4 +- .../FEMultiVector/FEMultiVector_UnitTests.cpp | 6 +- .../core/test/FEMultiVector/Fix3101.cpp | 4 +- .../tpetra/core/test/ImportExport/Bug9116.cpp | 4 +- .../ImportExport_ImportConstructExpert.cpp | 2 +- .../ImportExport/ImportExport_UnitTests.cpp | 4 +- .../core/test/ImportExport/Issue_114.cpp | 2 +- .../core/test/ImportExport/Issue_2198.cpp | 4 +- .../core/test/ImportExport/Issue_607.cpp | 4 +- .../ImportExport2/ImportExport2_UnitTests.cpp | 32 ++++----- packages/tpetra/core/test/Map/Map_Bug2431.cpp | 6 +- packages/tpetra/core/test/Map/Map_Bug6051.cpp | 2 +- packages/tpetra/core/test/Map/Map_Bug6412.cpp | 2 +- .../tpetra/core/test/Map/Map_LocalMap.cpp | 12 ++-- .../tpetra/core/test/Map/Map_OneToOne.cpp | 4 +- .../tpetra/core/test/Map/Map_UnitTests.cpp | 10 +-- .../core/test/Map/Map_getMinGlobalIndex.cpp | 4 +- .../core/test/Map/Map_getMyGlobalIndices.cpp | 8 +-- .../test/Map/Map_removeEmptyProcesses.cpp | 18 ++--- .../test/Map/Map_replaceCommWithSubset.cpp | 16 ++--- .../core/test/Map/NegativeBaseIndexTest.cpp | 4 +- .../MatrixMatrixKernels_UnitTests.cpp | 16 ++--- .../MatrixMatrix/MatrixMatrix_UnitTests.cpp | 12 ++-- .../tpetra/core/test/MultiVector/Bug5474.cpp | 2 +- .../tpetra/core/test/MultiVector/Bug7745.cpp | 10 +-- .../tpetra/core/test/MultiVector/Bug7758.cpp | 10 +-- .../MultiVector/MultiVector_MixedNode.cpp | 2 +- .../MultiVector/MultiVector_UnitTests.cpp | 4 +- .../core/test/RowMatrixTransposer/main.cpp | 2 +- .../core/test/RowMatrixTransposer/sorted.cpp | 4 +- ...MatrixMarket_Tpetra_CrsGraph_InOutTest.cpp | 2 +- .../MatrixMarket_Tpetra_CrsMatrix_Dist.cpp | 2 +- ...atrixMarket_Tpetra_CrsMatrix_InOutTest.cpp | 2 +- .../MatrixMarket_Tpetra_OperatorTest.cpp | 8 +-- 104 files changed, 483 insertions(+), 477 deletions(-) diff --git a/packages/tpetra/core/example/Lesson03-Power-Method/lesson03_power_method.cpp b/packages/tpetra/core/example/Lesson03-Power-Method/lesson03_power_method.cpp index f65ac3ef5d3b..b7b2a63ecfc4 100644 --- a/packages/tpetra/core/example/Lesson03-Power-Method/lesson03_power_method.cpp +++ b/packages/tpetra/core/example/Lesson03-Power-Method/lesson03_power_method.cpp @@ -241,7 +241,7 @@ main (int argc, char *argv[]) RCP map = rcp (new map_type (numGblIndices, indexBase, comm)); - const size_t numMyElements = map->getNodeNumElements (); + const size_t numMyElements = map->getLocalNumElements (); // If you like, you may get the list of global indices that the // calling process owns. This is unnecessary if you don't mind diff --git a/packages/tpetra/core/example/Lesson05-Redistribution/lesson05_redistribution.cpp b/packages/tpetra/core/example/Lesson05-Redistribution/lesson05_redistribution.cpp index db527e9ae036..c36b51dcf98f 100644 --- a/packages/tpetra/core/example/Lesson05-Redistribution/lesson05_redistribution.cpp +++ b/packages/tpetra/core/example/Lesson05-Redistribution/lesson05_redistribution.cpp @@ -90,7 +90,7 @@ createMatrix (const Teuchos::RCP& map) const scalar_type negOne = static_cast (-1.0); const GST numGlobalIndices = map->getGlobalNumElements (); - // const size_t numMyElements = map->getNodeNumElements (); + // const size_t numMyElements = map->getLocalNumElements (); // The list of global elements owned by this MPI process. ArrayView myGlobalElements = map->getNodeElementList (); diff --git a/packages/tpetra/core/example/Lesson06-Custom-Operator/lesson06_custom_operator.cpp b/packages/tpetra/core/example/Lesson06-Custom-Operator/lesson06_custom_operator.cpp index d430c6440bc9..24ecec748667 100644 --- a/packages/tpetra/core/example/Lesson06-Custom-Operator/lesson06_custom_operator.cpp +++ b/packages/tpetra/core/example/Lesson06-Custom-Operator/lesson06_custom_operator.cpp @@ -129,7 +129,7 @@ class MyOp : public Tpetra::Operator<> { // // Get the local number of rows // - local_ordinal_type nlocal = opMap_->getNodeNumElements (); + local_ordinal_type nlocal = opMap_->getLocalNumElements (); // // Define the distribution that you need for the matvec. When you diff --git a/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixDenseRowUnpack.cpp b/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixDenseRowUnpack.cpp index 60b818d57308..e406241c8325 100644 --- a/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixDenseRowUnpack.cpp +++ b/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixDenseRowUnpack.cpp @@ -136,7 +136,7 @@ getLclRowsToTest(const export_type& exporter) { Teuchos::ArrayView incomingRows = exporter.getRemoteLIDs(); const map_type& tgtMap = *(exporter.getTargetMap()); - const LO tgtLclNumRows = LO(tgtMap.getNodeNumElements()); + const LO tgtLclNumRows = LO(tgtMap.getLocalNumElements()); using device_type = crs_matrix_type::device_type; using Kokkos::view_alloc; @@ -558,13 +558,13 @@ void benchmark(const RCP>& comm, std::unique_ptr colGids(new GO[numColsToFill]); std::iota(colGids.get(), colGids.get()+numColsToFill, domainMap->getIndexBase()); - const LO tgtLclNumRows = LO(tgtRowMap->getNodeNumElements()); + const LO tgtLclNumRows = LO(tgtRowMap->getLocalNumElements()); for(LO lclRow = 0; lclRow < tgtLclNumRows; ++lclRow) { const GO gblRow = tgtRowMap->getGlobalElement(lclRow); tgtGraph->insertGlobalIndices(gblRow, numColsToFill, colGids.get()); } - const LO srcLclNumRows = LO(srcRowMap->getNodeNumElements()); + const LO srcLclNumRows = LO(srcRowMap->getLocalNumElements()); for(LO lclRow = 0; lclRow < srcLclNumRows; ++lclRow) { const GO gblRow = srcRowMap->getGlobalElement(lclRow); srcGraph->insertGlobalIndices(gblRow, numColsToFill, diff --git a/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixMatVec.cpp b/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixMatVec.cpp index a5d2f1620ca8..d1fa95460c54 100644 --- a/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixMatVec.cpp +++ b/packages/tpetra/core/example/advanced/Benchmarks/CrsMatrixMatVec.cpp @@ -270,7 +270,7 @@ getTpetraCrsMatrix (Teuchos::FancyOStream& out, // columns, or asking the column Map for the number of entries, // won't give the correct number of columns in the graph. // const GO gblNumCols = graph->getDomainMap ()->getGlobalNumElements (); - const LO lclNumRows = meshRowMap.getNodeNumElements (); + const LO lclNumRows = meshRowMap.getLocalNumElements (); RCP A = rcp (new matrix_type (graph)); diff --git a/packages/tpetra/core/example/advanced/Benchmarks/blockCrsMatrixMatVec.cpp b/packages/tpetra/core/example/advanced/Benchmarks/blockCrsMatrixMatVec.cpp index e3c1b087e177..d948ee5c2c79 100644 --- a/packages/tpetra/core/example/advanced/Benchmarks/blockCrsMatrixMatVec.cpp +++ b/packages/tpetra/core/example/advanced/Benchmarks/blockCrsMatrixMatVec.cpp @@ -87,7 +87,7 @@ localApplyBlockNoTrans (Tpetra::BlockCrsMatrix& A, const IST zero = KAT::zero (); const IST one = KAT::one (); const LO numLocalMeshRows = - static_cast (G.getRowMap ()->getNodeNumElements ()); + static_cast (G.getRowMap ()->getLocalNumElements ()); const LO numVecs = static_cast (X.getNumVectors ()); const LO blockSize = A.getBlockSize (); @@ -175,7 +175,7 @@ compareLocalMatVec (Teuchos::FancyOStream& out, "X_mv and Y_mv must have the same number of columns."); const auto G = A.getCrsGraph (); - const size_t lclNumMeshRows = G.getRowMap ()->getNodeNumElements (); + const size_t lclNumMeshRows = G.getRowMap ()->getLocalNumElements (); const LO blockSize = A.getBlockSize (); const size_t maxNumTermsInRowSum = static_cast (G.getNodeMaxNumRowEntries ()) * @@ -522,7 +522,7 @@ getTpetraBlockCrsMatrix (Teuchos::FancyOStream& out, // columns, or asking the column Map for the number of entries, // won't give the correct number of columns in the graph. // const GO gblNumCols = graph->getDomainMap ()->getGlobalNumElements (); - const LO lclNumRows = meshRowMap.getNodeNumElements (); + const LO lclNumRows = meshRowMap.getLocalNumElements (); const LO blkSize = opts.blockSize; RCP A = rcp (new matrix_type (*graph, blkSize)); diff --git a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_Cuda.hpp b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_Cuda.hpp index 857ba10dfec8..45da445b82f6 100644 --- a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_Cuda.hpp +++ b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_Cuda.hpp @@ -207,7 +207,7 @@ void KernelWrappersgetNodeNumElements()); + const KCRS Bmerged = Tpetra::MMdetails::merge_matrices(Aview,Bview,Acol2Brow,Acol2Irow,Bcol2Ccol,Icol2Ccol,C.getColMap()->getLocalNumElements()); #ifdef HAVE_TPETRA_MMM_TIMINGS MM = Teuchos::null; MM = rcp(new TimeMonitor (*TimeMonitor::getNewTimer(prefix_mmm + std::string("MMM Newmatrix CudaCore")))); @@ -325,7 +325,7 @@ void KernelWrappers Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); // Grab the Kokkos::SparseCrsMatrices & inner stuff const KCRS & Amat = Aview.origMatrix->getLocalMatrixHost(); @@ -555,7 +555,7 @@ void KernelWrappers2 Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); // Grab the Kokkos::SparseCrsMatrices & inner stuff const KCRS & Amat = Aview.origMatrix->getLocalMatrixHost(); @@ -700,7 +700,7 @@ void KernelWrappers2getRowMap(); Tpetra::Vector diags(rowMap); Aview.origMatrix->getLocalDiagCopy(diags); - size_t diagLength = rowMap->getNodeNumElements(); + size_t diagLength = rowMap->getLocalNumElements(); Teuchos::Array diagonal(diagLength); diags.get1dCopy(diagonal()); @@ -738,7 +738,7 @@ void KernelWrappers2getNodeNumElements()); + const matrix_t Bmerged = Tpetra::MMdetails::merge_matrices(Aview,Bview,Acol2Brow,Acol2Irow,Bcol2Ccol,Icol2Ccol,C.getColMap()->getLocalNumElements()); // Get the properties and arrays of input matrices const matrix_t & Amat = Aview.origMatrix->getLocalMatrixDevice(); diff --git a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_ExtraKernels_def.hpp b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_ExtraKernels_def.hpp index a6d5c1bf50ac..b71be934bf76 100644 --- a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_ExtraKernels_def.hpp +++ b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_ExtraKernels_def.hpp @@ -161,7 +161,7 @@ void mult_A_B_newmatrix_LowThreadGustavsonKernel(CrsMatrixStruct Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); size_t Cest_nnz_per_row = 2*C_estimate_nnz_per_row(*Aview.origMatrix,*Bview.origMatrix); // Get my node / thread info (right from openmp or parameter list) @@ -372,7 +372,7 @@ void mult_A_B_reuse_LowThreadGustavsonKernel(CrsMatrixStruct Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); // Get my node / thread info (right from openmp or parameter list) size_t thread_max = Kokkos::Compat::KokkosOpenMPWrapperNode::execution_space::concurrency(); @@ -538,7 +538,7 @@ void jacobi_A_B_newmatrix_LowThreadGustavsonKernel(Scalar omega, // Sizes RCP Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); size_t Cest_nnz_per_row = 2*C_estimate_nnz_per_row(*Aview.origMatrix,*Bview.origMatrix); // Get my node / thread info (right from openmp) @@ -781,7 +781,7 @@ void jacobi_A_B_reuse_LowThreadGustavsonKernel(Scalar omega, // Sizes RCP Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); // Get my node / thread info (right from openmp or parameter list) size_t thread_max = Kokkos::Compat::KokkosOpenMPWrapperNode::execution_space::concurrency(); @@ -1072,7 +1072,7 @@ static inline void mult_R_A_P_newmatrix_LowThreadGustavsonKernel(CrsMatrixStruct // Sizes RCP Accolmap = Ac.getColMap(); size_t m = Rview.origMatrix->getNodeNumRows(); - size_t n = Accolmap->getNodeNumElements(); + size_t n = Accolmap->getLocalNumElements(); // Get raw Kokkos matrices, and the raw CSR views const KCRS & Rmat = Rview.origMatrix->getLocalMatrixDevice(); @@ -1336,7 +1336,7 @@ static inline void mult_R_A_P_reuse_LowThreadGustavsonKernel(CrsMatrixStruct Accolmap = Ac.getColMap(); size_t m = Rview.origMatrix->getNodeNumRows(); - size_t n = Accolmap->getNodeNumElements(); + size_t n = Accolmap->getLocalNumElements(); // Get raw Kokkos matrices, and the raw CSR views const KCRS & Rmat = Rview.origMatrix->getLocalMatrixDevice(); diff --git a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_HIP.hpp b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_HIP.hpp index 4447328af238..bc0f3f7ac11b 100644 --- a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_HIP.hpp +++ b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_HIP.hpp @@ -207,7 +207,7 @@ void KernelWrappersgetNodeNumElements()); + const KCRS Bmerged = Tpetra::MMdetails::merge_matrices(Aview,Bview,Acol2Brow,Acol2Irow,Bcol2Ccol,Icol2Ccol,C.getColMap()->getLocalNumElements()); #ifdef HAVE_TPETRA_MMM_TIMINGS MM = Teuchos::null; MM = rcp(new TimeMonitor (*TimeMonitor::getNewTimer(prefix_mmm + std::string("MMM Newmatrix HIPCore")))); @@ -321,7 +321,7 @@ void KernelWrappers Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); // Grab the Kokkos::SparseCrsMatrices & inner stuff const KCRS & Amat = Aview.origMatrix->getLocalMatrixHost(); @@ -548,7 +548,7 @@ void KernelWrappers2 Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); // Grab the Kokkos::SparseCrsMatrices & inner stuff const KCRS & Amat = Aview.origMatrix->getLocalMatrixHost(); @@ -693,7 +693,7 @@ void KernelWrappers2getRowMap(); Tpetra::Vector diags(rowMap); Aview.origMatrix->getLocalDiagCopy(diags); - size_t diagLength = rowMap->getNodeNumElements(); + size_t diagLength = rowMap->getLocalNumElements(); Teuchos::Array diagonal(diagLength); diags.get1dCopy(diagonal()); @@ -731,7 +731,7 @@ void KernelWrappers2getNodeNumElements()); + const matrix_t Bmerged = Tpetra::MMdetails::merge_matrices(Aview,Bview,Acol2Brow,Acol2Irow,Bcol2Ccol,Icol2Ccol,C.getColMap()->getLocalNumElements()); // Get the properties and arrays of input matrices const matrix_t & Amat = Aview.origMatrix->getLocalMatrixDevice(); diff --git a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_OpenMP.hpp b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_OpenMP.hpp index 53ee0052ebbf..9965adeba572 100644 --- a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_OpenMP.hpp +++ b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_OpenMP.hpp @@ -249,7 +249,7 @@ void KernelWrappersgetNodeNumElements()); + const KCRS Bmerged = Tpetra::MMdetails::merge_matrices(Aview,Bview,Acol2Brow,Acol2Irow,Bcol2Ccol,Icol2Ccol,C.getColMap()->getLocalNumElements()); #ifdef HAVE_TPETRA_MMM_TIMINGS MM = Teuchos::null; MM = rcp(new TimeMonitor (*TimeMonitor::getNewTimer(prefix_mmm + std::string("MMM Newmatrix OpenMPCore")))); @@ -530,7 +530,7 @@ void KernelWrappers2getRowMap(); Tpetra::Vector diags(rowMap); Aview.origMatrix->getLocalDiagCopy(diags); - size_t diagLength = rowMap->getNodeNumElements(); + size_t diagLength = rowMap->getLocalNumElements(); Teuchos::Array diagonal(diagLength); diags.get1dCopy(diagonal()); @@ -568,7 +568,7 @@ void KernelWrappers2getNodeNumElements()); + const matrix_t Bmerged = Tpetra::MMdetails::merge_matrices(Aview,Bview,Acol2Brow,Acol2Irow,Bcol2Ccol,Icol2Ccol,C.getColMap()->getLocalNumElements()); // Get the properties and arrays of input matrices const matrix_t & Amat = Aview.origMatrix->getLocalMatrixDevice(); diff --git a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_SYCL.hpp b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_SYCL.hpp index 8a76ac813b08..cbd9c7a78000 100644 --- a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_SYCL.hpp +++ b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_SYCL.hpp @@ -210,7 +210,7 @@ void KernelWrappersgetNodeNumElements()); + const KCRS Bmerged = Tpetra::MMdetails::merge_matrices(Aview,Bview,Acol2Brow,Acol2Irow,Bcol2Ccol,Icol2Ccol,C.getColMap()->getLocalNumElements()); #ifdef HAVE_TPETRA_MMM_TIMINGS MM = Teuchos::null; MM = rcp(new TimeMonitor (*TimeMonitor::getNewTimer(prefix_mmm + std::string("MMM Newmatrix SYCLCore")))); @@ -328,7 +328,7 @@ void KernelWrappers Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); // Grab the Kokkos::SparseCrsMatrices & inner stuff const KCRS & Amat = Aview.origMatrix->getLocalMatrixHost(); @@ -558,7 +558,7 @@ void KernelWrappers2 Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); // Grab the Kokkos::SparseCrsMatrices & inner stuff const KCRS & Amat = Aview.origMatrix->getLocalMatrixHost(); @@ -703,7 +703,7 @@ void KernelWrappers2getRowMap(); Tpetra::Vector diags(rowMap); Aview.origMatrix->getLocalDiagCopy(diags); - size_t diagLength = rowMap->getNodeNumElements(); + size_t diagLength = rowMap->getLocalNumElements(); Teuchos::Array diagonal(diagLength); diags.get1dCopy(diagonal()); @@ -741,7 +741,7 @@ void KernelWrappers2getNodeNumElements()); + const matrix_t Bmerged = Tpetra::MMdetails::merge_matrices(Aview,Bview,Acol2Brow,Acol2Irow,Bcol2Ccol,Icol2Ccol,C.getColMap()->getLocalNumElements()); // Get the properties and arrays of input matrices const matrix_t & Amat = Aview.origMatrix->getLocalMatrixDevice(); diff --git a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_def.hpp b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_def.hpp index 7a02211a5141..ea3d195e29d2 100644 --- a/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_def.hpp +++ b/packages/tpetra/core/ext/TpetraExt_MatrixMatrix_def.hpp @@ -1351,8 +1351,8 @@ void mult_A_B( // Run through all the hash table lookups once and for all LocalOrdinal LO_INVALID = OrdinalTraits::invalid(); - Array Acol2Brow(Aview.colMap->getNodeNumElements(),LO_INVALID); - Array Acol2Irow(Aview.colMap->getNodeNumElements(),LO_INVALID); + Array Acol2Brow(Aview.colMap->getLocalNumElements(),LO_INVALID); + Array Acol2Irow(Aview.colMap->getLocalNumElements(),LO_INVALID); if(Aview.colMap->isSameAs(*Bview.origMatrix->getRowMap())){ // Maps are the same: Use local IDs as the hash for(LocalOrdinal i=Aview.colMap->getMinLocalIndex(); i <= @@ -1397,7 +1397,7 @@ void mult_A_B( c_index[i] = OrdinalTraits::invalid(); // Loop over the rows of A. - size_t Arows = Aview.rowMap->getNodeNumElements(); + size_t Arows = Aview.rowMap->getLocalNumElements(); for(size_t i=0; igetNodeNumElements()), Icol2Ccol; + lo_view_t Bcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Bcol2Ccol"),Bview.colMap->getLocalNumElements()), Icol2Ccol; if (Bview.importMatrix.is_null()) { // mfh 27 Sep 2016: B has no "remotes," so B and C have the same column Map. Cimport = Bimport; Ccolmap = Bview.colMap; - const LO colMapSize = static_cast(Bview.colMap->getNodeNumElements()); + const LO colMapSize = static_cast(Bview.colMap->getLocalNumElements()); // Bcol2Ccol is trivial Kokkos::parallel_for("Tpetra::mult_A_B_newmatrix::Bcol2Ccol_fill", Kokkos::RangePolicy(0, colMapSize), @@ -1649,12 +1649,12 @@ void mult_A_B_newmatrix( // mfh 27 Sep 2016: What the above comment means, is that the // setUnion operation on Import objects could also compute these // local index - to - local index look-up tables. - Kokkos::resize(Icol2Ccol,Bview.importMatrix->getColMap()->getNodeNumElements()); + Kokkos::resize(Icol2Ccol,Bview.importMatrix->getColMap()->getLocalNumElements()); local_map_type Ccolmap_local = Ccolmap->getLocalMap(); - Kokkos::parallel_for("Tpetra::mult_A_B_newmatrix::Bcol2Ccol_getGlobalElement",range_type(0,Bview.origMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::parallel_for("Tpetra::mult_A_B_newmatrix::Bcol2Ccol_getGlobalElement",range_type(0,Bview.origMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Bcol2Ccol(i) = Ccolmap_local.getLocalElement(Bcolmap_local.getGlobalElement(i)); }); - Kokkos::parallel_for("Tpetra::mult_A_B_newmatrix::Icol2Ccol_getGlobalElement",range_type(0,Bview.importMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::parallel_for("Tpetra::mult_A_B_newmatrix::Icol2Ccol_getGlobalElement",range_type(0,Bview.importMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Icol2Ccol(i) = Ccolmap_local.getLocalElement(Icolmap_local.getGlobalElement(i)); }); @@ -1682,8 +1682,8 @@ void mult_A_B_newmatrix( // (a flag value). // Run through all the hash table lookups once and for all - lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getNodeNumElements()); - lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getNodeNumElements()); + lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getLocalNumElements()); + lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getLocalNumElements()); Kokkos::parallel_for("Tpetra::mult_A_B_newmatrix::construct_tables",range_type(Aview.colMap->getMinLocalIndex(), Aview.colMap->getMaxLocalIndex()+1),KOKKOS_LAMBDA(const LO i) { GO aidx = Acolmap_local.getGlobalElement(i); @@ -1755,7 +1755,7 @@ void KernelWrappers // Sizes RCP Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); size_t b_max_nnz_per_row = Bview.origMatrix->getNodeMaxNumRowEntries(); // Grab the Kokkos::SparseCrsMatrices & inner stuff @@ -1984,11 +1984,11 @@ void mult_A_B_reuse( local_map_type Ccolmap_local = Ccolmap->getLocalMap(); // Build the final importer / column map, hash table lookups for C - lo_view_t Bcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Bcol2Ccol"),Bview.colMap->getNodeNumElements()), Icol2Ccol; + lo_view_t Bcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Bcol2Ccol"),Bview.colMap->getLocalNumElements()), Icol2Ccol; { // Bcol2Col may not be trivial, as Ccolmap is compressed during fillComplete in newmatrix // So, column map of C may be a strict subset of the column map of B - Kokkos::parallel_for(range_type(0,Bview.origMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::parallel_for(range_type(0,Bview.origMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Bcol2Ccol(i) = Ccolmap_local.getLocalElement(Bcolmap_local.getGlobalElement(i)); }); @@ -1996,16 +1996,16 @@ void mult_A_B_reuse( TEUCHOS_TEST_FOR_EXCEPTION(!Cimport->getSourceMap()->isSameAs(*Bview.origMatrix->getDomainMap()), std::runtime_error, "Tpetra::MMM: Import setUnion messed with the DomainMap in an unfortunate way"); - Kokkos::resize(Icol2Ccol,Bview.importMatrix->getColMap()->getNodeNumElements()); - Kokkos::parallel_for(range_type(0,Bview.importMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::resize(Icol2Ccol,Bview.importMatrix->getColMap()->getLocalNumElements()); + Kokkos::parallel_for(range_type(0,Bview.importMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Icol2Ccol(i) = Ccolmap_local.getLocalElement(Icolmap_local.getGlobalElement(i)); }); } } // Run through all the hash table lookups once and for all - lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getNodeNumElements()); - lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getNodeNumElements()); + lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getLocalNumElements()); + lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getLocalNumElements()); Kokkos::parallel_for(range_type(Aview.colMap->getMinLocalIndex(), Aview.colMap->getMaxLocalIndex()+1),KOKKOS_LAMBDA(const LO i) { GO aidx = Acolmap_local.getGlobalElement(i); LO B_LID = Browmap_local.getLocalElement(aidx); @@ -2072,7 +2072,7 @@ void KernelWrappers // Sizes RCP Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); // Grab the Kokkos::SparseCrsMatrices & inner stuff const KCRS & Amat = Aview.origMatrix->getLocalMatrixHost(); @@ -2231,7 +2231,7 @@ void jacobi_A_B_newmatrix( // same number of columns.) The kernel uses this, instead of // copying the entire input matrix B and converting its column // indices to those of C. - lo_view_t Bcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Bcol2Ccol"),Bview.colMap->getNodeNumElements()), Icol2Ccol; + lo_view_t Bcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Bcol2Ccol"),Bview.colMap->getLocalNumElements()), Icol2Ccol; if (Bview.importMatrix.is_null()) { // mfh 27 Sep 2016: B has no "remotes," so B and C have the same column Map. @@ -2240,7 +2240,7 @@ void jacobi_A_B_newmatrix( // Bcol2Ccol is trivial // Bcol2Ccol is trivial - Kokkos::RangePolicy range (0, static_cast (Bview.colMap->getNodeNumElements ())); + Kokkos::RangePolicy range (0, static_cast (Bview.colMap->getLocalNumElements ())); Kokkos::parallel_for (range, KOKKOS_LAMBDA (const size_t i) { Bcol2Ccol(i) = static_cast (i); }); @@ -2276,12 +2276,12 @@ void jacobi_A_B_newmatrix( // mfh 27 Sep 2016: What the above comment means, is that the // setUnion operation on Import objects could also compute these // local index - to - local index look-up tables. - Kokkos::resize(Icol2Ccol,Bview.importMatrix->getColMap()->getNodeNumElements()); + Kokkos::resize(Icol2Ccol,Bview.importMatrix->getColMap()->getLocalNumElements()); local_map_type Ccolmap_local = Ccolmap->getLocalMap(); - Kokkos::parallel_for(range_type(0,Bview.origMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::parallel_for(range_type(0,Bview.origMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Bcol2Ccol(i) = Ccolmap_local.getLocalElement(Bcolmap_local.getGlobalElement(i)); }); - Kokkos::parallel_for(range_type(0,Bview.importMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::parallel_for(range_type(0,Bview.importMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Icol2Ccol(i) = Ccolmap_local.getLocalElement(Icolmap_local.getGlobalElement(i)); }); @@ -2309,8 +2309,8 @@ void jacobi_A_B_newmatrix( // (a flag value). // Run through all the hash table lookups once and for all - lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getNodeNumElements()); - lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getNodeNumElements()); + lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getLocalNumElements()); + lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getLocalNumElements()); Kokkos::parallel_for(range_type(Aview.colMap->getMinLocalIndex(), Aview.colMap->getMaxLocalIndex()+1),KOKKOS_LAMBDA(const LO i) { GO aidx = Acolmap_local.getGlobalElement(i); LO B_LID = Browmap_local.getLocalElement(aidx); @@ -2389,7 +2389,7 @@ void KernelWrappers2 Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); size_t b_max_nnz_per_row = Bview.origMatrix->getNodeMaxNumRowEntries(); // Grab the Kokkos::SparseCrsMatrices & inner stuff @@ -2631,11 +2631,11 @@ void jacobi_A_B_reuse( local_map_type Ccolmap_local = Ccolmap->getLocalMap(); // Build the final importer / column map, hash table lookups for C - lo_view_t Bcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Bcol2Ccol"),Bview.colMap->getNodeNumElements()), Icol2Ccol; + lo_view_t Bcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Bcol2Ccol"),Bview.colMap->getLocalNumElements()), Icol2Ccol; { // Bcol2Col may not be trivial, as Ccolmap is compressed during fillComplete in newmatrix // So, column map of C may be a strict subset of the column map of B - Kokkos::parallel_for(range_type(0,Bview.origMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::parallel_for(range_type(0,Bview.origMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Bcol2Ccol(i) = Ccolmap_local.getLocalElement(Bcolmap_local.getGlobalElement(i)); }); @@ -2643,16 +2643,16 @@ void jacobi_A_B_reuse( TEUCHOS_TEST_FOR_EXCEPTION(!Cimport->getSourceMap()->isSameAs(*Bview.origMatrix->getDomainMap()), std::runtime_error, "Tpetra::Jacobi: Import setUnion messed with the DomainMap in an unfortunate way"); - Kokkos::resize(Icol2Ccol,Bview.importMatrix->getColMap()->getNodeNumElements()); - Kokkos::parallel_for(range_type(0,Bview.importMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::resize(Icol2Ccol,Bview.importMatrix->getColMap()->getLocalNumElements()); + Kokkos::parallel_for(range_type(0,Bview.importMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Icol2Ccol(i) = Ccolmap_local.getLocalElement(Icolmap_local.getGlobalElement(i)); }); } } // Run through all the hash table lookups once and for all - lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getNodeNumElements()); - lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getNodeNumElements()); + lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getLocalNumElements()); + lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getLocalNumElements()); Kokkos::parallel_for(range_type(Aview.colMap->getMinLocalIndex(), Aview.colMap->getMaxLocalIndex()+1),KOKKOS_LAMBDA(const LO i) { GO aidx = Acolmap_local.getGlobalElement(i); LO B_LID = Browmap_local.getLocalElement(aidx); @@ -2727,7 +2727,7 @@ void KernelWrappers2 Ccolmap = C.getColMap(); size_t m = Aview.origMatrix->getNodeNumRows(); - size_t n = Ccolmap->getNodeNumElements(); + size_t n = Ccolmap->getLocalNumElements(); // Grab the Kokkos::SparseCrsMatrices & inner stuff const KCRS & Amat = Aview.origMatrix->getLocalMatrixHost(); @@ -2941,7 +2941,7 @@ void import_and_extract_views( TimeMonitor MM2 = *TimeMonitor::getNewTimer(prefix_mmm + std::string("MMM I&X RemoteMap-Mode2")); #endif ArrayView rows = targetMap->getNodeElementList(); - size_t numRows = targetMap->getNodeNumElements(); + size_t numRows = targetMap->getLocalNumElements(); Array remoteRows(numRows); for(size_t i = 0; i < numRows; ++i) { diff --git a/packages/tpetra/core/ext/TpetraExt_TripleMatrixMultiply_def.hpp b/packages/tpetra/core/ext/TpetraExt_TripleMatrixMultiply_def.hpp index 5df1da47daed..c3b099e2b502 100644 --- a/packages/tpetra/core/ext/TpetraExt_TripleMatrixMultiply_def.hpp +++ b/packages/tpetra/core/ext/TpetraExt_TripleMatrixMultiply_def.hpp @@ -411,13 +411,13 @@ namespace Tpetra { // same number of columns.) The kernel uses this, instead of // copying the entire input matrix B and converting its column // indices to those of C. - lo_view_t Pcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Pcol2Ccol"),Pview.colMap->getNodeNumElements()), Icol2Ccol; + lo_view_t Pcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Pcol2Ccol"),Pview.colMap->getLocalNumElements()), Icol2Ccol; if (Pview.importMatrix.is_null()) { // mfh 27 Sep 2016: B has no "remotes," so P and C have the same column Map. Cimport = Pimport; Ccolmap = Pview.colMap; - const LO colMapSize = static_cast(Pview.colMap->getNodeNumElements()); + const LO colMapSize = static_cast(Pview.colMap->getLocalNumElements()); // Pcol2Ccol is trivial Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::Pcol2Ccol_fill", Kokkos::RangePolicy(0, colMapSize), @@ -459,12 +459,12 @@ namespace Tpetra { // mfh 27 Sep 2016: What the above comment means, is that the // setUnion operation on Import objects could also compute these // local index - to - local index look-up tables. - Kokkos::resize(Icol2Ccol,Pview.importMatrix->getColMap()->getNodeNumElements()); + Kokkos::resize(Icol2Ccol,Pview.importMatrix->getColMap()->getLocalNumElements()); local_map_type Ccolmap_local = Ccolmap->getLocalMap(); - Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::Pcol2Ccol_getGlobalElement",range_type(0,Pview.origMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::Pcol2Ccol_getGlobalElement",range_type(0,Pview.origMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Pcol2Ccol(i) = Ccolmap_local.getLocalElement(Pcolmap_local.getGlobalElement(i)); }); - Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::Icol2Ccol_getGlobalElement",range_type(0,Pview.importMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::Icol2Ccol_getGlobalElement",range_type(0,Pview.importMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Icol2Ccol(i) = Ccolmap_local.getLocalElement(Icolmap_local.getGlobalElement(i)); }); @@ -492,8 +492,8 @@ namespace Tpetra { // (a flag value). // Run through all the hash table lookups once and for all - lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getNodeNumElements()); - lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getNodeNumElements()); + lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getLocalNumElements()); + lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getLocalNumElements()); Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::construct_tables",range_type(Aview.colMap->getMinLocalIndex(), Aview.colMap->getMaxLocalIndex()+1),KOKKOS_LAMBDA(const LO i) { GO aidx = Acolmap_local.getGlobalElement(i); LO P_LID = Prowmap_local.getLocalElement(aidx); @@ -572,11 +572,11 @@ namespace Tpetra { local_map_type Ccolmap_local = Ccolmap->getLocalMap(); // Build the final importer / column map, hash table lookups for C - lo_view_t Bcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Bcol2Ccol"),Pview.colMap->getNodeNumElements()), Icol2Ccol; + lo_view_t Bcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Bcol2Ccol"),Pview.colMap->getLocalNumElements()), Icol2Ccol; { // Bcol2Col may not be trivial, as Ccolmap is compressed during fillComplete in newmatrix // So, column map of C may be a strict subset of the column map of B - Kokkos::parallel_for(range_type(0,Pview.origMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::parallel_for(range_type(0,Pview.origMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Bcol2Ccol(i) = Ccolmap_local.getLocalElement(Pcolmap_local.getGlobalElement(i)); }); @@ -584,16 +584,16 @@ namespace Tpetra { TEUCHOS_TEST_FOR_EXCEPTION(!Cimport->getSourceMap()->isSameAs(*Pview.origMatrix->getDomainMap()), std::runtime_error, "Tpetra::MMM: Import setUnion messed with the DomainMap in an unfortunate way"); - Kokkos::resize(Icol2Ccol,Pview.importMatrix->getColMap()->getNodeNumElements()); - Kokkos::parallel_for(range_type(0,Pview.importMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::resize(Icol2Ccol,Pview.importMatrix->getColMap()->getLocalNumElements()); + Kokkos::parallel_for(range_type(0,Pview.importMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Icol2Ccol(i) = Ccolmap_local.getLocalElement(Icolmap_local.getGlobalElement(i)); }); } } // Run through all the hash table lookups once and for all - lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getNodeNumElements()); - lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getNodeNumElements()); + lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getLocalNumElements()); + lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getLocalNumElements()); Kokkos::parallel_for(range_type(Aview.colMap->getMinLocalIndex(), Aview.colMap->getMaxLocalIndex()+1),KOKKOS_LAMBDA(const LO i) { GO aidx = Acolmap_local.getGlobalElement(i); LO B_LID = Prowmap_local.getLocalElement(aidx); @@ -676,13 +676,13 @@ namespace Tpetra { // same number of columns.) The kernel uses this, instead of // copying the entire input matrix B and converting its column // indices to those of C. - lo_view_t Pcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Pcol2Ccol"),Pview.colMap->getNodeNumElements()), Icol2Ccol; + lo_view_t Pcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Pcol2Ccol"),Pview.colMap->getLocalNumElements()), Icol2Ccol; if (Pview.importMatrix.is_null()) { // mfh 27 Sep 2016: B has no "remotes," so P and C have the same column Map. Cimport = Pimport; Ccolmap = Pview.colMap; - const LO colMapSize = static_cast(Pview.colMap->getNodeNumElements()); + const LO colMapSize = static_cast(Pview.colMap->getLocalNumElements()); // Pcol2Ccol is trivial Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::Pcol2Ccol_fill", Kokkos::RangePolicy(0, colMapSize), @@ -724,12 +724,12 @@ namespace Tpetra { // mfh 27 Sep 2016: What the above comment means, is that the // setUnion operation on Import objects could also compute these // local index - to - local index look-up tables. - Kokkos::resize(Icol2Ccol,Pview.importMatrix->getColMap()->getNodeNumElements()); + Kokkos::resize(Icol2Ccol,Pview.importMatrix->getColMap()->getLocalNumElements()); local_map_type Ccolmap_local = Ccolmap->getLocalMap(); - Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::Pcol2Ccol_getGlobalElement",range_type(0,Pview.origMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::Pcol2Ccol_getGlobalElement",range_type(0,Pview.origMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Pcol2Ccol(i) = Ccolmap_local.getLocalElement(Pcolmap_local.getGlobalElement(i)); }); - Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::Icol2Ccol_getGlobalElement",range_type(0,Pview.importMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::Icol2Ccol_getGlobalElement",range_type(0,Pview.importMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Icol2Ccol(i) = Ccolmap_local.getLocalElement(Icolmap_local.getGlobalElement(i)); }); @@ -757,8 +757,8 @@ namespace Tpetra { // (a flag value). // Run through all the hash table lookups once and for all - lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getNodeNumElements()); - lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getNodeNumElements()); + lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getLocalNumElements()); + lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getLocalNumElements()); Kokkos::parallel_for("Tpetra::mult_R_A_P_newmatrix::construct_tables",range_type(Aview.colMap->getMinLocalIndex(), Aview.colMap->getMaxLocalIndex()+1),KOKKOS_LAMBDA(const LO i) { GO aidx = Acolmap_local.getGlobalElement(i); @@ -836,11 +836,11 @@ namespace Tpetra { local_map_type Ccolmap_local = Ccolmap->getLocalMap(); // Build the final importer / column map, hash table lookups for C - lo_view_t Bcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Bcol2Ccol"),Pview.colMap->getNodeNumElements()), Icol2Ccol; + lo_view_t Bcol2Ccol(Kokkos::ViewAllocateWithoutInitializing("Bcol2Ccol"),Pview.colMap->getLocalNumElements()), Icol2Ccol; { // Bcol2Col may not be trivial, as Ccolmap is compressed during fillComplete in newmatrix // So, column map of C may be a strict subset of the column map of B - Kokkos::parallel_for(range_type(0,Pview.origMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::parallel_for(range_type(0,Pview.origMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Bcol2Ccol(i) = Ccolmap_local.getLocalElement(Pcolmap_local.getGlobalElement(i)); }); @@ -848,16 +848,16 @@ namespace Tpetra { TEUCHOS_TEST_FOR_EXCEPTION(!Cimport->getSourceMap()->isSameAs(*Pview.origMatrix->getDomainMap()), std::runtime_error, "Tpetra::MMM: Import setUnion messed with the DomainMap in an unfortunate way"); - Kokkos::resize(Icol2Ccol,Pview.importMatrix->getColMap()->getNodeNumElements()); - Kokkos::parallel_for(range_type(0,Pview.importMatrix->getColMap()->getNodeNumElements()),KOKKOS_LAMBDA(const LO i) { + Kokkos::resize(Icol2Ccol,Pview.importMatrix->getColMap()->getLocalNumElements()); + Kokkos::parallel_for(range_type(0,Pview.importMatrix->getColMap()->getLocalNumElements()),KOKKOS_LAMBDA(const LO i) { Icol2Ccol(i) = Ccolmap_local.getLocalElement(Icolmap_local.getGlobalElement(i)); }); } } // Run through all the hash table lookups once and for all - lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getNodeNumElements()); - lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getNodeNumElements()); + lo_view_t targetMapToOrigRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToOrigRow"),Aview.colMap->getLocalNumElements()); + lo_view_t targetMapToImportRow(Kokkos::ViewAllocateWithoutInitializing("targetMapToImportRow"),Aview.colMap->getLocalNumElements()); Kokkos::parallel_for(range_type(Aview.colMap->getMinLocalIndex(), Aview.colMap->getMaxLocalIndex()+1),KOKKOS_LAMBDA(const LO i) { GO aidx = Acolmap_local.getGlobalElement(i); LO B_LID = Prowmap_local.getLocalElement(aidx); @@ -932,7 +932,7 @@ namespace Tpetra { // Sizes RCP Accolmap = Ac.getColMap(); size_t m = Rview.origMatrix->getNodeNumRows(); - size_t n = Accolmap->getNodeNumElements(); + size_t n = Accolmap->getLocalNumElements(); size_t p_max_nnz_per_row = Pview.origMatrix->getNodeMaxNumRowEntries(); // Routine runs on host; have to put arguments on host, too @@ -1193,7 +1193,7 @@ namespace Tpetra { // Sizes RCP Accolmap = Ac.getColMap(); size_t m = Rview.origMatrix->getNodeNumRows(); - size_t n = Accolmap->getNodeNumElements(); + size_t n = Accolmap->getLocalNumElements(); size_t p_max_nnz_per_row = Pview.origMatrix->getNodeMaxNumRowEntries(); // Routine runs on host; have to put arguments on host, too @@ -1469,7 +1469,7 @@ namespace Tpetra { // number of rows on the process of the fine matrix // size_t m = Pview.origMatrix->getNodeNumRows(); // number of rows on the process of the coarse matrix - size_t n = Ac.getRowMap()->getNodeNumElements(); + size_t n = Ac.getRowMap()->getLocalNumElements(); LO maxAccol = Ac.getColMap()->getMaxLocalIndex(); // Get Data Pointers diff --git a/packages/tpetra/core/guide/src/Examples/SourceCode/data_redist_1.cpp b/packages/tpetra/core/guide/src/Examples/SourceCode/data_redist_1.cpp index 270371fffc01..bcd0dfaac3c7 100644 --- a/packages/tpetra/core/guide/src/Examples/SourceCode/data_redist_1.cpp +++ b/packages/tpetra/core/guide/src/Examples/SourceCode/data_redist_1.cpp @@ -82,7 +82,7 @@ createMatrix(const Teuchos::RCP& map) const SC negOne = static_cast(-1.0); const GST numGlobalIndices = map->getGlobalNumElements(); - // const size_t numMyElements = map->getNodeNumElements(); + // const size_t numMyElements = map->getLocalNumElements(); // The list of global elements owned by this MPI process. ArrayView myGlobalElements = map->getNodeElementList(); typedef typename ArrayView::const_iterator iter_type; diff --git a/packages/tpetra/core/guide/src/Examples/SourceCode/power_method_1.cpp b/packages/tpetra/core/guide/src/Examples/SourceCode/power_method_1.cpp index 827517e76a6f..d501fdec9120 100644 --- a/packages/tpetra/core/guide/src/Examples/SourceCode/power_method_1.cpp +++ b/packages/tpetra/core/guide/src/Examples/SourceCode/power_method_1.cpp @@ -212,7 +212,7 @@ main (int argc, char *argv[]) // equations on each processor. const global_ordinal_type indexBase = 0; RCP map = rcp (new map_type (numGblIndices, indexBase, comm)); - const size_t numMyElements = map->getNodeNumElements (); + const size_t numMyElements = map->getLocalNumElements (); // If you like, you may get the list of global indices that the // calling process owns. This is unnecessary if you don't mind diff --git a/packages/tpetra/core/inout/MatrixMarket_Tpetra.hpp b/packages/tpetra/core/inout/MatrixMarket_Tpetra.hpp index 69bdeb9cd26b..22718efe0c0c 100644 --- a/packages/tpetra/core/inout/MatrixMarket_Tpetra.hpp +++ b/packages/tpetra/core/inout/MatrixMarket_Tpetra.hpp @@ -438,12 +438,12 @@ namespace Tpetra { ArrayView myRows = pRowMap->getNodeElementList(); const size_type myNumRows = myRows.size(); TEUCHOS_TEST_FOR_EXCEPTION(static_cast(myNumRows) != - pRowMap->getNodeNumElements(), + pRowMap->getLocalNumElements(), std::logic_error, "pRowMap->getNodeElementList().size() = " << myNumRows - << " != pRowMap->getNodeNumElements() = " - << pRowMap->getNodeNumElements() << ". " + << " != pRowMap->getLocalNumElements() = " + << pRowMap->getLocalNumElements() << ". " "Please report this bug to the Tpetra developers."); TEUCHOS_TEST_FOR_EXCEPTION(myRank == 0 && numEntriesPerRow.size() < myNumRows, std::logic_error, @@ -1554,7 +1554,7 @@ namespace Tpetra { } } - Teuchos::Array numEntriesPerRow (proc0Map->getNodeNumElements ()); + Teuchos::Array numEntriesPerRow (proc0Map->getLocalNumElements ()); for (const auto& ent : numEntriesPerRow_map) { const local_ordinal_type lclRow = proc0Map->getLocalElement (ent.first); numEntriesPerRow[lclRow] = ent.second; @@ -7547,7 +7547,7 @@ namespace Tpetra { err->pushTab (); } - const size_t myNumRows = map.getNodeNumElements (); + const size_t myNumRows = map.getLocalNumElements (); // Use a different tag for the "size" messages than for the // "data" messages, in order to help us debug any mix-ups. const int sizeTag = 1337; @@ -8336,7 +8336,7 @@ namespace Tpetra { } // Create map that replicates the range map on pid 0 and is empty for all other pids - size_t numLocalRangeEntries = rangeMap->getNodeNumElements(); + size_t numLocalRangeEntries = rangeMap->getLocalNumElements(); // Create contiguous source map RCP allGidsMap = rcp(new map_type(TGOT::invalid(), numLocalRangeEntries, diff --git a/packages/tpetra/core/inout/MatrixMarket_TpetraNew.hpp b/packages/tpetra/core/inout/MatrixMarket_TpetraNew.hpp index 81e188da5b38..ed068266e641 100644 --- a/packages/tpetra/core/inout/MatrixMarket_TpetraNew.hpp +++ b/packages/tpetra/core/inout/MatrixMarket_TpetraNew.hpp @@ -1124,11 +1124,11 @@ readSparseFile( << " minCol " << A->getColMap()->getMinGlobalIndex() << " maxCol " << A->getColMap()->getMaxGlobalIndex() << "\nRank " << A->getComm()->getRank() - << " nDomain " << A->getDomainMap()->getNodeNumElements() + << " nDomain " << A->getDomainMap()->getLocalNumElements() << " minDomain " << A->getDomainMap()->getMinGlobalIndex() << " maxDomain " << A->getDomainMap()->getMaxGlobalIndex() << "\nRank " << A->getComm()->getRank() - << " nRange " << A->getRangeMap()->getNodeNumElements() + << " nRange " << A->getRangeMap()->getLocalNumElements() << " minRange " << A->getRangeMap()->getMinGlobalIndex() << " maxRange " << A->getRangeMap()->getMaxGlobalIndex() << "\nRank " << A->getComm()->getRank() diff --git a/packages/tpetra/core/inout/Tpetra_DistributionLowerTriangularBlock.hpp b/packages/tpetra/core/inout/Tpetra_DistributionLowerTriangularBlock.hpp index 6846d1edb383..e3d84fe549f0 100644 --- a/packages/tpetra/core/inout/Tpetra_DistributionLowerTriangularBlock.hpp +++ b/packages/tpetra/core/inout/Tpetra_DistributionLowerTriangularBlock.hpp @@ -299,7 +299,7 @@ class DistributionLowerTriangularBlock : public Distribution { Teuchos::Array cols(1); Teuchos::Array vals(1); vals[0] = 1.; - for (size_t i = 0; i < permMap->getNodeNumElements(); i++) { + for (size_t i = 0; i < permMap->getLocalNumElements(); i++) { gno_t gid = permMap->getGlobalElement(i); cols[0] = permuteIndex[gid]; permMatrix->insertGlobalValues(gid, cols(), vals()); diff --git a/packages/tpetra/core/inout/Tpetra_MatrixIO_def.hpp b/packages/tpetra/core/inout/Tpetra_MatrixIO_def.hpp index 63138d4fa4ad..718b916b7981 100644 --- a/packages/tpetra/core/inout/Tpetra_MatrixIO_def.hpp +++ b/packages/tpetra/core/inout/Tpetra_MatrixIO_def.hpp @@ -174,9 +174,9 @@ readHBMatrix (const std::string &filename, TEUCHOS_TEST_FOR_EXCEPTION( rowMap->isDistributed() == false && comm->getSize() > 1, std::runtime_error, "Tpetra::Utils::readHBMatrix(): specified map is not distributed."); } - Teuchos::Array myNNZ (rowMap->getNodeNumElements ()); + Teuchos::Array myNNZ (rowMap->getLocalNumElements ()); if (myRank == 0) { - LocalOrdinal numRowsAlreadyDistributed = rowMap->getNodeNumElements(); + LocalOrdinal numRowsAlreadyDistributed = rowMap->getLocalNumElements(); std::copy(nnzPerRow.begin(), nnzPerRow.begin()+numRowsAlreadyDistributed, myNNZ.begin()); for (int p=1; p < Teuchos::size(*comm); ++p) { size_t numRowsForP; @@ -188,7 +188,7 @@ readHBMatrix (const std::string &filename, } } else { - const size_t numMyRows = rowMap->getNodeNumElements(); + const size_t numMyRows = rowMap->getLocalNumElements(); Teuchos::send(*comm,numMyRows,0); if (numMyRows) { Teuchos::receive(*comm,0,numMyRows,myNNZ(0,numMyRows).getRawPtr()); diff --git a/packages/tpetra/core/src/Tpetra_BlockCrsMatrix_Helpers_def.hpp b/packages/tpetra/core/src/Tpetra_BlockCrsMatrix_Helpers_def.hpp index cb636b540c10..8b14096b84b8 100644 --- a/packages/tpetra/core/src/Tpetra_BlockCrsMatrix_Helpers_def.hpp +++ b/packages/tpetra/core/src/Tpetra_BlockCrsMatrix_Helpers_def.hpp @@ -131,7 +131,7 @@ namespace Tpetra { if (numProcs==1 && !alwaysUseParallelAlgorithm) { writeMatrixStrip(A,os,params); } else { - size_t numRows = rowMap->getNodeNumElements(); + size_t numRows = rowMap->getLocalNumElements(); //Create source map RCP allMeshGidsMap = rcp(new map_type(TOT::invalid(), numRows, A.getIndexBase(), comm)); @@ -520,8 +520,8 @@ namespace Tpetra { // Get the last few things const crs_graph_type & blockGraph = blockMatrix.getCrsGraph(); - LO point_rows = (LO) pointRowMap->getNodeNumElements(); - LO block_rows = (LO) blockRowMap->getNodeNumElements(); + LO point_rows = (LO) pointRowMap->getLocalNumElements(); + LO block_rows = (LO) blockRowMap->getLocalNumElements(); auto blockValues = blockMatrix.getValuesDevice(); auto blockLocalGraph = blockGraph.getLocalGraphDevice(); row_map_type_const blockRowptr = blockLocalGraph.row_map; diff --git a/packages/tpetra/core/src/Tpetra_BlockCrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_BlockCrsMatrix_def.hpp index 1da618cd6d1e..a40a9180c782 100644 --- a/packages/tpetra/core/src/Tpetra_BlockCrsMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_BlockCrsMatrix_def.hpp @@ -979,7 +979,7 @@ class GetLocalDiagCopy { using Kokkos::parallel_for; const char prefix[] = "Tpetra::BlockCrsMatrix::getLocalDiagCopy (2-arg): "; - const LO lclNumMeshRows = static_cast (rowMeshMap_.getNodeNumElements ()); + const LO lclNumMeshRows = static_cast (rowMeshMap_.getLocalNumElements ()); const LO blockSize = this->getBlockSize (); TEUCHOS_TEST_FOR_EXCEPTION (static_cast (diag.extent (0)) < lclNumMeshRows || diff --git a/packages/tpetra/core/src/Tpetra_BlockMultiVector_def.hpp b/packages/tpetra/core/src/Tpetra_BlockMultiVector_def.hpp index 5ad71e1042d6..dbc28cfbc4e4 100644 --- a/packages/tpetra/core/src/Tpetra_BlockMultiVector_def.hpp +++ b/packages/tpetra/core/src/Tpetra_BlockMultiVector_def.hpp @@ -275,7 +275,7 @@ makePointMap (const map_type& meshMap, const LO blockSize) const GST gblNumMeshMapInds = static_cast (meshMap.getGlobalNumElements ()); const size_t lclNumMeshMapIndices = - static_cast (meshMap.getNodeNumElements ()); + static_cast (meshMap.getLocalNumElements ()); const GST gblNumPointMapInds = gblNumMeshMapInds * static_cast (blockSize); const size_t lclNumPointMapInds = @@ -821,7 +821,7 @@ blockWiseMultiply (const Scalar& alpha, { using Kokkos::ALL; typedef typename device_type::execution_space execution_space; - const LO lclNumMeshRows = meshMap_.getNodeNumElements (); + const LO lclNumMeshRows = meshMap_.getLocalNumElements (); if (alpha == STS::zero ()) { this->putScalar (STS::zero ()); diff --git a/packages/tpetra/core/src/Tpetra_ComputeGatherMap.hpp b/packages/tpetra/core/src/Tpetra_ComputeGatherMap.hpp index 9bca7e67a65d..ca5560af3973 100644 --- a/packages/tpetra/core/src/Tpetra_ComputeGatherMap.hpp +++ b/packages/tpetra/core/src/Tpetra_ComputeGatherMap.hpp @@ -258,7 +258,7 @@ namespace Tpetra { // order of rows right) at a time, and overlapping writing // to the file (resp. reading from it) with receiving (resp. // sending) the next chunk. - const int myEltCount = as (oneToOneMap->getNodeNumElements ()); + const int myEltCount = as (oneToOneMap->getLocalNumElements ()); Array recvCounts (numProcs); const int rootProc = 0; gather (&myEltCount, 1, recvCounts.getRawPtr (), 1, rootProc, comm); diff --git a/packages/tpetra/core/src/Tpetra_CrsGraphTransposer_def.hpp b/packages/tpetra/core/src/Tpetra_CrsGraphTransposer_def.hpp index dc4310f47aa7..54a405691eeb 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraphTransposer_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraphTransposer_def.hpp @@ -462,7 +462,7 @@ namespace Tpetra { using c_entries_t = typename local_graph_device_type::entries_type; using rowmap_t = typename local_graph_device_type::row_map_type::non_const_type; using entries_t = typename local_graph_device_type::entries_type::non_const_type; - LocalOrdinal numCols = origGraph_->getColMap()->getNodeNumElements(); + LocalOrdinal numCols = origGraph_->getColMap()->getLocalNumElements(); rowmap_t lclGraphT_rowmap("Transpose rowmap", numCols + 1); entries_t lclGraphT_entries( Kokkos::ViewAllocateWithoutInitializing("Transpose entries"), lclGraph.entries.extent(0)); diff --git a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp index 5ecfc74eff26..6fde1f819d4e 100644 --- a/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsGraph_def.hpp @@ -386,7 +386,7 @@ namespace Tpetra { staticAssertions (); const size_t lclNumRows = rowMap.is_null () ? - static_cast (0) : rowMap->getNodeNumElements (); + static_cast (0) : rowMap->getLocalNumElements (); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( static_cast (numEntPerRow.size ()) != lclNumRows, std::invalid_argument, "numEntPerRow has length " << numEntPerRow.size () @@ -452,7 +452,7 @@ namespace Tpetra { staticAssertions (); const size_t lclNumRows = rowMap.is_null () ? - static_cast (0) : rowMap->getNodeNumElements (); + static_cast (0) : rowMap->getLocalNumElements (); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( static_cast (numEntPerRow.extent (0)) != lclNumRows, std::invalid_argument, "numEntPerRow has length " << @@ -506,7 +506,7 @@ namespace Tpetra { staticAssertions (); const size_t lclNumRows = rowMap.is_null () ? - static_cast (0) : rowMap->getNodeNumElements (); + static_cast (0) : rowMap->getLocalNumElements (); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( static_cast (numEntPerRow.extent (0)) != lclNumRows, std::invalid_argument, "numEntPerRow has length " << @@ -559,7 +559,7 @@ namespace Tpetra { staticAssertions (); const size_t lclNumRows = rowMap.is_null () ? - static_cast (0) : rowMap->getNodeNumElements (); + static_cast (0) : rowMap->getLocalNumElements (); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( static_cast (numEntPerRow.size ()) != lclNumRows, std::invalid_argument, "numEntPerRow has length " << numEntPerRow.size () @@ -613,7 +613,7 @@ namespace Tpetra { { staticAssertions(); - int numRows = rowMap->getNodeNumElements(); + int numRows = rowMap->getLocalNumElements(); size_t numNonZeros = originalGraph.rowPtrsPacked_host_(numRows); auto rowsToUse = Kokkos::pair(0, numRows+1); @@ -725,15 +725,15 @@ namespace Tpetra { colMap.is_null (), std::runtime_error, ": The input column Map must be nonnull."); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( - k_local_graph_.numRows () != rowMap->getNodeNumElements (), + k_local_graph_.numRows () != rowMap->getLocalNumElements (), std::runtime_error, ": The input row Map and the input local graph need to have the same " - "number of rows. The row Map claims " << rowMap->getNodeNumElements () + "number of rows. The row Map claims " << rowMap->getLocalNumElements () << " row(s), but the local graph claims " << k_local_graph_.numRows () << " row(s)."); // NOTE (mfh 17 Mar 2014) getNodeNumRows() returns - // rowMap_->getNodeNumElements(), but it doesn't have to. + // rowMap_->getLocalNumElements(), but it doesn't have to. // TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( // k_local_graph_.numRows () != getNodeNumRows (), std::runtime_error, // ": The input row Map and the input local graph need to have the same " @@ -903,7 +903,7 @@ namespace Tpetra { { return this->rowMap_.is_null () ? static_cast (0) : - this->rowMap_->getNodeNumElements (); + this->rowMap_->getLocalNumElements (); } template @@ -919,7 +919,7 @@ namespace Tpetra { "column Map was given to the constructor, or that fillComplete() has " "been called."); return colMap_.is_null () ? static_cast (0) : - colMap_->getNodeNumElements (); + colMap_->getLocalNumElements (); } @@ -5949,7 +5949,7 @@ namespace Tpetra { // packCrsGraphNew requires k_rowPtrsPacked_ to be set else if (! getColMap ().is_null () && (rowPtrsPacked_dev_.extent (0) != 0 || - getRowMap ()->getNodeNumElements () == 0)) { + getRowMap ()->getLocalNumElements () == 0)) { if (verbose) { std::ostringstream os; os << *prefix << "packCrsGraphNew path" << endl; @@ -5987,7 +5987,7 @@ namespace Tpetra { { auto col_map = this->getColMap(); // packCrsGraph requires k_rowPtrsPacked to be set - if( !col_map.is_null() && (rowPtrsPacked_dev_.extent(0) != 0 || getRowMap()->getNodeNumElements() ==0)) { + if( !col_map.is_null() && (rowPtrsPacked_dev_.extent(0) != 0 || getRowMap()->getLocalNumElements() ==0)) { using Tpetra::Details::packCrsGraph; packCrsGraph(*this, exports, numPacketsPerLID, exportLIDs, constantNumPackets); @@ -7339,13 +7339,13 @@ namespace Tpetra { SourceDomain_pids.putScalar(MyPID); SourceCol_pids.doImport(SourceDomain_pids, *MyImporter, INSERT); - SourcePids.resize(getColMap()->getNodeNumElements()); + SourcePids.resize(getColMap()->getLocalNumElements()); SourceCol_pids.get1dCopy(SourcePids()); } else if (MyImporter.is_null() && bSameDomainMap) { // Graph has no off-process entries - SourcePids.resize(getColMap()->getNodeNumElements()); - SourcePids.assign(getColMap()->getNodeNumElements(), MyPID); + SourcePids.resize(getColMap()->getLocalNumElements()); + SourcePids.assign(getColMap()->getLocalNumElements(), MyPID); } else if ( ! MyImporter.is_null() && ! domainTransfer.is_null() ) { @@ -7382,7 +7382,7 @@ namespace Tpetra { prefix << "Should never get here! Please report this bug to a Tpetra developer."); } SourceCol_pids.doImport(SourceDomain_pids, *MyImporter, INSERT); - SourcePids.resize(getColMap()->getNodeNumElements()); + SourcePids.resize(getColMap()->getLocalNumElements()); SourceCol_pids.get1dCopy(SourcePids()); } else if (BaseDomainMap->isSameAs(*BaseRowMap) && @@ -7411,7 +7411,7 @@ namespace Tpetra { prefix << "Should never get here! Please report this bug to a Tpetra developer."); } SourceCol_pids.doImport(SourceRow_pids, *MyImporter, INSERT); - SourcePids.resize(getColMap()->getNodeNumElements()); + SourcePids.resize(getColMap()->getLocalNumElements()); SourceCol_pids.get1dCopy(SourcePids()); } else { @@ -7563,7 +7563,7 @@ namespace Tpetra { numImportPacketsPerLID, constantNumPackets, INSERT, NumSameIDs, PermuteToLIDs, PermuteFromLIDs); - size_t N = BaseRowMap->getNodeNumElements(); + size_t N = BaseRowMap->getLocalNumElements(); // Allocations ArrayRCP CSR_rowptr(N+1); diff --git a/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp index 4c623acea8f9..dc5788979588 100644 --- a/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_CrsMatrix_def.hpp @@ -1088,7 +1088,7 @@ namespace Tpetra { CrsMatrix:: getLocalMatrixDevice () const { - auto numCols = staticGraph_->getColMap()->getNodeNumElements(); + auto numCols = staticGraph_->getColMap()->getLocalNumElements(); return local_matrix_device_type("Tpetra::CrsMatrix::lclMatrixDevice", numCols, valuesPacked_wdv.getDeviceView(Access::ReadWrite), @@ -1100,7 +1100,7 @@ namespace Tpetra { CrsMatrix:: getLocalMatrixHost () const { - auto numCols = staticGraph_->getColMap()->getNodeNumElements(); + auto numCols = staticGraph_->getColMap()->getLocalNumElements(); return local_matrix_host_type("Tpetra::CrsMatrix::lclMatrixHost", numCols, valuesPacked_wdv.getHostView(Access::ReadWrite), staticGraph_->getLocalGraphHost()); @@ -5487,32 +5487,32 @@ CrsMatrix:: const bool transpose = (mode != Teuchos::NO_TRANS); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (! transpose && X.getLocalLength () != - getColMap ()->getNodeNumElements (), std::runtime_error, + getColMap ()->getLocalNumElements (), std::runtime_error, "NO_TRANS case: X has the wrong number of local rows. " "X.getLocalLength() = " << X.getLocalLength () << " != " - "getColMap()->getNodeNumElements() = " << - getColMap ()->getNodeNumElements () << "."); + "getColMap()->getLocalNumElements() = " << + getColMap ()->getLocalNumElements () << "."); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (! transpose && Y.getLocalLength () != - getRowMap ()->getNodeNumElements (), std::runtime_error, + getRowMap ()->getLocalNumElements (), std::runtime_error, "NO_TRANS case: Y has the wrong number of local rows. " "Y.getLocalLength() = " << Y.getLocalLength () << " != " - "getRowMap()->getNodeNumElements() = " << - getRowMap ()->getNodeNumElements () << "."); + "getRowMap()->getLocalNumElements() = " << + getRowMap ()->getLocalNumElements () << "."); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (transpose && X.getLocalLength () != - getRowMap ()->getNodeNumElements (), std::runtime_error, + getRowMap ()->getLocalNumElements (), std::runtime_error, "TRANS or CONJ_TRANS case: X has the wrong number of local " "rows. X.getLocalLength() = " << X.getLocalLength () - << " != getRowMap()->getNodeNumElements() = " - << getRowMap ()->getNodeNumElements () << "."); + << " != getRowMap()->getLocalNumElements() = " + << getRowMap ()->getLocalNumElements () << "."); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (transpose && Y.getLocalLength () != - getColMap ()->getNodeNumElements (), std::runtime_error, + getColMap ()->getLocalNumElements (), std::runtime_error, "TRANS or CONJ_TRANS case: X has the wrong number of local " "rows. Y.getLocalLength() = " << Y.getLocalLength () - << " != getColMap()->getNodeNumElements() = " - << getColMap ()->getNodeNumElements () << "."); + << " != getColMap()->getLocalNumElements() = " + << getColMap ()->getLocalNumElements () << "."); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (! isFillComplete (), std::runtime_error, "The matrix is not " "fill complete. You must call fillComplete() (possibly with " @@ -8001,7 +8001,7 @@ CrsMatrix:: // actually computing the sum. A reasonable upper bound is the // sum of the two entry counts in each row. if (A_rowMap->isSameAs (*B_rowMap)) { - const LO localNumRows = static_cast (A_rowMap->getNodeNumElements ()); + const LO localNumRows = static_cast (A_rowMap->getLocalNumElements ()); Array C_maxNumEntriesPerRow (localNumRows, 0); // Get the number of entries in each row of A. @@ -8056,7 +8056,7 @@ CrsMatrix:: vals_type val; if (alpha != ZERO) { - const LO A_localNumRows = static_cast (A_rowMap->getNodeNumElements ()); + const LO A_localNumRows = static_cast (A_rowMap->getLocalNumElements ()); for (LO localRow = 0; localRow < A_localNumRows; ++localRow) { size_t A_numEntries = A.getNumEntriesInLocalRow (localRow); const GO globalRow = A_rowMap->getGlobalElement (localRow); @@ -8080,7 +8080,7 @@ CrsMatrix:: } if (beta != ZERO) { - const LO B_localNumRows = static_cast (B_rowMap->getNodeNumElements ()); + const LO B_localNumRows = static_cast (B_rowMap->getLocalNumElements ()); for (LO localRow = 0; localRow < B_localNumRows; ++localRow) { size_t B_numEntries = B.getNumEntriesInLocalRow (localRow); const GO globalRow = B_rowMap->getGlobalElement (localRow); @@ -8468,13 +8468,13 @@ CrsMatrix:: SourceDomain_pids.putScalar(MyPID); SourceCol_pids.doImport (SourceDomain_pids, *MyImporter, INSERT); - SourcePids.resize (getColMap ()->getNodeNumElements ()); + SourcePids.resize (getColMap ()->getLocalNumElements ()); SourceCol_pids.get1dCopy (SourcePids ()); } else if (MyImporter.is_null ()) { // Matrix has no off-process entries - SourcePids.resize (getColMap ()->getNodeNumElements ()); - SourcePids.assign (getColMap ()->getNodeNumElements (), MyPID); + SourcePids.resize (getColMap ()->getLocalNumElements ()); + SourcePids.assign (getColMap ()->getLocalNumElements (), MyPID); } else if ( ! MyImporter.is_null () && ! domainTransfer.is_null () ) { @@ -8512,7 +8512,7 @@ CrsMatrix:: "Please report this bug to a Tpetra developer."); } SourceCol_pids.doImport (SourceDomain_pids, *MyImporter, INSERT); - SourcePids.resize (getColMap ()->getNodeNumElements ()); + SourcePids.resize (getColMap ()->getLocalNumElements ()); SourceCol_pids.get1dCopy (SourcePids ()); } else if ( ! MyImporter.is_null () && @@ -8545,7 +8545,7 @@ CrsMatrix:: } SourceCol_pids.doImport (SourceRow_pids, *MyImporter, INSERT); - SourcePids.resize (getColMap ()->getNodeNumElements ()); + SourcePids.resize (getColMap ()->getLocalNumElements ()); SourceCol_pids.get1dCopy (SourcePids ()); } else { @@ -8914,7 +8914,7 @@ CrsMatrix:: << mynnz << std::endl; std::cerr << os.str (); } - size_t N = BaseRowMap->getNodeNumElements (); + size_t N = BaseRowMap->getLocalNumElements (); // Allocations ArrayRCP CSR_rowptr(N+1); @@ -9155,7 +9155,7 @@ CrsMatrix:: Teuchos::ArrayView TEPID2 = rowTransfer.getExportPIDs(); // row matrix Teuchos::ArrayView TELID2 = rowTransfer.getExportLIDs(); - const int numCols = getGraph()->getColMap()->getNodeNumElements(); // may be dup + const int numCols = getGraph()->getColMap()->getLocalNumElements(); // may be dup // from EpetraExt_MMHelpers.cpp: build_type2_exports std::vector IsOwned(numCols,true); std::vector SentTo(numCols,-1); diff --git a/packages/tpetra/core/src/Tpetra_Details_LocalMap.hpp b/packages/tpetra/core/src/Tpetra_Details_LocalMap.hpp index 43e7eeeac23c..66fb4956a86d 100644 --- a/packages/tpetra/core/src/Tpetra_Details_LocalMap.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_LocalMap.hpp @@ -124,7 +124,7 @@ class LocalMap { {} //! The number of indices that live on the calling process. - KOKKOS_INLINE_FUNCTION LocalOrdinal getNodeNumElements () const { + KOKKOS_INLINE_FUNCTION LocalOrdinal getLocalNumElements () const { return numLocalElements_; } diff --git a/packages/tpetra/core/src/Tpetra_Details_Transfer_def.hpp b/packages/tpetra/core/src/Tpetra_Details_Transfer_def.hpp index a9759fa67e77..0314b28fef14 100644 --- a/packages/tpetra/core/src/Tpetra_Details_Transfer_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_Transfer_def.hpp @@ -303,8 +303,8 @@ template bool Transfer:: isLocallyFitted () const { - return (getNumSameIDs() == std::min(getSourceMap()->getNodeNumElements(), - getTargetMap()->getNodeNumElements())); + return (getNumSameIDs() == std::min(getSourceMap()->getLocalNumElements(), + getTargetMap()->getLocalNumElements())); } template @@ -315,9 +315,9 @@ detectRemoteExportLIDsContiguous () const { // Check that maps are locally fitted // TODO: We really want to check here that remote LIDs are sorted last. // The current check is too restrictive in special cases. - bool ordered = (getNumSameIDs() == std::min(getSourceMap()->getNodeNumElements(), - getTargetMap()->getNodeNumElements())); - ordered &= (getTargetMap()->getNodeNumElements() == getNumSameIDs() + getNumRemoteIDs()); + bool ordered = (getNumSameIDs() == std::min(getSourceMap()->getLocalNumElements(), + getTargetMap()->getLocalNumElements())); + ordered &= (getTargetMap()->getLocalNumElements() == getNumSameIDs() + getNumRemoteIDs()); if (ordered) { const auto& dv = TransferData_->remoteLIDs_; TEUCHOS_TEST_FOR_EXCEPTION @@ -329,9 +329,9 @@ detectRemoteExportLIDsContiguous () const { } TransferData_->remoteLIDsContiguous_ = ordered; - ordered = (getNumSameIDs() == std::min(getSourceMap()->getNodeNumElements(), - getTargetMap()->getNodeNumElements())); - ordered &= (getSourceMap()->getNodeNumElements() == getNumSameIDs() + getNumExportIDs()); + ordered = (getNumSameIDs() == std::min(getSourceMap()->getLocalNumElements(), + getTargetMap()->getLocalNumElements())); + ordered &= (getSourceMap()->getLocalNumElements() == getNumSameIDs() + getNumExportIDs()); if (ordered) { const auto& dv = TransferData_->exportLIDs_; TEUCHOS_TEST_FOR_EXCEPTION diff --git a/packages/tpetra/core/src/Tpetra_Details_getDiagCopyWithoutOffsets_def.hpp b/packages/tpetra/core/src/Tpetra_Details_getDiagCopyWithoutOffsets_def.hpp index ba6592628d50..1663a7e8fffa 100644 --- a/packages/tpetra/core/src/Tpetra_Details_getDiagCopyWithoutOffsets_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_getDiagCopyWithoutOffsets_def.hpp @@ -120,11 +120,11 @@ class GetLocalDiagCopyWithoutOffsetsNotFillCompleteFunctor { const LO lclNumRows = static_cast (diag.getLocalLength ()); { const LO matLclNumRows = - static_cast (lclRowMap_.getNodeNumElements ()); + static_cast (lclRowMap_.getLocalNumElements ()); TEUCHOS_TEST_FOR_EXCEPTION (lclNumRows != matLclNumRows, std::invalid_argument, "diag.getLocalLength() = " << lclNumRows << " != " - "A.getRowMap()->getNodeNumElements() = " << matLclNumRows << "."); + "A.getRowMap()->getLocalNumElements() = " << matLclNumRows << "."); } // Side effects start below this point. diff --git a/packages/tpetra/core/src/Tpetra_Details_getGraphDiagOffsets_def.hpp b/packages/tpetra/core/src/Tpetra_Details_getGraphDiagOffsets_def.hpp index 03283f802821..13b9ca5591a8 100644 --- a/packages/tpetra/core/src/Tpetra_Details_getGraphDiagOffsets_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_getGraphDiagOffsets_def.hpp @@ -91,7 +91,7 @@ GetGraphDiagOffsets (const diag_offsets_type& diagOffsets, typedef typename device_type::execution_space execution_space; typedef Kokkos::RangePolicy policy_type; - const LO lclNumRows = lclRowMap.getNodeNumElements (); + const LO lclNumRows = lclRowMap.getLocalNumElements (); policy_type range (0, lclNumRows); Kokkos::parallel_for (range, *this); } diff --git a/packages/tpetra/core/src/Tpetra_Details_localDeepCopyRowMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_Details_localDeepCopyRowMatrix_def.hpp index 8d7f74876cf4..7e92226ac5bf 100644 --- a/packages/tpetra/core/src/Tpetra_Details_localDeepCopyRowMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_localDeepCopyRowMatrix_def.hpp @@ -150,7 +150,7 @@ localDeepCopyLocallyIndexedRowMatrix Kokkos::deep_copy (val, val_h); local_graph_device_type lclGraph (ind, ptr); - const size_t numCols = A.getColMap ()->getNodeNumElements (); + const size_t numCols = A.getColMap ()->getLocalNumElements (); return local_matrix_device_type (label, numCols, val, lclGraph); } diff --git a/packages/tpetra/core/src/Tpetra_Details_makeColMap_def.hpp b/packages/tpetra/core/src/Tpetra_Details_makeColMap_def.hpp index bb493719c5c0..f4d01df82afb 100644 --- a/packages/tpetra/core/src/Tpetra_Details_makeColMap_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_makeColMap_def.hpp @@ -126,7 +126,7 @@ makeColMapImpl(Teuchos::RCP>& colMap, "domain and range Maps as input." << endl; } } - if (numLocalColGIDs == domMap->getNodeNumElements ()) { + if (numLocalColGIDs == domMap->getLocalNumElements ()) { colMap = domMap; // shallow copy return errCode; } @@ -207,7 +207,7 @@ makeColMapImpl(Teuchos::RCP>& colMap, // maintain a consistent ordering of GIDs between the columns // and the domain. - const size_t numDomainElts = domMap->getNodeNumElements (); + const size_t numDomainElts = domMap->getLocalNumElements (); if (numLocalColGIDs == numDomainElts) { // If the number of locally owned GIDs are the same as the // number of local domain Map elements, then the local domain @@ -375,7 +375,7 @@ makeColMap (Teuchos::RCP >& colMap, // Assume that we want to recreate the column Map. if (colMap->isContiguous ()) { // The number of indices on each process must fit in LO. - const LO numCurGids = static_cast (colMap->getNodeNumElements ()); + const LO numCurGids = static_cast (colMap->getLocalNumElements ()); myColumns.resize (numCurGids); const GO myFirstGblInd = colMap->getMinGlobalIndex (); for (LO k = 0; k < numCurGids; ++k) { @@ -423,7 +423,7 @@ makeColMap (Teuchos::RCP >& colMap, // GIDisLocal[lid] is false if and only if local index lid in the // domain Map is remote (not local). - std::vector GIDisLocal (domMap->getNodeNumElements (), false); + std::vector GIDisLocal (domMap->getLocalNumElements (), false); std::set RemoteGIDSet; // This preserves the not-sorted Epetra order of GIDs. // We only use this if sortEachProcsGids is false. @@ -431,7 +431,7 @@ makeColMap (Teuchos::RCP >& colMap, if (! graph.getRowMap ().is_null ()) { const Tpetra::Map& rowMap = * (graph.getRowMap ()); - const LO lclNumRows = rowMap.getNodeNumElements (); + const LO lclNumRows = rowMap.getLocalNumElements (); for (LO lclRow = 0; lclRow < lclNumRows; ++lclRow) { const GO gblRow = rowMap.getGlobalElement (lclRow); typename RowGraph::global_inds_host_view_type rowGids; @@ -639,7 +639,7 @@ makeColMap (Teuchos::RCP>& colMap, //Finally, populate the STL structures which hold the index lists std::set RemoteGIDSet; std::vector RemoteGIDUnorderedVector; - std::vector GIDisLocal (domMap->getNodeNumElements (), false); + std::vector GIDisLocal (domMap->getLocalNumElements (), false); for(GO i = 0; i < numLocalColGIDs; i++) { GO gid = localsHost(i); diff --git a/packages/tpetra/core/src/Tpetra_Details_makeOptimizedColMap.hpp b/packages/tpetra/core/src/Tpetra_Details_makeOptimizedColMap.hpp index e7141dabe78f..0702241b70a1 100644 --- a/packages/tpetra/core/src/Tpetra_Details_makeOptimizedColMap.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_makeOptimizedColMap.hpp @@ -132,7 +132,7 @@ namespace Details { if (verbose) { std::ostringstream os; os << *verboseHeader << "Domain Map GIDs: ["; - const LO domMapLclNumInds = static_cast (domMap.getNodeNumElements ()); + const LO domMapLclNumInds = static_cast (domMap.getLocalNumElements ()); for (LO lid = 0; lid < domMapLclNumInds; ++lid) { const GO gid = domMap.getGlobalElement (lid); os << gid; @@ -144,7 +144,7 @@ namespace Details { out << os.str (); } - const LO colMapLclNumInds = static_cast (colMap.getNodeNumElements ()); + const LO colMapLclNumInds = static_cast (colMap.getLocalNumElements ()); if (verbose) { std::ostringstream os; diff --git a/packages/tpetra/core/src/Tpetra_Details_residual.hpp b/packages/tpetra/core/src/Tpetra_Details_residual.hpp index 7c532a030d82..2d00d18a4e6b 100644 --- a/packages/tpetra/core/src/Tpetra_Details_residual.hpp +++ b/packages/tpetra/core/src/Tpetra_Details_residual.hpp @@ -303,25 +303,25 @@ void localResidual(const CrsMatrix & A, "R.getNumVectors() = " << R.getNumVectors () << "."); TEUCHOS_TEST_FOR_EXCEPTION (X_colmap.getLocalLength () != - A.getColMap ()->getNodeNumElements (), std::runtime_error, + A.getColMap ()->getLocalNumElements (), std::runtime_error, "X has the wrong number of local rows. " "X.getLocalLength() = " << X_colmap.getLocalLength () << " != " - "A.getColMap()->getNodeNumElements() = " << - A.getColMap ()->getNodeNumElements () << "."); + "A.getColMap()->getLocalNumElements() = " << + A.getColMap ()->getLocalNumElements () << "."); TEUCHOS_TEST_FOR_EXCEPTION (R.getLocalLength () != - A.getRowMap ()->getNodeNumElements (), std::runtime_error, + A.getRowMap ()->getLocalNumElements (), std::runtime_error, "R has the wrong number of local rows. " "R.getLocalLength() = " << R.getLocalLength () << " != " - "A.getRowMap()->getNodeNumElements() = " << - A.getRowMap ()->getNodeNumElements () << "."); + "A.getRowMap()->getLocalNumElements() = " << + A.getRowMap ()->getLocalNumElements () << "."); TEUCHOS_TEST_FOR_EXCEPTION (B.getLocalLength () != - A.getRowMap ()->getNodeNumElements (), std::runtime_error, + A.getRowMap ()->getLocalNumElements (), std::runtime_error, "B has the wrong number of local rows. " "B.getLocalLength() = " << B.getLocalLength () << " != " - "A.getRowMap()->getNodeNumElements() = " << - A.getRowMap ()->getNodeNumElements () << "."); + "A.getRowMap()->getLocalNumElements() = " << + A.getRowMap ()->getLocalNumElements () << "."); TEUCHOS_TEST_FOR_EXCEPTION (! A.isFillComplete (), std::runtime_error, "The matrix A is not " @@ -462,25 +462,25 @@ void localResidualWithCommCompOverlap(const CrsMatrix & A, "R.getNumVectors() = " << R.getNumVectors () << "."); TEUCHOS_TEST_FOR_EXCEPTION (X_colmap.getLocalLength () != - A.getColMap ()->getNodeNumElements (), std::runtime_error, + A.getColMap ()->getLocalNumElements (), std::runtime_error, "X has the wrong number of local rows. " "X.getLocalLength() = " << X_colmap.getLocalLength () << " != " - "A.getColMap()->getNodeNumElements() = " << - A.getColMap ()->getNodeNumElements () << "."); + "A.getColMap()->getLocalNumElements() = " << + A.getColMap ()->getLocalNumElements () << "."); TEUCHOS_TEST_FOR_EXCEPTION (R.getLocalLength () != - A.getRowMap ()->getNodeNumElements (), std::runtime_error, + A.getRowMap ()->getLocalNumElements (), std::runtime_error, "R has the wrong number of local rows. " "R.getLocalLength() = " << R.getLocalLength () << " != " - "A.getRowMap()->getNodeNumElements() = " << - A.getRowMap ()->getNodeNumElements () << "."); + "A.getRowMap()->getLocalNumElements() = " << + A.getRowMap ()->getLocalNumElements () << "."); TEUCHOS_TEST_FOR_EXCEPTION (B.getLocalLength () != - A.getRowMap ()->getNodeNumElements (), std::runtime_error, + A.getRowMap ()->getLocalNumElements (), std::runtime_error, "B has the wrong number of local rows. " "B.getLocalLength() = " << B.getLocalLength () << " != " - "A.getRowMap()->getNodeNumElements() = " << - A.getRowMap ()->getNodeNumElements () << "."); + "A.getRowMap()->getLocalNumElements() = " << + A.getRowMap ()->getLocalNumElements () << "."); TEUCHOS_TEST_FOR_EXCEPTION (! A.isFillComplete (), std::runtime_error, "The matrix A is not " diff --git a/packages/tpetra/core/src/Tpetra_DirectoryImpl_def.hpp b/packages/tpetra/core/src/Tpetra_DirectoryImpl_def.hpp index e238d75d6f47..012f2b064200 100644 --- a/packages/tpetra/core/src/Tpetra_DirectoryImpl_def.hpp +++ b/packages/tpetra/core/src/Tpetra_DirectoryImpl_def.hpp @@ -609,7 +609,7 @@ namespace Tpetra { directoryMap_ = rcp (new map_type (numGlobalEntries, minAllGID, comm, GloballyDistributed)); // The number of Directory elements that my process owns. - const size_t dir_numMyEntries = directoryMap_->getNodeNumElements (); + const size_t dir_numMyEntries = directoryMap_->getLocalNumElements (); // Fix for Bug 5822: If the input Map is "sparse," that is if // the difference between the global min and global max GID is @@ -635,13 +635,13 @@ namespace Tpetra { // switch to a hash table - based implementation. const size_t inverseSparsityThreshold = 10; useHashTables_ = - (dir_numMyEntries >= inverseSparsityThreshold * map.getNodeNumElements()); + (dir_numMyEntries >= inverseSparsityThreshold * map.getLocalNumElements()); // Get list of process IDs that own the directory entries for the // Map GIDs. These will be the targets of the sends that the // Distributor will do. const int myRank = comm->getRank (); - const size_t numMyEntries = map.getNodeNumElements (); + const size_t numMyEntries = map.getLocalNumElements (); Array sendImageIDs (numMyEntries); ArrayView myGlobalEntries = map.getNodeElementList (); // An ID not present in this lookup indicates that it lies outside diff --git a/packages/tpetra/core/src/Tpetra_Directory_def.hpp b/packages/tpetra/core/src/Tpetra_Directory_def.hpp index d3b658d88f6f..ced16d7f4065 100644 --- a/packages/tpetra/core/src/Tpetra_Directory_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Directory_def.hpp @@ -128,7 +128,7 @@ namespace Tpetra { else { dir = new ::Tpetra::Details::ReplicatedDirectory (map); - if (tieBreak.mayHaveSideEffects () && map.getNodeNumElements () != 0) { + if (tieBreak.mayHaveSideEffects () && map.getLocalNumElements () != 0) { // We need the second clause in the above test because Map's // interface provides an inclusive range of local indices. const int myRank = map.getComm ()->getRank (); @@ -155,7 +155,7 @@ namespace Tpetra { // This code appears twice because ReplicatedDirectory is a // special case: we already know what gets replicated. if (! usedTieBreak && tieBreak.mayHaveSideEffects () && - map.getNodeNumElements () != 0) { + map.getLocalNumElements () != 0) { // We need the third clause in the above test because Map's // interface provides an inclusive range of local indices. std::vector > pidLidList (1); diff --git a/packages/tpetra/core/src/Tpetra_EpetraRowMatrix.hpp b/packages/tpetra/core/src/Tpetra_EpetraRowMatrix.hpp index f4d03b52d81a..703ec01da7a9 100644 --- a/packages/tpetra/core/src/Tpetra_EpetraRowMatrix.hpp +++ b/packages/tpetra/core/src/Tpetra_EpetraRowMatrix.hpp @@ -82,7 +82,7 @@ tpetraToEpetraMapTmpl (const TpetraMapType& tpetraMap) typedef EpetraGlobalOrdinalType EGO; const TGO gblNumInds = static_cast (tpetraMap.getGlobalNumElements ()); - const LO lclNumInds = static_cast (tpetraMap.getNodeNumElements ()); + const LO lclNumInds = static_cast (tpetraMap.getLocalNumElements ()); ArrayView global_index_list = tpetraMap.getNodeElementList (); std::vector global_index_list_epetra; diff --git a/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp b/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp index 4869ead9cb68..63cebec90500 100644 --- a/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp +++ b/packages/tpetra/core/src/Tpetra_FECrsGraph_def.hpp @@ -230,10 +230,10 @@ setup(const Teuchos::RCP & ownedRowMap, } // Make sure the ownedPlusSharedRowMap has at least as many entries at the ownedRowMap (due to our superset requriement) - TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( ownedRowsImporter_->getNumSameIDs() != ownedRowsImporter_->getSourceMap()->getNodeNumElements(), + TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( ownedRowsImporter_->getNumSameIDs() != ownedRowsImporter_->getSourceMap()->getLocalNumElements(), std::runtime_error,"ownedRowMap contains entries which are not in the ownedPlusSharedRowMap."); - TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( ownedRowMap->getNodeNumElements() > ownedPlusSharedRowMap->getNodeNumElements(), + TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( ownedRowMap->getLocalNumElements() > ownedPlusSharedRowMap->getLocalNumElements(), std::runtime_error,"ownedRowMap more entries than the ownedPlusSharedRowMap."); // The locallyFitted check is debug mode only since it is more expensive @@ -279,10 +279,10 @@ void FECrsGraph::doOwnedPlusSharedToOwned(con this->getMyNonconstParamList()->get("Check Col GIDs In At Least One Owned Row",true); if (debug && checkColGIDsInAtLeastOneOwnedRow) { Teuchos::RCP colmap = this->getColMap(); - Teuchos::Array flag(colmap->getNodeNumElements(),false); + Teuchos::Array flag(colmap->getLocalNumElements(),false); typename crs_graph_type::nonconst_local_inds_host_view_type indices("indices",this->getNodeMaxNumRowEntries()); - for(size_t i=0; igetNodeNumElements(); i++) { + for(size_t i=0; igetLocalNumElements(); i++) { size_t NumEntries=0; this->getLocalRowCopy(i,indices,NumEntries); for(size_t j=0; j& Importer, LocalOrdinal ii; size_t i,j,k; int mypid = Importer.getTargetMap()->getComm()->getRank(); - size_t N = Importer.getTargetMap()->getNodeNumElements(); + size_t N = Importer.getTargetMap()->getLocalNumElements(); // Get the importer's data Teuchos::ArrayView RemoteLIDs = Importer.getRemoteLIDs(); @@ -152,7 +152,7 @@ getPids (const Tpetra::Import& Importer, bool use_minus_one_for_local) { // Resize the outgoing data structure - pids.resize(Importer.getTargetMap()->getNodeNumElements()); + pids.resize(Importer.getTargetMap()->getLocalNumElements()); Teuchos::ArrayView v_pids = pids(); getPids(Importer,v_pids,use_minus_one_for_local); } @@ -169,7 +169,7 @@ getPids (const Tpetra::Import& Importer, LocalOrdinal ii; size_t i,j,k; int mypid = Importer.getTargetMap()->getComm()->getRank(); - size_t N = Importer.getTargetMap()->getNodeNumElements(); + size_t N = Importer.getTargetMap()->getLocalNumElements(); if(N!=(size_t)pids.size()) throw std::runtime_error("Tpetra::Import_Util::getPids(): Incorrect size for output array"); // Get the importer's data diff --git a/packages/tpetra/core/src/Tpetra_Import_Util2.hpp b/packages/tpetra/core/src/Tpetra_Import_Util2.hpp index aef823ebc9f9..9ba35901172f 100644 --- a/packages/tpetra/core/src/Tpetra_Import_Util2.hpp +++ b/packages/tpetra/core/src/Tpetra_Import_Util2.hpp @@ -239,7 +239,7 @@ reverseNeighborDiscovery(const CrsMatrixgetNodeNumElements (); + const size_t numCols = MyColMap->getLocalNumElements (); RCP > target = MyImporter->getTargetMap(); // Get the owning pids in a special way, @@ -737,7 +737,7 @@ lowCommunicationMakeColMapAndReindex (const Teuchos::ArrayView &ro // Scan all column indices and sort into two groups: // Local: those whose GID matches a GID of the domain map on this processor and // Remote: All others. - const size_t numDomainElements = domainMap.getNodeNumElements (); + const size_t numDomainElements = domainMap.getLocalNumElements (); Teuchos::Array LocalGIDs; if (numDomainElements > 0) { LocalGIDs.resize (numDomainElements, false); // Assume domain GIDs are not local diff --git a/packages/tpetra/core/src/Tpetra_Import_def.hpp b/packages/tpetra/core/src/Tpetra_Import_def.hpp index 1aa3a8798832..f57bcd1b2c86 100644 --- a/packages/tpetra/core/src/Tpetra_Import_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Import_def.hpp @@ -622,7 +622,7 @@ namespace Tpetra { // Create list of GIDs to go into target Map. We need to copy // the GIDs into this list anyway, so once we have them, we can // sort the "remotes" in place. - const LO numLclSrcIDs = static_cast (sourceMap.getNodeNumElements ()); + const LO numLclSrcIDs = static_cast (sourceMap.getLocalNumElements ()); const LO numLclTgtIDs = numLclSrcIDs + numTargetMapRemoteOrPermuteGlobalIndices; if (verbose) { std::ostringstream os; @@ -680,7 +680,7 @@ namespace Tpetra { } // The _actual_ number of remotes. const LO numRemotes = numTargetMapRemoteOrPermuteGlobalIndices - result.numPermutes; - result.numSameIDs = static_cast (sourceMap.getNodeNumElements ()); + result.numSameIDs = static_cast (sourceMap.getLocalNumElements ()); if (verbose) { std::ostringstream os; @@ -1702,7 +1702,7 @@ namespace Tpetra { ArrayView tgtGIDs = tgtMap->getNodeElementList (); // All elements in srcMap will be in the "new" target map, so... - size_t numSameIDsNew = srcMap->getNodeNumElements (); + size_t numSameIDsNew = srcMap->getLocalNumElements (); size_t numRemoteIDsNew = this->getNumRemoteIDs (); Array permuteToLIDsNew, permuteFromLIDsNew; // empty on purpose @@ -1792,11 +1792,11 @@ namespace Tpetra { if (remoteTarget.is_null ()) { lclSuccess = -1; } - else if (NumRemotes != remoteTarget->getNodeNumElements ()) { + else if (NumRemotes != remoteTarget->getLocalNumElements ()) { lclSuccess = 0; lclErr << *procPrefix << "getNumRemoteIDs() = " << NumRemotes - << " != remoteTarget->getNodeNumElements() = " - << remoteTarget->getNodeNumElements () << "." << endl; + << " != remoteTarget->getLocalNumElements() = " + << remoteTarget->getLocalNumElements () << "." << endl; } if (comm.is_null ()) { diff --git a/packages/tpetra/core/src/Tpetra_Map_decl.hpp b/packages/tpetra/core/src/Tpetra_Map_decl.hpp index 4c5cd3649ccd..db91ca0f5347 100644 --- a/packages/tpetra/core/src/Tpetra_Map_decl.hpp +++ b/packages/tpetra/core/src/Tpetra_Map_decl.hpp @@ -582,9 +582,15 @@ namespace Tpetra { /// \note This function should be thread safe and thread scalable, /// assuming that you refer to the Map by value or reference, /// not by Teuchos::RCP. +#ifdef TPETRA_ENABLE_DEPRECATED_CODE + TPETRA_DEPRECATED size_t getNodeNumElements () const { return numLocalElements_; } +#endif + size_t getLocalNumElements () const { + return numLocalElements_; + } /// \brief The index base for this Map. /// @@ -607,7 +613,7 @@ namespace Tpetra { /// \brief The maximum local index on the calling process. /// /// If this process owns no elements, that is, if - /// getNodeNumElements() == 0, then this method returns + /// getLocalNumElements() == 0, then this method returns /// the same value as /// Teuchos::OrdinalTraits::invalid(). /// @@ -615,10 +621,10 @@ namespace Tpetra { /// assuming that you refer to the Map by value or reference, /// not by Teuchos::RCP. local_ordinal_type getMaxLocalIndex () const { - if (this->getNodeNumElements () == 0) { + if (this->getLocalNumElements () == 0) { return Tpetra::Details::OrdinalTraits::invalid (); } else { // Local indices are always zero-based. - return static_cast (this->getNodeNumElements () - 1); + return static_cast (this->getLocalNumElements () - 1); } } diff --git a/packages/tpetra/core/src/Tpetra_Map_def.hpp b/packages/tpetra/core/src/Tpetra_Map_def.hpp index cec223fbef6d..88c9b59c2901 100644 --- a/packages/tpetra/core/src/Tpetra_Map_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Map_def.hpp @@ -1347,7 +1347,7 @@ namespace Tpetra { return local_map_type (glMap_, lgMap_, getIndexBase (), getMinGlobalIndex (), getMaxGlobalIndex (), firstContiguousGID_, lastContiguousGID_, - getNodeNumElements (), isContiguous ()); + getLocalNumElements (), isContiguous ()); } template @@ -1409,7 +1409,7 @@ namespace Tpetra { // Do both Maps have the same number of indices on each process? const int locallyCompat = - (getNodeNumElements () == map.getNodeNumElements ()) ? 1 : 0; + (getLocalNumElements () == map.getLocalNumElements ()) ? 1 : 0; int globallyCompat = 0; reduceAll (*comm_, REDUCE_MIN, locallyCompat, outArg (globallyCompat)); @@ -1438,7 +1438,7 @@ namespace Tpetra { // equality on all processes, since Map is immutable. return true; } - else if (getNodeNumElements () != map.getNodeNumElements ()) { + else if (getLocalNumElements () != map.getLocalNumElements ()) { return false; } else if (getMinGlobalIndex () != map.getMinGlobalIndex () || @@ -1484,10 +1484,10 @@ namespace Tpetra { else if (this->lgMap_.data () == map.lgMap_.data ()) { // Pointers to LID->GID "map" (actually just an array) are the // same, and the number of GIDs are the same. - return this->getNodeNumElements () == map.getNodeNumElements (); + return this->getLocalNumElements () == map.getLocalNumElements (); } else { // we actually have to compare the GIDs - if (this->getNodeNumElements () != map.getNodeNumElements ()) { + if (this->getLocalNumElements () != map.getLocalNumElements ()) { return false; // We already checked above, but check just in case } else { @@ -1515,8 +1515,8 @@ namespace Tpetra { auto lmap1 = map.getLocalMap(); auto lmap2 = this->getLocalMap(); - auto numLocalElements1 = lmap1.getNodeNumElements(); - auto numLocalElements2 = lmap2.getNodeNumElements(); + auto numLocalElements1 = lmap1.getLocalNumElements(); + auto numLocalElements2 = lmap2.getLocalNumElements(); if (numLocalElements1 > numLocalElements2) { // There are more indices in the first map on this process than in second map. @@ -1689,7 +1689,7 @@ namespace Tpetra { "noncontiguous Map. Please report this bug to the Tpetra " "developers."); } - const LO numElts = static_cast (getNodeNumElements ()); + const LO numElts = static_cast (getLocalNumElements ()); using Kokkos::view_alloc; using Kokkos::WithoutInitializing; @@ -1799,7 +1799,7 @@ namespace Tpetra { out << "Process " << myRank << " of " << numProcs << ":" << endl; Teuchos::OSTab tab1 (out); - const LO numEnt = static_cast (this->getNodeNumElements ()); + const LO numEnt = static_cast (this->getLocalNumElements ()); out << "My number of entries: " << numEnt << endl << "My minimum global index: " << this->getMinGlobalIndex () << endl << "My maximum global index: " << this->getMaxGlobalIndex () << endl; @@ -1988,14 +1988,14 @@ namespace Tpetra { using size_type = typename std::decay::type; const size_type lclNumInds = - static_cast (this->getNodeNumElements ()); + static_cast (this->getLocalNumElements ()); using Teuchos::TypeNameTraits; TEUCHOS_TEST_FOR_EXCEPTION (lgMap.extent (0) != lclNumInds, std::logic_error, "Tpetra::Map::replaceCommWithSubset: Result of getMyGlobalIndices() " "has length " << lgMap.extent (0) << " (of type " << - TypeNameTraits::name () << ") != this->getNodeNumElements()" - " = " << this->getNodeNumElements () << ". The latter, upon being " + TypeNameTraits::name () << ") != this->getLocalNumElements()" + " = " << this->getLocalNumElements () << ". The latter, upon being " "cast to size_type = " << TypeNameTraits::name () << ", " "becomes " << lclNumInds << ". Please report this bug to the Tpetra " "developers."); @@ -2552,7 +2552,7 @@ Tpetra::createOneToOne (const Teuchos::RCP >& M) cerr << os.str (); } Tpetra::Directory directory; - const size_t numMyElems = M->getNodeNumElements (); + const size_t numMyElems = M->getLocalNumElements (); ArrayView myElems = M->getNodeElementList (); Array owner_procs_vec (numMyElems); @@ -2648,7 +2648,7 @@ Tpetra::createOneToOne (const Teuchos::RCPgetNodeNumElements (); + size_t numMyElems = M->getLocalNumElements (); ArrayView myElems = M->getNodeElementList (); Array owner_procs_vec (numMyElems); if (verbose) { diff --git a/packages/tpetra/core/src/Tpetra_MultiVector_def.hpp b/packages/tpetra/core/src/Tpetra_MultiVector_def.hpp index 9786a5bbd642..e44a8e12ca50 100644 --- a/packages/tpetra/core/src/Tpetra_MultiVector_def.hpp +++ b/packages/tpetra/core/src/Tpetra_MultiVector_def.hpp @@ -513,14 +513,14 @@ namespace Tpetra { { const char tfecfFuncName[] = "MultiVector(Map,DualView): "; const size_t lclNumRows_map = map.is_null () ? size_t (0) : - map->getNodeNumElements (); + map->getLocalNumElements (); const size_t lclNumRows_view = view.extent (0); const size_t LDA = getDualViewStride (view_); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (LDA < lclNumRows_map || lclNumRows_map != lclNumRows_view, std::invalid_argument, "Kokkos::DualView does not match Map. " - "map->getNodeNumElements() = " << lclNumRows_map + "map->getLocalNumElements() = " << lclNumRows_map << ", view.extent(0) = " << lclNumRows_view << ", and getStride() = " << LDA << "."); @@ -549,14 +549,14 @@ namespace Tpetra { { const char tfecfFuncName[] = "MultiVector(Map,DualView): "; const size_t lclNumRows_map = map.is_null () ? size_t (0) : - map->getNodeNumElements (); + map->getLocalNumElements (); const size_t lclNumRows_view = view.extent (0); const size_t LDA = getDualViewStride (view); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (LDA < lclNumRows_map || lclNumRows_map != lclNumRows_view, std::invalid_argument, "Kokkos::DualView does not match Map. " - "map->getNodeNumElements() = " << lclNumRows_map + "map->getLocalNumElements() = " << lclNumRows_map << ", view.extent(0) = " << lclNumRows_view << ", and getStride() = " << LDA << "."); @@ -590,10 +590,10 @@ namespace Tpetra { ::Tpetra::Details::ProfilingRegion region ("Tpetra::MV ctor (map,d_view)"); const size_t LDA = getViewStride (d_view); - const size_t lclNumRows = map->getNodeNumElements (); + const size_t lclNumRows = map->getLocalNumElements (); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (LDA < lclNumRows, std::invalid_argument, "Map does not match " - "Kokkos::View. map->getNodeNumElements() = " << lclNumRows + "Kokkos::View. map->getLocalNumElements() = " << lclNumRows << ", View's column stride = " << LDA << ", and View's extent(0) = " << d_view.extent (0) << "."); @@ -687,7 +687,7 @@ namespace Tpetra { } const size_t lclNumRows = map.is_null () ? size_t (0) : - map->getNodeNumElements (); + map->getLocalNumElements (); // Check dimensions of the input DualView. We accept that Kokkos // might not allow construction of a 0 x m (Dual)View with m > 0, // so we only require the number of rows to match if the @@ -697,7 +697,7 @@ namespace Tpetra { TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( view.extent (1) != 0 && static_cast (view.extent (0)) < lclNumRows, std::invalid_argument, "view.extent(0) = " << view.extent (0) - << " < map->getNodeNumElements() = " << lclNumRows << "."); + << " < map->getLocalNumElements() = " << lclNumRows << "."); if (whichVectors.size () != 0) { TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( view.extent (1) != 0 && view.extent (1) == 0, @@ -771,7 +771,7 @@ namespace Tpetra { } const size_t lclNumRows = map.is_null () ? size_t (0) : - map->getNodeNumElements (); + map->getLocalNumElements (); // Check dimensions of the input DualView. We accept that Kokkos // might not allow construction of a 0 x m (Dual)View with m > 0, // so we only require the number of rows to match if the @@ -781,7 +781,7 @@ namespace Tpetra { TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( view.extent (1) != 0 && static_cast (view.extent (0)) < lclNumRows, std::invalid_argument, "view.extent(0) = " << view.extent (0) - << " < map->getNodeNumElements() = " << lclNumRows << "."); + << " < map->getLocalNumElements() = " << lclNumRows << "."); if (whichVectors.size () != 0) { TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( view.extent (1) != 0 && view.extent (1) == 0, @@ -870,7 +870,7 @@ namespace Tpetra { TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( view.extent (1) != 0 && static_cast (view.extent (0)) < lclNumRows, std::invalid_argument, "view.extent(0) = " << view.extent (0) - << " < map->getNodeNumElements() = " << lclNumRows << "."); + << " < map->getLocalNumElements() = " << lclNumRows << "."); if (whichVectors.size () != 0) { TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( view.extent (1) != 0 && view.extent (1) == 0, @@ -935,10 +935,10 @@ namespace Tpetra { // There is no need for a deep copy constructor with nonconstant stride. const size_t lclNumRows = - map.is_null () ? size_t (0) : map->getNodeNumElements (); + map.is_null () ? size_t (0) : map->getLocalNumElements (); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (LDA < lclNumRows, std::invalid_argument, "LDA = " << LDA << " < " - "map->getNodeNumElements() = " << lclNumRows << "."); + "map->getLocalNumElements() = " << lclNumRows << "."); if (numVecs != 0) { const size_t minNumEntries = LDA * (numVecs - 1) + lclNumRows; TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC @@ -946,7 +946,7 @@ namespace Tpetra { std::invalid_argument, "Input Teuchos::ArrayView does not have enough " "entries, given the input Map and number of vectors in the MultiVector." " data.size() = " << data.size () << " < (LDA*(numVecs-1)) + " - "map->getNodeNumElements () = " << minNumEntries << "."); + "map->getLocalNumElements () = " << minNumEntries << "."); } this->view_ = allocDualView (lclNumRows, numVecs); @@ -1002,7 +1002,7 @@ namespace Tpetra { ::Tpetra::Details::ProfilingRegion region ("Tpetra::MV ctor (map,Teuchos::ArrayView of ArrayView,numVecs)"); const size_t lclNumRows = - map.is_null () ? size_t (0) : map->getNodeNumElements (); + map.is_null () ? size_t (0) : map->getLocalNumElements (); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (numVecs < 1 || numVecs != static_cast (ArrayOfPtrs.size ()), std::runtime_error, "Either numVecs (= " << numVecs << ") < 1, or " @@ -1012,7 +1012,7 @@ namespace Tpetra { TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC( static_cast (X_j_av.size ()) < lclNumRows, std::invalid_argument, "ArrayOfPtrs[" << j << "].size() = " - << X_j_av.size () << " < map->getNodeNumElements() = " << lclNumRows + << X_j_av.size () << " < map->getLocalNumElements() = " << lclNumRows << "."); } @@ -1051,7 +1051,7 @@ namespace Tpetra { if (this->getMap ().is_null ()) { // possible, due to replaceMap(). return static_cast (0); } else { - return this->getMap ()->getNodeNumElements (); + return this->getMap ()->getLocalNumElements (); } } @@ -2753,7 +2753,7 @@ namespace Tpetra { // Case 3: current Map is null, new Map is nonnull. // Reallocate the DualView with the right dimensions. - const size_t newNumRows = newMap->getNodeNumElements (); + const size_t newNumRows = newMap->getLocalNumElements (); const size_t origNumRows = view_.extent (0); const size_t numCols = this->getNumVectors (); @@ -3318,7 +3318,7 @@ namespace Tpetra { const LO lclNumRowsBefore = static_cast (X.getLocalLength ()); const LO numCols = static_cast (X.getNumVectors ()); - const LO newNumRows = static_cast (subMap->getNodeNumElements ()); + const LO newNumRows = static_cast (subMap->getLocalNumElements ()); if (verbose) { std::ostringstream os; os << "Proc " << myRank << ": " << prefix @@ -3335,7 +3335,7 @@ namespace Tpetra { newNumRows + rowOffset > static_cast (X.getOrigNumLocalRows ()); if (tooManyElts) { errStrm = std::unique_ptr (new std::ostringstream); - *errStrm << " Proc " << myRank << ": subMap->getNodeNumElements() (=" + *errStrm << " Proc " << myRank << ": subMap->getLocalNumElements() (=" << newNumRows << ") + rowOffset (=" << rowOffset << ") > X.getOrigNumLocalRows() (=" << X.getOrigNumLocalRows () << ")." << endl; @@ -3389,7 +3389,7 @@ namespace Tpetra { errStrm = std::unique_ptr (new std::ostringstream); } *errStrm << " Proc " << myRank << - ": subMap.getNodeNumElements(): " << newNumRows << + ": subMap.getLocalNumElements(): " << newNumRows << ", subViewMV.getLocalLength(): " << lclNumRowsRet << ", X.getNumVectors(): " << numCols << ", subViewMV.getNumVectors(): " << numColsRet << endl; diff --git a/packages/tpetra/core/src/Tpetra_RowMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_RowMatrix_def.hpp index 40a7e0eec4e6..c6da51661cdb 100644 --- a/packages/tpetra/core/src/Tpetra_RowMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_RowMatrix_def.hpp @@ -182,7 +182,7 @@ namespace Tpetra { // sum of the two entry counts in each row. If we choose this as // the actual per-row upper bound, we can use static profile. if (A_rowMap->isSameAs (*B_rowMap)) { - const LO localNumRows = static_cast (A_rowMap->getNodeNumElements ()); + const LO localNumRows = static_cast (A_rowMap->getLocalNumElements ()); Array C_maxNumEntriesPerRow (localNumRows, 0); // Get the number of entries in each row of A. @@ -236,7 +236,7 @@ namespace Tpetra { vals_type val; if (alpha != STS::zero ()) { - const LO A_localNumRows = static_cast (A_rowMap->getNodeNumElements ()); + const LO A_localNumRows = static_cast (A_rowMap->getLocalNumElements ()); for (LO localRow = 0; localRow < A_localNumRows; ++localRow) { size_t A_numEntries = A.getNumEntriesInLocalRow (localRow); const GO globalRow = A_rowMap->getGlobalElement (localRow); @@ -260,7 +260,7 @@ namespace Tpetra { } if (beta != STS::zero ()) { - const LO B_localNumRows = static_cast (B_rowMap->getNodeNumElements ()); + const LO B_localNumRows = static_cast (B_rowMap->getLocalNumElements ()); for (LO localRow = 0; localRow < B_localNumRows; ++localRow) { size_t B_numEntries = B.getNumEntriesInLocalRow (localRow); const GO globalRow = B_rowMap->getGlobalElement (localRow); diff --git a/packages/tpetra/core/src/Tpetra_Vector_def.hpp b/packages/tpetra/core/src/Tpetra_Vector_def.hpp index 534b6cdcf270..da07bb99371b 100644 --- a/packages/tpetra/core/src/Tpetra_Vector_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Vector_def.hpp @@ -237,7 +237,7 @@ namespace Tpetra { using Teuchos::rcp; typedef Vector V; - const size_t newNumRows = subMap->getNodeNumElements (); + const size_t newNumRows = subMap->getLocalNumElements (); const bool tooManyElts = newNumRows + offset > this->getOrigNumLocalRows (); if (tooManyElts) { const int myRank = this->getMap ()->getComm ()->getRank (); diff --git a/packages/tpetra/core/src/Tpetra_applyDirichletBoundaryCondition.hpp b/packages/tpetra/core/src/Tpetra_applyDirichletBoundaryCondition.hpp index e7a6e0a84eca..4c15524220d1 100644 --- a/packages/tpetra/core/src/Tpetra_applyDirichletBoundaryCondition.hpp +++ b/packages/tpetra/core/src/Tpetra_applyDirichletBoundaryCondition.hpp @@ -199,7 +199,7 @@ struct ApplyDirichletBoundaryConditionToLocalMatrixRows { "The matrix must have a column Map."); auto A_lcl = A.getLocalMatrixDevice (); - const LO lclNumRows = static_cast (rowMap->getNodeNumElements ()); + const LO lclNumRows = static_cast (rowMap->getLocalNumElements ()); TEUCHOS_TEST_FOR_EXCEPTION (lclNumRows != 0 && static_cast(A_lcl.graph.numRows ()) != lclNumRows, std::invalid_argument, "The matrix must have been either created " @@ -289,7 +289,7 @@ struct ApplyDirichletBoundaryConditionToLocalMatrixColumns { "The matrix must have a column Map."); auto A_lcl = A.getLocalMatrixDevice (); - const LO lclNumRows = static_cast (rowMap->getNodeNumElements ()); + const LO lclNumRows = static_cast (rowMap->getLocalNumElements ()); TEUCHOS_TEST_FOR_EXCEPTION (lclNumRows != 0 && static_cast(A_lcl.graph.numRows ()) != lclNumRows, std::invalid_argument, "The matrix must have been either created " @@ -307,7 +307,7 @@ struct ApplyDirichletBoundaryConditionToLocalMatrixColumns { A.resumeFill (); } - const LO numRows = (LO) A.getRowMap()->getNodeNumElements(); + const LO numRows = (LO) A.getRowMap()->getLocalNumElements(); if (! runOnHost) { using range_type = Kokkos::RangePolicy; Kokkos::parallel_for @@ -355,7 +355,7 @@ void localRowsToColumns(const typename ::Tpetra::CrsMatrix::exec TEUCHOS_TEST_FOR_EXCEPTION(!A.getRowMap()->isSameAs(*A.getDomainMap()),std::invalid_argument, "localRowsToColumns: Row/Domain maps do not match"); // Assume that the dirichletColFlags array is the correct size - TEUCHOS_TEST_FOR_EXCEPTION(A.getColMap()->getNodeNumElements() != dirichletColFlags.size(), std::invalid_argument,"localRowsToColumns: dirichletColFlags must be the correct size"); + TEUCHOS_TEST_FOR_EXCEPTION(A.getColMap()->getLocalNumElements() != dirichletColFlags.size(), std::invalid_argument,"localRowsToColumns: dirichletColFlags must be the correct size"); LO numDirichletRows = (LO) dirichletRowIds.size(); LO LO_INVALID = Teuchos::OrdinalTraits::invalid(); @@ -400,7 +400,7 @@ void localRowsToColumns(const typename ::Tpetra::CrsMatrix::exec }); } colDirichlet.doImport(domainDirichlet,*Importer,::Tpetra::INSERT); - LO numCols = (LO) A.getColMap()->getNodeNumElements(); + LO numCols = (LO) A.getColMap()->getLocalNumElements(); { auto col_data = colDirichlet.template getLocalView(Access::ReadOnly); Kokkos::parallel_for @@ -506,7 +506,7 @@ applyDirichletBoundaryConditionToLocalMatrixRowsAndColumns // Copy the Host array to device auto lclRowInds_d = Kokkos::create_mirror_view_and_copy(execution_space(),lclRowInds); - Kokkos::View dirichletColFlags("dirichletColFlags",A.getColMap()->getNodeNumElements()); + Kokkos::View dirichletColFlags("dirichletColFlags",A.getColMap()->getLocalNumElements()); Kokkos::View dirichletColFlags_a(dirichletColFlags); Details::localRowsToColumns(execution_space(),A,lclRowInds_d,dirichletColFlags_a); @@ -532,7 +532,7 @@ applyDirichletBoundaryConditionToLocalMatrixRowsAndColumns TEUCHOS_TEST_FOR_EXCEPTION(A.getColMap().get () == nullptr, std::invalid_argument,"The matrix must have a column Map."); - Kokkos::View dirichletColFlags("dirichletColFlags",A.getColMap()->getNodeNumElements()); + Kokkos::View dirichletColFlags("dirichletColFlags",A.getColMap()->getLocalNumElements()); Kokkos::View dirichletColFlags_a(dirichletColFlags); Details::localRowsToColumns(execution_space(),A,lclRowInds_d,dirichletColFlags_a); @@ -560,7 +560,7 @@ applyDirichletBoundaryConditionToLocalMatrixRowsAndColumns TEUCHOS_TEST_FOR_EXCEPTION(A.getColMap().get () == nullptr, std::invalid_argument,"The matrix must have a column Map."); - Kokkos::View dirichletColFlags("dirichletColFlags",A.getColMap()->getNodeNumElements()); + Kokkos::View dirichletColFlags("dirichletColFlags",A.getColMap()->getLocalNumElements()); Kokkos::View dirichletColFlags_a(dirichletColFlags); Details::localRowsToColumns(execSpace,A,lclRowInds_d,dirichletColFlags_a); diff --git a/packages/tpetra/core/src/Tpetra_computeRowAndColumnOneNorms_def.hpp b/packages/tpetra/core/src/Tpetra_computeRowAndColumnOneNorms_def.hpp index d5c4a09df5e1..0bb8fa07f7cc 100644 --- a/packages/tpetra/core/src/Tpetra_computeRowAndColumnOneNorms_def.hpp +++ b/packages/tpetra/core/src/Tpetra_computeRowAndColumnOneNorms_def.hpp @@ -67,7 +67,7 @@ std::size_t lclMaxNumEntriesRowMatrix (const Tpetra::RowMatrix& A) { const auto& rowMap = * (A.getRowMap ()); - const LO lclNumRows = static_cast (rowMap.getNodeNumElements ()); + const LO lclNumRows = static_cast (rowMap.getLocalNumElements ()); std::size_t maxNumEnt {0}; for (LO lclRow = 0; lclRow < lclNumRows; ++lclRow) { @@ -114,7 +114,7 @@ forEachLocalRowMatrixRow ( std::size_t /*numEnt*/ )> doForEachRow) { const auto& rowMap = * (A.getRowMap ()); - const LO lclNumRows = static_cast (rowMap.getNodeNumElements ()); + const LO lclNumRows = static_cast (rowMap.getLocalNumElements ()); const std::size_t maxNumEnt = lclMaxNumEntriesRowMatrix (A); forEachLocalRowMatrixRow (A, lclNumRows, maxNumEnt, doForEachRow); @@ -167,7 +167,7 @@ computeLocalRowOneNorms_RowMatrix (const Tpetra::RowMatrix& A) const auto& rowMap = * (A.getRowMap ()); const auto& colMap = * (A.getColMap ()); - const LO lclNumRows = static_cast (rowMap.getNodeNumElements ()); + const LO lclNumRows = static_cast (rowMap.getLocalNumElements ()); const LO lclNumCols = 0; // don't allocate column-related Views constexpr bool assumeSymmetric = false; // doesn't matter here equib_info_type result (lclNumRows, lclNumCols, assumeSymmetric); @@ -235,8 +235,8 @@ computeLocalRowAndColumnOneNorms_RowMatrix (const Tpetra::RowMatrix (rowMap.getNodeNumElements ()); - const LO lclNumCols = static_cast (colMap.getNodeNumElements ()); + const LO lclNumRows = static_cast (rowMap.getLocalNumElements ()); + const LO lclNumCols = static_cast (colMap.getLocalNumElements ()); EquilibrationInfo result (lclNumRows, lclNumCols, assumeSymmetric); @@ -337,7 +337,7 @@ class ComputeLocalRowScaledColumnNorms { functor_type functor (rowScaledColNorms, rowNorms, A); const LO lclNumRows = - static_cast (A.getRowMap ()->getNodeNumElements ()); + static_cast (A.getRowMap ()->getLocalNumElements ()); Kokkos::parallel_for ("computeLocalRowScaledColumnNorms", range_type (0, lclNumRows), functor); } @@ -376,7 +376,7 @@ computeLocalRowScaledColumnNorms (EquilibrationInfo (colMapPtr->getNodeNumElements ()); + const LO lclNumCols = static_cast (colMapPtr->getLocalNumElements ()); if (static_cast (result.rowScaledColNorms.extent (0)) != static_cast (lclNumCols)) { result.rowScaledColNorms = @@ -604,7 +604,7 @@ computeLocalRowOneNorms_CrsMatrix (const Tpetra::CrsMatrix& A) using device_type = typename NT::device_type; using equib_info_type = EquilibrationInfo; - const LO lclNumRows = static_cast (A.getRowMap ()->getNodeNumElements ()); + const LO lclNumRows = static_cast (A.getRowMap ()->getLocalNumElements ()); const LO lclNumCols = 0; // don't allocate column-related Views constexpr bool assumeSymmetric = false; // doesn't matter here equib_info_type equib (lclNumRows, lclNumCols, assumeSymmetric); @@ -637,8 +637,8 @@ computeLocalRowAndColumnOneNorms_CrsMatrix (const Tpetra::CrsMatrix; - const LO lclNumRows = static_cast (A.getRowMap ()->getNodeNumElements ()); - const LO lclNumCols = static_cast (A.getColMap ()->getNodeNumElements ()); + const LO lclNumRows = static_cast (A.getRowMap ()->getLocalNumElements ()); + const LO lclNumCols = static_cast (A.getColMap ()->getLocalNumElements ()); equib_info_type equib (lclNumRows, lclNumCols, assumeSymmetric); functor_type functor (equib, A.getLocalMatrixDevice (), @@ -932,7 +932,7 @@ globalizeColumnOneNorms (EquilibrationInfo::val // Make sure the result has allocations of the right size. const LO lclNumCols = - static_cast (G->getColMap ()->getNodeNumElements ()); + static_cast (G->getColMap ()->getLocalNumElements ()); if (static_cast (equib.colNorms.extent (0)) != lclNumCols) { equib.colNorms = Kokkos::View ("colNorms", lclNumCols); diff --git a/packages/tpetra/core/src/Tpetra_createDeepCopy_CrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_createDeepCopy_CrsMatrix_def.hpp index a268052d55b0..d7e014bbcc1d 100644 --- a/packages/tpetra/core/src/Tpetra_createDeepCopy_CrsMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_createDeepCopy_CrsMatrix_def.hpp @@ -51,7 +51,7 @@ localDeepCopyFillCompleteCrsMatrix (const CrsMatrix& A) Kokkos::deep_copy (val, A_lcl.values); local_graph_device_type lclGraph (ind, ptr); - const size_t numCols = A.getColMap ()->getNodeNumElements (); + const size_t numCols = A.getColMap ()->getLocalNumElements (); return local_matrix_type (A.getObjectLabel (), numCols, val, lclGraph); } diff --git a/packages/tpetra/core/src/Tpetra_leftAndOrRightScaleCrsMatrix_def.hpp b/packages/tpetra/core/src/Tpetra_leftAndOrRightScaleCrsMatrix_def.hpp index 7e29ce882c66..ce1e3d73745b 100644 --- a/packages/tpetra/core/src/Tpetra_leftAndOrRightScaleCrsMatrix_def.hpp +++ b/packages/tpetra/core/src/Tpetra_leftAndOrRightScaleCrsMatrix_def.hpp @@ -85,7 +85,7 @@ leftAndOrRightScaleCrsMatrix (Tpetra::CrsMatrix& A, // constructed. auto A_lcl = A.getLocalMatrixDevice (); const LO lclNumRows = - static_cast (A.getRowMap ()->getNodeNumElements ()); + static_cast (A.getRowMap ()->getLocalNumElements ()); TEUCHOS_TEST_FOR_EXCEPTION (A_lcl.numRows () != lclNumRows, std::invalid_argument, "leftAndOrRightScaleCrsMatrix: Local matrix is not valid. " diff --git a/packages/tpetra/core/test/Block/BlockCrsMatrix.cpp b/packages/tpetra/core/test/Block/BlockCrsMatrix.cpp index e33f75f88ef5..05f9b9d12aa1 100644 --- a/packages/tpetra/core/test/Block/BlockCrsMatrix.cpp +++ b/packages/tpetra/core/test/Block/BlockCrsMatrix.cpp @@ -1278,7 +1278,7 @@ namespace { out << "Creating mesh graph" << endl; graph_type graph (meshRowMapPtr, 2); - if (meshRowMapPtr->getNodeNumElements () > 0) { + if (meshRowMapPtr->getLocalNumElements () > 0) { const GO myMinGblRow = meshRowMapPtr->getMinGlobalIndex (); const GO myMaxGblRow = meshRowMapPtr->getMaxGlobalIndex (); for (GO gblRow = myMinGblRow; gblRow <= myMaxGblRow; ++gblRow) { @@ -1403,7 +1403,7 @@ namespace { out << "Creating mesh graph" << endl; graph_type graph (meshRowMapPtr, 2); - if (meshRowMapPtr->getNodeNumElements () > 0) { + if (meshRowMapPtr->getLocalNumElements () > 0) { const GO myMinGblRow = meshRowMapPtr->getMinGlobalIndex (); const GO myMaxGblRow = meshRowMapPtr->getMaxGlobalIndex (); for (GO gblRow = myMinGblRow; gblRow <= myMaxGblRow; ++gblRow) { @@ -1585,7 +1585,7 @@ namespace { out << "Create graph with overlapping mesh row Map" << endl; // Make a graph. It happens to have two entries per row. graph_type overlapGraph (overlapMeshRowMapPtr, 2); - if (overlapMeshRowMapPtr->getNodeNumElements () > 0) { + if (overlapMeshRowMapPtr->getLocalNumElements () > 0) { const GO myMinGblRow = overlapMeshRowMapPtr->getMinGlobalIndex (); const GO myMaxGblRow = overlapMeshRowMapPtr->getMaxGlobalIndex (); for (GO gblRow = myMinGblRow; gblRow <= myMaxGblRow; ++gblRow) { @@ -1599,7 +1599,7 @@ namespace { overlapGraph.fillComplete (meshDomainMapPtr, meshRangeMapPtr); { - const LO lclNumRowsOverlap = static_cast (overlapMeshRowMapPtr->getNodeNumElements ()); + const LO lclNumRowsOverlap = static_cast (overlapMeshRowMapPtr->getLocalNumElements ()); for (LO lclRow = 0; lclRow < lclNumRowsOverlap; ++lclRow) { const LO numEnt = static_cast (overlapGraph.getNumEntriesInLocalRow (lclRow)); TEST_EQUALITY( numEnt, static_cast (2) ); @@ -1636,7 +1636,7 @@ namespace { // Export can only add entries to each row, not remove them. { const LO lclNumRowsNonoverlap = - static_cast (meshRowMapPtr->getNodeNumElements ()); + static_cast (meshRowMapPtr->getLocalNumElements ()); for (LO lclRow = 0; lclRow < lclNumRowsNonoverlap; ++lclRow) { const LO numEnt = static_cast (graph->getNumEntriesInLocalRow (lclRow)); TEST_ASSERT( numEnt >= static_cast (2) ); diff --git a/packages/tpetra/core/test/Block/BlockMap.cpp b/packages/tpetra/core/test/Block/BlockMap.cpp index 02fe637dda4a..be173c28cff7 100644 --- a/packages/tpetra/core/test/Block/BlockMap.cpp +++ b/packages/tpetra/core/test/Block/BlockMap.cpp @@ -93,8 +93,8 @@ namespace { // local indices. TEST_EQUALITY( pointMap.getGlobalNumElements (), meshMap.getGlobalNumElements () * static_cast (blockSize) ); - TEST_EQUALITY( pointMap.getNodeNumElements (), - meshMap.getNodeNumElements () * static_cast (blockSize) ); + TEST_EQUALITY( pointMap.getLocalNumElements (), + meshMap.getLocalNumElements () * static_cast (blockSize) ); // If a GID g_mesh is in the input mesh Map on a process, and if // the block size is b, then the GID g_point := g_mesh * b must be @@ -103,7 +103,7 @@ namespace { { ArrayView gblMeshInds = meshMap.getNodeElementList (); TEST_EQUALITY( static_cast (gblMeshInds.size ()), - static_cast (meshMap.getNodeNumElements ()) ); + static_cast (meshMap.getLocalNumElements ()) ); Array gblPointIndsIdeal (gblMeshInds.size () * static_cast (blockSize)); for (size_type m = 0; m < gblMeshInds.size (); ++m) { const size_type offset = m * static_cast (blockSize); @@ -115,11 +115,11 @@ namespace { } TEST_EQUALITY( static_cast (gblPointIndsIdeal.size ()), - static_cast (pointMap.getNodeNumElements ()) ); + static_cast (pointMap.getLocalNumElements ()) ); ArrayView gblPointIndsActual = pointMap.getNodeElementList (); TEST_EQUALITY( gblPointIndsIdeal.size (), gblPointIndsActual.size () ); if (static_cast (gblPointIndsIdeal.size ()) == - static_cast (pointMap.getNodeNumElements ())) { + static_cast (pointMap.getLocalNumElements ())) { TEST_COMPARE_ARRAYS( gblPointIndsIdeal, gblPointIndsActual ); } } @@ -152,8 +152,8 @@ namespace { // local indices. TEST_EQUALITY( static_cast (ovrlpngPointMap.getGlobalNumElements ()), static_cast (ovrlpngMeshMap.getGlobalNumElements ()) * static_cast (blockSize) ); - TEST_EQUALITY( static_cast (ovrlpngPointMap.getNodeNumElements ()), - static_cast (ovrlpngMeshMap.getNodeNumElements ()) * static_cast (blockSize) ); + TEST_EQUALITY( static_cast (ovrlpngPointMap.getLocalNumElements ()), + static_cast (ovrlpngMeshMap.getLocalNumElements ()) * static_cast (blockSize) ); // If a GID g_mesh is in the input mesh Map on a process, and if // the block size is b, then the GID g_point := g_mesh * b must be @@ -162,7 +162,7 @@ namespace { { ArrayView gblMeshInds = ovrlpngMeshMap.getNodeElementList (); TEST_EQUALITY( static_cast (gblMeshInds.size ()), - static_cast (ovrlpngMeshMap.getNodeNumElements ()) ); + static_cast (ovrlpngMeshMap.getLocalNumElements ()) ); Array gblPointIndsIdeal (gblMeshInds.size () * static_cast (blockSize)); for (size_type m = 0; m < gblMeshInds.size (); ++m) { const size_type offset = m * static_cast (blockSize); @@ -174,11 +174,11 @@ namespace { } TEST_EQUALITY( static_cast (gblPointIndsIdeal.size ()), - static_cast (ovrlpngPointMap.getNodeNumElements ()) ); + static_cast (ovrlpngPointMap.getLocalNumElements ()) ); ArrayView gblPointIndsActual = ovrlpngPointMap.getNodeElementList (); TEST_EQUALITY( gblPointIndsIdeal.size (), gblPointIndsActual.size () ); if (static_cast (gblPointIndsIdeal.size ()) == - static_cast (ovrlpngPointMap.getNodeNumElements ())) { + static_cast (ovrlpngPointMap.getLocalNumElements ())) { TEST_COMPARE_ARRAYS( gblPointIndsIdeal, gblPointIndsActual ); } } diff --git a/packages/tpetra/core/test/Block/BlockMultiVector.cpp b/packages/tpetra/core/test/Block/BlockMultiVector.cpp index 5ee3b4f1f5e0..39f4cd3c4bb9 100644 --- a/packages/tpetra/core/test/Block/BlockMultiVector.cpp +++ b/packages/tpetra/core/test/Block/BlockMultiVector.cpp @@ -278,7 +278,7 @@ namespace { if (! X_mv.getMap ().is_null ()) { mv_map = * (X_mv.getMap ()); // Map implements view semantics } - TEST_EQUALITY_CONST( mv_map.getNodeNumElements (), static_cast (48) ); + TEST_EQUALITY_CONST( mv_map.getLocalNumElements (), static_cast (48) ); // X has three columns. In the following tests, change only // blocks in column 1. Entries in all other columns must remain @@ -338,7 +338,7 @@ namespace { // Make sure that all entries of X_mv (the MultiVector) contain // zeros, except for rows 20-23 in column colToModify. Those must // contain 1,2,3,4 (in order). - const size_t numLocalDofs = mv_map.getNodeNumElements (); + const size_t numLocalDofs = mv_map.getLocalNumElements (); for (LO curCol = 0; curCol < numVecs; ++curCol) { Teuchos::ArrayRCP X_mv_curCol = X_mv.getData (static_cast (curCol)); @@ -523,8 +523,8 @@ namespace { map_type X1_meshMap (INVALID, (meshMap.getNodeElementList ()) (0, 11), indexBase, comm); map_type X2_meshMap (INVALID, (meshMap.getNodeElementList ()) (11, 9), indexBase+11, comm); - TEST_EQUALITY_CONST( X1_meshMap.getNodeNumElements (), static_cast (11) ); - TEST_EQUALITY_CONST( X2_meshMap.getNodeNumElements (), static_cast (9) ); + TEST_EQUALITY_CONST( X1_meshMap.getLocalNumElements (), static_cast (11) ); + TEST_EQUALITY_CONST( X2_meshMap.getLocalNumElements (), static_cast (9) ); BMV X1 (X, X1_meshMap); BMV X2 (X, X2_meshMap, static_cast (11)); diff --git a/packages/tpetra/core/test/CrsGraph/CrsGraph_ReindexColumns.cpp b/packages/tpetra/core/test/CrsGraph/CrsGraph_ReindexColumns.cpp index 21c24c927816..7721dcc637c7 100644 --- a/packages/tpetra/core/test/CrsGraph/CrsGraph_ReindexColumns.cpp +++ b/packages/tpetra/core/test/CrsGraph/CrsGraph_ReindexColumns.cpp @@ -108,7 +108,7 @@ namespace { // column Map. We'll use that column Map to create a new column // Map, and give that column Map to reindexColumns(). - if (rowMap->getNodeNumElements () > 0) { + if (rowMap->getLocalNumElements () > 0) { const GO myMinGblInd = rowMap->getMinGlobalIndex (); const GO myMaxGblInd = rowMap->getMaxGlobalIndex (); const GO gblMinGblInd = rowMap->getMinAllGlobalIndex (); @@ -173,13 +173,13 @@ namespace { // of getColMap(), and the call to reindexColumns() will // invalidate the graph's current column Map. RCP curColMap = graph.getColMap (); - Array newGblInds (curColMap->getNodeNumElements ()); + Array newGblInds (curColMap->getLocalNumElements ()); if (curColMap->isContiguous ()) { // const GO myMinGblInd = curColMap->getMinGlobalIndex (); const GO myMaxGblInd = curColMap->getMaxGlobalIndex (); const size_type myNumInds = - static_cast (curColMap->getNodeNumElements ()); + static_cast (curColMap->getLocalNumElements ()); if (myNumInds > 0) { GO curGblInd = myMaxGblInd; for (size_type k = 0; k < myNumInds; ++k, --curGblInd) { @@ -342,7 +342,7 @@ namespace { // indices to global in the new column Map, and then back to local // in the old column Map, and compare with those in the original // graph. - const LO myNumRows = static_cast (rowMap->getNodeNumElements ()); + const LO myNumRows = static_cast (rowMap->getLocalNumElements ()); if (myNumRows > 0) { for (LO lclRowInd = 0; lclRowInd < myNumRows; ++lclRowInd) { os << "Proc " << myRank << ": Row: " << lclRowInd; @@ -567,7 +567,7 @@ namespace { // column Map. We'll use that column Map to create a new column // Map, and give that column Map to reindexColumns(). - if (rowMap->getNodeNumElements () > 0) { + if (rowMap->getLocalNumElements () > 0) { const GO myMinGblInd = rowMap->getMinGlobalIndex (); const GO myMaxGblInd = rowMap->getMaxGlobalIndex (); const GO gblMinGblInd = rowMap->getMinAllGlobalIndex (); @@ -632,13 +632,13 @@ namespace { // of getColMap(), and the call to reindexColumns() will // invalidate the graph's current column Map. RCP curColMap = graph.getColMap (); - Array newGblInds (curColMap->getNodeNumElements ()); + Array newGblInds (curColMap->getLocalNumElements ()); if (curColMap->isContiguous ()) { // const GO myMinGblInd = curColMap->getMinGlobalIndex (); const GO myMaxGblInd = curColMap->getMaxGlobalIndex (); const size_type myNumInds = - static_cast (curColMap->getNodeNumElements ()); + static_cast (curColMap->getLocalNumElements ()); if (myNumInds > 0) { GO curGblInd = myMaxGblInd; for (size_type k = 0; k < myNumInds; ++k, --curGblInd) { @@ -805,7 +805,7 @@ namespace { // indices to global in the new column Map, and then back to local // in the old column Map, and compare with those in the original // graph. - const LO myNumRows = static_cast (rowMap->getNodeNumElements ()); + const LO myNumRows = static_cast (rowMap->getLocalNumElements ()); if (myNumRows > 0) { for (LO lclRowInd = 0; lclRowInd < myNumRows; ++lclRowInd) { os << "Proc " << myRank << ": Row: " << lclRowInd; diff --git a/packages/tpetra/core/test/CrsGraph/CrsGraph_StaticImportExport.cpp b/packages/tpetra/core/test/CrsGraph/CrsGraph_StaticImportExport.cpp index 496a84561aa1..d28bc8aba4f3 100644 --- a/packages/tpetra/core/test/CrsGraph/CrsGraph_StaticImportExport.cpp +++ b/packages/tpetra/core/test/CrsGraph/CrsGraph_StaticImportExport.cpp @@ -83,7 +83,7 @@ generate_crs_graph(const RCP>& map) // Create a Tpetra::Matrix using the Map, with dynamic allocation. auto A = rcp(new graph_type(map, 3)); - // const size_t numMyElements = map->getNodeNumElements (); + // const size_t numMyElements = map->getLocalNumElements (); // The list of global elements owned by this MPI process. const Tpetra::global_size_t num_gbl_inds = map->getGlobalNumElements(); auto my_gbl_elems = map->getNodeElementList(); diff --git a/packages/tpetra/core/test/CrsMatrix/Bug6069_1.cpp b/packages/tpetra/core/test/CrsMatrix/Bug6069_1.cpp index 3d454a6525ca..61496fd542f3 100644 --- a/packages/tpetra/core/test/CrsMatrix/Bug6069_1.cpp +++ b/packages/tpetra/core/test/CrsMatrix/Bug6069_1.cpp @@ -172,7 +172,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(CrsMatrix, Bug6069_1, SC, LO, GO, NT) //fos->setOutputToRootOnly(-1); //map->describe(*fos,Teuchos::VERB_EXTREME); - const size_t numMyElements = map->getNodeNumElements (); + const size_t numMyElements = map->getLocalNumElements (); switch (myRank) { case 0: assert(numMyElements==40); diff --git a/packages/tpetra/core/test/CrsMatrix/Bug6069_2.cpp b/packages/tpetra/core/test/CrsMatrix/Bug6069_2.cpp index dff4df35cc47..f5e450b029fd 100644 --- a/packages/tpetra/core/test/CrsMatrix/Bug6069_2.cpp +++ b/packages/tpetra/core/test/CrsMatrix/Bug6069_2.cpp @@ -136,7 +136,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(CrsMatrix, Bug6069_2, SC, LO, GO, NT) fos->setOutputToRootOnly (-1); map->describe (*fos, Teuchos::VERB_EXTREME); - const size_t numMyElements = map->getNodeNumElements (); + const size_t numMyElements = map->getLocalNumElements (); switch (myRank) { case 0: assert(numMyElements==2); diff --git a/packages/tpetra/core/test/CrsMatrix/Bug8794.cpp b/packages/tpetra/core/test/CrsMatrix/Bug8794.cpp index 22904c00ec70..6b349e7bff74 100644 --- a/packages/tpetra/core/test/CrsMatrix/Bug8794.cpp +++ b/packages/tpetra/core/test/CrsMatrix/Bug8794.cpp @@ -93,7 +93,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Bug8794, InsertDenseRows, { expected.putScalar(0.); auto expectedData = Kokkos::subview(expected.getLocalViewHost(Tpetra::Access::ReadWrite), Kokkos::ALL(), 0); - for (size_t i = 0; i < map->getNodeNumElements(); i++) { + for (size_t i = 0; i < map->getLocalNumElements(); i++) { GO gid = map->getGlobalElement(i); bool denseRow = (gid % (divisor+1) == 1); @@ -152,7 +152,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Bug8794, InsertDenseRows, // Initialize domain vector for SpMV { auto xData = x.getLocalViewHost(Tpetra::Access::OverwriteAll); - for (size_t i = 0; i < map->getNodeNumElements(); i++) + for (size_t i = 0; i < map->getLocalNumElements(); i++) xData(i, 0) = map->getGlobalElement(i); } @@ -164,7 +164,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Bug8794, InsertDenseRows, auto expectedData = expected.getLocalViewHost(Tpetra::Access::ReadOnly); auto yData = y.getLocalViewHost(Tpetra::Access::ReadOnly); - for (size_t i = 0; i < map->getNodeNumElements(); i++) { + for (size_t i = 0; i < map->getLocalNumElements(); i++) { if (yData(i, 0) != expectedData(i, 0)) { std::cout << me << " of " << np << ": y[" << map->getGlobalElement(i) << "] " << yData(i, 0) << " != " << expectedData(i, 0) diff --git a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_ReindexColumns.cpp b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_ReindexColumns.cpp index 64c1aa4da47c..0827e6e2f545 100644 --- a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_ReindexColumns.cpp +++ b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_ReindexColumns.cpp @@ -108,7 +108,7 @@ namespace { // column Map. We'll use that column Map to create a new column // Map, and give that column Map to reindexColumns(). - if (rowMap->getNodeNumElements () > 0) { + if (rowMap->getLocalNumElements () > 0) { const GO myMinGblInd = rowMap->getMinGlobalIndex (); const GO myMaxGblInd = rowMap->getMaxGlobalIndex (); const GO gblMinGblInd = rowMap->getMinAllGlobalIndex (); @@ -168,7 +168,7 @@ namespace { // Create and fill a matrix using the graph. // matrix_type matrix (rcpFromRef (graph)); - if (rowMap->getNodeNumElements () > 0) { + if (rowMap->getLocalNumElements () > 0) { const GO myMinGblInd = rowMap->getMinGlobalIndex (); const GO myMaxGblInd = rowMap->getMaxGlobalIndex (); const GO gblMinGblInd = rowMap->getMinAllGlobalIndex (); @@ -227,13 +227,13 @@ namespace { // of getColMap(), and the call to reindexColumns() will // invalidate the graph's current column Map. RCP curColMap = graph.getColMap (); - Array newGblInds (curColMap->getNodeNumElements ()); + Array newGblInds (curColMap->getLocalNumElements ()); if (curColMap->isContiguous ()) { // const GO myMinGblInd = curColMap->getMinGlobalIndex (); const GO myMaxGblInd = curColMap->getMaxGlobalIndex (); const size_type myNumInds = - static_cast (curColMap->getNodeNumElements ()); + static_cast (curColMap->getLocalNumElements ()); if (myNumInds > 0) { GO curGblInd = myMaxGblInd; for (size_type k = 0; k < myNumInds; ++k, --curGblInd) { @@ -414,7 +414,7 @@ namespace { // indices to global in the new column Map, and then back to local // in the old column Map, and compare with those in the original // graph. - const LO myNumRows = static_cast (rowMap->getNodeNumElements ()); + const LO myNumRows = static_cast (rowMap->getLocalNumElements ()); if (myNumRows > 0) { for (LO lclRowInd = 0; lclRowInd < myNumRows; ++lclRowInd) { os << "Proc " << myRank << ": Row: " << lclRowInd; diff --git a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_ReplaceDiagonal.cpp b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_ReplaceDiagonal.cpp index aafb3a1f4f20..012e8981359e 100644 --- a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_ReplaceDiagonal.cpp +++ b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_ReplaceDiagonal.cpp @@ -183,7 +183,7 @@ namespace { // (anonymous) /* Test that no other matrix values were changed */ - for (size_t i = 0; i < matrix->getRowMap()->getNodeNumElements(); i++) { + for (size_t i = 0; i < matrix->getRowMap()->getLocalNumElements(); i++) { typename crs_matrix_type::local_inds_host_view_type lcols; typename crs_matrix_type::values_host_view_type lvals; matrix->getLocalRowView(static_cast(i), lcols, lvals); @@ -372,7 +372,7 @@ namespace { // (anonymous) */ using impl_scalar_type = typename crs_matrix_type::impl_scalar_type; - for (size_t i = 0; i < matrix->getRowMap()->getNodeNumElements(); i++) { + for (size_t i = 0; i < matrix->getRowMap()->getLocalNumElements(); i++) { typename crs_matrix_type::local_inds_host_view_type lcols; typename crs_matrix_type::values_host_view_type lvals; matrix->getLocalRowView(static_cast(i), lcols, lvals); diff --git a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_ReplaceLocalValues.cpp b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_ReplaceLocalValues.cpp index fb96473f6955..00b6191ab23a 100644 --- a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_ReplaceLocalValues.cpp +++ b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_ReplaceLocalValues.cpp @@ -105,7 +105,7 @@ namespace { // (anonymous) RCP matrix = rcp (new crs_matrix_type (map, 10)); - const LO NumMyElements = map->getNodeNumElements (); + const LO NumMyElements = map->getLocalNumElements (); Teuchos::ArrayView MyGlobalElements = map->getNodeElementList (); // Make the matrix the identity matrix. @@ -468,15 +468,15 @@ namespace { // (anonymous) cerr << "Test the entries of vec_sol" << endl; } comm->barrier (); - if (rangeMap->getNodeNumElements () > 0) { + if (rangeMap->getLocalNumElements () > 0) { // Test this both for a const view and for a nonconst view. // This may also be a test for {T,X}petra::MultiVector::getData // and {T,X}petra::MultiVector::getDataNonConst. // Create the const view. Teuchos::ArrayRCP outData = vec_sol->getData (0); - TEST_ASSERT( static_cast (outData.size ()) == rangeMap->getNodeNumElements () ); - if (static_cast (outData.size ()) == rangeMap->getNodeNumElements () && + TEST_ASSERT( static_cast (outData.size ()) == rangeMap->getLocalNumElements () ); + if (static_cast (outData.size ()) == rangeMap->getLocalNumElements () && outData.size () > static_cast (0)) { TEST_EQUALITY( outData[0], FIVE ); if (outData[0] != FIVE) { @@ -486,9 +486,9 @@ namespace { // (anonymous) cerr << os.str (); } } - if (rangeMap->getNodeNumElements () > static_cast (1)) { + if (rangeMap->getLocalNumElements () > static_cast (1)) { bool allOnes = true; - for (size_t k = 1; k < rangeMap->getNodeNumElements (); ++k) { + for (size_t k = 1; k < rangeMap->getLocalNumElements (); ++k) { if (outData[k] != ONE) { allOnes = false; } @@ -500,14 +500,14 @@ namespace { // (anonymous) outData = Teuchos::null; // Create the nonconst view. Teuchos::ArrayRCP outDataNonConst = vec_sol->getDataNonConst (0); - TEST_ASSERT( static_cast (outDataNonConst.size ()) == rangeMap->getNodeNumElements () ); - if (static_cast (outDataNonConst.size ()) == rangeMap->getNodeNumElements () && + TEST_ASSERT( static_cast (outDataNonConst.size ()) == rangeMap->getLocalNumElements () ); + if (static_cast (outDataNonConst.size ()) == rangeMap->getLocalNumElements () && outDataNonConst.size () > static_cast (0)) { TEST_EQUALITY( outDataNonConst[0], FIVE ); } - if (rangeMap->getNodeNumElements () > static_cast (1)) { + if (rangeMap->getLocalNumElements () > static_cast (1)) { bool allOnes = true; - for (size_t k = 1; k < rangeMap->getNodeNumElements (); ++k) { + for (size_t k = 1; k < rangeMap->getLocalNumElements (); ++k) { if (outDataNonConst[k] != ONE) { allOnes = false; } diff --git a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_StaticImportExport.cpp b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_StaticImportExport.cpp index ee7afdc9347f..fdf1696022c4 100644 --- a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_StaticImportExport.cpp +++ b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_StaticImportExport.cpp @@ -87,7 +87,7 @@ generate_crs_matrix(const RCP>& map) // Create a Tpetra::Matrix using the Map, with dynamic allocation. auto A = rcp(new matrix_type(map, 3)); - // const size_t numMyElements = map->getNodeNumElements (); + // const size_t numMyElements = map->getLocalNumElements (); // The list of global elements owned by this MPI process. const Tpetra::global_size_t num_gbl_inds = map->getGlobalNumElements(); auto my_gbl_elems = map->getNodeElementList(); diff --git a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_TransformValues.cpp b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_TransformValues.cpp index 5ee1919ce884..75f6c469056a 100644 --- a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_TransformValues.cpp +++ b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_TransformValues.cpp @@ -83,7 +83,7 @@ namespace { // (anonymous) crs_matrix_type matrix (rowMap, 1); out << "Fill matrix by calling insertGlobalValues" << endl; - if (rowMap->getNodeNumElements () != 0) { + if (rowMap->getLocalNumElements () != 0) { for (LO lclRow = rowMap->getMinLocalIndex (); lclRow <= rowMap->getMaxLocalIndex (); ++lclRow) { const GO gblRow = rowMap->getGlobalElement (lclRow); @@ -113,7 +113,7 @@ namespace { // (anonymous) // Use transformLocalValues to change entries of the matrix. matrix.resumeFill (); - if (rowMap->getNodeNumElements () != 0) { + if (rowMap->getLocalNumElements () != 0) { for (LO lclRow = rowMap->getMinLocalIndex (); lclRow <= rowMap->getMaxLocalIndex (); ++lclRow) { const GO gblRow = rowMap->getGlobalElement (lclRow); @@ -135,7 +135,7 @@ namespace { // (anonymous) TEST_EQUALITY_CONST( gblSuccess, 1 ); // Make sure that the values actually got changed. - if (rowMap->getNodeNumElements () != 0) { + if (rowMap->getLocalNumElements () != 0) { for (LO lclRow = rowMap->getMinLocalIndex (); lclRow <= rowMap->getMaxLocalIndex (); ++lclRow) { const GO gblRow = rowMap->getGlobalElement (lclRow); @@ -154,7 +154,7 @@ namespace { // (anonymous) // Again, use transformLocalValues to change entries of the // matrix, but use a different binary function this time. matrix.resumeFill (); - if (rowMap->getNodeNumElements () != 0) { + if (rowMap->getLocalNumElements () != 0) { for (LO lclRow = rowMap->getMinLocalIndex (); lclRow <= rowMap->getMaxLocalIndex (); ++lclRow) { const GO gblRow = rowMap->getGlobalElement (lclRow); @@ -169,7 +169,7 @@ namespace { // (anonymous) matrix.fillComplete (); // Make sure that the values actually got changed. - if (rowMap->getNodeNumElements () != 0) { + if (rowMap->getLocalNumElements () != 0) { for (LO lclRow = rowMap->getMinLocalIndex (); lclRow <= rowMap->getMaxLocalIndex (); ++lclRow) { const GO gblRow = rowMap->getGlobalElement (lclRow); @@ -235,7 +235,7 @@ namespace { // (anonymous) crs_matrix_type matrix (rowMap, 1); out << "Fill matrix by calling insertGlobalValues" << endl; - if (rowMap->getNodeNumElements () != 0) { + if (rowMap->getLocalNumElements () != 0) { for (LO lclRow = rowMap->getMinLocalIndex (); lclRow <= rowMap->getMaxLocalIndex (); ++lclRow) { const GO gblRow = rowMap->getGlobalElement (lclRow); @@ -261,7 +261,7 @@ namespace { // (anonymous) Kokkos::View gblInds ("gblInds", 1); Kokkos::View vals ("vals", 1); - if (rowMap->getNodeNumElements () != 0) { + if (rowMap->getLocalNumElements () != 0) { for (LO lclRow = rowMap->getMinLocalIndex (); lclRow <= rowMap->getMaxLocalIndex (); ++lclRow) { const GO gblRow = rowMap->getGlobalElement (lclRow); @@ -282,7 +282,7 @@ namespace { // (anonymous) TEST_EQUALITY_CONST( gblSuccess, 1 ); out << "Before calling fillComplete, test the values" << endl; - if (rowMap->getNodeNumElements () != 0) { + if (rowMap->getLocalNumElements () != 0) { for (LO lclRow = rowMap->getMinLocalIndex (); lclRow <= rowMap->getMaxLocalIndex (); ++lclRow) { const GO gblRow = rowMap->getGlobalElement (lclRow); @@ -321,7 +321,7 @@ namespace { // (anonymous) Kokkos::View lclInds ("lclInds", 1); auto colMap = matrix.getColMap (); matrix.resumeFill (); - if (rowMap->getNodeNumElements () != 0) { + if (rowMap->getLocalNumElements () != 0) { for (LO lclRow = rowMap->getMinLocalIndex (); lclRow <= rowMap->getMaxLocalIndex (); ++lclRow) { const GO gblRow = rowMap->getGlobalElement (lclRow); @@ -343,7 +343,7 @@ namespace { // (anonymous) TEST_EQUALITY_CONST( gblSuccess, 1 ); // Make sure that the values actually got changed. - if (rowMap->getNodeNumElements () != 0) { + if (rowMap->getLocalNumElements () != 0) { for (LO lclRow = rowMap->getMinLocalIndex (); lclRow <= rowMap->getMaxLocalIndex (); ++lclRow) { const GO gblRow = rowMap->getGlobalElement (lclRow); diff --git a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_removeEmptyProcesses.cpp b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_removeEmptyProcesses.cpp index dfad30c703db..052368f2fd7d 100644 --- a/packages/tpetra/core/test/CrsMatrix/CrsMatrix_removeEmptyProcesses.cpp +++ b/packages/tpetra/core/test/CrsMatrix/CrsMatrix_removeEmptyProcesses.cpp @@ -109,7 +109,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL( CrsMatrix, RemoveEmptyProcesses, Scalar, LO, RCP matrix = rcp (new crs_matrix_type (map, 1)); - const LO NumMyElements = map->getNodeNumElements (); + const LO NumMyElements = map->getLocalNumElements (); Teuchos::ArrayView MyGlobalElements = map->getNodeElementList (); // Make the matrix the identity matrix. diff --git a/packages/tpetra/core/test/CrsMatrix/Equilibration.cpp b/packages/tpetra/core/test/CrsMatrix/Equilibration.cpp index 3769504a1def..b8e960cc98be 100644 --- a/packages/tpetra/core/test/CrsMatrix/Equilibration.cpp +++ b/packages/tpetra/core/test/CrsMatrix/Equilibration.cpp @@ -273,9 +273,9 @@ testEquilibration (Teuchos::FancyOStream& out, Teuchos::OSTab tab1 (out); const LO lclNumRows = - static_cast (test.A->getRowMap ()->getNodeNumElements ()); + static_cast (test.A->getRowMap ()->getLocalNumElements ()); RCP colMap = test.A->getColMap (); - const LO lclNumCols = static_cast (colMap->getNodeNumElements ()); + const LO lclNumCols = static_cast (colMap->getLocalNumElements ()); // Test computeLocalRowAndColumnOneNorms (CrsMatrix) { @@ -1040,7 +1040,7 @@ makeSymmetricPositiveDefiniteTridiagonalMatrixTest (Teuchos::FancyOStream& out, A->fillComplete (domMap, ranMap); RCP colMap = G->getColMap (); - const LO lclNumCols = static_cast (colMap->getNodeNumElements ()); + const LO lclNumCols = static_cast (colMap->getLocalNumElements ()); const GO gblNumCols = static_cast (G->getDomainMap ()->getGlobalNumElements ()); const mag_type diagAbsVal = KAT::abs (diagVal); @@ -1363,7 +1363,7 @@ makeMatrixTestWithExplicitZeroDiag (Teuchos::FancyOStream& out, A->fillComplete (domMap, ranMap); RCP colMap = G->getColMap (); - const LO lclNumCols = static_cast (colMap->getNodeNumElements ()); + const LO lclNumCols = static_cast (colMap->getLocalNumElements ()); out << "Compute local row norms and diagonal entries" << endl; std::vector lclRowDiagonalEntries (lclNumRows); @@ -1601,7 +1601,7 @@ makeMatrixTestWithImplicitZeroDiag (Teuchos::FancyOStream& out, A->fillComplete (domMap, ranMap); RCP colMap = G->getColMap (); - const LO lclNumCols = static_cast (colMap->getNodeNumElements ()); + const LO lclNumCols = static_cast (colMap->getLocalNumElements ()); out << "Compute local row norms and diagonal entries" << endl; std::vector lclRowDiagonalEntries (lclNumRows); @@ -1842,7 +1842,7 @@ makeMatrixTestWithExplicitInfAndNan (Teuchos::FancyOStream& out, A->fillComplete (domMap, ranMap); RCP colMap = G->getColMap (); - const LO lclNumCols = static_cast (colMap->getNodeNumElements ()); + const LO lclNumCols = static_cast (colMap->getLocalNumElements ()); out << "Compute local row norms and diagonal entries" << endl; std::vector lclRowDiagonalEntries (lclNumRows); diff --git a/packages/tpetra/core/test/CrsMatrix/Regression/Albany182.cpp b/packages/tpetra/core/test/CrsMatrix/Regression/Albany182.cpp index ef9f17eeae7a..df655877172d 100644 --- a/packages/tpetra/core/test/CrsMatrix/Regression/Albany182.cpp +++ b/packages/tpetra/core/test/CrsMatrix/Regression/Albany182.cpp @@ -156,7 +156,7 @@ namespace { // (anonymous) } const int myRank = map.getComm ()->getRank (); out << "Proc " << myRank << ": ["; - const LO lclNumInds = static_cast (map.getNodeNumElements ()); + const LO lclNumInds = static_cast (map.getLocalNumElements ()); if (lclNumInds != 0) { for (LO lclInd = 0; lclInd < lclNumInds; ++lclInd) { const GO gblInd = map.getGlobalElement (lclInd); @@ -196,7 +196,7 @@ namespace { // (anonymous) const int myRank = rowMap.getComm ()->getRank (); out << "Proc " << myRank << ": {"; - const LO lclNumRows = static_cast (rowMap.getNodeNumElements ()); + const LO lclNumRows = static_cast (rowMap.getLocalNumElements ()); if (lclNumRows != 0) { if (A.isLocallyIndexed ()) { Teuchos::Array gblColInds; diff --git a/packages/tpetra/core/test/CrsMatrix/applyDirichlet.cpp b/packages/tpetra/core/test/CrsMatrix/applyDirichlet.cpp index 1fb6644ed651..ed21ac797dd6 100644 --- a/packages/tpetra/core/test/CrsMatrix/applyDirichlet.cpp +++ b/packages/tpetra/core/test/CrsMatrix/applyDirichlet.cpp @@ -151,7 +151,7 @@ namespace { // (anonymous) } }); local_graph_device_type I_G_lcl (I_lclColInds, I_rowOffsets); - I_A_lcl = local_matrix_device_type("A_lcl", colMap->getNodeNumElements(),I_values,I_G_lcl); + I_A_lcl = local_matrix_device_type("A_lcl", colMap->getLocalNumElements(),I_values,I_G_lcl); } crs_matrix_type input_matrix (I_A_lcl, rowMap, colMap, domMap, ranMap); @@ -180,7 +180,7 @@ namespace { // (anonymous) } }); local_graph_device_type O_G_lcl (O_lclColInds, O_rowOffsets); - O_A_lcl = local_matrix_device_type("A_lcl", colMap->getNodeNumElements(),O_values,O_G_lcl); + O_A_lcl = local_matrix_device_type("A_lcl", colMap->getLocalNumElements(),O_values,O_G_lcl); } crs_matrix_type output_matrix (O_A_lcl, rowMap, colMap, domMap, ranMap); @@ -301,7 +301,7 @@ namespace { // (anonymous) } }); local_graph_device_type I_G_lcl (I_lclColInds, I_rowOffsets); - I_A_lcl = local_matrix_device_type("A_lcl", colMap->getNodeNumElements(),I_values,I_G_lcl); + I_A_lcl = local_matrix_device_type("A_lcl", colMap->getLocalNumElements(),I_values,I_G_lcl); } crs_matrix_type input_matrix (I_A_lcl, rowMap, colMap, domMap, ranMap); @@ -331,7 +331,7 @@ namespace { // (anonymous) } }); local_graph_device_type O_G_lcl (O_lclColInds, O_rowOffsets); - O_A_lcl = local_matrix_device_type("A_lcl", colMap->getNodeNumElements(),O_values,O_G_lcl); + O_A_lcl = local_matrix_device_type("A_lcl", colMap->getLocalNumElements(),O_values,O_G_lcl); } crs_matrix_type output_matrix (O_A_lcl, rowMap, colMap, domMap, ranMap); diff --git a/packages/tpetra/core/test/Distributor/Issue1752.cpp b/packages/tpetra/core/test/Distributor/Issue1752.cpp index 5c7830e58f57..58f19627b1cd 100644 --- a/packages/tpetra/core/test/Distributor/Issue1752.cpp +++ b/packages/tpetra/core/test/Distributor/Issue1752.cpp @@ -86,7 +86,7 @@ void fill_and_complete(CrsMatrixType& matrix) // Fill the sparse matrix, one row at a time. auto map = matrix.getRowMap(); - auto my_num_rows = map->getNodeNumElements(); + auto my_num_rows = map->getLocalNumElements(); auto num_rows = map->getGlobalNumElements(); for (LO i=0; i(my_num_rows); i++) { auto gbl_row = map->getGlobalElement(i); @@ -134,7 +134,7 @@ std::pair check_matrix(CrsMatrixType& matrix) // Fill the sparse matrix, one row at a time. auto map = matrix.getRowMap(); - auto my_num_rows = map->getNodeNumElements(); + auto my_num_rows = map->getLocalNumElements(); auto num_rows = matrix.getGlobalNumRows(); for (LO i=0; i(my_num_rows); i++) { diff --git a/packages/tpetra/core/test/Distributor/createfromsendsandrecvs.cpp b/packages/tpetra/core/test/Distributor/createfromsendsandrecvs.cpp index 944fb53e4153..995c1f10100f 100644 --- a/packages/tpetra/core/test/Distributor/createfromsendsandrecvs.cpp +++ b/packages/tpetra/core/test/Distributor/createfromsendsandrecvs.cpp @@ -124,7 +124,7 @@ namespace { // (anonymous) // columns, or asking the column Map for the number of entries, // won't give the correct number of columns in the graph. // const GO gblNumCols = graph->getDomainMap ()->getGlobalNumElements (); - const LO lclNumRows = meshRowMap.getNodeNumElements (); + const LO lclNumRows = meshRowMap.getLocalNumElements (); const LO blkSize = 101; RCP A = rcp (new matrix_type (*graph, blkSize)); diff --git a/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp b/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp index 0a7425f4e01a..2822019cf485 100644 --- a/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp +++ b/packages/tpetra/core/test/FECrsGraph/FECrsGraph_UnitTests.cpp @@ -212,12 +212,12 @@ class GraphPack { void print(int rank, std::ostream & out) { using std::endl; out << "["<getNodeNumElements(); i++) + for(size_t i=0; igetLocalNumElements(); i++) out << uniqueMap->getGlobalElement(i) << " "; out<getNodeNumElements(); i++) + for(size_t i=0; igetLocalNumElements(); i++) out << overlapMap->getGlobalElement(i) << " "; out<getNodeNumElements(); i++) + for(size_t i=0; igetLocalNumElements(); i++) out << uniqueMap->getGlobalElement(i) << " "; out<getNodeNumElements(); i++) + for(size_t i=0; igetLocalNumElements(); i++) out << overlapMap->getGlobalElement(i) << " "; out< entry(1); - for (size_t i = 0; i < map->getNodeNumElements (); i++) { + for (size_t i = 0; i < map->getLocalNumElements (); i++) { const GO globalrow = map->getGlobalElement (i); entry[0] = globalrow; graph->insertGlobalIndices (globalrow, entry()); @@ -147,8 +147,8 @@ namespace { RCP > importer = graph->getImporter(); Tpetra::MultiVector Vdomain(domainMap,1), Vcolumn(columnMap,1); Tpetra::FEMultiVector Vfe(domainMap,importer,1); - size_t Ndomain = domainMap->getNodeNumElements(); - size_t Ncolumn = domainMap->getNodeNumElements(); + size_t Ndomain = domainMap->getLocalNumElements(); + size_t Ncolumn = domainMap->getLocalNumElements(); if(importer.is_null()) throw std::runtime_error("No valid importer"); diff --git a/packages/tpetra/core/test/FEMultiVector/Fix3101.cpp b/packages/tpetra/core/test/FEMultiVector/Fix3101.cpp index 20d6749793c5..1f8b1819ac4c 100644 --- a/packages/tpetra/core/test/FEMultiVector/Fix3101.cpp +++ b/packages/tpetra/core/test/FEMultiVector/Fix3101.cpp @@ -81,14 +81,14 @@ FEMultiVectorTest::FEMultiVectorTest( // Print the entries of each map std::cout << me << " MAP WITH COPIES (" << mapWithCopies->getGlobalNumElements() << "): "; - lno_t nlocal = lno_t(mapWithCopies->getNodeNumElements()); + lno_t nlocal = lno_t(mapWithCopies->getLocalNumElements()); for (lno_t i = 0; i < nlocal; i++) std::cout << mapWithCopies->getGlobalElement(i) << " "; std::cout << std::endl; std::cout << me << " ONE TO ONE MAP (" << mapOwned->getGlobalNumElements() << "): "; - nlocal = lno_t(mapOwned->getNodeNumElements()); + nlocal = lno_t(mapOwned->getLocalNumElements()); for (lno_t i = 0; i < nlocal; i++) std::cout << mapOwned->getGlobalElement(i) << " "; std::cout << std::endl; diff --git a/packages/tpetra/core/test/ImportExport/Bug9116.cpp b/packages/tpetra/core/test/ImportExport/Bug9116.cpp index 7e3632638bb5..76a333962537 100644 --- a/packages/tpetra/core/test/ImportExport/Bug9116.cpp +++ b/packages/tpetra/core/test/ImportExport/Bug9116.cpp @@ -81,7 +81,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Bug9116, LargeImport, // One-to-one (oto) map across all processors Teuchos::RCP map_oto = rcp(new map_t(len, 0, comm)); - size_t myLen = map_oto->getNodeNumElements(); + size_t myLen = map_oto->getLocalNumElements(); // create one-to-one Vector with entries = GIDs vector_t x_oto(map_oto); @@ -112,7 +112,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Bug9116, LargeImport, size_t ierr = 0; { auto x_h = x_olap.getLocalViewHost(Tpetra::Access::ReadOnly); - for (size_t i = 0; i < map_olap->getNodeNumElements(); i++) { + for (size_t i = 0; i < map_olap->getLocalNumElements(); i++) { if (x_h(i,0) != map_olap->getGlobalElement(i)) { // std::cout << comm->getRank() << " of " << np << ": x_olap[ " << i // << "] " << x_h(i, 0) << " != " diff --git a/packages/tpetra/core/test/ImportExport/ImportExport_ImportConstructExpert.cpp b/packages/tpetra/core/test/ImportExport/ImportExport_ImportConstructExpert.cpp index 94e90a7d8cb7..91f83299ab68 100644 --- a/packages/tpetra/core/test/ImportExport/ImportExport_ImportConstructExpert.cpp +++ b/packages/tpetra/core/test/ImportExport/ImportExport_ImportConstructExpert.cpp @@ -122,7 +122,7 @@ namespace { // columns, or asking the column Map for the number of entries, // won't give the correct number of columns in the graph. // const GO gblNumCols = graph->getDomainMap ()->getGlobalNumElements (); - const LO lclNumRows = meshRowMap.getNodeNumElements (); + const LO lclNumRows = meshRowMap.getLocalNumElements (); const LO blkSize = 16; RCP A = rcp (new matrix_type (*G, blkSize)); diff --git a/packages/tpetra/core/test/ImportExport/ImportExport_UnitTests.cpp b/packages/tpetra/core/test/ImportExport/ImportExport_UnitTests.cpp index 83f9c8adc214..0ea8970ee97b 100644 --- a/packages/tpetra/core/test/ImportExport/ImportExport_UnitTests.cpp +++ b/packages/tpetra/core/test/ImportExport/ImportExport_UnitTests.cpp @@ -123,7 +123,7 @@ namespace { auto permute = importer->getNumPermuteIDs(); auto remote = importer->getNumRemoteIDs(); auto sum = same + permute + remote; - auto expectedSum = target->getNodeNumElements(); + auto expectedSum = target->getLocalNumElements(); TEST_EQUALITY( sum, expectedSum ); bool isvalid=Tpetra::Import_Util::checkImportValidity(*importer); @@ -466,7 +466,7 @@ namespace { // Check the "FromAnswer" answer against who_owns bool all_is_well=true; - for(size_t i=0; igetNodeNumElements(); i++) { + for(size_t i=0; igetLocalNumElements(); i++) { if(f_view[i] != who_owns[FromMap->getGlobalElement(i)]) { std::cerr<<"["<getGlobalElement(i)<<" is incorrect!"<getNodeNumElements (); ++i) { + for (size_t i = 0; i < FromMap->getLocalNumElements (); ++i) { if (f_view[i] != who_owns[FromMap->getGlobalElement(i)]) { lclErrStrm << "[" << myRank << "] ERROR: Ownership of GID " << FromMap->getGlobalElement(i) << " is incorrect!" << endl; diff --git a/packages/tpetra/core/test/ImportExport/Issue_2198.cpp b/packages/tpetra/core/test/ImportExport/Issue_2198.cpp index 7d5fe0ef8415..d704f8b93a7c 100644 --- a/packages/tpetra/core/test/ImportExport/Issue_2198.cpp +++ b/packages/tpetra/core/test/ImportExport/Issue_2198.cpp @@ -95,7 +95,7 @@ printMapCompactly (Teuchos::FancyOStream& out, std::ostringstream lclOut; lclOut << "Proc " << myRank << ": ["; - if (map.getNodeNumElements () != 0) { + if (map.getLocalNumElements () != 0) { for (LO lid = map.getMinLocalIndex (); lid <= map.getMaxLocalIndex (); ++lid) { const GO gid = map.getGlobalElement (lid); lclOut << gid; @@ -417,7 +417,7 @@ makeTargetMapFromTestInput (const Issue2198TestInput& testInput, const std::vector& remoteGlobalIndices = optimized ? testInput.optimizedRemoteGlobalIndices : testInput.remoteGlobalIndices; - const LO numLclSrcGids = static_cast (sourceMap.getNodeNumElements ()); + const LO numLclSrcGids = static_cast (sourceMap.getLocalNumElements ()); const LO numInputGids = static_cast (remoteGlobalIndices.size ()); const LO numLclTgtGids = numLclSrcGids + numInputGids; std::vector tgtGids (numLclTgtGids); diff --git a/packages/tpetra/core/test/ImportExport/Issue_607.cpp b/packages/tpetra/core/test/ImportExport/Issue_607.cpp index c1ed1e3456e4..f41886c528d0 100644 --- a/packages/tpetra/core/test/ImportExport/Issue_607.cpp +++ b/packages/tpetra/core/test/ImportExport/Issue_607.cpp @@ -205,7 +205,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( ImportExport, IsLocallyComplete, LO, GO, NT ) out << "Create map4 (noncontiguous, compatible with map1)" << endl; RCP map4; { - const LO map1LclSize = static_cast (map1->getNodeNumElements ()); + const LO map1LclSize = static_cast (map1->getLocalNumElements ()); TEST_ASSERT( trueOnAllProcesses (*comm, map1LclSize == static_cast (10)) ); Teuchos::Array gids4 (map1LclSize); for (LO map1_lid = 0; map1_lid < map1LclSize; ++map1_lid) { @@ -219,7 +219,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( ImportExport, IsLocallyComplete, LO, GO, NT ) out << "Create map5 (noncontiguous, compatible with map3)" << endl; RCP map5; { - const LO map3LclSize = static_cast (map3->getNodeNumElements ()); + const LO map3LclSize = static_cast (map3->getLocalNumElements ()); TEST_ASSERT( trueOnAllProcesses (*comm, map3LclSize == static_cast (11)) ); Teuchos::Array gids5 (map3LclSize); for (LO map3_lid = 0; map3_lid < map3LclSize; ++map3_lid) { diff --git a/packages/tpetra/core/test/ImportExport2/ImportExport2_UnitTests.cpp b/packages/tpetra/core/test/ImportExport2/ImportExport2_UnitTests.cpp index 99c5eb21ab3b..f5c48c16791d 100644 --- a/packages/tpetra/core/test/ImportExport2/ImportExport2_UnitTests.cpp +++ b/packages/tpetra/core/test/ImportExport2/ImportExport2_UnitTests.cpp @@ -272,7 +272,7 @@ namespace { } Array diag(1); LO row = 0; - for (size_t i = 0; i < src_map->getNodeNumElements (); ++i, ++row) { + for (size_t i = 0; i < src_map->getLocalNumElements (); ++i, ++row) { const GO globalrow = src_map->getGlobalElement (row); diag[0] = globalrow; src_graph->insertGlobalIndices (globalrow, diag ()); @@ -291,7 +291,7 @@ namespace { out << "Verifying target CrsGraph" << endl; } row = 0; - for (size_t i = 0; i < tgt_map->getNodeNumElements (); ++i, ++row) { + for (size_t i = 0; i < tgt_map->getLocalNumElements (); ++i, ++row) { typename CrsGraph::local_inds_host_view_type rowview; tgt_graph->getLocalRowView( row, rowview ); TEST_EQUALITY(rowview.size(), 1); @@ -1047,7 +1047,7 @@ test_with_matvec_reduced_maps (const CrsMatrixType& A, RCP Amap = A.getDomainMap(); vector_type Xa(Amap,1), Ya(Amap,1), Diff(Amap,1); - RCP Bmap = Bfullmap.getNodeNumElements() > 0 ? + RCP Bmap = Bfullmap.getLocalNumElements() > 0 ? B.getDomainMap() : Teuchos::null; vector_type Xb_alias(rcp(&Bfullmap,false),1); @@ -1327,7 +1327,7 @@ build_test_prolongator (const Teuchos::RCP& A, // Make DomainMap Array gids; - for (size_t i = 0; i < RowMap->getNodeNumElements (); ++i) { + for (size_t i = 0; i < RowMap->getLocalNumElements (); ++i) { const GO gid = RowMap->getGlobalElement (i); if (gid % static_cast (3) == static_cast (0)) { gids.push_back (gid / 3); @@ -1341,7 +1341,7 @@ build_test_prolongator (const Teuchos::RCP& A, Teuchos::Array Indices(1); Values[0] = STS::one (); const GO minP = DomainMap->getMinGlobalIndex (); - for (size_t i = 0; i < RowMap->getNodeNumElements (); ++i) { + for (size_t i = 0; i < RowMap->getLocalNumElements (); ++i) { const GO GID = RowMap->getGlobalElement (i); Indices[0] = (static_cast (GID / 3.0) < minP) ? minP : static_cast (GID / 3.0); P->insertGlobalValues (GID, Indices (), Values ()); @@ -1529,7 +1529,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( FusedImportExport, doImport, LO, GO, Scalar ) out << "Test #2: Tridiagonal Matrix; Locally Reversed Map" << endl; try { OSTab tab2 (out); - size_t num_local = A->getRowMap()->getNodeNumElements(); + size_t num_local = A->getRowMap()->getLocalNumElements(); Teuchos::Array MyGIDs(num_local); for(size_t i=0; igetRowMap(),Map3)); Bg = Tpetra::importAndFillCompleteCrsGraph(Ag,*Import1,Map3,Map3,rcp(¶ms,false)); - if (Map3->getNodeNumElements() > 0) { + if (Map3->getLocalNumElements() > 0) { if (!graphs_are_same(Bg, B->getCrsGraph())) { if (MyPID == 0) cerr << "FusedImport: CrsGraph test #6 FAILED." << endl; total_err--; @@ -1778,7 +1778,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( FusedImportExport, doImport, LO, GO, Scalar ) // Test the graph version Export1 = rcp(new ExportType(Ag->getRowMap(),Map3)); Bg = Tpetra::exportAndFillCompleteCrsGraph(Ag,*Export1,Map3,Map3,rcp(¶ms,false)); - if (Map3->getNodeNumElements() > 0) { + if (Map3->getLocalNumElements() > 0) { if (!graphs_are_same(Bg, B->getCrsGraph())) { if (MyPID == 0) cerr << "FusedExport: CrsGraph test #6 FAILED." << endl; total_err--; @@ -2292,7 +2292,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( Import_Util, UnpackAndCombineWithOwningPIDs, size_t nnz1=B->getNodeNumEntries(); // Call the P&PWOPIDs - Teuchos::Array SourcePids(A->getColMap()->getNodeNumElements()); + Teuchos::Array SourcePids(A->getColMap()->getLocalNumElements()); Tpetra::Distributor &distor = Importer->getDistributor(); if(A->getGraph()->getImporter()==Teuchos::null) SourcePids.assign(SourcePids.size(),MyPID); else Tpetra::Import_Util::getPids(*A->getGraph()->getImporter(),SourcePids,false); @@ -2387,7 +2387,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( Import_Util, UnpackAndCombineWithOwningPIDs, ///////////////////////////////////////////////////////// // Test #2: Actual combine test ///////////////////////////////////////////////////////// - Teuchos::Array rowptr (MapTarget->getNodeNumElements () + 1); + Teuchos::Array rowptr (MapTarget->getLocalNumElements () + 1); Teuchos::Array colind (nnz2); Teuchos::Array vals (nnz2); Teuchos::Array TargetPids; @@ -2409,7 +2409,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( Import_Util, UnpackAndCombineWithOwningPIDs, Importer->getNumSameIDs (), Importer->getPermuteToLIDs (), Importer->getPermuteFromLIDs (), - MapTarget->getNodeNumElements (), + MapTarget->getLocalNumElements (), nnz2, MyPID, rowptr (), @@ -2511,7 +2511,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_2_DECL( Import_Util,LowCommunicationMakeColMapAndRein Adomainmap = A->getDomainMap(); // Get owning PID information - size_t numMyCols = A->getColMap()->getNodeNumElements(); + size_t numMyCols = A->getColMap()->getLocalNumElements(); RCP Importer = A->getGraph()->getImporter(); Teuchos::Array AcolmapPIDs(numMyCols,-1); if(Importer!=Teuchos::null) @@ -2536,9 +2536,9 @@ TEUCHOS_UNIT_TEST_TEMPLATE_2_DECL( Import_Util,LowCommunicationMakeColMapAndRein // Since this was sorted to begin with, the outgoing maps should be // in an identical order. So let's check. - if(Acolmap->getNodeNumElements()!=Bcolmap->getNodeNumElements()) test_err++; + if(Acolmap->getLocalNumElements()!=Bcolmap->getLocalNumElements()) test_err++; else { - for(size_t i=0; igetNodeNumElements(); i++) + for(size_t i=0; igetLocalNumElements(); i++) if(Acolmap->getGlobalElement(i)!=Bcolmap->getGlobalElement(i)) test_err++; } @@ -2894,7 +2894,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_2_DECL( RemoteOnlyImport, Basic, LO, GO ) { Teuchos::ArrayRCP view1 = TargetVector->get1dView(); Teuchos::ArrayRCP view2 = TestVector->get1dView(); double diff=0; - size_t NumComps = Map0->getNodeNumElements(); + size_t NumComps = Map0->getLocalNumElements(); for(size_t i=0; i < NumComps; i++) { const size_t j = (size_t) Import1->getTargetMap ()->getLocalElement (Map0->getGlobalElement (static_cast (i))); diff += std::abs (view1[j] - view2[i]); @@ -2995,7 +2995,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_2_DECL( Import_Util,GetTwoTransferOwnershipVector, LO // Check answer [ownership(GID i) should contain the owning PID in Map0] - for(size_t i=0; igetNodeNumElements(); i++) { + for(size_t i=0; igetLocalNumElements(); i++) { GO GID = Map2->getGlobalElement(i); int PID = (int)(GID / num_per_proc); if (odata[i]!=PID) { diff --git a/packages/tpetra/core/test/Map/Map_Bug2431.cpp b/packages/tpetra/core/test/Map/Map_Bug2431.cpp index a709b520b09a..04d7bf843035 100644 --- a/packages/tpetra/core/test/Map/Map_Bug2431.cpp +++ b/packages/tpetra/core/test/Map/Map_Bug2431.cpp @@ -135,7 +135,7 @@ int runTest( std::cout << message << ": Before Tpetra::createOneToOne on " << "Proc " << overlapMap->getComm()->getRank() - << "; nGids = " << overlapMap->getNodeNumElements() << "\n"; + << "; nGids = " << overlapMap->getLocalNumElements() << "\n"; auto myidx_o = overlapMap->getMyGlobalIndices(); outStream << "IDS ON PROC " << comm->getRank() << ": "; @@ -151,7 +151,7 @@ int runTest( std::cout << message << ": After Tpetra::createOneToOne with TieBreak on Proc " << overlapMap->getComm()->getRank() - << "; nGids = " << nonOverlapMapTB->getNodeNumElements() << "\n"; + << "; nGids = " << nonOverlapMapTB->getLocalNumElements() << "\n"; auto myidx_notb = nonOverlapMapTB->getMyGlobalIndices(); outStream << "IDS ON PROC " << comm->getRank() << ": "; @@ -167,7 +167,7 @@ int runTest( std::cout << message << ": After Tpetra::createOneToOne without TieBreak on Proc " << overlapMap->getComm()->getRank() - << "; nGids = " << nonOverlapMap->getNodeNumElements() << "\n"; + << "; nGids = " << nonOverlapMap->getLocalNumElements() << "\n"; auto myidx_no = nonOverlapMap->getMyGlobalIndices(); outStream << "IDS ON PROC " << comm->getRank() << ": "; diff --git a/packages/tpetra/core/test/Map/Map_Bug6051.cpp b/packages/tpetra/core/test/Map/Map_Bug6051.cpp index b79661970b06..73d2ccd56f46 100644 --- a/packages/tpetra/core/test/Map/Map_Bug6051.cpp +++ b/packages/tpetra/core/test/Map/Map_Bug6051.cpp @@ -141,7 +141,7 @@ namespace { out << "Checking results" << endl; ArrayView my_owned = new_map->getNodeElementList (); - const LO my_num_owned = static_cast (new_map->getNodeNumElements ()); + const LO my_num_owned = static_cast (new_map->getLocalNumElements ()); Array nodeIDlist (num_loc_elems); Tpetra::LookupStatus stat = new_map->getRemoteIndexList (gidList (), nodeIDlist ()); diff --git a/packages/tpetra/core/test/Map/Map_Bug6412.cpp b/packages/tpetra/core/test/Map/Map_Bug6412.cpp index 6f79f175a042..5b617982c6c1 100644 --- a/packages/tpetra/core/test/Map/Map_Bug6412.cpp +++ b/packages/tpetra/core/test/Map/Map_Bug6412.cpp @@ -25,7 +25,7 @@ searchIt (bool& success, std::ostream& out, const map_type& myMap, const std::st // Print the map elements out << me << " " << myName << " MINE: "; - for (size_t i = 0; i < myMap.getNodeNumElements (); ++i) { + for (size_t i = 0; i < myMap.getLocalNumElements (); ++i) { out << myMap.getGlobalElement(i) << " "; } out << endl; diff --git a/packages/tpetra/core/test/Map/Map_LocalMap.cpp b/packages/tpetra/core/test/Map/Map_LocalMap.cpp index 6c585c941c26..4301e64b14a5 100644 --- a/packages/tpetra/core/test/Map/Map_LocalMap.cpp +++ b/packages/tpetra/core/test/Map/Map_LocalMap.cpp @@ -88,12 +88,12 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( LocalMap, UniformContig, LO, GO, NT ) try { // Sanity check on the global Map. - TEST_EQUALITY( gblMap.getNodeNumElements (), static_cast (numLclElts) ); + TEST_EQUALITY( gblMap.getLocalNumElements (), static_cast (numLclElts) ); TEST_EQUALITY( gblMap.getMinLocalIndex (), static_cast (0) ); TEST_EQUALITY( gblMap.getMaxLocalIndex (), static_cast (numLclElts - 1) ); // Test constants. - TEST_EQUALITY( gblMap.getNodeNumElements (), static_cast (lclMap.getNodeNumElements ()) ); + TEST_EQUALITY( gblMap.getLocalNumElements (), static_cast (lclMap.getLocalNumElements ()) ); TEST_EQUALITY( gblMap.getIndexBase (), lclMap.getIndexBase () ); TEST_EQUALITY( gblMap.isContiguous (), lclMap.isContiguous () ); TEST_EQUALITY( gblMap.getMinLocalIndex (), lclMap.getMinLocalIndex () ); @@ -177,12 +177,12 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( LocalMap, NonuniformContig, LO, GO, NT ) try { // Sanity check on the global Map. - TEST_EQUALITY( gblMap.getNodeNumElements (), static_cast (numLclElts) ); + TEST_EQUALITY( gblMap.getLocalNumElements (), static_cast (numLclElts) ); TEST_EQUALITY( gblMap.getMinLocalIndex (), static_cast (0) ); TEST_EQUALITY( gblMap.getMaxLocalIndex (), static_cast (numLclElts - 1) ); // Test constants. - TEST_EQUALITY( gblMap.getNodeNumElements (), static_cast (lclMap.getNodeNumElements ()) ); + TEST_EQUALITY( gblMap.getLocalNumElements (), static_cast (lclMap.getLocalNumElements ()) ); TEST_EQUALITY( gblMap.getIndexBase (), lclMap.getIndexBase () ); TEST_EQUALITY( gblMap.isContiguous (), lclMap.isContiguous () ); TEST_EQUALITY( gblMap.getMinLocalIndex (), lclMap.getMinLocalIndex () ); @@ -267,12 +267,12 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( LocalMap, Noncontig, LO, GO, NT ) try { // Sanity check on the global Map. - TEST_EQUALITY( gblMap.getNodeNumElements (), static_cast (numLclElts) ); + TEST_EQUALITY( gblMap.getLocalNumElements (), static_cast (numLclElts) ); TEST_EQUALITY( gblMap.getMinLocalIndex (), static_cast (0) ); TEST_EQUALITY( gblMap.getMaxLocalIndex (), static_cast (numLclElts - 1) ); // Test constants. - TEST_EQUALITY( gblMap.getNodeNumElements (), static_cast (lclMap.getNodeNumElements ()) ); + TEST_EQUALITY( gblMap.getLocalNumElements (), static_cast (lclMap.getLocalNumElements ()) ); TEST_EQUALITY( gblMap.getIndexBase (), lclMap.getIndexBase () ); TEST_EQUALITY( gblMap.isContiguous (), lclMap.isContiguous () ); TEST_EQUALITY( gblMap.getMinLocalIndex (), lclMap.getMinLocalIndex () ); diff --git a/packages/tpetra/core/test/Map/Map_OneToOne.cpp b/packages/tpetra/core/test/Map/Map_OneToOne.cpp index 792939cd7f75..4ac6579ffdf9 100644 --- a/packages/tpetra/core/test/Map/Map_OneToOne.cpp +++ b/packages/tpetra/core/test/Map/Map_OneToOne.cpp @@ -319,11 +319,11 @@ namespace { // (anonymous) if(myRankgetNodeNumElements(),0); + TEST_EQUALITY(new_map->getLocalNumElements(),0); } else//I should have all of them. { - TEST_EQUALITY(new_map->getNodeNumElements(),NUM_GLOBAL_ELEMENTS); + TEST_EQUALITY(new_map->getLocalNumElements(),NUM_GLOBAL_ELEMENTS); } } diff --git a/packages/tpetra/core/test/Map/Map_UnitTests.cpp b/packages/tpetra/core/test/Map/Map_UnitTests.cpp index 89757cdf338e..67316c9f18d4 100644 --- a/packages/tpetra/core/test/Map/Map_UnitTests.cpp +++ b/packages/tpetra/core/test/Map/Map_UnitTests.cpp @@ -188,8 +188,8 @@ namespace { Teuchos::OSTab tab1 (out); out << "m1.getGlobalNumElements() = " << m1.getGlobalNumElements () << endl << "m2.getGlobalNumElements() = " << m2.getGlobalNumElements () << endl - << "m1.getNodeNumElements() = " << m1.getNodeNumElements () << endl - << "m2.getNodeNumElements() = " << m2.getNodeNumElements () << endl; + << "m1.getLocalNumElements() = " << m1.getLocalNumElements () << endl + << "m2.getLocalNumElements() = " << m2.getLocalNumElements () << endl; TEST_IS_COMPATIBLE( m1, m2, false); } if (numImages > 2) { @@ -279,7 +279,7 @@ namespace { TEST_EQUALITY_CONST(map.isContiguous(), true); TEST_EQUALITY_CONST(map.isDistributed(), numImages > 1); TEST_EQUALITY(map.getGlobalNumElements(), numGlobalEntries); - TEST_EQUALITY_CONST(map.getNodeNumElements(), 2); + TEST_EQUALITY_CONST(map.getLocalNumElements(), 2); TEST_EQUALITY_CONST(map.getIndexBase(), indexBase); TEST_EQUALITY_CONST(map.getMinLocalIndex(), localIndexBase); TEST_EQUALITY_CONST(map.getMaxLocalIndex(), 1); @@ -340,7 +340,7 @@ namespace { } // TEST_EQUALITY(map.getGlobalNumElements(), numGlobal); - TEST_EQUALITY(map.getNodeNumElements(), numLocal); + TEST_EQUALITY(map.getLocalNumElements(), numLocal); TEST_EQUALITY(map.getIndexBase(), indexBase); TEST_EQUALITY_CONST(map.getMinLocalIndex(), 0); TEST_EQUALITY(map.getMaxLocalIndex(), numLocal-1); @@ -385,7 +385,7 @@ namespace { Map map (numGlobal, GIDs (), indexBase, comm); // TEST_EQUALITY(map.getGlobalNumElements(), numGlobal); - TEST_EQUALITY(map.getNodeNumElements(), numLocal); + TEST_EQUALITY(map.getLocalNumElements(), numLocal); TEST_EQUALITY(map.getIndexBase(), indexBase); TEST_EQUALITY_CONST(map.getMinLocalIndex(), 0); TEST_EQUALITY(map.getMaxLocalIndex(), numLocal-1); diff --git a/packages/tpetra/core/test/Map/Map_getMinGlobalIndex.cpp b/packages/tpetra/core/test/Map/Map_getMinGlobalIndex.cpp index 4ec2ee1763f7..5ee88268f3ec 100644 --- a/packages/tpetra/core/test/Map/Map_getMinGlobalIndex.cpp +++ b/packages/tpetra/core/test/Map/Map_getMinGlobalIndex.cpp @@ -82,7 +82,7 @@ namespace { reduceAll(*comm, Teuchos::REDUCE_MAX, myMaxGID, outArg(maxAllGIDs)); // TEST_EQUALITY(map.getGlobalNumElements(), numGlobal); - TEST_EQUALITY(map.getNodeNumElements(), numLocal); + TEST_EQUALITY(map.getLocalNumElements(), numLocal); TEST_EQUALITY(map.getIndexBase(), indexBase); TEST_EQUALITY(map.getMinGlobalIndex(), myMinGID); TEST_EQUALITY(map.getMaxGlobalIndex(), myMaxGID ); @@ -133,7 +133,7 @@ namespace { reduceAll(*comm, Teuchos::REDUCE_MAX, myMaxGID, outArg(maxAllGIDs)); // TEST_EQUALITY(map.getGlobalNumElements(), numGlobal); - TEST_EQUALITY(map.getNodeNumElements(), numLocal); + TEST_EQUALITY(map.getLocalNumElements(), numLocal); TEST_EQUALITY(map.getIndexBase(), indexBase); TEST_EQUALITY(map.getMinGlobalIndex(), myMinGID); TEST_EQUALITY(map.getMaxGlobalIndex(), myMaxGID ); diff --git a/packages/tpetra/core/test/Map/Map_getMyGlobalIndices.cpp b/packages/tpetra/core/test/Map/Map_getMyGlobalIndices.cpp index 2bee49744eb3..a7f8aac5501a 100644 --- a/packages/tpetra/core/test/Map/Map_getMyGlobalIndices.cpp +++ b/packages/tpetra/core/test/Map/Map_getMyGlobalIndices.cpp @@ -71,7 +71,7 @@ testGids (bool& success, auto gblInds = gblMap.getMyGlobalIndices (); TEST_EQUALITY( static_cast (gblInds.size ()), - static_cast (gblMap.getNodeNumElements ()) ); + static_cast (gblMap.getLocalNumElements ()) ); if (success) { const LO numLclElts = static_cast (gblInds.size ()); @@ -115,7 +115,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( getMyGlobalIndices, UniformContig, LO, GO, NT map_type gblMap (numGblElts, indexBase, comm); // Sanity check on the global Map. - TEST_EQUALITY( gblMap.getNodeNumElements (), static_cast (numLclElts) ); + TEST_EQUALITY( gblMap.getLocalNumElements (), static_cast (numLclElts) ); TEST_EQUALITY( gblMap.getMinLocalIndex (), static_cast (0) ); TEST_EQUALITY( gblMap.getMaxLocalIndex (), static_cast (numLclElts - 1) ); @@ -157,7 +157,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( getMyGlobalIndices, NonuniformContig, LO, GO, map_type gblMap (numGblElts, static_cast (numLclElts), indexBase, comm); // Sanity check on the global Map. - TEST_EQUALITY( gblMap.getNodeNumElements (), static_cast (numLclElts) ); + TEST_EQUALITY( gblMap.getLocalNumElements (), static_cast (numLclElts) ); TEST_EQUALITY( gblMap.getMinLocalIndex (), static_cast (0) ); TEST_EQUALITY( gblMap.getMaxLocalIndex (), static_cast (numLclElts - 1) ); @@ -206,7 +206,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( getMyGlobalIndices, Noncontig, LO, GO, NT ) map_type gblMap (numGblElts, eltList (), indexBase, comm); // Sanity check on the global Map. - TEST_EQUALITY( gblMap.getNodeNumElements (), static_cast (numLclElts) ); + TEST_EQUALITY( gblMap.getLocalNumElements (), static_cast (numLclElts) ); TEST_EQUALITY( gblMap.getMinLocalIndex (), static_cast (0) ); TEST_EQUALITY( gblMap.getMaxLocalIndex (), static_cast (numLclElts - 1) ); diff --git a/packages/tpetra/core/test/Map/Map_removeEmptyProcesses.cpp b/packages/tpetra/core/test/Map/Map_removeEmptyProcesses.cpp index 9cdb875bd47f..e9f4b3ae180d 100644 --- a/packages/tpetra/core/test/Map/Map_removeEmptyProcesses.cpp +++ b/packages/tpetra/core/test/Map/Map_removeEmptyProcesses.cpp @@ -132,11 +132,11 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL(Map, removeEmptyProcesses_MpiComm_noncontigMap << origMap->getGlobalNumElements() << "." << endl; } - if (newMap->getNodeNumElements() != origMap->getNodeNumElements()) { + if (newMap->getLocalNumElements() != origMap->getLocalNumElements()) { localSuccess = 0; - err << "New Map has " << newMap->getNodeNumElements() << " local " + err << "New Map has " << newMap->getLocalNumElements() << " local " "elements, which differs from the original number " - << origMap->getNodeNumElements() << "." << endl; + << origMap->getLocalNumElements() << "." << endl; } if (newMap->getIndexBase() != origMap->getIndexBase()) { @@ -277,11 +277,11 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL(Map, removeEmptyProcesses_MpiComm_contigMap, L << origMap->getGlobalNumElements() << "." << endl; } - if (newMap->getNodeNumElements() != origMap->getNodeNumElements()) { + if (newMap->getLocalNumElements() != origMap->getLocalNumElements()) { localSuccess = 0; - err << "New Map has " << newMap->getNodeNumElements() << " local " + err << "New Map has " << newMap->getLocalNumElements() << " local " "elements, which differs from the original number " - << origMap->getNodeNumElements() << "." << endl; + << origMap->getLocalNumElements() << "." << endl; } if (newMap->getIndexBase() != origMap->getIndexBase()) { @@ -423,11 +423,11 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( Map, removeEmptyProcesses_SerialComm1, LO, GO << origMap->getGlobalNumElements() << "." << endl; } - if (newMap->getNodeNumElements() != origMap->getNodeNumElements()) { + if (newMap->getLocalNumElements() != origMap->getLocalNumElements()) { localSuccess = 0; - err << "New Map has " << newMap->getNodeNumElements() << " local " + err << "New Map has " << newMap->getLocalNumElements() << " local " "elements, which differs from the original number " - << origMap->getNodeNumElements() << "." << endl; + << origMap->getLocalNumElements() << "." << endl; } if (newMap->getIndexBase() != origMap->getIndexBase()) { diff --git a/packages/tpetra/core/test/Map/Map_replaceCommWithSubset.cpp b/packages/tpetra/core/test/Map/Map_replaceCommWithSubset.cpp index 3522355d56a3..e5546f6f9409 100644 --- a/packages/tpetra/core/test/Map/Map_replaceCommWithSubset.cpp +++ b/packages/tpetra/core/test/Map/Map_replaceCommWithSubset.cpp @@ -135,12 +135,12 @@ testSubsetMapOverSubsetComm (int& gblSuccess, // output argument; 0 means false // another all-reduce, then check the features of the Map that may // require communication (and thus have collective semantics). - if (subsetMap->getNodeNumElements () != origMap->getNodeNumElements ()) { + if (subsetMap->getLocalNumElements () != origMap->getLocalNumElements ()) { lclSuccess = 0; - out << "subsetMap->getNodeNumElements() = " - << subsetMap->getNodeNumElements () - << " != origMap->getNodeNumElements() = " - << origMap->getNodeNumElements () + out << "subsetMap->getLocalNumElements() = " + << subsetMap->getLocalNumElements () + << " != origMap->getLocalNumElements() = " + << origMap->getLocalNumElements () << endl; } if (subsetMap->getMinLocalIndex () != origMap->getMinLocalIndex ()) { @@ -184,8 +184,8 @@ testSubsetMapOverSubsetComm (int& gblSuccess, // output argument; 0 means false try { const LO lclNumInds = - std::min (static_cast (subsetMap->getNodeNumElements ()), - static_cast (origMap->getNodeNumElements ())); + std::min (static_cast (subsetMap->getLocalNumElements ()), + static_cast (origMap->getLocalNumElements ())); Teuchos::Array badLclInds; Teuchos::Array > badGblInds; bool foundBadInd = false; @@ -237,7 +237,7 @@ testSubsetMapOverSubsetComm (int& gblSuccess, // output argument; 0 means false // Use the original Map to compute how many entries the subset Map // _should_ have. This is just the sum of all the local entry // counts in the original Map, over the subset comm. - const GO lclNumEnt = static_cast (origMap->getNodeNumElements ()); + const GO lclNumEnt = static_cast (origMap->getLocalNumElements ()); GO gblNumEnt = 0; // output argument reduceAll (*subsetComm, REDUCE_SUM, lclNumEnt, outArg (gblNumEnt)); diff --git a/packages/tpetra/core/test/Map/NegativeBaseIndexTest.cpp b/packages/tpetra/core/test/Map/NegativeBaseIndexTest.cpp index 7983ed9ffeea..a372893f4708 100644 --- a/packages/tpetra/core/test/Map/NegativeBaseIndexTest.cpp +++ b/packages/tpetra/core/test/Map/NegativeBaseIndexTest.cpp @@ -116,7 +116,7 @@ namespace { out << "Process " << myRank << ":" << endl; { Teuchos::OSTab tab1 (out); - out << "My number of global indices: " << map->getNodeNumElements () + out << "My number of global indices: " << map->getLocalNumElements () << endl << "Global number of global indices: " << map->getGlobalNumElements () << endl @@ -125,7 +125,7 @@ namespace { << "Global min global index: " << map->getMinAllGlobalIndex () << endl; } - TEST_EQUALITY( map->getNodeNumElements(), + TEST_EQUALITY( map->getLocalNumElements(), static_cast (numElements) ); TEST_EQUALITY( map->getGlobalNumElements(), static_cast (numElements*numProcs) ); diff --git a/packages/tpetra/core/test/MatrixMatrix/MatrixMatrixKernels_UnitTests.cpp b/packages/tpetra/core/test/MatrixMatrix/MatrixMatrixKernels_UnitTests.cpp index 174e2c605a27..c89f62b26b53 100644 --- a/packages/tpetra/core/test/MatrixMatrix/MatrixMatrixKernels_UnitTests.cpp +++ b/packages/tpetra/core/test/MatrixMatrix/MatrixMatrixKernels_UnitTests.cpp @@ -371,9 +371,9 @@ mult_test_results multiply_test_kernel( RCP Be2_rowmap = Aeff->getGraph()->getColMap(); // Do rowptr - Teuchos::ArrayRCP Be2_rowptr(Be2_rowmap->getNodeNumElements()+1); + Teuchos::ArrayRCP Be2_rowptr(Be2_rowmap->getLocalNumElements()+1); Be2_rowptr[0]=0; - for(size_t i=0; igetNodeNumElements(); i++) { + for(size_t i=0; igetLocalNumElements(); i++) { LO lrid_1 = Be1_rowmap->getLocalElement(Be2_rowmap->getGlobalElement(i)); if(lrid_1 == LO_INVALID) Be2_rowptr[i+1] = Be2_rowptr[i]; @@ -381,13 +381,13 @@ mult_test_results multiply_test_kernel( Be2_rowptr[i+1] = Be2_rowptr[i] + Be1_rowptr[lrid_1+1] - Be1_rowptr[lrid_1]; } } - int nnz_2 = Be2_rowptr[Be2_rowmap->getNodeNumElements()]; + int nnz_2 = Be2_rowptr[Be2_rowmap->getLocalNumElements()]; Teuchos::ArrayRCP Be2_colind(nnz_2); Teuchos::ArrayRCP Be2_vals(nnz_2); // Copy colind/vals - for(size_t i=0; igetNodeNumElements(); i++) { + for(size_t i=0; igetLocalNumElements(); i++) { LO lrid_1 = Be1_rowmap->getLocalElement(Be2_rowmap->getGlobalElement(i)); // NOTE: Invalid rows will be length zero, so this will always work for(size_t j=Be2_rowptr[i]; jgetGraph()->getRowMap()->getGlobalElement(i)); printf("\n"); printf("Aeff rowgids = "); - for(size_t i=0; i<(size_t) Aeff->getGraph()->getRowMap()->getNodeNumElements(); i++) + for(size_t i=0; i<(size_t) Aeff->getGraph()->getRowMap()->getLocalNumElements(); i++) printf("%d ",(int)Aeff->getGraph()->getRowMap()->getGlobalElement(i)); printf("\n"); @@ -533,11 +533,11 @@ mult_test_results multiply_test_kernel( if(has_mismatch) { #if 0 printf("Real colmap = "); - for(size_t i=0; i<(size_t) C->getGraph()->getColMap()->getNodeNumElements(); i++) + for(size_t i=0; i<(size_t) C->getGraph()->getColMap()->getLocalNumElements(); i++) printf("%d ",(int)C->getGraph()->getColMap()->getGlobalElement(i)); printf("\n"); printf(" B colmap = "); - for(size_t i=0; i<(size_t) Beff->getGraph()->getColMap()->getNodeNumElements(); i++) + for(size_t i=0; i<(size_t) Beff->getGraph()->getColMap()->getLocalNumElements(); i++) printf("%d ",(int)Beff->getGraph()->getColMap()->getGlobalElement(i)); printf("\n"); diff --git a/packages/tpetra/core/test/MatrixMatrix/MatrixMatrix_UnitTests.cpp b/packages/tpetra/core/test/MatrixMatrix/MatrixMatrix_UnitTests.cpp index 810ca4e1fda2..a809efab749e 100644 --- a/packages/tpetra/core/test/MatrixMatrix/MatrixMatrix_UnitTests.cpp +++ b/packages/tpetra/core/test/MatrixMatrix/MatrixMatrix_UnitTests.cpp @@ -1051,7 +1051,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Tpetra_MatMat, operations_test,SC,LO, GO, NT) auto rowMap = A->getRowMap(); Tpetra::Vector diags(rowMap); A->getLocalDiagCopy(diags); - size_t diagLength = rowMap->getNodeNumElements(); + size_t diagLength = rowMap->getLocalNumElements(); Teuchos::Array diagonal(diagLength); diags.get1dCopy(diagonal()); @@ -1847,7 +1847,7 @@ bool verifySum(const CrsMat& A, const CrsMat& B, const CrsMat& C) typedef typename CrsMat::nonconst_values_host_view_type vals_type; auto rowMap = A.getRowMap(); - LO numLocalRows = rowMap->getNodeNumElements(); + LO numLocalRows = rowMap->getLocalNumElements(); GO Amax = A.getGlobalMaxNumRowEntries(); GO Bmax = B.getGlobalMaxNumRowEntries(); GO Cmax = C.getGlobalMaxNumRowEntries(); @@ -1937,7 +1937,7 @@ RCP> getTestMatrix( { using Teuchos::Array; using Teuchos::ArrayView; - const LO maxNnzPerRow = colMap->getNodeNumElements(); + const LO maxNnzPerRow = colMap->getLocalNumElements(); auto mat = rcp(new Tpetra::CrsMatrix(rowRangeMap, colMap, maxNnzPerRow)); //get consistent results between runs on a given machine srand(seed); @@ -1950,7 +1950,7 @@ RCP> getTestMatrix( for(int j = 0; j < n; j++) { vals[j] = 10.0 * rand() / RAND_MAX; - inds[j] = rand() % colMap->getNodeNumElements(); + inds[j] = rand() % colMap->getLocalNumElements(); } mat->insertLocalValues(i, inds(), vals()); } @@ -1976,8 +1976,8 @@ RCP> getUnsortedTestMatrix( using kk_scalar_t = typename KCRS::values_type::non_const_value_type; //Get consistent results between runs on a given machine srand(seed); - lno_t numLocalRows = rowRangeMap->getNodeNumElements(); - lno_t numLocalCols = colMap->getNodeNumElements(); + lno_t numLocalRows = rowRangeMap->getLocalNumElements(); + lno_t numLocalCols = colMap->getLocalNumElements(); Array entriesPerRow(numLocalRows, 0); for(LO i = 0; i < numLocalRows; i++) entriesPerRow[i] = rand() % numLocalCols; diff --git a/packages/tpetra/core/test/MultiVector/Bug5474.cpp b/packages/tpetra/core/test/MultiVector/Bug5474.cpp index c83cb02f0823..ce23f6e43b9b 100644 --- a/packages/tpetra/core/test/MultiVector/Bug5474.cpp +++ b/packages/tpetra/core/test/MultiVector/Bug5474.cpp @@ -119,7 +119,7 @@ namespace { // (anonymous) } TPETRA_MV_TEST_REPORT_GLOBAL_ERR( "Map constructor threw exception" ); TEST_EQUALITY( rowMap->getGlobalNumElements (), static_cast (0) ); - TEST_EQUALITY( rowMap->getNodeNumElements (), static_cast (0) ); + TEST_EQUALITY( rowMap->getLocalNumElements (), static_cast (0) ); vec_type x (rowMap); TEST_EQUALITY( x.getNumVectors (), static_cast (1) ); diff --git a/packages/tpetra/core/test/MultiVector/Bug7745.cpp b/packages/tpetra/core/test/MultiVector/Bug7745.cpp index 170c4472199d..bdb121cb1dd2 100644 --- a/packages/tpetra/core/test/MultiVector/Bug7745.cpp +++ b/packages/tpetra/core/test/MultiVector/Bug7745.cpp @@ -229,10 +229,10 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Bug7745, OverlapToDefault, Scalar,LO,GO,Node) // Overlap map; some entries are stored on two procs int nMyEntries = 0; - for (size_t i = 0; i < defaultMap->getNodeNumElements()/2; i++) { + for (size_t i = 0; i < defaultMap->getLocalNumElements()/2; i++) { myEntries[nMyEntries++] = defaultMap->getGlobalElement(i); } - for (size_t i = 0; i < defaultMap->getNodeNumElements(); i++) { + for (size_t i = 0; i < defaultMap->getLocalNumElements(); i++) { myEntries[nMyEntries++] = (defaultMap->getMaxGlobalIndex() + 1 + i) % nGlobalEntries; } @@ -404,10 +404,10 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Bug7745, SupersetToDefault, Scalar,LO,GO,Node) // Superset map; some entries are stored on two procs int nMyEntries = 0; - for (size_t i = 0; i < defaultMap->getNodeNumElements(); i++) { + for (size_t i = 0; i < defaultMap->getLocalNumElements(); i++) { myEntries[nMyEntries++] = defaultMap->getGlobalElement(i); } - for (size_t i = 0; i < defaultMap->getNodeNumElements()/2; i++) { + for (size_t i = 0; i < defaultMap->getLocalNumElements()/2; i++) { myEntries[nMyEntries++] = (defaultMap->getMaxGlobalIndex() + 1 + i) % nGlobalEntries; } @@ -487,7 +487,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Bug7745, NoSamesToDefault, Scalar,LO,GO,Node) // Map with no sames or permutes int nMyEntries = 0; - for (size_t i = 0; i < defaultMap->getNodeNumElements(); i++) { + for (size_t i = 0; i < defaultMap->getLocalNumElements(); i++) { myEntries[nMyEntries++] = (defaultMap->getMaxGlobalIndex() + 1 + i) % nGlobalEntries; } diff --git a/packages/tpetra/core/test/MultiVector/Bug7758.cpp b/packages/tpetra/core/test/MultiVector/Bug7758.cpp index 1e9b62d3e5e2..9b463551f1b5 100644 --- a/packages/tpetra/core/test/MultiVector/Bug7758.cpp +++ b/packages/tpetra/core/test/MultiVector/Bug7758.cpp @@ -221,10 +221,10 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Bug7758, OverlapToDefault, Scalar,LO,GO,Node) // Overlap map; some entries are stored on two procs int nMyEntries = 0; - for (size_t i = 0; i < defaultMap->getNodeNumElements()/2; i++) { + for (size_t i = 0; i < defaultMap->getLocalNumElements()/2; i++) { myEntries[nMyEntries++] = defaultMap->getGlobalElement(i); } - for (size_t i = 0; i < defaultMap->getNodeNumElements(); i++) { + for (size_t i = 0; i < defaultMap->getLocalNumElements(); i++) { myEntries[nMyEntries++] = (defaultMap->getMaxGlobalIndex() + 1 + i) % nGlobalEntries; } @@ -377,10 +377,10 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Bug7758, SupersetToDefault, Scalar,LO,GO,Node) // Superset map; some entries are stored on two procs int nMyEntries = 0; - for (size_t i = 0; i < defaultMap->getNodeNumElements(); i++) { + for (size_t i = 0; i < defaultMap->getLocalNumElements(); i++) { myEntries[nMyEntries++] = defaultMap->getGlobalElement(i); } - for (size_t i = 0; i < defaultMap->getNodeNumElements()/2; i++) { + for (size_t i = 0; i < defaultMap->getLocalNumElements()/2; i++) { myEntries[nMyEntries++] = (defaultMap->getMaxGlobalIndex() + 1 + i) % nGlobalEntries; } @@ -450,7 +450,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_4_DECL(Bug7758, NoSamesToDefault, Scalar,LO,GO,Node) // Map with no sames or permutes int nMyEntries = 0; - for (size_t i = 0; i < defaultMap->getNodeNumElements(); i++) { + for (size_t i = 0; i < defaultMap->getLocalNumElements(); i++) { myEntries[nMyEntries++] = (defaultMap->getMaxGlobalIndex() + 1 + i) % nGlobalEntries; } diff --git a/packages/tpetra/core/test/MultiVector/MultiVector_MixedNode.cpp b/packages/tpetra/core/test/MultiVector/MultiVector_MixedNode.cpp index 84bfa33b2ea0..2b6be6f40fbf 100644 --- a/packages/tpetra/core/test/MultiVector/MultiVector_MixedNode.cpp +++ b/packages/tpetra/core/test/MultiVector/MultiVector_MixedNode.cpp @@ -175,7 +175,7 @@ namespace { return false; } TEST_EQUALITY( mvec->getNumVectors(), numVecs ); - TEST_EQUALITY( mvec->getLocalLength(), map->getNodeNumElements() ); + TEST_EQUALITY( mvec->getLocalLength(), map->getLocalNumElements() ); TEST_EQUALITY( mvec->getGlobalLength(), map->getGlobalNumElements() ); out << "Test that all norms are zero" << endl; diff --git a/packages/tpetra/core/test/MultiVector/MultiVector_UnitTests.cpp b/packages/tpetra/core/test/MultiVector/MultiVector_UnitTests.cpp index bd79d5139162..42d3c08b5ebb 100644 --- a/packages/tpetra/core/test/MultiVector/MultiVector_UnitTests.cpp +++ b/packages/tpetra/core/test/MultiVector/MultiVector_UnitTests.cpp @@ -3971,7 +3971,7 @@ namespace { RCP map = rcp (new map_type (gblNumRows, lclNumRows, indexBase, comm)); TEST_ASSERT( ! map.is_null () ); TEST_EQUALITY( map->getGlobalNumElements (), gblNumRows ); - TEST_EQUALITY( map->getNodeNumElements (), lclNumRows ); + TEST_EQUALITY( map->getLocalNumElements (), lclNumRows ); TEST_EQUALITY( map->getIndexBase (), indexBase ); // @@ -5270,7 +5270,7 @@ namespace { RCP map = rcp (new map_type (1000, 0, comm)); MV x(map, 1); x.putScalar(0.0); - LO N= (LO) map->getNodeNumElements(); + LO N= (LO) map->getLocalNumElements(); // Vector parallel fill // If we diff --git a/packages/tpetra/core/test/RowMatrixTransposer/main.cpp b/packages/tpetra/core/test/RowMatrixTransposer/main.cpp index 98fab5cf549b..5ee2fddf404c 100644 --- a/packages/tpetra/core/test/RowMatrixTransposer/main.cpp +++ b/packages/tpetra/core/test/RowMatrixTransposer/main.cpp @@ -107,7 +107,7 @@ main (int argc, char* argv[]) // Get update list and number of local equations from newly created map. - const size_t numMyElements = map->getNodeNumElements(); + const size_t numMyElements = map->getLocalNumElements(); Teuchos::ArrayView myGlobalElements = map->getNodeElementList(); diff --git a/packages/tpetra/core/test/RowMatrixTransposer/sorted.cpp b/packages/tpetra/core/test/RowMatrixTransposer/sorted.cpp index 38f380131bc8..9745057f65e2 100644 --- a/packages/tpetra/core/test/RowMatrixTransposer/sorted.cpp +++ b/packages/tpetra/core/test/RowMatrixTransposer/sorted.cpp @@ -223,7 +223,7 @@ testTranspose (bool& success, // By this point, we know that the row Maps are the same. auto rowMap_at = AT_unsorted->getRowMap (); - const LO lclNumRows_at (rowMap_at->getNodeNumElements ()); + const LO lclNumRows_at (rowMap_at->getLocalNumElements ()); if (lclNumRows_at != 0) { std::vector lclColIndsBuf; std::vector valsBuf; @@ -295,7 +295,7 @@ testTranspose (bool& success, // By this point, we know that the row Maps are the same. auto rowMap_at = AT_sorted->getRowMap (); - const LO lclNumRows_at (rowMap_at->getNodeNumElements ()); + const LO lclNumRows_at (rowMap_at->getLocalNumElements ()); if (lclNumRows_at != 0) { for (LO lclRow = 0; lclRow < lclNumRows_at; ++lclRow) { typename crs_matrix_type::local_inds_host_view_type lclColInds; diff --git a/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_CrsGraph_InOutTest.cpp b/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_CrsGraph_InOutTest.cpp index 58d60709979d..fa2cbeaeac6c 100644 --- a/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_CrsGraph_InOutTest.cpp +++ b/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_CrsGraph_InOutTest.cpp @@ -152,7 +152,7 @@ computeGatherMap (Teuchos::RCP map, // MPI_Gatherv. Counts and offsets are all int, because // that's what MPI uses. Teuchos::as will at least prevent // bad casts to int in a dbg build. - const int myEltCount = as (oneToOneMap->getNodeNumElements ()); + const int myEltCount = as (oneToOneMap->getLocalNumElements ()); Array recvCounts (numProcs); const int rootProc = 0; gather (&myEltCount, 1, recvCounts.getRawPtr (), 1, rootProc, *comm); diff --git a/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_CrsMatrix_Dist.cpp b/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_CrsMatrix_Dist.cpp index d660e6be7b3f..46352e65511e 100644 --- a/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_CrsMatrix_Dist.cpp +++ b/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_CrsMatrix_Dist.cpp @@ -124,7 +124,7 @@ class TestReader { if (diagonal == "exclude") { A_baseline->resumeFill(); auto rowMap = A_baseline->getRowMap(); - size_t nMyRows = rowMap->getNodeNumElements(); + size_t nMyRows = rowMap->getLocalNumElements(); for (size_t i = 0; i < nMyRows; i++) { gno_t gid = rowMap->getGlobalElement(i); scalar_t val = Teuchos::ScalarTraits::zero(); diff --git a/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_CrsMatrix_InOutTest.cpp b/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_CrsMatrix_InOutTest.cpp index 0ebbc7d9a0cb..3e86468398c0 100644 --- a/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_CrsMatrix_InOutTest.cpp +++ b/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_CrsMatrix_InOutTest.cpp @@ -152,7 +152,7 @@ computeGatherMap (Teuchos::RCP map, // MPI_Gatherv. Counts and offsets are all int, because // that's what MPI uses. Teuchos::as will at least prevent // bad casts to int in a dbg build. - const int myEltCount = as (oneToOneMap->getNodeNumElements ()); + const int myEltCount = as (oneToOneMap->getLocalNumElements ()); Array recvCounts (numProcs); const int rootProc = 0; gather (&myEltCount, 1, recvCounts.getRawPtr (), 1, rootProc, *comm); diff --git a/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_OperatorTest.cpp b/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_OperatorTest.cpp index 3e99ef77e76f..33cb233ca5dd 100644 --- a/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_OperatorTest.cpp +++ b/packages/tpetra/core/test/inout/MatrixMarket_Tpetra_OperatorTest.cpp @@ -136,20 +136,20 @@ computeGatherMap (Teuchos::RCP map, // overflow on any process. It's OK to do the all-reduce, // because this is a test, not performance-oriented code. const int lclSuccess = - (oneToOneMap->getNodeNumElements () <= static_cast (INT_MAX)) ? + (oneToOneMap->getLocalNumElements () <= static_cast (INT_MAX)) ? 1 : 0; int gblSuccess = 1; using Teuchos::outArg; reduceAll (*comm, REDUCE_MIN, lclSuccess, outArg (gblSuccess)); TEUCHOS_TEST_FOR_EXCEPTION (gblSuccess != 1, std::runtime_error, "On some process, " - "oneToOneMap->getNodeNumElements() = " - << oneToOneMap->getNodeNumElements () << " > INT_MAX = " << INT_MAX + "oneToOneMap->getLocalNumElements() = " + << oneToOneMap->getLocalNumElements () << " > INT_MAX = " << INT_MAX << ". This means that the code below that uses MPI_Gather to collect " "indices onto Process 0 will be incorrect."); } - const int myEltCount = static_cast (oneToOneMap->getNodeNumElements ()); + const int myEltCount = static_cast (oneToOneMap->getLocalNumElements ()); Array recvCounts (numProcs); const int rootProc = 0; gather (&myEltCount, 1, recvCounts.getRawPtr (), 1, rootProc, *comm);