ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-11 16:49:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

Activate multithreading when meshing from GUI

Browse Source 
- Meshing options for parallelization and number of threads
 - RegionTaskManager() to locally start the TaskManager
This commit is contained in:
Matthias Hochsteger 2019-09-26 16:15:50 +02:00
parent 36ada6f90c
commit 6a7030b81a
9 changed files with 98 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libsrc/core/taskmanager.hpp
View File

@ -133,6 +133,41 @@ namespace ngcore
NGCORE_API int EnterTaskManager ();
NGCORE_API void ExitTaskManager (int num_threads);
class RegionTaskManager
{
int nthreads_before;
int nthreads;
bool started_taskmanager;
public:
RegionTaskManager(int anthreads=TaskManager::GetMaxThreads())
: nthreads(anthreads)
{
if(task_manager || nthreads==0)
{
// already running, no need to do anything
started_taskmanager = false;
return;
}
else
{
nthreads_before = TaskManager::GetMaxThreads();
TaskManager::SetNumThreads(nthreads);
nthreads = EnterTaskManager();
started_taskmanager = true;
}
}
~RegionTaskManager()
{
if(started_taskmanager)
{
ExitTaskManager(nthreads);
TaskManager::SetNumThreads(nthreads_before);
}
}
};
NETGEN_INLINE int TasksPerThread (int tpt)
{
// return task_manager ? tpt*task_manager->GetNumThreads() : 1;

23
libsrc/meshing/delaunay.cpp
View File

@ -1092,19 +1092,22 @@ namespace netgen
// tempmesh.PrintMemInfo(cout);
// tempmesh.Save ("tempmesh.vol");
for (int i = 1; i <= 4; i++)
{
tempmesh.FindOpenElements ();
{
RegionTaskManager rtm(mp.parallel_meshing ? mp.nthreads : 0);
for (int i = 1; i <= 4; i++)
{
tempmesh.FindOpenElements ();
PrintMessage (5, "Num open: ", tempmesh.GetNOpenElements());
tempmesh.CalcSurfacesOfNode ();
PrintMessage (5, "Num open: ", tempmesh.GetNOpenElements());
tempmesh.CalcSurfacesOfNode ();
tempmesh.FreeOpenElementsEnvironment (1);
tempmesh.FreeOpenElementsEnvironment (1);
MeshOptimize3d meshopt(mp);
// tempmesh.CalcSurfacesOfNode();
meshopt.SwapImprove(tempmesh, OPT_CONFORM);
}
MeshOptimize3d meshopt(mp);
// tempmesh.CalcSurfacesOfNode();
meshopt.SwapImprove(tempmesh, OPT_CONFORM);
}
}
MeshQuality3d (tempmesh);

1
libsrc/meshing/meshfunc.cpp
View File

@ -645,6 +645,7 @@ namespace netgen
// const CSGeometry * geometry)
{
static Timer t("OptimizeVolume"); RegionTimer reg(t);
RegionTaskManager rtm(mp.parallel_meshing ? mp.nthreads : 0);
int i;

3
libsrc/meshing/meshtype.hpp
View File

@ -1316,6 +1316,9 @@ namespace netgen
///
bool autozrefine = false;
bool parallel_meshing = true;
int nthreads = 4;
Flags geometrySpecificParameters;
///
MeshingParameters ();

4
libsrc/meshing/python_mesh.hpp
View File

@ -172,6 +172,10 @@ inline void CreateMPfromKwargs(MeshingParameters& mp, py::kwargs kwargs, bool th
mp.inverttrigs = py::cast<bool>(kwargs.attr("pop")("inverttrigs"));
if(kwargs.contains("autozrefine"))
mp.autozrefine = py::cast<bool>(kwargs.attr("pop")("autozrefine"));
if(kwargs.contains("parallel_meshing"))
mp.parallel_meshing = py::cast<bool>(kwargs.attr("pop")("parallel_meshing"));
if(kwargs.contains("nthreads"))
mp.nthreads = py::cast<int>(kwargs.attr("pop")("nthreads"));
if(kwargs.size())
{
if(throw_if_not_all_parsed)

20
ng/dialog.tcl
View File

@ -183,7 +183,7 @@ proc meshingoptionsdialog { } {
ttk::labelframe $f.bts -borderwidth 3 -relief groove -text "Additional meshing options"
pack $f.bts -fill x -pady 15
ttk::frame $f.bts.btnframe
ttk::checkbutton $f.bts.btnframe.parthread -text "Parallel meshing thread" \
ttk::checkbutton $f.bts.btnframe.parthread -text "Separate meshing thread" \
-variable options.parthread
ttk::checkbutton $f.bts.btnframe.second -text "Second order elements" \
-variable options.secondorder
@ -214,9 +214,21 @@ proc meshingoptionsdialog { } {
#ttk::frame $f.bts.sbox
#pack $f.bts.sbox -anchor w -pady 10
ttk::label $f.bts.btnframe.l -text "Element order"
ttk::spinbox $f.bts.btnframe.elementorder2 -from 1 -to 20 -textvariable options.elementorder -width 2
pack $f.bts.btnframe.elementorder2 $f.bts.btnframe.l -anchor w -side left
ttk::frame $f.bts.btnframe.elorder
ttk::label $f.bts.btnframe.elorder.l -text "Element order"
ttk::spinbox $f.bts.btnframe.elorder.elementorder2 -from 1 -to 20 -textvariable options.elementorder -width 2
pack $f.bts.btnframe.elorder -fill x
pack $f.bts.btnframe.elorder.elementorder2 $f.bts.btnframe.elorder.l -anchor w -side left
ttk::frame $f.bts.btnframe.pm
ttk::checkbutton $f.bts.btnframe.pm.parallel_meshing -text "Parallel meshing" \
-variable options.parallel_meshing
pack $f.bts.btnframe.pm -fill x -pady 5
pack $f.bts.btnframe.pm.parallel_meshing -anchor w
ttk::label $f.bts.btnframe.pm.lnthreads -text "Number of meshing threads"
ttk::spinbox $f.bts.btnframe.pm.nthreads -from 1 -to 128 -textvariable options.nthreads -width 2
pack $f.bts.btnframe.pm.nthreads $f.bts.btnframe.pm.lnthreads -anchor w -side left

3
ng/ngpkg.cpp
View File

@ -1224,6 +1224,9 @@ namespace netgen
printmessage_importance = atoi (Tcl_GetVar (interp, "::options.printmsg", 0));
printdots = (printmessage_importance >= 4);
mparam.parallel_meshing = atoi (Tcl_GetVar (interp, "::options.parallel_meshing", 0));
mparam.nthreads = atoi (Tcl_GetVar (interp, "::options.nthreads", 0));
//BaseMoveableMem::totalsize = 0;
// 1048576 * atoi (Tcl_GetVar (interp, "::options.memory", 0));
if (mesh)

22
ng/onetcl.cpp
View File

@ -73,6 +73,8 @@ const char * ngscript[] = {""
,"set options.inverttets 0\n"
,"set options.inverttrigs 0\n"
,"set options.autozrefine 0\n"
,"set options.parallel_meshing 1\n"
,"set options.nthreads 4\n"
,"set options.meshsize 1000\n"
,"set options.minmeshsize 0\n"
,"set options.curvaturesafety 2\n"
@ -403,6 +405,8 @@ const char * ngscript[] = {""
,"puts $datei \"options.opterrpow ${options.opterrpow}\"\n"
,"puts $datei \"options.grading ${options.grading}\"\n"
,"puts $datei \"options.printmsg ${options.printmsg}\"\n"
,"puts $datei \"options.parallel_meshing ${options.parallel_meshing}\"\n"
,"puts $datei \"options.nthreads ${options.nthreads}\"\n"
,"puts $datei \"geooptions.drawcsg ${geooptions.drawcsg}\"\n"
,"puts $datei \"geooptions.detail ${geooptions.detail}\"\n"
,"puts $datei \"geooptions.accuracy ${geooptions.accuracy}\"\n"
@ -1540,7 +1544,7 @@ const char * ngscript[] = {""
,"ttk::labelframe $f.bts -borderwidth 3 -relief groove -text \"Additional meshing options\"\n"
,"pack $f.bts -fill x -pady 15\n"
,"ttk::frame $f.bts.btnframe\n"
,"ttk::checkbutton $f.bts.btnframe.parthread -text \"Parallel meshing thread\" \\\n"
,"ttk::checkbutton $f.bts.btnframe.parthread -text \"Separate meshing thread\" \\\n"
,"-variable options.parthread\n"
,"ttk::checkbutton $f.bts.btnframe.second -text \"Second order elements\" \\\n"
,"-variable options.secondorder\n"
@ -1558,9 +1562,19 @@ const char * ngscript[] = {""
,"-variable options.autozrefine\n"
,"pack $f.bts.btnframe -anchor center\n"
,"pack $f.bts.btnframe.parthread $f.bts.btnframe.second $f.bts.btnframe.quad $f.bts.btnframe.invtets $f.bts.btnframe.invtrigs $f.bts.btnframe.azref -anchor w\n"
,"ttk::label $f.bts.btnframe.l -text \"Element order\"\n"
,"ttk::spinbox $f.bts.btnframe.elementorder2 -from 1 -to 20 -textvariable options.elementorder -width 2\n"
,"pack $f.bts.btnframe.elementorder2 $f.bts.btnframe.l -anchor w -side left\n"
,"ttk::frame $f.bts.btnframe.elorder\n"
,"ttk::label $f.bts.btnframe.elorder.l -text \"Element order\"\n"
,"ttk::spinbox $f.bts.btnframe.elorder.elementorder2 -from 1 -to 20 -textvariable options.elementorder -width 2\n"
,"pack $f.bts.btnframe.elorder -fill x\n"
,"pack $f.bts.btnframe.elorder.elementorder2 $f.bts.btnframe.elorder.l -anchor w -side left\n"
,"ttk::frame $f.bts.btnframe.pm\n"
,"ttk::checkbutton $f.bts.btnframe.pm.parallel_meshing -text \"Parallel meshing\" \\\n"
,"-variable options.parallel_meshing\n"
,"pack $f.bts.btnframe.pm -fill x -pady 5\n"
,"pack $f.bts.btnframe.pm.parallel_meshing -anchor w\n"
,"ttk::label $f.bts.btnframe.pm.lnthreads -text \"Number of meshing threads\"\n"
,"ttk::spinbox $f.bts.btnframe.pm.nthreads -from 1 -to 128 -textvariable options.nthreads -width 2\n"
,"pack $f.bts.btnframe.pm.nthreads $f.bts.btnframe.pm.lnthreads -anchor w -side left\n"
,"set f $w.nb.meshsize\n"
,"ttk::frame $f.f2\n"
,"pack $f.f2 -pady 10\n"

5
ng/variables.tcl
View File

@ -47,6 +47,9 @@ set options.opterrpow 2
set options.grading 0.5
set options.printmsg 2
set options.parallel_meshing 1
set options.nthreads 4
set debug.slowchecks 0
set debug.debugoutput 0
set debug.haltexistingline 0
@ -427,6 +430,8 @@ proc saveoptions { } {
puts $datei "options.opterrpow ${options.opterrpow}"
puts $datei "options.grading ${options.grading}"
puts $datei "options.printmsg ${options.printmsg}"
puts $datei "options.parallel_meshing ${options.parallel_meshing}"
puts $datei "options.nthreads ${options.nthreads}"
puts $datei "geooptions.drawcsg ${geooptions.drawcsg}"
puts $datei "geooptions.detail ${geooptions.detail}"
puts $datei "geooptions.accuracy ${geooptions.accuracy}"