From 2bc18cd725632e1dadc3c143a111cdbe3d357d49 Mon Sep 17 00:00:00 2001
From: Koen Hillewaert <koen.hillewaert@cenaero.be>
Date: Mon, 6 Sep 2010 17:00:32 +0000
Subject: [PATCH] allow for weighted partitioning with Metis
---
Common/DefaultOptions.h | 13 ++++++
Common/Options.cpp | 42 ++++++++++++++++++
Common/Options.h | 6 +++
Fltk/partitionDialog.cpp | 85 ++++++++++++++++++++++++++++++++++++-
Mesh/meshPartition.cpp | 27 +++++++-----
Mesh/meshPartitionObjects.h | 35 +++++++++++++++
Mesh/meshPartitionOptions.h | 16 +++++++
7 files changed, 211 insertions(+), 13 deletions(-)
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index f188b5deb4..05e96a1aed 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -1138,6 +1138,19 @@ StringXNumber MeshOptions_Number[] = {
"Version of the MSH file format to use" },
{ F|O, "MshFilePartitioned" , opt_mesh_msh_file_partitioned , 0. ,
"Split MSH file by mesh partition" },
+
+ { F|O, "PartitionHexWeight" , opt_mesh_partition_hex_weight , 1 ,
+ "Weight of hexahedral element for METIS load balancing" },
+ { F|O, "PartitionPrismWeight" , opt_mesh_partition_pri_weight , 1 ,
+ "Weight of prismatic element (wedge) for METIS load balancing" },
+ { F|O, "PartitionPyramidWeight" , opt_mesh_partition_pyr_weight , 1 ,
+ "Weight of pyramidal element for METIS load balancing" },
+ { F|O, "PartitionQuadWeight" , opt_mesh_partition_qua_weight , 1 ,
+ "Weight of quadrangle for METIS load balancing" },
+ { F|O, "PartitionTetWeight" , opt_mesh_partition_tet_weight , 1 ,
+ "Weight of tetrahedral element for METIS load balancing" },
+ { F|O, "PartitionTriWeight" , opt_mesh_partition_tri_weight , 1 ,
+ "Weight of triangle for METIS load balancing" ,},
{ F|O, "PartitionByExtrusion" , opt_mesh_partition_by_extrusion, 0. ,
"Special partitioner that annotates all all extruded elements to the same node as the source element" },
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 399fafa5f3..5667a5eac0 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -5507,6 +5507,48 @@ double opt_mesh_msh_file_partitioned(OPT_ARGS_NUM)
return CTX::instance()->mesh.mshFilePartitioned;
}
+double opt_mesh_partition_hex_weight(OPT_ARGS_NUM)
+{
+ if (action & GMSH_SET)
+ CTX::instance()->partitionOptions.hexWeight = (int) val;
+ return CTX::instance()->partitionOptions.hexWeight;
+}
+
+double opt_mesh_partition_pri_weight(OPT_ARGS_NUM)
+{
+ if (action & GMSH_SET)
+ CTX::instance()->partitionOptions.priWeight = (int) val;
+ return CTX::instance()->partitionOptions.priWeight;
+}
+
+double opt_mesh_partition_pyr_weight(OPT_ARGS_NUM)
+{
+ if (action & GMSH_SET)
+ CTX::instance()->partitionOptions.pyrWeight = (int) val;
+ return CTX::instance()->partitionOptions.pyrWeight;
+}
+
+double opt_mesh_partition_qua_weight(OPT_ARGS_NUM)
+{
+ if (action & GMSH_SET)
+ CTX::instance()->partitionOptions.quaWeight = (int) val;
+ return CTX::instance()->partitionOptions.quaWeight;
+}
+
+double opt_mesh_partition_tet_weight(OPT_ARGS_NUM)
+{
+ if (action & GMSH_SET)
+ CTX::instance()->partitionOptions.tetWeight = (int) val;
+ return CTX::instance()->partitionOptions.tetWeight;
+}
+
+double opt_mesh_partition_tri_weight(OPT_ARGS_NUM)
+{
+ if (action & GMSH_SET)
+ CTX::instance()->partitionOptions.triWeight = (int) val;
+ return CTX::instance()->partitionOptions.triWeight;
+}
+
double opt_mesh_binary(OPT_ARGS_NUM)
{
if(action & GMSH_SET)
diff --git a/Common/Options.h b/Common/Options.h
index 46e5dd19e2..799568de88 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -513,6 +513,12 @@ double opt_mesh_light_two_side(OPT_ARGS_NUM);
double opt_mesh_file_format(OPT_ARGS_NUM);
double opt_mesh_msh_file_version(OPT_ARGS_NUM);
double opt_mesh_msh_file_partitioned(OPT_ARGS_NUM);
+double opt_mesh_partition_hex_weight(OPT_ARGS_NUM);
+double opt_mesh_partition_pri_weight(OPT_ARGS_NUM);
+double opt_mesh_partition_pyr_weight(OPT_ARGS_NUM);
+double opt_mesh_partition_qua_weight(OPT_ARGS_NUM);
+double opt_mesh_partition_tet_weight(OPT_ARGS_NUM);
+double opt_mesh_partition_tri_weight(OPT_ARGS_NUM);
double opt_mesh_binary(OPT_ARGS_NUM);
double opt_mesh_bdf_field_format(OPT_ARGS_NUM);
double opt_mesh_nb_smoothing(OPT_ARGS_NUM);
diff --git a/Fltk/partitionDialog.cpp b/Fltk/partitionDialog.cpp
index 015d7a8014..ffd16814ca 100644
--- a/Fltk/partitionDialog.cpp
+++ b/Fltk/partitionDialog.cpp
@@ -69,6 +69,14 @@ struct PartitionDialog
// Group 4
Fl_Choice *choiceEdgeMatch;
Fl_Choice *choiceRefineAlg;
+ // weights
+ Fl_Value_Input *inputTriWeight;
+ Fl_Value_Input *inputQuaWeight;
+ Fl_Value_Input *inputTetWeight;
+ Fl_Value_Input *inputPriWeight;
+ Fl_Value_Input *inputPyrWeight;
+ Fl_Value_Input *inputHexWeight;
+
void write_all_options()
{
// Group 0
@@ -115,6 +123,14 @@ struct PartitionDialog
// Group 4
CTX::instance()->partitionOptions.edge_matching = choiceEdgeMatch->value() + 1;
CTX::instance()->partitionOptions.refine_algorithm = choiceRefineAlg->value() + 1;
+
+ CTX::instance()->partitionOptions.triWeight = inputTriWeight->value();
+ CTX::instance()->partitionOptions.quaWeight = inputQuaWeight->value();
+ CTX::instance()->partitionOptions.tetWeight = inputTetWeight->value();
+ CTX::instance()->partitionOptions.priWeight = inputPriWeight->value();
+ CTX::instance()->partitionOptions.pyrWeight = inputPyrWeight->value();
+ CTX::instance()->partitionOptions.hexWeight = inputHexWeight->value();
+
}
void read_all_options()
{
@@ -154,7 +170,14 @@ struct PartitionDialog
// Group 4
choiceEdgeMatch->value(CTX::instance()->partitionOptions.edge_matching - 1);
choiceRefineAlg->value(CTX::instance()->partitionOptions.refine_algorithm - 1);
-
+
+ inputTriWeight->value(CTX::instance()->partitionOptions.triWeight);
+ inputQuaWeight->value(CTX::instance()->partitionOptions.quaWeight);
+ inputTetWeight->value(CTX::instance()->partitionOptions.tetWeight);
+ inputPriWeight->value(CTX::instance()->partitionOptions.priWeight);
+ inputPyrWeight->value(CTX::instance()->partitionOptions.pyrWeight);
+ inputHexWeight->value(CTX::instance()->partitionOptions.hexWeight);
+
// Call all callbacks to ensure consistent options
partition_opt_chaco_globalalg_cb(choiceChacoAlg, this);
partition_opt_architecture_cb(choiceArchitecture, this);
@@ -707,7 +730,7 @@ void partition_dialog()
// Metis advanced option group [4]
{
- const int GH = 2 + WB + (BH + WB) + 2;
+ const int GH = 2 + WB + 3*(BH + WB) + 2;
Fl_Group *g = new Fl_Group(0, y, w, GH);
// Box (line)
{
@@ -732,6 +755,64 @@ void partition_dialog()
o->align(FL_ALIGN_RIGHT);
}
y += BH + WB + 1; // +1 for multiline label
+ // element weights - line 1
+ {
+ Fl_Value_Input *const o = new Fl_Value_Input
+ (WB, y, 2*BB/3, BH, "Triangle");
+ dlg.inputTriWeight = o;
+ o->minimum(1);
+ o->maximum(std::numeric_limits<int>::max());
+ o->step(1);
+ o->align(FL_ALIGN_RIGHT);
+ }
+ {
+ Fl_Value_Input *const o = new Fl_Value_Input
+ (2*WB + (w/3-WB), y,2*BB/3, BH, "Tetrahedron");
+ dlg.inputTetWeight = o;
+ o->minimum(1);
+ o->maximum(std::numeric_limits<int>::max());
+ o->step(1);
+ o->align(FL_ALIGN_RIGHT);
+ }
+ {
+ Fl_Value_Input *const o = new Fl_Value_Input
+ (3*WB + 2*(w/3-WB), y,2*BB/3, BH, "Prism");
+ dlg.inputPriWeight = o;
+ o->minimum(1);
+ o->maximum(std::numeric_limits<int>::max());
+ o->step(1);
+ o->align(FL_ALIGN_RIGHT);
+ }
+ y += 2 + WB + BH + 1;
+ // element weights - line 2
+ {
+ Fl_Value_Input *const o = new Fl_Value_Input
+ (WB, y, 2*BB/3, BH, "Quadrangle");
+ dlg.inputQuaWeight = o;
+ o->minimum(1);
+ o->maximum(std::numeric_limits<int>::max());
+ o->step(1);
+ o->align(FL_ALIGN_RIGHT);
+ }
+ {
+ Fl_Value_Input *const o = new Fl_Value_Input
+ (2*WB + (w/3-WB), y,2*BB/3, BH, "Hexahedron");
+ dlg.inputHexWeight = o;
+ o->minimum(1);
+ o->maximum(std::numeric_limits<int>::max());
+ o->step(1);
+ o->align(FL_ALIGN_RIGHT);
+ }
+ {
+ Fl_Value_Input *const o = new Fl_Value_Input
+ (3*WB + 2*(w/3-WB), y,2*BB/3, BH, "Pyramid");
+ dlg.inputPyrWeight = o;
+ o->minimum(1);
+ o->maximum(std::numeric_limits<int>::max());
+ o->step(1);
+ o->align(FL_ALIGN_RIGHT);
+ }
+ y += BH + WB + 1; // +1 for multiline label
g->end();
g->hide();
}
diff --git a/Mesh/meshPartition.cpp b/Mesh/meshPartition.cpp
index a9c4899741..b336104087 100644
--- a/Mesh/meshPartition.cpp
+++ b/Mesh/meshPartition.cpp
@@ -451,11 +451,13 @@ int PartitionGraph(Graph &graph, meshPartitionOptions &options)
metisOptions[2] = 1;
metisOptions[3] = options.refine_algorithm;
metisOptions[4] = 0;
- METIS_PartGraphKway
- (&n, &graph.xadj[graph.section[iSec]],
- &graph.adjncy[graph.section[iSec]], NULL, NULL, &wgtflag, &numflag,
- &options.num_partitions, metisOptions, &edgeCut,
- &graph.partition[graph.section[iSec]]);
+ if (options.num_partitions > 1) { // partgraphkway aborts with floating point error if np = 1
+ METIS_PartGraphKway
+ (&n, &graph.xadj[graph.section[iSec]],
+ &graph.adjncy[graph.section[iSec]], NULL, NULL, &wgtflag, &numflag,
+ &options.num_partitions, metisOptions, &edgeCut,
+ &graph.partition[graph.section[iSec]]);
+ }
break;
case 3: // Nodal weight
printf("METIS with weights\n");
@@ -465,12 +467,15 @@ int PartitionGraph(Graph &graph, meshPartitionOptions &options)
metisOptions[3] = 1;
metisOptions[4] = 0;
wgtflag = 2;
- graph.fillWeights(options.nodalWeights);
- METIS_PartGraphKway
- (&n, &graph.xadj[graph.section[iSec]],
- &graph.adjncy[graph.section[iSec]], &graph.vwgts[graph.section[iSec]], NULL, &wgtflag, &numflag,
- &options.num_partitions, metisOptions, &edgeCut,
- &graph.partition[graph.section[iSec]]);
+ graph.fillDefaultWeights();
+ // graph.fillWeights(options.nodalWeights);
+ if (options.num_partitions > 1) { // partgraphkway aborts with floating point error if np = 1
+ METIS_PartGraphKway
+ (&n, &graph.xadj[graph.section[iSec]],
+ &graph.adjncy[graph.section[iSec]], &graph.vwgts[graph.section[iSec]], NULL, &wgtflag, &numflag,
+ &options.num_partitions, metisOptions, &edgeCut,
+ &graph.partition[graph.section[iSec]]);
+ }
break;
}
}
diff --git a/Mesh/meshPartitionObjects.h b/Mesh/meshPartitionObjects.h
index b721ac1e27..134cb58658 100644
--- a/Mesh/meshPartitionObjects.h
+++ b/Mesh/meshPartitionObjects.h
@@ -10,6 +10,7 @@
#include <vector>
#include "MElement.h"
#include "GmshMessage.h"
+#include "Context.h"
/*******************************************************************************
@@ -156,6 +157,40 @@ class Graph
}
}
+ // Add weights per element, as defined in options
+ void fillDefaultWeights()
+ {
+ std::vector<MElement*>::iterator eIt = element.begin();
+ vwgts.resize(element.size());
+ std::vector<int>::iterator wIt = vwgts.begin();
+ for ( ; eIt != element.end() ; eIt++ , wIt++) {
+
+ switch ((*eIt)->getType()) {
+ case TYPE_TRI:
+ *wIt = CTX::instance()->partitionOptions.triWeight;
+ break;
+ case TYPE_QUA:
+ *wIt = CTX::instance()->partitionOptions.quaWeight;
+ break;
+ case TYPE_TET:
+ *wIt = CTX::instance()->partitionOptions.tetWeight;
+ break;
+ case TYPE_PYR:
+ *wIt = CTX::instance()->partitionOptions.pyrWeight;
+ break;
+ case TYPE_PRI:
+ *wIt = CTX::instance()->partitionOptions.priWeight;
+ break;
+ case TYPE_HEX:
+ *wIt = CTX::instance()->partitionOptions.hexWeight;
+ break;
+ default:
+ *wIt = 1;
+ break;
+ }
+ }
+ }
+
void markSection() { section.push_back(numGrVert); }
// Returns the next index for a graph vertex
int getNextIndex() { return cIndex++; }
diff --git a/Mesh/meshPartitionOptions.h b/Mesh/meshPartitionOptions.h
index 2867ab086c..56aa905f54 100644
--- a/Mesh/meshPartitionOptions.h
+++ b/Mesh/meshPartitionOptions.h
@@ -72,6 +72,15 @@ struct meshPartitionOptions
int partitionByExtrusion; // if true, all extruded elements belong
// to the same partition as the source element
+ // element weights for load-balancing (currently used in METIS algorithm 3)
+
+ int triWeight;
+ int quaWeight;
+ int tetWeight;
+ int priWeight;
+ int pyrWeight;
+ int hexWeight;
+
//--NODAL WEIGHT
std::vector<int> nodalWeights;
@@ -112,6 +121,13 @@ struct meshPartitionOptions
createPartitionBoundaries = true;
createGhostCells = true;
partitionByExtrusion =false;
+ triWeight = 1;
+ quaWeight = 1;
+ tetWeight = 1;
+ priWeight = 1;
+ pyrWeight = 1;
+ hexWeight = 1;
+
}
};
--
GitLab