metis 5 adaption

This commit is contained in:
Joachim Schoeberl 2011-11-01 12:54:07 +00:00
parent 97dcbc09c2
commit fec9740f4c
2 changed files with 79 additions and 21 deletions

View File

@ -182,13 +182,27 @@ namespace netgen
{
char buf[100];
strcpy (buf, cmd);
MPI_Bcast (&buf, 100, MPI_CHAR, 0, MPI_COMM_WORLD);
// MPI_Bcast (&buf, 100, MPI_CHAR, 0, MPI_COMM_WORLD);
for (int dest = 1; dest < ntasks; dest++)
MPI_Send( &buf, 100, MPI_CHAR, dest, MPI_TAG_CMD, MPI_COMM_WORLD);
}
inline string MyMPI_RecvCmd ()
{
char buf[100];
MPI_Bcast (&buf, 100, MPI_CHAR, 0, MPI_COMM_WORLD);
// MPI_Bcast (&buf, 100, MPI_CHAR, 0, MPI_COMM_WORLD);
MPI_Status status;
int flag;
do
{
MPI_Iprobe (0, MPI_TAG_CMD, MPI_COMM_WORLD, &flag, &status);
if (!flag) usleep (50000);
}
while (!flag);
MPI_Recv( &buf, 100, MPI_CHAR, 0, MPI_TAG_CMD, MPI_COMM_WORLD, &status);
return string(buf);
}

View File

@ -3,13 +3,23 @@
#include <meshing.hpp>
#include "paralleltop.hpp"
#define METIS4
#ifdef METIS
namespace metis {
extern "C" {
#ifdef METIS4
#include <metis.h>
typedef idxtype idx_t;
#else
#include <metis.h>
typedef idx_t idxtype;
#endif
}
}
using namespace metis;
#endif
@ -625,8 +635,8 @@ namespace netgen
int timerloc2 = NgProfiler::CreateTimer ("CalcSurfacesOfNode");
NgProfiler::RegionTimer regloc(timerloc);
PrintMessage (2, "Got ", GetNE(), " elements");
PrintMessage (2, "Got ", GetNSE(), " surface elements");
PrintMessage (2, "Got ", GetNE(), " elements and ", GetNSE(), " surface elements");
// PrintMessage (2, "Got ", GetNSE(), " surface elements");
NgProfiler::StartTimer (timerloc2);
@ -690,8 +700,8 @@ namespace netgen
}
int ne = GetNE();
int nn = GetNP();
idx_t ne = GetNE();
idx_t nn = GetNP();
if (ntasks <= 2 || ne <= 1)
{
@ -742,7 +752,7 @@ namespace netgen
int numflag = 0;
int nparts = ntasks-1;
int ncommon = 3;
int edgecut;
Array<idxtype> epart(ne), npart(nn);
@ -766,19 +776,34 @@ namespace netgen
cout << "call metis ... " << flush;
int timermetis = NgProfiler::CreateTimer ("Metis itself");
NgProfiler::StartTimer (timermetis);
#ifdef METIS4
cout << "call metis ... " << flush;
METIS_PartMeshDual (&ne, &nn, &elmnts[0], &etype, &numflag, &nparts,
&edgecut, &epart[0], &npart[0]);
#else
cout << "call metis-5 ... " << endl;
idx_t options[METIS_NOPTIONS];
Array<idx_t> eptr(ne+1);
for (int j = 0; j < ne+1; j++)
eptr[j] = 4*j;
METIS_PartMeshDual (&ne, &nn, &eptr[0], &elmnts[0], NULL, NULL, &ncommon, &nparts,
NULL, NULL,
&edgecut, &epart[0], &npart[0]);
#endif
NgProfiler::StopTimer (timermetis);
cout << "complete" << endl;
#ifdef METIS4
cout << "edge-cut: " << edgecut << ", balance: "
<< ComputeElementBalance(ne, nparts, &epart[0]) << endl;
#endif
// partition numbering by metis : 0 ... ntasks - 1
// we want: 1 ... ntasks
@ -867,8 +892,12 @@ namespace netgen
BubbleSort(array);
}
#ifdef METIS4
METIS_PartGraphKway ( &nn, xadj, adjacency, v_weights, e_weights, &weightflag,
&numflag, &nparts, options, &edgecut, part );
#else
cout << "currently not supported (metis5), A" << endl;
#endif
Array<int> nodesinpart(ntasks);
@ -986,8 +1015,13 @@ namespace netgen
int timermetis = NgProfiler::CreateTimer ("Metis itself");
NgProfiler::StartTimer (timermetis);
#ifdef METIS4
METIS_PartGraphKway ( &ne, xadj, adjacency, v_weights, e_weights, &weightflag,
&numflag, &nparts, options, &edgecut, part );
#else
cout << "currently not supported (metis5), B" << endl;
#endif
NgProfiler::StopTimer (timermetis);
@ -1093,8 +1127,18 @@ namespace netgen
for ( int el = 0; el < ne; el++ )
BubbleSort (adjacency.Range (xadj[el], xadj[el+1]));
#ifdef METIS4
METIS_PartGraphKway ( &ne, &xadj[0], &adjacency[0], v_weights, e_weights, &weightflag,
&numflag, &nparts, options, &edgecut, &part[0] );
#else
idx_t ncon = 1;
METIS_PartGraphKway ( &ne, &ncon, &xadj[0], &adjacency[0],
v_weights, NULL, e_weights,
&nparts,
NULL, NULL, NULL,
&edgecut, &part[0] );
#endif
for (SurfaceElementIndex sei = 0; sei < ne; sei++)
(*this) [sei].SetPartition (part[sei]+1);