Skip to content

Commit b30fb40

Browse files
authored
Merge branch 'main' into chore/euclidean_cluster/add_unit_tests
2 parents 62d5f89 + 9df90bc commit b30fb40

File tree

341 files changed

+8675
-5787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

341 files changed

+8675
-5787
lines changed

Diff for: .github/CODEOWNERS

-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ perception/lidar_apollo_instance_segmentation/** yukihiro.saito@tier4.jp
119119
perception/lidar_apollo_segmentation_tvm/** ambroise.vincent@arm.com xinyu.wang@tier4.jp
120120
perception/lidar_apollo_segmentation_tvm_nodes/** ambroise.vincent@arm.com xinyu.wang@tier4.jp
121121
perception/lidar_centerpoint/** kenzo.lobos@tier4.jp koji.minoda@tier4.jp
122-
perception/lidar_centerpoint_tvm/** carl.liu@autocore.ai xinyu.wang@tier4.jp
123122
perception/lidar_transfusion/** amadeusz.szymko.2@tier4.jp kenzo.lobos@tier4.jp satoshi.tanaka@tier4.jp
124123
perception/multi_object_tracker/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
125124
perception/object_merger/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp

Diff for: .github/workflows/build-and-test-daily-arm64.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
fail_ci_if_error: false
7474
verbose: true
7575
flags: total-arm64
76+
token: ${{ secrets.CODECOV_TOKEN }}
7677

7778
- name: Show disk space after the tasks
7879
run: df -h

Diff for: .github/workflows/build-and-test-daily.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
fail_ci_if_error: false
7474
verbose: true
7575
flags: total
76+
token: ${{ secrets.CODECOV_TOKEN }}
7677

7778
- name: Show disk space after the tasks
7879
run: df -h

Diff for: .github/workflows/build-and-test-differential-arm64.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ jobs:
8787
fail_ci_if_error: false
8888
verbose: true
8989
flags: differential-arm64
90+
token: ${{ secrets.CODECOV_TOKEN }}
9091

9192
- name: Show disk space after the tasks
9293
run: df -h

Diff for: .github/workflows/build-and-test-differential.yaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ jobs:
114114
fail_ci_if_error: false
115115
verbose: true
116116
flags: differential
117+
token: ${{ secrets.CODECOV_TOKEN }}
117118

118119
- name: Show disk space after the tasks
119120
run: df -h
@@ -142,20 +143,20 @@ jobs:
142143
id: get-modified-packages
143144
uses: autowarefoundation/autoware-github-actions/get-modified-packages@v1
144145

145-
- name: Get modified files
146-
id: get-modified-files
146+
- name: Get changed files (existing files only)
147+
id: get-changed-files
147148
run: |
148-
echo "changed_files=$(git diff --name-only "origin/${{ github.base_ref }}"...HEAD | grep -E '\.(cpp|hpp)$' | tr '\n' ' ' || true)" >> $GITHUB_OUTPUT
149+
echo "changed-files=$(git diff --name-only "origin/${{ github.base_ref }}"...HEAD | grep -E '\.(cpp|hpp)$' | while read -r file; do [ -e "$file" ] && echo -n "$file "; done)" >> $GITHUB_OUTPUT
149150
shell: bash
150151

151152
- name: Run clang-tidy
152-
if: ${{ steps.get-modified-files.outputs.changed_files != '' }}
153+
if: ${{ steps.get-changed-files.outputs.changed-files != '' }}
153154
uses: autowarefoundation/autoware-github-actions/clang-tidy@v1
154155
with:
155156
rosdistro: humble
156157
target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }}
157-
target-files: ${{ steps.get-modified-files.outputs.changed_files }}
158-
clang-tidy-config-url: https://raw.githubusercontent.com/autowarefoundation/autoware/main/.clang-tidy
158+
target-files: ${{ steps.get-changed-files.outputs.changed-files }}
159+
clang-tidy-config-url: https://raw.githubusercontent.com/autowarefoundation/autoware/main/.clang-tidy-ci
159160
build-depends-repos: build_depends.repos
160161
cache-key-element: cuda
161162

Diff for: .github/workflows/build-and-test.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ jobs:
115115
fail_ci_if_error: false
116116
verbose: true
117117
flags: total
118+
token: ${{ secrets.CODECOV_TOKEN }}
118119

119120
- name: Show disk space after the tasks
120121
run: df -h

Diff for: build_depends.repos

+13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
repositories:
22
# core
3+
# TODO(youtalk): Remove autoware_common when https://github.com/autowarefoundation/autoware/issues/4911 is closed
34
core/autoware_common:
45
type: git
56
url: https://github.com/autowarefoundation/autoware_common.git
7+
version: remove-autoware-cmake-utils
8+
core/autoware_cmake:
9+
type: git
10+
url: https://github.com/autowarefoundation/autoware_cmake.git
11+
version: main
12+
core/autoware_utils:
13+
type: git
14+
url: https://github.com/autowarefoundation/autoware_utils.git
15+
version: main
16+
core/autoware_lanelet2_extension:
17+
type: git
18+
url: https://github.com/autowarefoundation/autoware_lanelet2_extension.git
619
version: main
720
core/autoware.core:
821
type: git
Loading

Diff for: common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/include/signal_display.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ private Q_SLOTS:
7676
rviz_common::properties::IntProperty * property_left_;
7777
rviz_common::properties::IntProperty * property_top_;
7878
rviz_common::properties::ColorProperty * property_signal_color_;
79+
rviz_common::properties::FloatProperty * property_handle_angle_scale_;
7980
std::unique_ptr<rviz_common::properties::RosTopicProperty> steering_topic_property_;
8081
std::unique_ptr<rviz_common::properties::RosTopicProperty> gear_topic_property_;
8182
std::unique_ptr<rviz_common::properties::RosTopicProperty> speed_topic_property_;

Diff for: common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/include/steering_wheel_display.hpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ class SteeringWheelDisplay
3636
{
3737
public:
3838
SteeringWheelDisplay();
39-
void drawSteeringWheel(QPainter & painter, const QRectF & backgroundRect);
39+
void drawSteeringWheel(
40+
QPainter & painter, const QRectF & backgroundRect, float handle_angle_scale_);
4041
void updateSteeringData(const autoware_vehicle_msgs::msg::SteeringReport::ConstSharedPtr & msg);
4142

4243
private:
@@ -46,6 +47,7 @@ class SteeringWheelDisplay
4647
QImage wheelImage;
4748
QImage scaledWheelImage;
4849
QImage coloredImage(const QImage & source, const QColor & color);
50+
autoware_vehicle_msgs::msg::SteeringReport::ConstSharedPtr last_msg_ptr_;
4951
};
5052

5153
} // namespace autoware_overlay_rviz_plugin

Diff for: common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/src/signal_display.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ SignalDisplay::SignalDisplay()
4949
property_signal_color_ = new rviz_common::properties::ColorProperty(
5050
"Signal Color", QColor(QString("#00E678")), "Color of the signal arrows", this,
5151
SLOT(updateOverlayColor()));
52+
property_handle_angle_scale_ = new rviz_common::properties::FloatProperty(
53+
"Handle Angle Scale", 17.0, "Scale of the steering wheel handle angle", this,
54+
SLOT(updateOverlaySize()));
5255

5356
// Initialize the component displays
5457
steering_wheel_display_ = std::make_unique<SteeringWheelDisplay>();
@@ -285,7 +288,8 @@ void SignalDisplay::drawWidget(QImage & hud)
285288
}
286289

287290
if (steering_wheel_display_) {
288-
steering_wheel_display_->drawSteeringWheel(painter, backgroundRect);
291+
steering_wheel_display_->drawSteeringWheel(
292+
painter, backgroundRect, property_handle_angle_scale_->getFloat());
289293
}
290294

291295
if (speed_display_) {

Diff for: common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/src/steering_wheel_display.cpp

+36-14
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,17 @@ void SteeringWheelDisplay::updateSteeringData(
5959
const autoware_vehicle_msgs::msg::SteeringReport::ConstSharedPtr & msg)
6060
{
6161
try {
62-
// Assuming msg->steering_angle is the field you're interested in
63-
float steeringAngle = msg->steering_tire_angle;
64-
// we received it as a radian value, but we want to display it in degrees
65-
steering_angle_ =
66-
(steeringAngle * -180 / M_PI) *
67-
17; // 17 is the ratio between the steering wheel and the steering tire angle i assume
62+
last_msg_ptr_ = msg;
63+
64+
steering_angle_ = msg->steering_tire_angle;
6865
} catch (const std::exception & e) {
6966
// Log the error
7067
std::cerr << "Error in processMessage: " << e.what() << std::endl;
7168
}
7269
}
7370

74-
void SteeringWheelDisplay::drawSteeringWheel(QPainter & painter, const QRectF & backgroundRect)
71+
void SteeringWheelDisplay::drawSteeringWheel(
72+
QPainter & painter, const QRectF & backgroundRect, float handle_angle_scale_)
7573
{
7674
// Enable Antialiasing for smoother drawing
7775
painter.setRenderHint(QPainter::Antialiasing, true);
@@ -80,7 +78,7 @@ void SteeringWheelDisplay::drawSteeringWheel(QPainter & painter, const QRectF &
8078
QImage wheel = coloredImage(scaledWheelImage, gray);
8179

8280
// Rotate the wheel
83-
float steeringAngle = steering_angle_; // No need to round here
81+
float steeringAngle = std::round(handle_angle_scale_ * (steering_angle_ / M_PI) * -180.0);
8482
// Calculate the position
8583
int wheelCenterX = backgroundRect.left() + wheel.width() + 54 + 54;
8684
int wheelCenterY = backgroundRect.height() / 2;
@@ -99,16 +97,40 @@ void SteeringWheelDisplay::drawSteeringWheel(QPainter & painter, const QRectF &
9997
// Draw the rotated image
10098
painter.drawImage(drawPoint.x(), drawPoint.y(), rotatedWheel);
10199

102-
QString steeringAngleStringAfterModulo = QString::number(fmod(steeringAngle, 360), 'f', 0);
100+
std::ostringstream steering_angle_ss;
101+
if (last_msg_ptr_) {
102+
steering_angle_ss << std::fixed << std::setprecision(1) << steering_angle_ * 180.0 / M_PI
103+
<< "°";
104+
} else {
105+
steering_angle_ss << "N/A";
106+
}
107+
108+
QString steeringAngleString = QString::fromStdString(steering_angle_ss.str());
109+
// if the string doesn't have a negative sign, add a space to the front of the string
110+
// to align the text in both cases (negative and positive)
111+
if (steeringAngleString[0] != '-') {
112+
steeringAngleString = " " + steeringAngleString;
113+
}
103114

104115
// Draw the steering angle text
105-
QFont steeringFont("Quicksand", 9, QFont::Bold);
116+
QFont steeringFont("Quicksand", 8, QFont::Bold);
106117
painter.setFont(steeringFont);
107118
painter.setPen(QColor(0, 0, 0, 255));
108-
QRect steeringRect(
109-
wheelCenterX - wheelImage.width() / 2, wheelCenterY - wheelImage.height() / 2,
110-
wheelImage.width(), wheelImage.height());
111-
painter.drawText(steeringRect, Qt::AlignCenter, steeringAngleStringAfterModulo + "°");
119+
// QRect steeringRect(
120+
// wheelCenterX - wheelImage.width() / 2 + 1, wheelCenterY - wheelImage.height() / 2,
121+
// wheelImage.width(), wheelImage.height());
122+
// painter.drawText(steeringRect, Qt::AlignCenter, steeringAngleString);
123+
124+
// Measure the text
125+
QFontMetrics fontMetrics(steeringFont);
126+
QRect textRect = fontMetrics.boundingRect(steeringAngleString);
127+
128+
// Center the text
129+
int textX = wheelCenterX - textRect.width() / 2;
130+
int textY = wheelCenterY - textRect.height() / 2;
131+
132+
QRect steeringRect(textX, textY, textRect.width(), textRect.height());
133+
painter.drawText(steeringRect, Qt::AlignCenter, steeringAngleString);
112134
}
113135

114136
QImage SteeringWheelDisplay::coloredImage(const QImage & source, const QColor & color)

Diff for: common/autoware_perception_rviz_plugin/src/object_detection/object_polygon_detail.cpp

+2-8
Original file line numberDiff line numberDiff line change
@@ -526,10 +526,7 @@ visualization_msgs::msg::Marker::SharedPtr get_shape_marker_ptr(
526526
marker_ptr->scale = shape_msg.dimensions;
527527
marker_ptr->color.a = 0.75f;
528528
}
529-
} else if (shape_msg.type == Shape::POLYGON) {
530-
marker_ptr->type = visualization_msgs::msg::Marker::LINE_LIST;
531-
calc_polygon_line_list(shape_msg, marker_ptr->points);
532-
} else {
529+
} else { // including shape_msg.type == Shape::POLYGON
533530
marker_ptr->type = visualization_msgs::msg::Marker::LINE_LIST;
534531
calc_polygon_line_list(shape_msg, marker_ptr->points);
535532
}
@@ -562,10 +559,7 @@ visualization_msgs::msg::Marker::SharedPtr get_2d_shape_marker_ptr(
562559
} else if (shape_msg.type == Shape::CYLINDER) {
563560
marker_ptr->type = visualization_msgs::msg::Marker::LINE_LIST;
564561
calc_2d_cylinder_bottom_line_list(shape_msg, marker_ptr->points);
565-
} else if (shape_msg.type == Shape::POLYGON) {
566-
marker_ptr->type = visualization_msgs::msg::Marker::LINE_LIST;
567-
calc_2d_polygon_bottom_line_list(shape_msg, marker_ptr->points);
568-
} else {
562+
} else { // including shape_msg.type == Shape::POLYGON
569563
marker_ptr->type = visualization_msgs::msg::Marker::LINE_LIST;
570564
calc_2d_polygon_bottom_line_list(shape_msg, marker_ptr->points);
571565
}

Diff for: common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
#define AUTOWARE_TEST_UTILS__AUTOWARE_TEST_UTILS_HPP_
1717

1818
#include <autoware/universe_utils/geometry/geometry.hpp>
19+
#include <autoware_lanelet2_extension/io/autoware_osm_parser.hpp>
20+
#include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
21+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
22+
#include <autoware_lanelet2_extension/utility/utilities.hpp>
1923
#include <component_interface_specs/planning.hpp>
20-
#include <lanelet2_extension/io/autoware_osm_parser.hpp>
21-
#include <lanelet2_extension/projection/mgrs_projector.hpp>
22-
#include <lanelet2_extension/utility/message_conversion.hpp>
23-
#include <lanelet2_extension/utility/utilities.hpp>
2424

2525
#include <autoware_adapi_v1_msgs/msg/operation_mode_state.hpp>
2626
#include <autoware_map_msgs/msg/lanelet_map_bin.hpp>

Diff for: common/autoware_test_utils/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
<buildtool_depend>autoware_cmake</buildtool_depend>
1717

1818
<depend>autoware_control_msgs</depend>
19+
<depend>autoware_lanelet2_extension</depend>
1920
<depend>autoware_map_msgs</depend>
2021
<depend>autoware_perception_msgs</depend>
2122
<depend>autoware_planning_msgs</depend>
2223
<depend>autoware_universe_utils</depend>
2324
<depend>autoware_vehicle_msgs</depend>
2425
<depend>component_interface_specs</depend>
2526
<depend>component_interface_utils</depend>
26-
<depend>lanelet2_extension</depend>
2727
<depend>lanelet2_io</depend>
2828
<depend>nav_msgs</depend>
2929
<depend>rclcpp</depend>

Diff for: common/geography_utils/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1111
<buildtool_depend>autoware_cmake</buildtool_depend>
1212

13+
<depend>autoware_lanelet2_extension</depend>
1314
<depend>geographic_msgs</depend>
1415
<depend>geographiclib</depend>
1516
<depend>geometry_msgs</depend>
16-
<depend>lanelet2_extension</depend>
1717
<depend>lanelet2_io</depend>
1818
<depend>tier4_map_msgs</depend>
1919

Diff for: common/geography_utils/src/lanelet2_projector.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
// limitations under the License.
1414

1515
#include <GeographicLib/Geoid.hpp>
16+
#include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
17+
#include <autoware_lanelet2_extension/projection/transverse_mercator_projector.hpp>
1618
#include <geography_utils/lanelet2_projector.hpp>
17-
#include <lanelet2_extension/projection/mgrs_projector.hpp>
18-
#include <lanelet2_extension/projection/transverse_mercator_projector.hpp>
1919

2020
#include <lanelet2_projection/UTM.h>
2121

Diff for: common/geography_utils/src/projection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
// limitations under the License.
1414

1515
#include <GeographicLib/Geoid.hpp>
16+
#include <autoware_lanelet2_extension/projection/mgrs_projector.hpp>
1617
#include <geography_utils/lanelet2_projector.hpp>
1718
#include <geography_utils/projection.hpp>
18-
#include <lanelet2_extension/projection/mgrs_projector.hpp>
1919

2020
namespace geography_utils
2121
{

Diff for: common/tier4_traffic_light_rviz_plugin/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<buildtool_depend>ament_cmake_auto</buildtool_depend>
1111
<buildtool_depend>autoware_cmake</buildtool_depend>
1212

13+
<depend>autoware_lanelet2_extension</depend>
1314
<depend>autoware_map_msgs</depend>
1415
<depend>autoware_perception_msgs</depend>
15-
<depend>lanelet2_extension</depend>
1616
<depend>libqt5-core</depend>
1717
<depend>libqt5-gui</depend>
1818
<depend>libqt5-widgets</depend>

Diff for: common/tier4_traffic_light_rviz_plugin/src/traffic_light_publish_panel.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include <QString>
2323
#include <QStringList>
2424
#include <QVBoxLayout>
25-
#include <lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp>
26-
#include <lanelet2_extension/utility/message_conversion.hpp>
27-
#include <lanelet2_extension/utility/query.hpp>
25+
#include <autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp>
26+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
27+
#include <autoware_lanelet2_extension/utility/query.hpp>
2828
#include <rviz_common/display_context.hpp>
2929

3030
#include <lanelet2_core/primitives/RegulatoryElement.h>

Diff for: common/traffic_light_recognition_marker_publisher/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<buildtool_depend>ament_cmake</buildtool_depend>
1313
<buildtool_depend>autoware_cmake</buildtool_depend>
1414

15+
<depend>autoware_lanelet2_extension</depend>
1516
<depend>autoware_map_msgs</depend>
1617
<depend>autoware_perception_msgs</depend>
1718
<depend>autoware_universe_utils</depend>
1819
<depend>geometry_msgs</depend>
19-
<depend>lanelet2_extension</depend>
2020
<depend>rclcpp</depend>
2121
<depend>rclcpp_components</depend>
2222
<depend>visualization_msgs</depend>

Diff for: common/traffic_light_recognition_marker_publisher/src/traffic_light_recognition_marker_publisher.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#ifndef TRAFFIC_LIGHT_RECOGNITION_MARKER_PUBLISHER_HPP_
1616
#define TRAFFIC_LIGHT_RECOGNITION_MARKER_PUBLISHER_HPP_
1717

18-
#include <lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp>
19-
#include <lanelet2_extension/utility/message_conversion.hpp>
20-
#include <lanelet2_extension/utility/query.hpp>
21-
#include <lanelet2_extension/visualization/visualization.hpp>
18+
#include <autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp>
19+
#include <autoware_lanelet2_extension/utility/message_conversion.hpp>
20+
#include <autoware_lanelet2_extension/utility/query.hpp>
21+
#include <autoware_lanelet2_extension/visualization/visualization.hpp>
2222
#include <rclcpp/rclcpp.hpp>
2323

2424
#include <autoware_map_msgs/msg/lanelet_map_bin.hpp>

Diff for: common/traffic_light_utils/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<test_depend>ament_lint_auto</test_depend>
1717
<test_depend>autoware_lint_common</test_depend>
1818

19+
<depend>autoware_lanelet2_extension</depend>
1920
<depend>autoware_perception_msgs</depend>
20-
<depend>lanelet2_extension</depend>
2121
<depend>tier4_perception_msgs</depend>
2222

2323
<export>

Diff for: common/tvm_utility/include/tvm_utility/pipeline.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ class PipelineStage
9393
* @return The output of the pipeline
9494
*/
9595
virtual OutputType schedule(const InputType & input) = 0;
96+
virtual ~PipelineStage() {}
9697
InputType input_type_indicator_;
9798
OutputType output_type_indicator_;
9899
};
@@ -299,7 +300,7 @@ class InferenceEngineTVM : public InferenceEngine
299300
}
300301
}
301302

302-
TVMArrayContainerVector schedule(const TVMArrayContainerVector & input)
303+
TVMArrayContainerVector schedule(const TVMArrayContainerVector & input) override
303304
{
304305
// Set input(s)
305306
for (uint32_t index = 0; index < input.size(); ++index) {

0 commit comments

Comments
 (0)