fdurastante
/
amg4psblas
mirror of https://github.com/sfilippone/amg4psblas.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactoring + critical(Mate)

Browse Source
omp-walther
StefanoPetrilli 3 years ago
parent 002239f5b6
commit 766ef320c2
1 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File

79
amgprec/impl/aggregator/algoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP.cpp
Unescape Escape View File

@ -215,7 +215,7 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
double Ghost2LocalInitialization = MPI_Wtime(); double Ghost2LocalInitialization = MPI_Wtime();
#endif #endif
#pragma omp parallel private(insertMe, k, k1, adj1, adj2, adj11, adj12, heaviestEdgeWt, w, ghostOwner) firstprivate(StartIndex, EndIndex) default(shared) num_threads(4) #pragma omp parallel private(insertMe, k, k1, adj1, adj2, adj11, adj12, heaviestEdgeWt, w, ghostOwner, u) firstprivate(StartIndex, EndIndex) default(shared) num_threads(4)
{ {
// TODO comments about the reduction // TODO comments about the reduction
@ -475,9 +475,8 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
if (w >= 0) { if (w >= 0) {
//This piece of code is actually executed under 0.01% of the times //This piece of code is actually executed under 0.01% of the times
#pragma omp critical
{ if (isAlreadyMatched(verLocInd[k], StartIndex, EndIndex, GMate, Mate, Ghost2LocalMap)) {
if (isAlreadyMatched(k, verLocInd, StartIndex, EndIndex, GMate, Mate, Ghost2LocalMap)) {
w = computeCandidateMate(verLocPtr[v], w = computeCandidateMate(verLocPtr[v],
verLocPtr[v + 1], verLocPtr[v + 1],
edgeLocWeight, 0, edgeLocWeight, 0,
@ -489,7 +488,6 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
Ghost2LocalMap); Ghost2LocalMap);
candidateMate[v] = w; candidateMate[v] = w;
} }
}
if (w >= 0) { if (w >= 0) {
@ -511,7 +509,7 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
NumMessagesBundled++; NumMessagesBundled++;
ghostOwner = findOwnerOfGhost(w, verDistance, myRank, numProcs); ghostOwner = findOwnerOfGhost(w, verDistance, myRank, numProcs);
PCounter[ghostOwner]++; PCounter[ghostOwner]++;
#pragma omp critical #pragma omp critical(Mate)
{ {
QLocalVtx.push_back(v + StartIndex); QLocalVtx.push_back(v + StartIndex);
QGhostVtx.push_back(w); QGhostVtx.push_back(w);
@ -551,7 +549,7 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
else { // w is a local vertex else { // w is a local vertex
if (candidateMate[w - StartIndex] == (v + StartIndex)) { if (candidateMate[w - StartIndex] == (v + StartIndex)) {
#pragma omp critical #pragma omp critical(Mate)
{ {
Mate[v] = w; //v is local Mate[v] = w; //v is local
Mate[w - StartIndex] = v + StartIndex; //w is local Mate[w - StartIndex] = v + StartIndex; //w is local
@ -632,41 +630,32 @@ void dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(
adj2 = verLocPtr[u-StartIndex+1]; adj2 = verLocPtr[u-StartIndex+1];
for( k = adj1; k < adj2; k++ ) { for( k = adj1; k < adj2; k++ ) {
v = verLocInd[k]; v = verLocInd[k];
if ( (v >= StartIndex) && (v <= EndIndex) ) { //If Local Vertex: if ( (v >= StartIndex) && (v <= EndIndex) ) { //If Local Vertex:
if ( (v<StartIndex) || (v>EndIndex) ) { //Is it a ghost vertex?
if(GMate[Ghost2LocalMap[v]] >= 0 )// Already matched if (isAlreadyMatched(v, StartIndex, EndIndex, GMate, Mate, Ghost2LocalMap)) continue;
continue;
} else { //A local vertex
if( Mate[v-StartIndex] >= 0 ) // Already matched
continue;
} //End of else
#ifdef PRINT_DEBUG_INFO_ #ifdef PRINT_DEBUG_INFO_
cout<<"\n("<<myRank<<")v: "<<v<<" c(v)= "<<candidateMate[v-StartIndex]<<" Mate[v]: "<<Mate[v]; cout<<"\n("<<myRank<<")v: "<<v<<" c(v)= "<<candidateMate[v-StartIndex]<<" Mate[v]: "<<Mate[v];
fflush(stdout); fflush(stdout);
#endif #endif
if ( candidateMate[v-StartIndex] == u ) { //Only if pointing to the matched vertex if ( candidateMate[v-StartIndex] == u ) { //Only if pointing to the matched vertex
//Start: PARALLEL_PROCESS_EXPOSED_VERTEX_B(v) //Start: PARALLEL_PROCESS_EXPOSED_VERTEX_B(v)
//Start: PARALLEL_COMPUTE_CANDIDATE_MATE_B(v) //Start: PARALLEL_COMPUTE_CANDIDATE_MATE_B(v)
adj11 = verLocPtr[v-StartIndex]; w = computeCandidateMate(verLocPtr[v - StartIndex],
adj12 = verLocPtr[v-StartIndex+1]; verLocPtr[v - StartIndex + 1],
w = -1; edgeLocWeight, 0,
heaviestEdgeWt = MilanRealMin; //Assign the smallest Value possible first LDBL_MIN verLocInd,
for( k1 = adj11; k1 < adj12; k1++ ) { StartIndex,
if ( (verLocInd[k1]<StartIndex) || (verLocInd[k1]>EndIndex) ) { //Is it a ghost vertex? EndIndex,
if(GMate[Ghost2LocalMap[verLocInd[k1]]] >= 0 )// Already matched GMate,
continue; Mate,
} else { //A local vertex Ghost2LocalMap);
if( Mate[verLocInd[k1]-StartIndex] >= 0 ) // Already matched #pragma omp critical
continue; {
} candidateMate[v - StartIndex] = w;
if( (edgeLocWeight[k1] > heaviestEdgeWt) || }
((edgeLocWeight[k1] == heaviestEdgeWt)&&(w < verLocInd[k1])) ) {
heaviestEdgeWt = edgeLocWeight[k1];
w = verLocInd[k1];
}
} //End of for loop
candidateMate[v-StartIndex] = w;
//End: PARALLEL_COMPUTE_CANDIDATE_MATE_B(v) //End: PARALLEL_COMPUTE_CANDIDATE_MATE_B(v)
#ifdef PRINT_DEBUG_INFO_ #ifdef PRINT_DEBUG_INFO_
cout<<"\n("<<myRank<<")"<<v<<" Points to: "<<w; fflush(stdout); cout<<"\n("<<myRank<<")"<<v<<" Points to: "<<w; fflush(stdout);
@ -1573,8 +1562,7 @@ inline MilanLongInt firstComputeCandidateMate(MilanLongInt adj1,
* @param Ghost2LocalMap * @param Ghost2LocalMap
* @return * @return
*/ */
inline bool isAlreadyMatched(MilanLongInt k, inline bool isAlreadyMatched(MilanLongInt node,
MilanLongInt* verLocInd,
MilanLongInt StartIndex, MilanLongInt StartIndex,
MilanLongInt EndIndex, MilanLongInt EndIndex,
vector <MilanLongInt> &GMate, vector <MilanLongInt> &GMate,
@ -1582,15 +1570,20 @@ inline bool isAlreadyMatched(MilanLongInt k,
map <MilanLongInt, MilanLongInt> &Ghost2LocalMap map <MilanLongInt, MilanLongInt> &Ghost2LocalMap
) { ) {
if ((verLocInd[k] < StartIndex) || (verLocInd[k] > EndIndex)) { //Is it a ghost vertex? bool result = false;
if (GMate[Ghost2LocalMap[verLocInd[k]]] >= 0)// Already matched #pragma omp critical(Mate)
return true; {
} else { //A local vertex if ((node < StartIndex) || (node > EndIndex)) { //Is it a ghost vertex?
if (Mate[verLocInd[k] - StartIndex] >= 0) // Already matched if (GMate[Ghost2LocalMap[node]] >= 0)// Already matched
return true; result = true;
} else { //A local vertex
if (Mate[node - StartIndex] >= 0) // Already matched
result = true;
}
} }
return false; return result;
} }
/** /**
@ -1621,7 +1614,7 @@ inline MilanLongInt computeCandidateMate(MilanLongInt adj1,
MilanInt w = -1; MilanInt w = -1;
MilanReal heaviestEdgeWt = MilanRealMin; //Assign the smallest Value possible first LDBL_MIN MilanReal heaviestEdgeWt = MilanRealMin; //Assign the smallest Value possible first LDBL_MIN
for (k = adj1; k < adj2; k++) { for (k = adj1; k < adj2; k++) {
if (isAlreadyMatched(k, verLocInd, StartIndex, EndIndex, GMate, Mate, Ghost2LocalMap)) continue; if (isAlreadyMatched(verLocInd[k], StartIndex, EndIndex, GMate, Mate, Ghost2LocalMap)) continue;
if ((edgeLocWeight[k] > heaviestEdgeWt) || if ((edgeLocWeight[k] > heaviestEdgeWt) ||
((edgeLocWeight[k] == heaviestEdgeWt) && (w < verLocInd[k]))) { ((edgeLocWeight[k] == heaviestEdgeWt) && (w < verLocInd[k]))) {

Write Preview
Loading…
Cancel
Save