Removes parallel execution due to race conditions.

Signed-off-by: Franco Cipollone <franco.c@ekumenlabs.com>
maliput · Feb 6, 2023 · 9f81200 · 9f81200
1 parent 1d2c300
commit 9f81200
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,9 +14,6 @@ message(STATUS "\n\n====== Finding 3rd Party Packages ======\n")
 find_package(ament_cmake REQUIRED)
 find_package(maliput REQUIRED)
 
-# TODO(francocipollone): Remove this once we move to GCC 10.
-find_package(TBB REQUIRED)
-
 ##############################################################################
 # Project Configuration
 ##############################################################################

diff --git a/package.xml b/package.xml
@@ -11,7 +11,6 @@
   <doc_depend>ament_cmake_doxygen</doc_depend>
 
   <depend>maliput</depend>
-  <depend>tbb</depend>
 
   <test_depend>ament_cmake_clang_format</test_depend>
   <test_depend>ament_cmake_gmock</test_depend>

diff --git a/src/geometry/CMakeLists.txt b/src/geometry/CMakeLists.txt
@@ -26,8 +26,6 @@ target_link_libraries(geometry
   PUBLIC
     maliput::common
     maliput::math
-  PRIVATE
-    TBB::tbb
 )
 
 ##############################################################################

diff --git a/src/geometry/utility/geometry.cc b/src/geometry/utility/geometry.cc
@@ -62,7 +62,6 @@
 #include <cmath>
 #include <numeric>
 
-#include <execution>
 #include <maliput/common/range_validator.h>
 
 namespace maliput_sparse {
@@ -354,7 +353,7 @@ ClosestPointResult3d GetClosestPoint(const LineString3d& line_string, const mali
   segment_closest_point_result.distance = std::numeric_limits<double>::max();
 
   const auto& segments = line_string.segments();
-  std::for_each(std::execution::par, segments.begin(), segments.end(), [&](const auto& segment) {
+  std::for_each(segments.begin(), segments.end(), [&](const auto& segment) {
     const auto& start = line_string[segment.second.idx_start];
     const auto& end = line_string[segment.second.idx_end];
     const auto current_closest_point_res = GetClosestPointToSegment(Segment3d{start, end}, xyz, tolerance);
@@ -378,7 +377,7 @@ ClosestPointResult3d GetClosestPointUsing2dProjection(const LineString3d& line_s
   segment_closest_point_result.distance = std::numeric_limits<double>::max();
 
   const auto& segments = line_string.segments();
-  std::for_each(std::execution::par, segments.begin(), segments.end(), [&](const auto& segment) {
+  std::for_each(segments.begin(), segments.end(), [&](const auto& segment) {
     const auto& start = line_string[segment.second.idx_start];
     const auto& end = line_string[segment.second.idx_end];
     const Segment2d segment_2d{To2D(start), To2D(end)};