X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Gen.cxx;h=45a0049b45c474f3449e37da3c31261c340f93b4;hb=7a915a21ead4b7032d3c8626d154783f6dd17647;hp=02d5a217e18a283ddb9f9bf81b933d8768f3655f;hpb=8385b9256f21bfce0ad0bc71d94b37bb90737637;p=modules%2Fsmesh.git diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx index 02d5a217e..45a0049b4 100644 --- a/src/SMESH/SMESH_Gen.cxx +++ b/src/SMESH/SMESH_Gen.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2022 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -30,6 +30,7 @@ #include "SMESH_Gen.hxx" +#include "DriverMesh.hxx" #include "SMDS_Mesh.hxx" #include "SMDS_MeshElement.hxx" #include "SMDS_MeshNode.hxx" @@ -47,6 +48,8 @@ #include #include "memoire.h" +#include +#include #ifdef WIN32 #include @@ -55,6 +58,9 @@ #include using namespace std; +#include +#include +namespace fs = boost::filesystem; // Environment variable separator #ifdef WIN32 @@ -155,6 +161,42 @@ SMESH_Mesh* SMESH_Gen::CreateMesh(bool theIsEmbeddedMode) return aMesh; } +//============================================================================= +/* + * Parallel compute of a submesh + * This function is used to pass to thread_pool + */ +//============================================================================= +const std::function + compute_function([&] (int id, + SMESH_subMesh* sm, + SMESH_subMesh::compute_event event, + SMESH_subMesh *shapeSM, + bool aShapeOnly, + TopTools_IndexedMapOfShape *allowedSubShapes, + TSetOfInt* aShapesId) -> void +{ + if (sm->GetComputeState() == SMESH_subMesh::READY_TO_COMPUTE) + { + sm->SetAllowedSubShapes( fillAllowed( shapeSM, aShapeOnly, allowedSubShapes )); + //setCurrentSubMesh( sm ); + sm->ComputeStateEngine(event); + //setCurrentSubMesh( nullptr ); + sm->SetAllowedSubShapes( nullptr ); + } + + // TODO: Check if this is necessary + if ( aShapesId ) + aShapesId->insert( sm->GetId() ); + +}); + //============================================================================= /* * Compute a mesh @@ -182,6 +224,10 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, const bool complexShapeFirst = true; const int globalAlgoDim = 100; + // Pool of thread for computation + if(aMesh.IsParallel()) + aMesh.InitPoolThreads(); + SMESH_subMeshIteratorPtr smIt; // Fix of Issue 22150. Due to !BLSURF->OnlyUnaryInput(), BLSURF computes edges @@ -202,6 +248,11 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, // Mesh all the sub-shapes starting from vertices // =============================================== + TopAbs_ShapeEnum previousShapeType = TopAbs_VERTEX; + int nbThreads = aMesh.GetNbThreads(); + auto begin = std::chrono::high_resolution_clock::now(); + + smIt = shapeSM->getDependsOnIterator(includeSelf, !complexShapeFirst); while ( smIt->more() ) { @@ -212,6 +263,41 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, const TopAbs_ShapeEnum shapeType = shape.ShapeType(); if ( !aMesh.HasShapeToMesh() && shapeType == TopAbs_VERTEX ) continue; + if(shapeType==TopAbs_FACE||shapeType==TopAbs_EDGE) + aMesh.SetNbThreads(0); + else + aMesh.SetNbThreads(nbThreads); + //DEBUG std::cout << "Shape Type" << shapeType << " previous" << previousShapeType << std::endl; + if ((aMesh.IsParallel()||nbThreads!=0) && shapeType != previousShapeType) { + // Waiting for all threads for the previous type to end + aMesh.wait(); + + std::string file_name; + switch(previousShapeType){ + case TopAbs_FACE: + file_name = "Mesh2D.med"; + break; + case TopAbs_EDGE: + file_name = "Mesh1D.med"; + break; + case TopAbs_VERTEX: + file_name = "Mesh0D.med"; + break; + case TopAbs_SOLID: + default: + file_name = ""; + break; + } + if(file_name != "") + { + fs::path mesh_file = fs::path(aMesh.tmp_folder) / fs::path(file_name); + // TODO: change mesh name + export_mesh(mesh_file.string(), aMesh, "Maillage_1"); + + } + //Resetting threaded pool info + previousShapeType = shapeType; + } // check for preview dimension limitations if ( aShapesId && GetShapeDim( shapeType ) > (int)aDim ) @@ -221,37 +307,56 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, smToCompute->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE ); continue; } - - if (smToCompute->GetComputeState() == SMESH_subMesh::READY_TO_COMPUTE) + if(aMesh.IsParallel()) { - if (_compute_canceled) - return false; - smToCompute->SetAllowedSubShapes( fillAllowed( shapeSM, aShapeOnly, allowedSubShapes )); - setCurrentSubMesh( smToCompute ); - smToCompute->ComputeStateEngine( computeEvent ); - setCurrentSubMesh( nullptr ); - smToCompute->SetAllowedSubShapes( nullptr ); + std::cout << "Submitting thread function " << std::endl; + boost::asio::post(*(aMesh._pool), [](){std::cerr<< "In Here" << std::endl;}); + boost::asio::post(*(aMesh._pool), std::bind(compute_function, 1, smToCompute, computeEvent, + shapeSM, aShapeOnly, allowedSubShapes, + aShapesId)); + } else { + auto begin2 = std::chrono::high_resolution_clock::now(); + + compute_function(1 ,smToCompute, computeEvent, + shapeSM, aShapeOnly, allowedSubShapes, + aShapesId); + + + + if (smToCompute->GetComputeState() == SMESH_subMesh::FAILED_TO_COMPUTE && + ( shapeType != TopAbs_EDGE || !SMESH_Algo::isDegenerated( TopoDS::Edge( shape )))) + ret = false; + else if ( aShapesId ) + aShapesId->insert( smToCompute->GetId() ); } + } - // we check all the sub-meshes here and detect if any of them failed to compute - if (smToCompute->GetComputeState() == SMESH_subMesh::FAILED_TO_COMPUTE && - ( shapeType != TopAbs_EDGE || !SMESH_Algo::isDegenerated( TopoDS::Edge( shape )))) - ret = false; - else if ( aShapesId ) - aShapesId->insert( smToCompute->GetId() ); + // TODO: Check error handling in parallel mode + if(aMesh.IsParallel()){ + // Waiting for the thread for Solids to finish + aMesh.wait(); } - //aMesh.GetMeshDS()->Modified(); + + aMesh.GetMeshDS()->Modified(); + auto end = std::chrono::high_resolution_clock::now(); + auto elapsed = std::chrono::duration_cast(end - begin); + std::cout << "Time for All: " << elapsed.count()*1e-9 << std::endl; + + // Pool of thread for computation + if(aMesh.IsParallel()) + aMesh.DeletePoolThreads(); + return ret; } else { // ================================================================ - // Apply algos that do NOT require discreteized boundaries + // Apply algos that do NOT require discretized boundaries // ("all-dimensional") and do NOT support sub-meshes, starting from // the most complex shapes and collect sub-meshes with algos that // DO support sub-meshes // ================================================================ - + auto begin = std::chrono::high_resolution_clock::now(); list< SMESH_subMesh* > smWithAlgoSupportingSubmeshes[4]; // for each dim // map to sort sm with same dim algos according to dim of @@ -447,7 +552,12 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, continue; sm->SetAllowedSubShapes( fillAllowed( shapeSM, aShapeOnly, allowedSubShapes )); setCurrentSubMesh( sm ); + auto begin = std::chrono::high_resolution_clock::now(); sm->ComputeStateEngine( computeEvent ); + auto end = std::chrono::high_resolution_clock::now(); + auto elapsed = std::chrono::duration_cast(end - begin); + std::cout << "Time for seq:alldim:compute: " << elapsed.count()*1e-9 << std::endl; + setCurrentSubMesh( NULL ); sm->SetAllowedSubShapes( nullptr ); if ( aShapesId ) @@ -460,6 +570,10 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, // mesh the rest sub-shapes starting from vertices // ----------------------------------------------- ret = Compute( aMesh, aShape, aFlags | UPWARD, aDim, aShapesId, allowedSubShapes ); + auto end = std::chrono::high_resolution_clock::now(); + auto elapsed = std::chrono::duration_cast(end - begin); + std::cout << "Time for All: " << elapsed.count()*1e-9 << std::endl; + } MEMOSTAT; @@ -603,7 +717,7 @@ bool SMESH_Gen::Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape& aSubShape = smToCompute->GetSubShape(); const int aShapeDim = GetShapeDim( aSubShape ); if ( aShapeDim < 1 ) break; - + SMESH_Algo* algo = GetAlgo( smToCompute ); if ( algo && !algo->NeedDiscreteBoundary() ) { if ( algo->SupportSubmeshes() ) {