Merge branch 'main' into feat/remove-system-error-monitor

autowarefoundation · Sep 24, 2024 · 8deac7e · 8deac7e
2 parents e9d1a05 + 9f7ba86
commit 8deac7e
Show file tree

Hide file tree

Showing 160 changed files with 1,342 additions and 569 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -10,6 +10,7 @@ common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/** khalil@leodr
 common/autoware_path_distance_calculator/** [email protected]
 common/autoware_perception_rviz_plugin/** [email protected] [email protected] [email protected] [email protected] [email protected]
 common/autoware_point_types/** [email protected] [email protected]
+common/autoware_signal_processing/** [email protected] [email protected] [email protected] [email protected] [email protected]
 common/autoware_test_utils/** [email protected] [email protected] [email protected] [email protected]
 common/autoware_testing/** [email protected] [email protected] [email protected] [email protected]
 common/autoware_universe_utils/** [email protected] [email protected] [email protected]
@@ -27,7 +28,6 @@ common/object_recognition_utils/** [email protected] takayuki.murooka@tier
 common/osqp_interface/** [email protected] [email protected] [email protected] [email protected]
 common/polar_grid/** [email protected]
 common/qp_interface/** [email protected] [email protected] [email protected] [email protected]
-common/signal_processing/** [email protected] [email protected] [email protected] [email protected] [email protected]
 common/tensorrt_common/** [email protected] [email protected]
 common/tier4_adapi_rviz_plugin/** [email protected] [email protected] [email protected]
 common/tier4_api_utils/** [email protected]

diff --git a/.github/actions/build-and-test-differential/action.yaml b/.github/actions/build-and-test-differential/action.yaml
@@ -57,8 +57,10 @@ runs:
         restore-keys: |
           ccache-main-${{ runner.arch }}-${{ inputs.rosdistro }}-
 
-    - name: Show ccache stats before build
-      run: du -sh ${CCACHE_DIR} && ccache -s
+    - name: Show ccache stats before build and reset stats
+      run: |
+        du -sh ${CCACHE_DIR} && ccache -s
+        ccache --zero-stats
       shell: bash
 
     - name: Export CUDA state as a variable for adding to cache key

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -69,8 +69,10 @@ jobs:
           echo -e "# Set maximum cache size\nmax_size = 600MB" >> "${CCACHE_DIR}/ccache.conf"
         shell: bash
 
-      - name: Show ccache stats before build
-        run: du -sh ${CCACHE_DIR} && ccache -s
+      - name: Show ccache stats before build and reset stats
+        run: |
+          du -sh ${CCACHE_DIR} && ccache -s
+          ccache --zero-stats
         shell: bash
 
       - name: Export CUDA state as a variable for adding to cache key

diff --git a/common/interpolation/CMakeLists.txt → common/autoware_interpolation/CMakeLists.txt b/common/interpolation/CMakeLists.txt → common/autoware_interpolation/CMakeLists.txt
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.14)
-project(interpolation)
+project(autoware_interpolation)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()
 
-ament_auto_add_library(interpolation SHARED
+ament_auto_add_library(autoware_interpolation SHARED
   src/linear_interpolation.cpp
   src/spline_interpolation.cpp
   src/spline_interpolation_points_2d.cpp
@@ -17,7 +17,7 @@ if(BUILD_TESTING)
   ament_add_ros_isolated_gtest(test_interpolation ${test_files})
 
   target_link_libraries(test_interpolation
-    interpolation
+    autoware_interpolation
   )
 endif()
 

diff --git a/common/interpolation/README.md → common/autoware_interpolation/README.md b/common/interpolation/README.md → common/autoware_interpolation/README.md
diff --git a/...ude/interpolation/interpolation_utils.hpp → ...are/interpolation/interpolation_utils.hpp b/...ude/interpolation/interpolation_utils.hpp → ...are/interpolation/interpolation_utils.hpp
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INTERPOLATION__INTERPOLATION_UTILS_HPP_
-#define INTERPOLATION__INTERPOLATION_UTILS_HPP_
+#ifndef AUTOWARE__INTERPOLATION__INTERPOLATION_UTILS_HPP_
+#define AUTOWARE__INTERPOLATION__INTERPOLATION_UTILS_HPP_
 
 #include <algorithm>
 #include <array>
 #include <stdexcept>
 #include <vector>
 
-namespace interpolation_utils
+namespace autoware::interpolation
 {
 inline bool isIncreasing(const std::vector<double> & x)
 {
@@ -109,6 +109,6 @@ void validateKeysAndValues(
     throw std::invalid_argument("The size of base_keys and base_values are not the same.");
   }
 }
-}  // namespace interpolation_utils
+}  // namespace autoware::interpolation
 
-#endif  // INTERPOLATION__INTERPOLATION_UTILS_HPP_
+#endif  // AUTOWARE__INTERPOLATION__INTERPOLATION_UTILS_HPP_
diff --git a/...de/interpolation/linear_interpolation.hpp → ...re/interpolation/linear_interpolation.hpp b/...de/interpolation/linear_interpolation.hpp → ...re/interpolation/linear_interpolation.hpp
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INTERPOLATION__LINEAR_INTERPOLATION_HPP_
-#define INTERPOLATION__LINEAR_INTERPOLATION_HPP_
+#ifndef AUTOWARE__INTERPOLATION__LINEAR_INTERPOLATION_HPP_
+#define AUTOWARE__INTERPOLATION__LINEAR_INTERPOLATION_HPP_
 
-#include "interpolation/interpolation_utils.hpp"
+#include "autoware/interpolation/interpolation_utils.hpp"
 
 #include <vector>
 
-namespace interpolation
+namespace autoware::interpolation
 {
 double lerp(const double src_val, const double dst_val, const double ratio);
 
@@ -30,7 +30,6 @@ std::vector<double> lerp(
 double lerp(
   const std::vector<double> & base_keys, const std::vector<double> & base_values,
   const double query_key);
+}  // namespace autoware::interpolation
 
-}  // namespace interpolation
-
-#endif  // INTERPOLATION__LINEAR_INTERPOLATION_HPP_
+#endif  // AUTOWARE__INTERPOLATION__LINEAR_INTERPOLATION_HPP_
diff --git a/...lation/spherical_linear_interpolation.hpp → ...lation/spherical_linear_interpolation.hpp b/...lation/spherical_linear_interpolation.hpp → ...lation/spherical_linear_interpolation.hpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INTERPOLATION__SPHERICAL_LINEAR_INTERPOLATION_HPP_
-#define INTERPOLATION__SPHERICAL_LINEAR_INTERPOLATION_HPP_
+#ifndef AUTOWARE__INTERPOLATION__SPHERICAL_LINEAR_INTERPOLATION_HPP_
+#define AUTOWARE__INTERPOLATION__SPHERICAL_LINEAR_INTERPOLATION_HPP_
 
-#include "interpolation/interpolation_utils.hpp"
+#include "autoware/interpolation/interpolation_utils.hpp"
 
 #include <geometry_msgs/msg/quaternion.hpp>
 
@@ -29,7 +29,7 @@
 
 #include <vector>
 
-namespace interpolation
+namespace autoware::interpolation
 {
 geometry_msgs::msg::Quaternion slerp(
   const geometry_msgs::msg::Quaternion & src_quat, const geometry_msgs::msg::Quaternion & dst_quat,
@@ -43,6 +43,6 @@ std::vector<geometry_msgs::msg::Quaternion> slerp(
 geometry_msgs::msg::Quaternion lerpOrientation(
   const geometry_msgs::msg::Quaternion & o_from, const geometry_msgs::msg::Quaternion & o_to,
   const double ratio);
-}  // namespace interpolation
+}  // namespace autoware::interpolation
 
-#endif  // INTERPOLATION__SPHERICAL_LINEAR_INTERPOLATION_HPP_
+#endif  // AUTOWARE__INTERPOLATION__SPHERICAL_LINEAR_INTERPOLATION_HPP_
diff --git a/...de/interpolation/spline_interpolation.hpp → ...re/interpolation/spline_interpolation.hpp b/...de/interpolation/spline_interpolation.hpp → ...re/interpolation/spline_interpolation.hpp
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INTERPOLATION__SPLINE_INTERPOLATION_HPP_
-#define INTERPOLATION__SPLINE_INTERPOLATION_HPP_
+#ifndef AUTOWARE__INTERPOLATION__SPLINE_INTERPOLATION_HPP_
+#define AUTOWARE__INTERPOLATION__SPLINE_INTERPOLATION_HPP_
 
+#include "autoware/interpolation/interpolation_utils.hpp"
 #include "autoware/universe_utils/geometry/geometry.hpp"
-#include "interpolation/interpolation_utils.hpp"
 
 #include <Eigen/Core>
 
@@ -26,7 +26,7 @@
 #include <numeric>
 #include <vector>
 
-namespace interpolation
+namespace autoware::interpolation
 {
 // static spline interpolation functions
 std::vector<double> spline(
@@ -35,7 +35,6 @@ std::vector<double> spline(
 std::vector<double> splineByAkima(
   const std::vector<double> & base_keys, const std::vector<double> & base_values,
   const std::vector<double> & query_keys);
-}  // namespace interpolation
 
 // non-static 1-dimensional spline interpolation
 //
@@ -93,5 +92,6 @@ class SplineInterpolation
 
   Eigen::Index get_index(const double & key) const;
 };
+}  // namespace autoware::interpolation
 
-#endif  // INTERPOLATION__SPLINE_INTERPOLATION_HPP_
+#endif  // AUTOWARE__INTERPOLATION__SPLINE_INTERPOLATION_HPP_
diff --git a/...lation/spline_interpolation_points_2d.hpp → ...lation/spline_interpolation_points_2d.hpp b/...lation/spline_interpolation_points_2d.hpp → ...lation/spline_interpolation_points_2d.hpp
@@ -12,19 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INTERPOLATION__SPLINE_INTERPOLATION_POINTS_2D_HPP_
-#define INTERPOLATION__SPLINE_INTERPOLATION_POINTS_2D_HPP_
+#ifndef AUTOWARE__INTERPOLATION__SPLINE_INTERPOLATION_POINTS_2D_HPP_
+#define AUTOWARE__INTERPOLATION__SPLINE_INTERPOLATION_POINTS_2D_HPP_
 
-#include "interpolation/spline_interpolation.hpp"
+#include "autoware/interpolation/spline_interpolation.hpp"
 
 #include <vector>
 
-namespace interpolation
+namespace autoware::interpolation
 {
 
 template <typename T>
 std::vector<double> splineYawFromPoints(const std::vector<T> & points);
-}  // namespace interpolation
 
 // non-static points spline interpolation
 // NOTE: We can calculate yaw from the x and y by interpolation derivatives.
@@ -85,5 +84,6 @@ class SplineInterpolationPoints2d
 
   std::vector<double> base_s_vec_;
 };
+}  // namespace autoware::interpolation
 
-#endif  // INTERPOLATION__SPLINE_INTERPOLATION_POINTS_2D_HPP_
+#endif  // AUTOWARE__INTERPOLATION__SPLINE_INTERPOLATION_POINTS_2D_HPP_
diff --git a/...include/interpolation/zero_order_hold.hpp → ...utoware/interpolation/zero_order_hold.hpp b/...include/interpolation/zero_order_hold.hpp → ...utoware/interpolation/zero_order_hold.hpp
@@ -12,21 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INTERPOLATION__ZERO_ORDER_HOLD_HPP_
-#define INTERPOLATION__ZERO_ORDER_HOLD_HPP_
+#ifndef AUTOWARE__INTERPOLATION__ZERO_ORDER_HOLD_HPP_
+#define AUTOWARE__INTERPOLATION__ZERO_ORDER_HOLD_HPP_
 
-#include "interpolation/interpolation_utils.hpp"
+#include "autoware/interpolation/interpolation_utils.hpp"
 
 #include <vector>
 
-namespace interpolation
+namespace autoware::interpolation
 {
 inline std::vector<size_t> calc_closest_segment_indices(
   const std::vector<double> & base_keys, const std::vector<double> & query_keys,
   const double overlap_threshold = 1e-3)
 {
   // throw exception for invalid arguments
-  const auto validated_query_keys = interpolation_utils::validateKeys(base_keys, query_keys);
+  const auto validated_query_keys = validateKeys(base_keys, query_keys);
 
   std::vector<size_t> closest_segment_indices(validated_query_keys.size());
   size_t closest_segment_idx = 0;
@@ -58,7 +58,7 @@ std::vector<T> zero_order_hold(
   const std::vector<size_t> & closest_segment_indices)
 {
   // throw exception for invalid arguments
-  interpolation_utils::validateKeysAndValues(base_keys, base_values);
+  validateKeysAndValues(base_keys, base_values);
 
   std::vector<T> query_values(closest_segment_indices.size());
   for (size_t i = 0; i < closest_segment_indices.size(); ++i) {
@@ -76,6 +76,6 @@ std::vector<T> zero_order_hold(
   return zero_order_hold(
     base_keys, base_values, calc_closest_segment_indices(base_keys, query_keys, overlap_threshold));
 }
-}  // namespace interpolation
+}  // namespace autoware::interpolation
 
-#endif  // INTERPOLATION__ZERO_ORDER_HOLD_HPP_
+#endif  // AUTOWARE__INTERPOLATION__ZERO_ORDER_HOLD_HPP_
diff --git a/common/interpolation/package.xml → common/autoware_interpolation/package.xml b/common/interpolation/package.xml → common/autoware_interpolation/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>interpolation</name>
+  <name>autoware_interpolation</name>
   <version>0.1.0</version>
   <description>The spline interpolation package</description>
   <maintainer email="[email protected]">Fumiya Watanabe</maintainer>

diff --git a/...nterpolation/src/linear_interpolation.cpp → ...nterpolation/src/linear_interpolation.cpp b/...nterpolation/src/linear_interpolation.cpp → ...nterpolation/src/linear_interpolation.cpp
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "interpolation/linear_interpolation.hpp"
+#include "autoware/interpolation/linear_interpolation.hpp"
 
 #include <vector>
 
-namespace interpolation
+namespace autoware::interpolation
 {
 double lerp(const double src_val, const double dst_val, const double ratio)
 {
@@ -28,8 +28,8 @@ std::vector<double> lerp(
   const std::vector<double> & query_keys)
 {
   // throw exception for invalid arguments
-  const auto validated_query_keys = interpolation_utils::validateKeys(base_keys, query_keys);
-  interpolation_utils::validateKeysAndValues(base_keys, base_values);
+  const auto validated_query_keys = validateKeys(base_keys, query_keys);
+  validateKeysAndValues(base_keys, base_values);
 
   // calculate linear interpolation
   std::vector<double> query_values;
@@ -56,4 +56,4 @@ double lerp(
 {
   return lerp(base_keys, base_values, std::vector<double>{query_key}).front();
 }
-}  // namespace interpolation
+}  // namespace autoware::interpolation
diff --git a/...on/src/spherical_linear_interpolation.cpp → ...on/src/spherical_linear_interpolation.cpp b/...on/src/spherical_linear_interpolation.cpp → ...on/src/spherical_linear_interpolation.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "interpolation/spherical_linear_interpolation.hpp"
+#include "autoware/interpolation/spherical_linear_interpolation.hpp"
 
-namespace interpolation
+namespace autoware::interpolation
 {
 geometry_msgs::msg::Quaternion slerp(
   const geometry_msgs::msg::Quaternion & src_quat, const geometry_msgs::msg::Quaternion & dst_quat,
@@ -34,8 +34,8 @@ std::vector<geometry_msgs::msg::Quaternion> slerp(
   const std::vector<double> & query_keys)
 {
   // throw exception for invalid arguments
-  const auto validated_query_keys = interpolation_utils::validateKeys(base_keys, query_keys);
-  interpolation_utils::validateKeysAndValues(base_keys, base_values);
+  const auto validated_query_keys = validateKeys(base_keys, query_keys);
+  validateKeysAndValues(base_keys, base_values);
 
   // calculate linear interpolation
   std::vector<geometry_msgs::msg::Quaternion> query_values;
@@ -68,4 +68,4 @@ geometry_msgs::msg::Quaternion lerpOrientation(
   const auto q_interpolated = q_from.slerp(q_to, ratio);
   return tf2::toMsg(q_interpolated);
 }
-}  // namespace interpolation
+}  // namespace autoware::interpolation