From 36bd3a51a22a26589728ab2cf06c32f8f3336e3d Mon Sep 17 00:00:00 2001 From: StefanoPetrilli Date: Mon, 11 Jul 2022 16:31:58 -0500 Subject: [PATCH] Makefile fix --- amgprec/impl/aggregator/Makefile | 13 + amgprec/impl/aggregator/MatchBoxPC.h | 314 +++++++++++------- ...DomEdgesLinearSearchMesgBndlSmallMateC.cpp | 6 - ...mEdgesLinearSearchMesgBndlSmallMateCMP.cpp | 12 - amgprec/impl/aggregator/clean.cpp | 11 +- .../impl/aggregator/computeCandidateMate.cpp | 4 +- amgprec/impl/aggregator/extractUChunk.cpp | 11 +- amgprec/impl/aggregator/findOwnerOfGhost.cpp | 8 +- amgprec/impl/aggregator/initialize.cpp | 14 +- amgprec/impl/aggregator/isAlreadyMatched.cpp | 8 +- .../parallelComputeCandidateMateB.cpp | 10 +- amgprec/impl/aggregator/processCrossEdge.cpp | 10 +- .../impl/aggregator/processExposedVertex.cpp | 14 +- .../aggregator/processMatchedVertices.cpp | 11 +- amgprec/impl/aggregator/processMessages.cpp | 9 +- amgprec/impl/aggregator/queueTransfer.cpp | 9 +- .../impl/aggregator/sendBundledMessages.cpp | 11 +- 17 files changed, 233 insertions(+), 242 deletions(-) diff --git a/amgprec/impl/aggregator/Makefile b/amgprec/impl/aggregator/Makefile index 1f6f52af..f1760822 100644 --- a/amgprec/impl/aggregator/Makefile +++ b/amgprec/impl/aggregator/Makefile @@ -62,9 +62,22 @@ amg_s_parmatch_smth_bld.o \ amg_s_parmatch_spmm_bld_inner.o MPCOBJS=MatchBoxPC.o \ +sendBundledMessages.o \ +initialize.o \ +extractUChunk.o \ +isAlreadyMatched.o \ +findOwnerOfGhost.o \ +computeCandidateMate.o \ +parallelComputeCandidateMateB.o \ +processMatchedVertices.o \ +processCrossEdge.o \ +queueTransfer.o \ +processMessages.o \ +processExposedVertex.o \ algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.o \ algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP.o + OBJS = $(FOBJS) $(MPCOBJS) LIBNAME=libamg_prec.a diff --git a/amgprec/impl/aggregator/MatchBoxPC.h b/amgprec/impl/aggregator/MatchBoxPC.h index c6445c81..dfcb6f7e 100644 --- a/amgprec/impl/aggregator/MatchBoxPC.h +++ b/amgprec/impl/aggregator/MatchBoxPC.h @@ -64,7 +64,10 @@ #include "dataStrStaticQueue.h" using namespace std; + #define NUM_THREAD 4 +#define UCHUNK 1000 + const MilanLongInt REQUEST = 1; const MilanLongInt SUCCESS = 2; const MilanLongInt FAILURE = 3; @@ -166,119 +169,206 @@ extern "C" #define MilanRealMin MINUS_INFINITY #endif - - // Function of find the owner of a ghost vertex using binary search: - inline MilanInt findOwnerOfGhost(MilanLongInt vtxIndex, MilanLongInt *mVerDistance, - MilanInt myRank, MilanInt numProcs); - - inline MilanLongInt firstComputeCandidateMate(MilanLongInt adj1, - MilanLongInt adj2, - MilanLongInt *verLocInd, - MilanReal *edgeLocWeight); - - inline bool isAlreadyMatched(MilanLongInt node, - MilanLongInt StartIndex, - MilanLongInt EndIndex, - vector &GMate, - MilanLongInt *Mate, - map &Ghost2LocalMap); - - inline MilanLongInt computeCandidateMate(MilanLongInt adj1, - MilanLongInt adj2, - MilanReal *edgeLocWeight, - MilanLongInt k, - MilanLongInt *verLocInd, - MilanLongInt StartIndex, - MilanLongInt EndIndex, - vector &GMate, - MilanLongInt *Mate, - map &Ghost2LocalMap); - - inline void initialize(MilanLongInt NLVer, MilanLongInt NLEdge, - MilanLongInt StartIndex, MilanLongInt EndIndex, - MilanLongInt *numGhostEdgesPtr, - MilanLongInt *numGhostVerticesPtr, - MilanLongInt *S, - MilanLongInt *verLocInd, - MilanLongInt *verLocPtr, - omp_lock_t *MateLock, - map &Ghost2LocalMap, - vector &Counter, - vector &verGhostPtr, - vector &verGhostInd, - vector &tempCounter, - vector &GMate, - vector &Message, - vector &QLocalVtx, - vector &QGhostVtx, - vector &QMsgType, - vector &QOwner, - MilanLongInt *&candidateMate, - staticQueue &U, - staticQueue &privateU, - staticQueue &privateQLocalVtx, - staticQueue &privateQGhostVtx, - staticQueue &privateQMsgType, - staticQueue &privateQOwner); - - inline void PARALLEL_COMPUTE_CANDIDATE_MATE_B(MilanLongInt NLVer, - MilanLongInt *verLocPtr, - MilanLongInt *verLocInd, - MilanInt myRank, - MilanReal *edgeLocWeight, - MilanLongInt *candidateMate); - - inline void PARALLEL_PROCESS_EXPOSED_VERTEX_B(MilanLongInt NLVer, - MilanLongInt *candidateMate, - MilanLongInt *verLocInd, - MilanLongInt *verLocPtr, - MilanLongInt StartIndex, - MilanLongInt EndIndex, - MilanLongInt *Mate, - vector &GMate, - map &Ghost2LocalMap, - MilanReal *edgeLocWeight, - MilanLongInt *myCardPtr, - MilanLongInt *msgIndPtr, - MilanLongInt *NumMessagesBundledPtr, - MilanLongInt *SPtr, - MilanLongInt *verDistance, - MilanLongInt *PCounter, - vector &Counter, - MilanInt myRank, - MilanInt numProcs, - staticQueue &U, - staticQueue &privateU, - vector &QLocalVtx, - vector &QGhostVtx, - vector &QMsgType, - vector &QOwner, - staticQueue &privateQLocalVtx, - staticQueue &privateQGhostVtx, - staticQueue &privateQMsgType, - staticQueue &privateQOwner); - - inline void queuesTransfer(staticQueue &U, - staticQueue &privateU, - vector &QLocalVtx, - vector &QGhostVtx, - vector &QMsgType, - vector &QOwner, - staticQueue &privateQLocalVtx, - staticQueue &privateQGhostVtx, - staticQueue &privateQMsgType, - staticQueue &privateQOwner); - - void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP( - MilanLongInt NLVer, MilanLongInt NLEdge, - MilanLongInt *verLocPtr, MilanLongInt *verLocInd, MilanReal *edgeLocWeight, - MilanLongInt *verDistance, - MilanLongInt *Mate, - MilanInt myRank, MilanInt numProcs, MPI_Comm comm, - MilanLongInt *msgIndSent, MilanLongInt *msgActualSent, MilanReal *msgPercent, - MilanReal *ph0_time, MilanReal *ph1_time, MilanReal *ph2_time, - MilanLongInt *ph1_card, MilanLongInt *ph2_card); + MilanInt findOwnerOfGhost(MilanLongInt vtxIndex, MilanLongInt *mVerDistance, + MilanInt myRank, MilanInt numProcs); + + MilanLongInt firstComputeCandidateMate(MilanLongInt adj1, + MilanLongInt adj2, + MilanLongInt *verLocInd, + MilanReal *edgeLocWeight); + + void queuesTransfer(staticQueue &U, + staticQueue &privateU, + vector &QLocalVtx, + vector &QGhostVtx, + vector &QMsgType, + vector &QOwner, + staticQueue &privateQLocalVtx, + staticQueue &privateQGhostVtx, + staticQueue &privateQMsgType, + staticQueue &privateQOwner); + + bool isAlreadyMatched(MilanLongInt node, + MilanLongInt StartIndex, + MilanLongInt EndIndex, + vector &GMate, + MilanLongInt *Mate, + map &Ghost2LocalMap); + + MilanLongInt computeCandidateMate(MilanLongInt adj1, + MilanLongInt adj2, + MilanReal *edgeLocWeight, + MilanLongInt k, + MilanLongInt *verLocInd, + MilanLongInt StartIndex, + MilanLongInt EndIndex, + vector &GMate, + MilanLongInt *Mate, + map &Ghost2LocalMap); + + void initialize(MilanLongInt NLVer, MilanLongInt NLEdge, + MilanLongInt StartIndex, MilanLongInt EndIndex, + MilanLongInt *numGhostEdgesPtr, + MilanLongInt *numGhostVerticesPtr, + MilanLongInt *S, + MilanLongInt *verLocInd, + MilanLongInt *verLocPtr, + omp_lock_t *MateLock, + map &Ghost2LocalMap, + vector &Counter, + vector &verGhostPtr, + vector &verGhostInd, + vector &tempCounter, + vector &GMate, + vector &Message, + vector &QLocalVtx, + vector &QGhostVtx, + vector &QMsgType, + vector &QOwner, + MilanLongInt *&candidateMate, + staticQueue &U, + staticQueue &privateU, + staticQueue &privateQLocalVtx, + staticQueue &privateQGhostVtx, + staticQueue &privateQMsgType, + staticQueue &privateQOwner); + + void clean(MilanInt myRank, + MilanLongInt MessageIndex, + vector &SRequest, + vector &SStatus, + MilanInt BufferSize, + MilanLongInt *Buffer, + MilanLongInt msgActual, + MilanLongInt *msgActualSent, + MilanLongInt msgInd, + MilanLongInt *msgIndSent, + MilanLongInt NumMessagesBundled, + MilanReal *msgPercent); + + void PARALLEL_COMPUTE_CANDIDATE_MATE_B(MilanLongInt NLVer, + MilanLongInt *verLocPtr, + MilanLongInt *verLocInd, + MilanInt myRank, + MilanReal *edgeLocWeight, + MilanLongInt *candidateMate); + + void PARALLEL_PROCESS_EXPOSED_VERTEX_B(MilanLongInt NLVer, + MilanLongInt *candidateMate, + MilanLongInt *verLocInd, + MilanLongInt *verLocPtr, + MilanLongInt StartIndex, + MilanLongInt EndIndex, + MilanLongInt *Mate, + vector &GMate, + map &Ghost2LocalMap, + MilanReal *edgeLocWeight, + MilanLongInt *myCardPtr, + MilanLongInt *msgIndPtr, + MilanLongInt *NumMessagesBundledPtr, + MilanLongInt *SPtr, + MilanLongInt *verDistance, + MilanLongInt *PCounter, + vector &Counter, + MilanInt myRank, + MilanInt numProcs, + staticQueue &U, + staticQueue &privateU, + vector &QLocalVtx, + vector &QGhostVtx, + vector &QMsgType, + vector &QOwner, + staticQueue &privateQLocalVtx, + staticQueue &privateQGhostVtx, + staticQueue &privateQMsgType, + staticQueue &privateQOwner); + + void PROCESS_CROSS_EDGE(vector &Counter, + map &Ghost2LocalMap, + MilanLongInt edge, + MilanLongInt *SPtr); + + void processMatchedVertices( + MilanLongInt NLVer, + vector &UChunkBeingProcessed, + staticQueue &U, + staticQueue &privateU, + MilanLongInt StartIndex, + MilanLongInt EndIndex, + MilanLongInt *myCardPtr, + MilanLongInt *msgIndPtr, + MilanLongInt *NumMessagesBundledPtr, + MilanLongInt *SPtr, + MilanLongInt *verLocPtr, + MilanLongInt *verLocInd, + MilanLongInt *verDistance, + MilanLongInt *PCounter, + vector &Counter, + MilanInt myRank, + MilanInt numProcs, + MilanLongInt *candidateMate, + vector &GMate, + MilanLongInt *Mate, + map &Ghost2LocalMap, + MilanReal *edgeLocWeight, + vector &QLocalVtx, + vector &QGhostVtx, + vector &QMsgType, + vector &QOwner, + staticQueue &privateQLocalVtx, + staticQueue &privateQGhostVtx, + staticQueue &privateQMsgType, + staticQueue &privateQOwner); + + void sendBundledMessages(MilanLongInt *numGhostEdgesPtr, + MilanInt *BufferSizePtr, + MilanLongInt *Buffer, + vector &PCumulative, + vector &PMessageBundle, + vector &PSizeInfoMessages, + MilanLongInt *PCounter, + MilanLongInt NumMessagesBundled, + MilanLongInt *msgActualPtr, + MilanLongInt *MessageIndexPtr, + MilanInt numProcs, + MilanInt myRank, + int ComputeTag, + int BundleTag, + MPI_Comm comm, + vector &QLocalVtx, + vector &QGhostVtx, + vector &QMsgType, + vector &QOwner, + vector &SRequest, + vector &SStatus); + + void processMessages(int error_codeC, + MilanInt numProcs, + MilanInt myRank, + int ComputeTag, + int BundleTag, + MPI_Comm comm, + vector &Message, + char *error_message, + int message_length, + vector &ReceiveBuffer, + MilanLongInt *BundleSizePtr); + + void extractUChunk( + vector &UChunkBeingProcessed, + staticQueue &U, + staticQueue &privateU); + + void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP( + MilanLongInt NLVer, MilanLongInt NLEdge, + MilanLongInt *verLocPtr, MilanLongInt *verLocInd, MilanReal *edgeLocWeight, + MilanLongInt *verDistance, + MilanLongInt *Mate, + MilanInt myRank, MilanInt numProcs, MPI_Comm comm, + MilanLongInt *msgIndSent, MilanLongInt *msgActualSent, MilanReal *msgPercent, + MilanReal *ph0_time, MilanReal *ph1_time, MilanReal *ph2_time, + MilanLongInt *ph1_card, MilanLongInt *ph2_card); void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC( MilanLongInt NLVer, MilanLongInt NLEdge, diff --git a/amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.cpp b/amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.cpp index 8be438b6..f03f726f 100644 --- a/amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.cpp +++ b/amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateC.cpp @@ -72,12 +72,6 @@ #ifdef SERIAL_MPI #else -//MPI type map -template MPI_Datatype TypeMap(); -template<> inline MPI_Datatype TypeMap() { return MPI_LONG_LONG; } -template<> inline MPI_Datatype TypeMap() { return MPI_INT; } -template<> inline MPI_Datatype TypeMap() { return MPI_DOUBLE; } -template<> inline MPI_Datatype TypeMap() { return MPI_FLOAT; } // DOUBLE PRECISION VERSION //WARNING: The vertex block on a given rank is contiguous diff --git a/amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP.cpp b/amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP.cpp index ad5d1142..50930601 100644 --- a/amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP.cpp +++ b/amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP.cpp @@ -1,16 +1,4 @@ #include "MatchBoxPC.h" -#include -#include -#include "isAlreadyMatched.cpp" -#include "findOwnerOfGhost.cpp" -#include "computeCandidateMate.cpp" -#include "initialize.cpp" -#include "parallelComputeCandidateMateB.cpp" -#include "processExposedVertex.cpp" -#include "processMatchedVertices.cpp" -#include "sendBundledMessages.cpp" -#include "processMessages.cpp" -#include "clean.cpp" // *********************************************************************** // diff --git a/amgprec/impl/aggregator/clean.cpp b/amgprec/impl/aggregator/clean.cpp index 6c5543b8..5204894a 100644 --- a/amgprec/impl/aggregator/clean.cpp +++ b/amgprec/impl/aggregator/clean.cpp @@ -1,19 +1,10 @@ #include "MatchBoxPC.h" -#include -#include -#include -#include -#include -#include "primitiveDataTypeDefinitions.h" -#include "dataStrStaticQueue.h" -#include "omp.h" - //TODO comment //TODO use task //TODO destroy the locks -inline void clean(MilanInt myRank, +void clean(MilanInt myRank, MilanLongInt MessageIndex, vector &SRequest, vector &SStatus, diff --git a/amgprec/impl/aggregator/computeCandidateMate.cpp b/amgprec/impl/aggregator/computeCandidateMate.cpp index b6d8b3ff..36eaa727 100644 --- a/amgprec/impl/aggregator/computeCandidateMate.cpp +++ b/amgprec/impl/aggregator/computeCandidateMate.cpp @@ -9,7 +9,7 @@ * @param edgeLocWeight * @return */ -inline MilanLongInt firstComputeCandidateMate(MilanLongInt adj1, +MilanLongInt firstComputeCandidateMate(MilanLongInt adj1, MilanLongInt adj2, MilanLongInt *verLocInd, MilanReal *edgeLocWeight) @@ -45,7 +45,7 @@ inline MilanLongInt firstComputeCandidateMate(MilanLongInt adj1, * @param Ghost2LocalMap * @return */ -inline MilanLongInt computeCandidateMate(MilanLongInt adj1, +MilanLongInt computeCandidateMate(MilanLongInt adj1, MilanLongInt adj2, MilanReal *edgeLocWeight, MilanLongInt k, diff --git a/amgprec/impl/aggregator/extractUChunk.cpp b/amgprec/impl/aggregator/extractUChunk.cpp index e8a6951c..b5bc1f5f 100644 --- a/amgprec/impl/aggregator/extractUChunk.cpp +++ b/amgprec/impl/aggregator/extractUChunk.cpp @@ -1,15 +1,6 @@ #include "MatchBoxPC.h" -#include -#include -#include -#include -#include "primitiveDataTypeDefinitions.h" -#include "dataStrStaticQueue.h" -#include "omp.h" -#define UCHUNK 1000 - -inline void extractUChunk( +void extractUChunk( vector &UChunkBeingProcessed, staticQueue &U, staticQueue &privateU) diff --git a/amgprec/impl/aggregator/findOwnerOfGhost.cpp b/amgprec/impl/aggregator/findOwnerOfGhost.cpp index 10850607..59a87bc3 100644 --- a/amgprec/impl/aggregator/findOwnerOfGhost.cpp +++ b/amgprec/impl/aggregator/findOwnerOfGhost.cpp @@ -1,13 +1,7 @@ #include "MatchBoxPC.h" -#include -#include -#include -#include -#include "primitiveDataTypeDefinitions.h" -#include "dataStrStaticQueue.h" ///Find the owner of a ghost node: -inline MilanInt findOwnerOfGhost(MilanLongInt vtxIndex, MilanLongInt *mVerDistance, +MilanInt findOwnerOfGhost(MilanLongInt vtxIndex, MilanLongInt *mVerDistance, MilanInt myRank, MilanInt numProcs) { //MilanLongInt Size = mVerDistance.size(); MilanLongInt mStartInd = mVerDistance[myRank]; diff --git a/amgprec/impl/aggregator/initialize.cpp b/amgprec/impl/aggregator/initialize.cpp index c5ae3f26..979cdcf5 100644 --- a/amgprec/impl/aggregator/initialize.cpp +++ b/amgprec/impl/aggregator/initialize.cpp @@ -1,16 +1,6 @@ #include "MatchBoxPC.h" -#include -#include -#include -#include -#include -#include "primitiveDataTypeDefinitions.h" -#include "dataStrStaticQueue.h" -#include "omp.h" - -#define NUM_THREAD 4 - -inline void initialize(MilanLongInt NLVer, MilanLongInt NLEdge, + +void initialize(MilanLongInt NLVer, MilanLongInt NLEdge, MilanLongInt StartIndex, MilanLongInt EndIndex, MilanLongInt *numGhostEdgesPtr, MilanLongInt *numGhostVerticesPtr, diff --git a/amgprec/impl/aggregator/isAlreadyMatched.cpp b/amgprec/impl/aggregator/isAlreadyMatched.cpp index 5a9cf476..dbb1052f 100644 --- a/amgprec/impl/aggregator/isAlreadyMatched.cpp +++ b/amgprec/impl/aggregator/isAlreadyMatched.cpp @@ -1,10 +1,4 @@ #include "MatchBoxPC.h" -#include -#include -#include -#include -#include "primitiveDataTypeDefinitions.h" -#include "dataStrStaticQueue.h" /** * //TODO documentation @@ -17,7 +11,7 @@ * @param Ghost2LocalMap * @return */ -inline bool isAlreadyMatched(MilanLongInt node, +bool isAlreadyMatched(MilanLongInt node, MilanLongInt StartIndex, MilanLongInt EndIndex, vector &GMate, diff --git a/amgprec/impl/aggregator/parallelComputeCandidateMateB.cpp b/amgprec/impl/aggregator/parallelComputeCandidateMateB.cpp index d3e39056..998edd9e 100644 --- a/amgprec/impl/aggregator/parallelComputeCandidateMateB.cpp +++ b/amgprec/impl/aggregator/parallelComputeCandidateMateB.cpp @@ -1,14 +1,6 @@ #include "MatchBoxPC.h" -#include -#include -#include -#include -#include -#include "primitiveDataTypeDefinitions.h" -#include "dataStrStaticQueue.h" -#include "omp.h" -inline void PARALLEL_COMPUTE_CANDIDATE_MATE_B(MilanLongInt NLVer, +void PARALLEL_COMPUTE_CANDIDATE_MATE_B(MilanLongInt NLVer, MilanLongInt *verLocPtr, MilanLongInt *verLocInd, MilanInt myRank, diff --git a/amgprec/impl/aggregator/processCrossEdge.cpp b/amgprec/impl/aggregator/processCrossEdge.cpp index f99bee1a..05cae5d2 100644 --- a/amgprec/impl/aggregator/processCrossEdge.cpp +++ b/amgprec/impl/aggregator/processCrossEdge.cpp @@ -1,14 +1,6 @@ #include "MatchBoxPC.h" -#include -#include -#include -#include -#include -#include "primitiveDataTypeDefinitions.h" -#include "dataStrStaticQueue.h" -#include "omp.h" -inline void PROCESS_CROSS_EDGE(vector &Counter, +void PROCESS_CROSS_EDGE(vector &Counter, map &Ghost2LocalMap, MilanLongInt edge, MilanLongInt *SPtr) diff --git a/amgprec/impl/aggregator/processExposedVertex.cpp b/amgprec/impl/aggregator/processExposedVertex.cpp index ff57b5e5..50a5ecfd 100644 --- a/amgprec/impl/aggregator/processExposedVertex.cpp +++ b/amgprec/impl/aggregator/processExposedVertex.cpp @@ -1,16 +1,6 @@ #include "MatchBoxPC.h" -#include -#include -#include -#include -#include -#include "primitiveDataTypeDefinitions.h" -#include "dataStrStaticQueue.h" -#include "omp.h" -#include "queueTransfer.cpp" -#include "processCrossEdge.cpp" - -inline void PARALLEL_PROCESS_EXPOSED_VERTEX_B(MilanLongInt NLVer, + +void PARALLEL_PROCESS_EXPOSED_VERTEX_B(MilanLongInt NLVer, MilanLongInt *candidateMate, MilanLongInt *verLocInd, MilanLongInt *verLocPtr, diff --git a/amgprec/impl/aggregator/processMatchedVertices.cpp b/amgprec/impl/aggregator/processMatchedVertices.cpp index c6c729ad..aaef21a1 100644 --- a/amgprec/impl/aggregator/processMatchedVertices.cpp +++ b/amgprec/impl/aggregator/processMatchedVertices.cpp @@ -1,16 +1,8 @@ #include "MatchBoxPC.h" -#include -#include -#include -#include -#include "primitiveDataTypeDefinitions.h" -#include "dataStrStaticQueue.h" -#include "omp.h" -#include "extractUChunk.cpp" //#define privateQueues -inline void processMatchedVertices( +void processMatchedVertices( MilanLongInt NLVer, vector &UChunkBeingProcessed, staticQueue &U, @@ -61,6 +53,7 @@ inline void processMatchedVertices( #endif // TODO what would be the optimal UCHUNK + // TODO refactor vector UChunkBeingProcessed; UChunkBeingProcessed.reserve(UCHUNK); diff --git a/amgprec/impl/aggregator/processMessages.cpp b/amgprec/impl/aggregator/processMessages.cpp index ae2c8671..cb43cdb8 100644 --- a/amgprec/impl/aggregator/processMessages.cpp +++ b/amgprec/impl/aggregator/processMessages.cpp @@ -1,13 +1,6 @@ #include "MatchBoxPC.h" -#include -#include -#include -#include -#include "primitiveDataTypeDefinitions.h" -#include "dataStrStaticQueue.h" -#include "omp.h" -inline void processMessages(int error_codeC, +void processMessages(int error_codeC, MilanInt numProcs, MilanInt myRank, int ComputeTag, diff --git a/amgprec/impl/aggregator/queueTransfer.cpp b/amgprec/impl/aggregator/queueTransfer.cpp index becf14cf..ed2829c6 100644 --- a/amgprec/impl/aggregator/queueTransfer.cpp +++ b/amgprec/impl/aggregator/queueTransfer.cpp @@ -1,13 +1,6 @@ #include "MatchBoxPC.h" -#include -#include -#include -#include -#include "primitiveDataTypeDefinitions.h" -#include "dataStrStaticQueue.h" -#include "omp.h" -inline void queuesTransfer(staticQueue &U, +void queuesTransfer(staticQueue &U, staticQueue &privateU, vector &QLocalVtx, vector &QGhostVtx, diff --git a/amgprec/impl/aggregator/sendBundledMessages.cpp b/amgprec/impl/aggregator/sendBundledMessages.cpp index e16c5669..382d8a16 100644 --- a/amgprec/impl/aggregator/sendBundledMessages.cpp +++ b/amgprec/impl/aggregator/sendBundledMessages.cpp @@ -1,13 +1,6 @@ #include "MatchBoxPC.h" -#include -#include -#include -#include -#include "primitiveDataTypeDefinitions.h" -#include "dataStrStaticQueue.h" -#include "omp.h" - -inline void sendBundledMessages(MilanLongInt *numGhostEdgesPtr, + +void sendBundledMessages(MilanLongInt *numGhostEdgesPtr, MilanInt *BufferSizePtr, MilanLongInt *Buffer, vector &PCumulative,