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

fix mutex version

This commit is contained in:
Sébastien Loriot 2025-06-10 20:32:19 +02:00
parent b8b7f6354e
commit bd0e60e950
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/autorefinement.h
View File

@ -1490,23 +1490,41 @@ bool autorefine_triangle_soup(PointRange& soup_points,
[&](const tbb::blocked_range<size_t>& r) { [&](const tbb::blocked_range<size_t>& r) {
for (size_t ti = r.begin(); ti != r.end(); ++ti) { for (size_t ti = r.begin(); ti != r.end(); ++ti) {
const std::array<EK::Point_3, 3>& t = new_triangles[ti].first; const std::array<EK::Point_3, 3>& t = new_triangles[ti].first;
visitor.new_subtriangle(offset+ti, tri_inter_ids_inverse[new_triangles[ti].second]);
triangle_buffer[ti] = CGAL::make_array(concurrent_get_point_id(t[0]), concurrent_get_point_id(t[1]), concurrent_get_point_id(t[2])); triangle_buffer[ti] = CGAL::make_array(concurrent_get_point_id(t[0]), concurrent_get_point_id(t[1]), concurrent_get_point_id(t[2]));
} }
} }
); );
tbb::parallel_for(tbb::blocked_range<size_t>(0, new_triangles.size()),
[&](const tbb::blocked_range<size_t>& r) { // The constexpr was initially inside the lambda, but that did not compile with VC 2017
for (size_t ti = r.begin(); ti != r.end(); ++ti) if constexpr(std::is_same_v<Visitor, Wrap_snap_visitor>){
{ tbb::parallel_for(tbb::blocked_range<size_t>(0, new_triangles.size()),
soup_triangles_out[offset + ti] = [&](const tbb::blocked_range<size_t>& r) {
{ triangle_buffer[ti][0]->second, for (size_t ti = r.begin(); ti != r.end(); ++ti)
triangle_buffer[ti][1]->second, {
triangle_buffer[ti][2]->second }; soup_triangles_out[offset + ti] =
visitor.new_subtriangle(soup_triangles_out[offset + ti], soup_triangle[tri_inter_ids_inverse[new_triangles[ti].second]]); { triangle_buffer[ti][0]->second,
triangle_buffer[ti][1]->second,
triangle_buffer[ti][2]->second };
visitor.new_subdivision(soup_triangles_out[offset + ti], soup_triangles[tri_inter_ids_inverse[new_triangles[ti].second]]);
}
} }
} );
); }
else
{
tbb::parallel_for(tbb::blocked_range<size_t>(0, new_triangles.size()),
[&](const tbb::blocked_range<size_t>& r) {
for (size_t ti = r.begin(); ti != r.end(); ++ti)
{
soup_triangles_out[offset + ti] =
{ triangle_buffer[ti][0]->second,
triangle_buffer[ti][1]->second,
triangle_buffer[ti][2]->second };
visitor.new_subtriangle(offset+ti, tri_inter_ids_inverse[new_triangles[ti].second]);
}
}
);
}
#else #else
//option 2 (without mutex) //option 2 (without mutex)
/// Lambda concurrent_get_point_id() /// Lambda concurrent_get_point_id()