Merge branch 'PolySmooth' of github.com:sfilippone/amg4psblas into PolySmooth

PolySmooth
sfilippone 7 months ago
commit 6d05120930

@ -75,7 +75,7 @@ CDEFINES=$(AMGCDEFINES)
AMGFDEFINES=@AMGFDEFINES@ $(PSBFDEFINES)
FDEFINES=$(AMGFDEFINES)
CXXDEFINES=@AMGCXXDEFINES@
CXXDEFINES=@AMGCXXDEFINES@ $(PSBCXXDEFINES)
@COMPILERULES@

@ -73,8 +73,8 @@ void dMatchBoxPC(MilanLongInt NLVer, MilanLongInt NLEdge,
#endif
// Rimosso per tornare al vecchio matching #define OMP
#ifdef OMP
fprintf(stderr,"Warning: using buggy OpenMP matching!\n");
#ifdef OPENMP
//fprintf(stderr,"Warning: using buggy OpenMP matching!\n");
dalgoDistEdgeApproxDomEdgesLinearSearchMesgBndlSmallMateCMP(NLVer, NLEdge,
verLocPtr, verLocInd, edgeLocWeight,
verDistance, Mate,

@ -59,7 +59,7 @@
#include <assert.h>
#include <map>
#include <vector>
#ifdef OMP
#ifdef OPENMP
// OpenMP is included and used if and only if the OpenMP version of the matching
// is required
#include "omp.h"
@ -178,7 +178,7 @@ extern "C"
#define MilanRealMin MINUS_INFINITY
#endif
#ifdef OMP
#ifdef OPENMP
/* These functions are only used in the experimental OMP implementation, if that
is disabled there is no reason to actually compile or reference them. */
@ -431,7 +431,7 @@ is disabled there is no reason to actually compile or reference them. */
#endif
#ifndef OMP
#ifndef OPENMP
//Function of find the owner of a ghost vertex using binary search:
inline MilanInt findOwnerOfGhost(MilanLongInt vtxIndex, MilanLongInt *mVerDistance,
MilanInt myRank, MilanInt numProcs);

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
// ***********************************************************************
//
// MatchboxP: A C++ library for approximate weighted matching

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
// TODO comment
void clean(MilanLongInt NLVer,

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
/**
* Execute the research fr the Candidate Mate without controlling if the vertices are already matched.
* Returns the vertices with the highest weight

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
void extractUChunk(
vector<MilanLongInt> &UChunkBeingProcessed,
vector<MilanLongInt> &U,

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
/// Find the owner of a ghost node:
MilanInt findOwnerOfGhost(MilanLongInt vtxIndex, MilanLongInt *mVerDistance,
MilanInt myRank, MilanInt numProcs)

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
void initialize(MilanLongInt NLVer, MilanLongInt NLEdge,
MilanLongInt StartIndex, MilanLongInt EndIndex,
MilanLongInt *numGhostEdges,

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
/**
* //TODO documentation
* @param k

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
void PARALLEL_COMPUTE_CANDIDATE_MATE_B(MilanLongInt NLVer,
MilanLongInt *verLocPtr,
MilanLongInt *verLocInd,

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
void PROCESS_CROSS_EDGE(MilanLongInt *edge,
MilanLongInt *S)
{

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
void PARALLEL_PROCESS_EXPOSED_VERTEX_B(MilanLongInt NLVer,
MilanLongInt *candidateMate,
MilanLongInt *verLocInd,

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
void processMatchedVertices(
MilanLongInt NLVer,
vector<MilanLongInt> &UChunkBeingProcessed,

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
//#define DEBUG_HANG_
void processMatchedVerticesAndSendMessages(
MilanLongInt NLVer,

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
//#define DEBUG_HANG_
void processMessages(

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
void queuesTransfer(vector<MilanLongInt> &U,
vector<MilanLongInt> &privateU,
vector<MilanLongInt> &QLocalVtx,

@ -1,5 +1,5 @@
#include "MatchBoxPC.h"
#ifdef OMP
#ifdef OPENMP
void sendBundledMessages(MilanLongInt *numGhostEdges,
MilanInt *BufferSize,
MilanLongInt *Buffer,

Loading…
Cancel
Save