clean partial refactoring

amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP.cpp

@@ -10,7 +10,7 @@
 #include "processMatchedVertices.cpp"
 #include "sendBundledMessages.cpp"
 #include "processMessages.cpp"
-
+#include "clean.cpp"
 
 // ***********************************************************************
 //
@@ -610,7 +610,7 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
         /////////////////////////// PROCESS MESSAGES //////////////////////////////////////
         ///////////////////////////////////////////////////////////////////////////////////
 
-        processMessages(error_codeC, 
+        processMessages(error_codeC,
                         numProcs,
                         myRank,
                         ComputeTag,
@@ -622,7 +622,6 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
                         ReceiveBuffer,
                         &bundleSize);
 
-
         bundleCounter = 0;
         while (bundleCounter < bundleSize)
         {
@@ -802,66 +801,22 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
 #endif
     } // End of while (true)
 
-#ifdef PRINT_DEBUG_INFO_
+    clean(myRank,
-    cout << "\n(" << myRank << ") Waitall= " << endl;
+          MessageIndex,
-    fflush(stdout);
+          SRequest,
-#endif
+          SStatus,
-#ifdef DEBUG_HANG_
+          BufferSize,
-    cout << "\n(" << myRank << ") Waitall " << endl;
+          Buffer,
-    fflush(stdout);
+          msgActual,
-#endif
+          msgActualSent,
-    // MPI_Barrier(comm);
+          msgInd,
-    // Cleanup Phase
+          msgIndSent,
-    MPI_Waitall(MessageIndex, &SRequest[0], &SStatus[0]);
+          NumMessagesBundled,
-    // MPI_Buffer_attach(&Buffer, BufferSize); //Attach the Buffer
+          msgPercent);
-    if (BufferSize > 0)
+
-    {
-        MPI_Buffer_detach(&Buffer, &BufferSize); // Detach the Buffer
-        free(Buffer);                            // Free the memory that was allocated
-    }
     finishTime = MPI_Wtime();
     *ph2_time = finishTime - startTime; // Time taken for Phase-2
     *ph2_card = myCard;                 // Cardinality at the end of Phase-2
-
-#ifdef PRINT_DEBUG_INFO_
-    cout << "\n(" << myRank << ")End of function to compute matching: " << endl;
-    fflush(stdout);
-    cout << "\n(" << myRank << ")myCardinality: " << myCard << endl;
-    fflush(stdout);
-    cout << "\n(" << myRank << ")Matching took " << finishTime - startTime << "seconds" << endl;
-    fflush(stdout);
-    cout << "\n(" << myRank << ")** Getting out of the matching function **" << endl;
-    fflush(stdout);
-#endif
-#ifdef PRINT_DEBUG_INFO_
-    cout << "\n(" << myRank << ") Number of Ghost edges = " << numGhostEdges;
-    cout << "\n(" << myRank << ") Total number of potential message X 2 = " << numGhostEdges * 2;
-    cout << "\n(" << myRank << ") Number messages bundled = " << NumMessagesBundled;
-    cout << "\n(" << myRank << ") Total Individual Messages sent = " << msgInd;
-    if (msgInd > 0)
-    {
-        cout << "\n(" << myRank << ") Percentage of messages bundled = " << ((double)NumMessagesBundled / (double)(msgInd)) * 100.0 << "% \n";
-    }
-    fflush(stdout);
-#endif
-
-    *msgActualSent = msgActual;
-    *msgIndSent = msgInd;
-    if (msgInd > 0)
-    {
-        *msgPercent = ((double)NumMessagesBundled / (double)(msgInd)) * 100.0;
-    }
-    else
-    {
-        *msgPercent = 0;
-    }
-
-#ifdef DEBUG_HANG_
-    if (myRank == 0)
-        cout << "\n(" << myRank << ") Done" << endl;
-    fflush(stdout);
-#endif
-    // MPI_Barrier(comm);
 }
 // End of algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMate
 #endif

amgprec/impl/aggregator/clean.cpp

@@ -0,0 +1,88 @@
+#include "MatchBoxPC.h"
+#include <stdio.h>
+#include <iostream>
+#include <assert.h>
+#include <map>
+#include <vector>
+#include "primitiveDataTypeDefinitions.h"
+#include "dataStrStaticQueue.h"
+#include "omp.h"
+
+
+//TODO comment
+//TODO use task
+//TODO destroy the locks
+
+inline void clean(MilanInt myRank,
+                  MilanLongInt MessageIndex,
+                  vector<MPI_Request> &SRequest,
+                  vector<MPI_Status> &SStatus,
+                  MilanInt BufferSize,
+                  MilanLongInt *Buffer,
+                  MilanLongInt msgActual,
+                  MilanLongInt *msgActualSent,
+                  MilanLongInt msgInd,
+                  MilanLongInt *msgIndSent,
+                  MilanLongInt NumMessagesBundled,
+                  MilanReal *msgPercent)
+{
+    // Cleanup Phase
+
+#ifdef PRINT_DEBUG_INFO_
+    cout << "\n(" << myRank << ") Waitall= " << endl;
+    fflush(stdout);
+#endif
+#ifdef DEBUG_HANG_
+    cout << "\n(" << myRank << ") Waitall " << endl;
+    fflush(stdout);
+#endif
+    return;
+
+    MPI_Waitall(MessageIndex, &SRequest[0], &SStatus[0]);
+
+    // MPI_Buffer_attach(&Buffer, BufferSize); //Attach the Buffer
+    if (BufferSize > 0)
+    {
+        MPI_Buffer_detach(&Buffer, &BufferSize); // Detach the Buffer
+        free(Buffer);                            // Free the memory that was allocated
+    }
+
+#ifdef PRINT_DEBUG_INFO_
+    cout << "\n(" << myRank << ")End of function to compute matching: " << endl;
+    fflush(stdout);
+    cout << "\n(" << myRank << ")myCardinality: " << myCard << endl;
+    fflush(stdout);
+    cout << "\n(" << myRank << ")Matching took " << finishTime - startTime << "seconds" << endl;
+    fflush(stdout);
+    cout << "\n(" << myRank << ")** Getting out of the matching function **" << endl;
+    fflush(stdout);
+#endif
+#ifdef PRINT_DEBUG_INFO_
+    cout << "\n(" << myRank << ") Number of Ghost edges = " << numGhostEdges;
+    cout << "\n(" << myRank << ") Total number of potential message X 2 = " << numGhostEdges * 2;
+    cout << "\n(" << myRank << ") Number messages bundled = " << NumMessagesBundled;
+    cout << "\n(" << myRank << ") Total Individual Messages sent = " << msgInd;
+    if (msgInd > 0)
+    {
+        cout << "\n(" << myRank << ") Percentage of messages bundled = " << ((double)NumMessagesBundled / (double)(msgInd)) * 100.0 << "% \n";
+    }
+    fflush(stdout);
+#endif
+
+    *msgActualSent = msgActual;
+    *msgIndSent = msgInd;
+    if (msgInd > 0)
+    {
+        *msgPercent = ((double)NumMessagesBundled / (double)(msgInd)) * 100.0;
+    }
+    else
+    {
+        *msgPercent = 0;
+    }
+
+#ifdef DEBUG_HANG_
+    if (myRank == 0)
+        cout << "\n(" << myRank << ") Done" << endl;
+    fflush(stdout);
+#endif
+}