songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a few performance data exports

This commit is contained in:
Mael Rouxel-Labbé 2023-12-07 20:56:52 +01:00
parent d715a658a0
commit dc38d13066
4 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
View File

@ -460,7 +460,7 @@ refine_mesh(std::string dump_after_refine_surface_prefix)
// If it's parallel but the refinement is forced to sequential, we don't // If it's parallel but the refinement is forced to sequential, we don't
// output the value // output the value
# ifndef CGAL_DEBUG_FORCE_SEQUENTIAL_MESH_REFINEMENT # ifndef CGAL_DEBUG_FORCE_SEQUENTIAL_MESH_REFINEMENT
CGAL_MESH_3_SET_PERFORMANCE_DATA("Facets_time", facet_ref_time); CGAL_MESH_3_SET_PERFORMANCE_DATA("Facets_refine_time", facet_ref_time);
# endif # endif
# endif # endif
#endif #endif
@ -503,7 +503,7 @@ refine_mesh(std::string dump_after_refine_surface_prefix)
// If it's parallel but the refinement is forced to sequential, we don't // If it's parallel but the refinement is forced to sequential, we don't
// output the value // output the value
# ifndef CGAL_DEBUG_FORCE_SEQUENTIAL_MESH_REFINEMENT # ifndef CGAL_DEBUG_FORCE_SEQUENTIAL_MESH_REFINEMENT
CGAL_MESH_3_SET_PERFORMANCE_DATA("Cells_refin_time", cell_ref_time); CGAL_MESH_3_SET_PERFORMANCE_DATA("Cells_refine_time", cell_ref_time);
# endif # endif
# endif # endif
#endif #endif

11
Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
View File

@ -1029,8 +1029,17 @@ scan_triangulation_impl()
} }
#ifdef CGAL_MESH_3_PROFILING #ifdef CGAL_MESH_3_PROFILING
std::cerr << "==== Facet scan: " << t.elapsed() << " seconds ====" double facet_scan_time = t.elapsed();
std::cerr << "==== Facet scan: " << facet_scan_time << " seconds ===="
<< std::endl << std::endl; << std::endl << std::endl;
# ifdef CGAL_MESH_3_EXPORT_PERFORMANCE_DATA
// If it's parallel but the refinement is forced to sequential, we don't
// output the value
# ifndef CGAL_DEBUG_FORCE_SEQUENTIAL_MESH_REFINEMENT
CGAL_MESH_3_SET_PERFORMANCE_DATA("Facets_scan_time", facet_scan_time);
# endif
# endif
#endif #endif
#if defined(CGAL_MESH_3_VERBOSE) || defined(CGAL_MESH_3_PROFILING) #if defined(CGAL_MESH_3_VERBOSE) || defined(CGAL_MESH_3_PROFILING)

11
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
View File

@ -855,16 +855,7 @@ operator()(Visitor visitor)
#if defined(CGAL_MESH_3_EXPORT_PERFORMANCE_DATA) \ #if defined(CGAL_MESH_3_EXPORT_PERFORMANCE_DATA) \
&& defined(CGAL_MESH_3_PROFILING) && defined(CGAL_MESH_3_PROFILING)
if (ret == BOUND_REACHED) CGAL_MESH_3_SET_PERFORMANCE_DATA("Perturber_optim_time", perturbation_time);
{
CGAL_MESH_3_SET_PERFORMANCE_DATA("Perturber_optim_time", perturbation_time);
}
else
{
CGAL_MESH_3_SET_PERFORMANCE_DATA("Perturber_optim_time",
(ret == CANT_IMPROVE_ANYMORE ?
"CANT_IMPROVE_ANYMORE" : "TIME_LIMIT_REACHED"));
}
#endif #endif
return ret; return ret;

14
Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
View File

@ -427,17 +427,9 @@ public: // methods
<< exudation_time << "s ====" << std::endl; << exudation_time << "s ====" << std::endl;
#endif #endif
#ifdef CGAL_MESH_3_EXPORT_PERFORMANCE_DATA #if defined(CGAL_MESH_3_EXPORT_PERFORMANCE_DATA) \
if (ret == BOUND_REACHED) && defined(CGAL_MESH_3_PROFILING)
{ CGAL_MESH_3_SET_PERFORMANCE_DATA("Exuder_optim_time", exudation_time);
CGAL_MESH_3_SET_PERFORMANCE_DATA("Exuder_optim_time", exudation_time);
}
else
{
CGAL_MESH_3_SET_PERFORMANCE_DATA("Exuder_optim_time",
(ret == CANT_IMPROVE_ANYMORE ?
"CANT_IMPROVE_ANYMORE" : "TIME_LIMIT_REACHED"));
}
#endif #endif
return ret; return ret;