From 2f5072166d845f2ea361044a99afb5252c8203e2 Mon Sep 17 00:00:00 2001 From: sfilippone Date: Fri, 5 Jul 2024 13:56:52 +0200 Subject: [PATCH] Switch off OpenMP in certain sections of MatchBOXP --- amgprec/impl/aggregator/MatchBoxPC.cpp | 2 +- amgprec/impl/aggregator/processExposedVertex.cpp | 8 ++++---- amgprec/impl/aggregator/processMatchedVertices.cpp | 2 +- .../aggregator/processMatchedVerticesAndSendMessages.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/amgprec/impl/aggregator/MatchBoxPC.cpp b/amgprec/impl/aggregator/MatchBoxPC.cpp index c49ce8d4..ef0cb3ef 100644 --- a/amgprec/impl/aggregator/MatchBoxPC.cpp +++ b/amgprec/impl/aggregator/MatchBoxPC.cpp @@ -67,7 +67,7 @@ void dMatchBoxPC(MilanLongInt NLVer, MilanLongInt NLEdge, #endif -#define TIME_TRACKER +#undef TIME_TRACKER #ifdef TIME_TRACKER double tmr = MPI_Wtime(); #endif diff --git a/amgprec/impl/aggregator/processExposedVertex.cpp b/amgprec/impl/aggregator/processExposedVertex.cpp index cb3cea65..7dfab012 100644 --- a/amgprec/impl/aggregator/processExposedVertex.cpp +++ b/amgprec/impl/aggregator/processExposedVertex.cpp @@ -33,13 +33,13 @@ void PARALLEL_PROCESS_EXPOSED_VERTEX_BD(MilanLongInt NLVer, MilanLongInt v = -1, k = -1, w = -1, adj11 = 0, adj12 = 0, k1 = 0; MilanInt ghostOwner = 0, option, igw; -#pragma omp parallel private(option, k, w, v, k1, adj11, adj12, ghostOwner) \ + //#pragma omp parallel private(option, k, w, v, k1, adj11, adj12, ghostOwner) \ firstprivate(privateU, StartIndex, EndIndex, privateQLocalVtx, \ privateQGhostVtx, privateQMsgType, privateQOwner) \ default(shared) num_threads(NUM_THREAD) { - #pragma omp for reduction(+ \ + //#pragma omp for reduction(+ \ : PCounter[:numProcs], myCard \ [:1], msgInd \ [:1], NumMessagesBundled \ @@ -217,13 +217,13 @@ void PARALLEL_PROCESS_EXPOSED_VERTEX_BS(MilanLongInt NLVer, MilanLongInt v = -1, k = -1, w = -1, adj11 = 0, adj12 = 0, k1 = 0; MilanInt ghostOwner = 0, option, igw; -#pragma omp parallel private(option, k, w, v, k1, adj11, adj12, ghostOwner) \ + //#pragma omp parallel private(option, k, w, v, k1, adj11, adj12, ghostOwner) \ firstprivate(privateU, StartIndex, EndIndex, privateQLocalVtx, \ privateQGhostVtx, privateQMsgType, privateQOwner) \ default(shared) num_threads(NUM_THREAD) { -#pragma omp for reduction(+ \ + //#pragma omp for reduction(+ \ : PCounter[:numProcs], myCard \ [:1], msgInd \ [:1], NumMessagesBundled \ diff --git a/amgprec/impl/aggregator/processMatchedVertices.cpp b/amgprec/impl/aggregator/processMatchedVertices.cpp index 531c9d32..2b2160e9 100644 --- a/amgprec/impl/aggregator/processMatchedVertices.cpp +++ b/amgprec/impl/aggregator/processMatchedVertices.cpp @@ -338,7 +338,7 @@ void processMatchedVerticesS( #ifdef COUNT_LOCAL_VERTEX MilanLongInt localVertices = 0; #endif -#pragma omp parallel private(k, w, v, k1, adj1, adj2, adj11, adj12, ghostOwner, option) \ + //#pragma omp parallel private(k, w, v, k1, adj1, adj2, adj11, adj12, ghostOwner, option) \ firstprivate(privateU, StartIndex, EndIndex, privateQLocalVtx, privateQGhostVtx, \ privateQMsgType, privateQOwner, UChunkBeingProcessed) \ default(shared) num_threads(NUM_THREAD) \ diff --git a/amgprec/impl/aggregator/processMatchedVerticesAndSendMessages.cpp b/amgprec/impl/aggregator/processMatchedVerticesAndSendMessages.cpp index d094afaa..1e1ba4b7 100644 --- a/amgprec/impl/aggregator/processMatchedVerticesAndSendMessages.cpp +++ b/amgprec/impl/aggregator/processMatchedVerticesAndSendMessages.cpp @@ -346,7 +346,7 @@ void processMatchedVerticesAndSendMessagesS( #ifdef COUNT_LOCAL_VERTEX MilanLongInt localVertices = 0; #endif -#pragma omp parallel private(k, w, v, k1, adj1, adj2, adj11, adj12, ghostOwner, option) \ + //#pragma omp parallel private(k, w, v, k1, adj1, adj2, adj11, adj12, ghostOwner, option) \ firstprivate(Message, privateU, StartIndex, EndIndex, privateQLocalVtx, privateQGhostVtx,\ privateQMsgType, privateQOwner, UChunkBeingProcessed) default(shared) \ num_threads(NUM_THREAD) \