ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Modifications for multinode parallelism"

Browse Source 
This reverts commit 90d8d4461e.
This commit is contained in:
YOANN AUDOUIN 2023-09-04 07:57:41 +02:00
parent 90d8d4461e
commit 8281d267cb
3 changed files with 45 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_Remote.cxx
View File

@ -39,7 +39,6 @@
#include <SMESH_Gen.hxx> #include <SMESH_Gen.hxx>
#include <SMESH_Mesh.hxx> #include <SMESH_Mesh.hxx>
#include <SMESH_ParallelMesh.hxx>
#include <SMESH_MesherHelper.hxx> #include <SMESH_MesherHelper.hxx>
#include <SMESH_DriverShape.hxx> #include <SMESH_DriverShape.hxx>
#include <SMESH_DriverMesh.hxx> #include <SMESH_DriverMesh.hxx>
@ -230,17 +229,22 @@ bool NETGENPlugin_NETGEN_3D_Remote::Compute(SMESH_Mesh& aMesh,
SMESH_Hypothesis::Hypothesis_Status hypStatus; SMESH_Hypothesis::Hypothesis_Status hypStatus;
NETGENPlugin_NETGEN_3D::CheckHypothesis(aMesh, aShape, hypStatus); NETGENPlugin_NETGEN_3D::CheckHypothesis(aMesh, aShape, hypStatus);
} }
SMESH_ParallelMesh& aParMesh = dynamic_cast<SMESH_ParallelMesh&>(aMesh);
// Temporary folder for run // Temporary folder for run
#ifdef WIN32 #ifdef WIN32
fs::path tmp_folder = aParMesh.GetTmpFolder() / fs::path("Volume-%%%%-%%%%"); // On windows mesh does not have GetTmpFolder
fs::path tmp_folder = fs::path("Volume-%%%%-%%%%");
#else #else
fs::path tmp_folder = aParMesh.GetTmpFolder() / fs::unique_path(fs::path("Volume-%%%%-%%%%")); fs::path tmp_folder = aMesh.GetTmpFolder() / fs::unique_path(fs::path("Volume-%%%%-%%%%"));
#endif #endif
fs::create_directories(tmp_folder); fs::create_directories(tmp_folder);
// Using MESH2D generated after all triangles where created. // Using MESH2D generated after all triangles where created.
fs::path mesh_file=aParMesh.GetTmpFolder() / fs::path("Mesh2D.med"); #ifdef WIN32
fs::path mesh_file=fs::path("Mesh2D.med");
#else
fs::path mesh_file=aMesh.GetTmpFolder() / fs::path("Mesh2D.med");
#endif
fs::path element_orientation_file=tmp_folder / fs::path("element_orientation.dat"); fs::path element_orientation_file=tmp_folder / fs::path("element_orientation.dat");
fs::path new_element_file=tmp_folder / fs::path("new_elements.dat"); fs::path new_element_file=tmp_folder / fs::path("new_elements.dat");
fs::path tmp_mesh_file=tmp_folder / fs::path("tmp_mesh.med"); fs::path tmp_mesh_file=tmp_folder / fs::path("tmp_mesh.med");
@ -249,8 +253,7 @@ bool NETGENPlugin_NETGEN_3D_Remote::Compute(SMESH_Mesh& aMesh,
fs::path shape_file=tmp_folder / fs::path("shape.brep"); fs::path shape_file=tmp_folder / fs::path("shape.brep");
fs::path param_file=tmp_folder / fs::path("netgen3d_param.txt"); fs::path param_file=tmp_folder / fs::path("netgen3d_param.txt");
fs::path log_file=tmp_folder / fs::path("run.log"); fs::path log_file=tmp_folder / fs::path("run.log");
fs::path cmd_file=tmp_folder / fs::path("cmd.txt"); fs::path cmd_file=tmp_folder / fs::path("cmd.log");
// TODO: See if we can retreived name from aMesh ?
std::string mesh_name = "MESH"; std::string mesh_name = "MESH";
{ {
@ -269,72 +272,57 @@ bool NETGENPlugin_NETGEN_3D_Remote::Compute(SMESH_Mesh& aMesh,
} }
// Calling run_mesher // Calling run_mesher
// Path to mesher script std::string cmd;
fs::path mesher_launcher = fs::path(std::getenv("SMESH_ROOT_DIR"))/ fs::path run_mesher_exe =
fs::path("bin")/ fs::path(std::getenv("NETGENPLUGIN_ROOT_DIR"))/
fs::path("salome")/ fs::path("bin")/
fs::path("mesher_launcher.py"); fs::path("salome")/
#ifdef WIN32
fs::path("NETGENPlugin_Runner.exe");
#else
fs::path("NETGENPlugin_Runner");
#endif
cmd = run_mesher_exe.string() +
std::string s_program="python3"; " NETGEN3D " + mesh_file.string() + " "
std::list<std::string> params; + shape_file.string() + " "
params.push_back(mesher_launcher.string()); + param_file.string() + " "
params.push_back("NETGEN3D"); + element_orientation_file.string() + " "
params.push_back(mesh_file.string()); + new_element_file.string() + " "
params.push_back(shape_file.string()); + "NONE";
params.push_back(param_file.string()); // Writing command in log
params.push_back("--elem-orient-file=" + element_orientation_file.string());
params.push_back("--new-element-file=" + new_element_file.string());
// Parallelism method parameters
int method = aParMesh.GetParallelismMethod();
if(method == ParallelismMethod::MultiThread){
params.push_back("--method=local");
} else if (method == ParallelismMethod::MultiNode){
// TODO :See what parameters to handle in the end
params.push_back("--method=cluster");
params.push_back("--resource="+aParMesh.GetResource());
params.push_back("--wc-key="+aParMesh.GetWcKey());
params.push_back("--nb-proc=1");
params.push_back("--nb-proc-per-node="+to_string(aParMesh.GetNbProcPerNode()));
params.push_back("--nb-node="+to_string(aParMesh.GetNbNode()));
} else {
throw SALOME_Exception("Unknown parallelism method "+method);
}
std::string cmd = "";
cmd += s_program;
for(auto arg: params){
cmd += " " + arg;
}
MESSAGE("Running command: ");
MESSAGE(cmd);
// Writing command in cmd.log
{ {
std::ofstream flog(cmd_file.string()); std::ofstream flog(cmd_file.string());
flog << cmd << endl; flog << cmd << endl;
flog << endl;
} }
MESSAGE("Running command: ");
MESSAGE(cmd);
// Building arguments for QProcess // Building arguments for QProcess
QString program = QString::fromStdString(s_program); QString program = run_mesher_exe.string().c_str();
QStringList arguments; QStringList arguments;
for(auto arg : params){ arguments << "NETGEN3D";
arguments << arg.c_str(); arguments << mesh_file.string().c_str();
} arguments << shape_file.string().c_str();
arguments << param_file.string().c_str();
arguments << element_orientation_file.string().c_str();
arguments << new_element_file.string().c_str();
arguments << "NONE";
QString out_file = log_file.string().c_str(); QString out_file = log_file.string().c_str();
QProcess myProcess; QProcess myProcess;
myProcess.setProcessChannelMode(QProcess::MergedChannels);
myProcess.setStandardOutputFile(out_file); myProcess.setStandardOutputFile(out_file);
myProcess.start(program, arguments); myProcess.start(program, arguments);
// Waiting for process to finish (argument -1 make it wait until the end of // Waiting for process to finish (argument -1 make it wait until the end of
// the process otherwise it just waits 30 seconds) // the process otherwise it just waits 30 seconds)
bool finished = myProcess.waitForFinished(-1); myProcess.waitForFinished(-1);
int ret = myProcess.exitCode(); int ret = myProcess.exitStatus();
if(ret != 0 || !finished){ if(ret != 0){
// Run crahed // Run crahed
std::string msg = "Issue with mesh_launcher: \n"; std::string msg = "Issue with command: \n";
msg += "See log for more details: " + log_file.string() + "\n"; msg += "See log for more details: " + log_file.string() + "\n";
msg += cmd + "\n"; msg += cmd + "\n";
throw SALOME_Exception(msg); throw SALOME_Exception(msg);

3
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
View File

@ -163,7 +163,6 @@ bool NETGENPlugin_NETGEN_3D_SA::computeFillNewElementFile(
int &Netgen_NbOfNodes int &Netgen_NbOfNodes
) )
{ {
MESSAGE("Writting new elements")
Ng_Mesh* Netgen_mesh = ngLib.ngMesh(); Ng_Mesh* Netgen_mesh = ngLib.ngMesh();
int Netgen_NbOfNodesNew = Ng_GetNP(Netgen_mesh); int Netgen_NbOfNodesNew = Ng_GetNP(Netgen_mesh);
@ -224,7 +223,6 @@ bool NETGENPlugin_NETGEN_3D_SA::Compute(
std::string new_element_file, std::string new_element_file,
bool output_mesh) bool output_mesh)
{ {
MESSAGE("Compute");
// vector of nodes in which node index == netgen ID // vector of nodes in which node index == netgen ID
vector< const SMDS_MeshNode* > nodeVec; vector< const SMDS_MeshNode* > nodeVec;
NETGENPlugin_NetgenLibWrapper ngLib; NETGENPlugin_NetgenLibWrapper ngLib;
@ -235,7 +233,6 @@ bool NETGENPlugin_NETGEN_3D_SA::Compute(
// Changing netgen log_file putting it next to new_element_file // Changing netgen log_file putting it next to new_element_file
fs::path netgen_log_file = fs::path(new_element_file).remove_filename() / fs::path("NETGEN.out"); fs::path netgen_log_file = fs::path(new_element_file).remove_filename() / fs::path("NETGEN.out");
MESSAGE("netgen ouput"<<netgen_log_file.string());
ngLib.setOutputFile(netgen_log_file.string()); ngLib.setOutputFile(netgen_log_file.string());

3
src/NETGENPlugin/NETGENPlugin_Runner_main.cxx
View File

@ -59,7 +59,7 @@ int main(int argc, char *argv[]){
std::cout << " (optional) ELEM_ORIENT_FILE: binary file containing the list of element from INPUT_MESH_FILE associated to the shape and their orientation" << std::endl; std::cout << " (optional) ELEM_ORIENT_FILE: binary file containing the list of element from INPUT_MESH_FILE associated to the shape and their orientation" << std::endl;
std::cout << " (optional) NEW_ELEMENT_FILE: (out) contains elements and nodes added by the meshing" << std::endl; std::cout << " (optional) NEW_ELEMENT_FILE: (out) contains elements and nodes added by the meshing" << std::endl;
std::cout << " (optional) OUTPUT_MESH_FILE: (out) MED File containing the mesh after the run of the mesher" << std::endl; std::cout << " (optional) OUTPUT_MESH_FILE: (out) MED File containing the mesh after the run of the mesher" << std::endl;
return 1; return 0;
} }
std::string mesher=argv[1]; std::string mesher=argv[1];
std::string input_mesh_file=argv[2]; std::string input_mesh_file=argv[2];
@ -89,7 +89,6 @@ int main(int argc, char *argv[]){
output_mesh_file); output_mesh_file);
} else { } else {
std::cerr << "Unknown mesher:" << mesher << std::endl; std::cerr << "Unknown mesher:" << mesher << std::endl;
return 1;
} }
return 0; return 0;
} }