Skip to content

Commit f66d080

Browse files
YamatoAndoYamatoAndo
authored
Merge branch 'main' into refactor/ndt_scan_matcher/rework_parameters
2 parents ec3e221 + fa8424d commit f66d080

File tree

154 files changed

+5917
-1458
lines changed

Some content is hidden

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

154 files changed

+5917
-1458
lines changed

‎.github/CODEOWNERS

+24-21
Large diffs are not rendered by default.

‎.github/workflows/build-and-test-differential.yaml

+8-13
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,10 @@ name: build-and-test-differential
22

33
on:
44
pull_request:
5-
types:
6-
- opened
7-
- synchronize
8-
- labeled
95

106
jobs:
11-
prevent-no-label-execution:
12-
uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
13-
with:
14-
label: tag:run-build-and-test-differential
15-
167
build-and-test-differential:
17-
needs: prevent-no-label-execution
18-
if: ${{ needs.prevent-no-label-execution.outputs.run == 'true' }}
19-
runs-on: [self-hosted, linux, X64]
8+
runs-on: ubuntu-latest
209
container: ${{ matrix.container }}${{ matrix.container-suffix }}
2110
strategy:
2211
fail-fast: false
@@ -36,6 +25,9 @@ jobs:
3625
with:
3726
fetch-depth: 0
3827

28+
- name: Check disk space before build
29+
run: df -h
30+
3931
- name: Remove exec_depend
4032
uses: autowarefoundation/autoware-github-actions/remove-exec-depend@v1
4133

@@ -69,8 +61,11 @@ jobs:
6961
verbose: true
7062
flags: differential
7163

64+
- name: Check disk space after build
65+
run: df -h
66+
7267
clang-tidy-differential:
73-
runs-on: [self-hosted, linux, X64]
68+
runs-on: ubuntu-latest
7469
container: ghcr.io/autowarefoundation/autoware-universe:humble-latest-cuda
7570
needs: build-and-test-differential
7671
steps:

‎.github/workflows/spell-check-differential.yaml

-16
This file was deleted.

‎common/autoware_auto_perception_rviz_plugin/package.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
<maintainer email="satoshi.tanaka@tier4.jp">Satoshi Tanaka</maintainer>
99
<maintainer email="taiki.tanaka@tier4.jp">Taiki Tanaka</maintainer>
1010
<maintainer email="takeshi.miura@tier4.jp">Takeshi Miura</maintainer>
11-
11+
<maintainer email="shunsuke.miura@tier4.jp">Shunsuke Miura</maintainer>
12+
<maintainer email="yoshi.ri@tier4.jp">Yoshi Ri</maintainer>
1213
<license>Apache 2.0</license>
1314

1415
<buildtool_depend>ament_cmake</buildtool_depend>

‎common/object_recognition_utils/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<description>The object_recognition_utils package</description>
77
<maintainer email="takayuki.murooka@tier4.jp">Takayuki Murooka</maintainer>
88
<maintainer email="satoshi.tanaka@tier4.jp">Satoshi Tanaka</maintainer>
9-
<maintainer email="yusuke.muramatsu@tier4.jp">Yusuke Muramatsu</maintainer>
109
<maintainer email="shunsuke.miura@tier4.jp">Shunsuke Miura</maintainer>
10+
<maintainer email="yoshi.ri@tier4.jp">Yoshi Ri</maintainer>
1111
<license>Apache License 2.0</license>
1212

1313
<buildtool_depend>ament_cmake_auto</buildtool_depend>

‎common/perception_utils/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<version>0.1.0</version>
66
<description>The perception_utils package</description>
77
<maintainer email="satoshi.tanaka@tier4.jp">Satoshi Tanaka</maintainer>
8-
<maintainer email="yusuke.muramatsu@tier4.jp">Yusuke Muramatsu</maintainer>
98
<maintainer email="shunsuke.miura@tier4.jp">Shunsuke Miura</maintainer>
9+
<maintainer email="yoshi.ri@tier4.jp">Yoshi Ri</maintainer>
1010
<license>Apache License 2.0</license>
1111

1212
<buildtool_depend>ament_cmake_auto</buildtool_depend>

‎common/tensorrt_common/include/tensorrt_common/logger.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ namespace
493493
//!
494494
inline LogStreamConsumer LOG_VERBOSE(const Logger & logger)
495495
{
496-
return LogStreamConsumer(logger.getReportableSeverity(), Severity::kVERBOSE) << "[TRT] ";
496+
return LogStreamConsumer(logger.getReportableSeverity(), Severity::kVERBOSE);
497497
}
498498

499499
//!
@@ -505,7 +505,7 @@ inline LogStreamConsumer LOG_VERBOSE(const Logger & logger)
505505
//!
506506
inline LogStreamConsumer LOG_INFO(const Logger & logger)
507507
{
508-
return LogStreamConsumer(logger.getReportableSeverity(), Severity::kINFO) << "[TRT] ";
508+
return LogStreamConsumer(logger.getReportableSeverity(), Severity::kINFO);
509509
}
510510

511511
//!
@@ -517,7 +517,7 @@ inline LogStreamConsumer LOG_INFO(const Logger & logger)
517517
//!
518518
inline LogStreamConsumer LOG_WARN(const Logger & logger)
519519
{
520-
return LogStreamConsumer(logger.getReportableSeverity(), Severity::kWARNING) << "[TRT] ";
520+
return LogStreamConsumer(logger.getReportableSeverity(), Severity::kWARNING);
521521
}
522522

523523
//!
@@ -529,7 +529,7 @@ inline LogStreamConsumer LOG_WARN(const Logger & logger)
529529
//!
530530
inline LogStreamConsumer LOG_ERROR(const Logger & logger)
531531
{
532-
return LogStreamConsumer(logger.getReportableSeverity(), Severity::kERROR) << "[TRT] ";
532+
return LogStreamConsumer(logger.getReportableSeverity(), Severity::kERROR);
533533
}
534534

535535
//!
@@ -543,7 +543,7 @@ inline LogStreamConsumer LOG_ERROR(const Logger & logger)
543543
//!
544544
inline LogStreamConsumer LOG_FATAL(const Logger & logger)
545545
{
546-
return LogStreamConsumer(logger.getReportableSeverity(), Severity::kINTERNAL_ERROR) << "[TRT] ";
546+
return LogStreamConsumer(logger.getReportableSeverity(), Severity::kINTERNAL_ERROR);
547547
}
548548

549549
} // anonymous namespace

‎control/control_validator/package.xml

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<maintainer email="kyoichi.sugahara@tier4.jp">Kyoichi Sugahara</maintainer>
88
<maintainer email="takamasa.horibe@tier4.jp">Takamasa Horibe</maintainer>
99
<maintainer email="makoto.kurihara@tier4.jp">Makoto Kurihara</maintainer>
10+
<maintainer email="mamoru.sobue@tier4.jp">Mamoru Sobue</maintainer>
11+
<maintainer email="takayuki.murooka@tier4.jp">Takayuki Murooka</maintainer>
12+
1013
<license>Apache License 2.0</license>
1114

1215
<author email="kyoichi.sugahara@tier4.jp">Kyoichi Sugahara</author>

‎launch/tier4_localization_launch/launch/pose_twist_fusion_filter/pose_twist_fusion_filter.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
<group>
2929
<include file="$(find-pkg-share twist2accel)/launch/twist2accel.launch.xml">
30-
<arg name="use_odom" value="true"/>
3130
<arg name="in_odom" value="/localization/kinematic_state"/>
3231
<arg name="in_twist" value="/localization/twist_estimator/twist_with_covariance"/>
3332
<arg name="out_accel" value="/localization/acceleration"/>
33+
<arg name="param_file" value="$(var twist2accel_param_path)"/>
3434
</include>
3535
</group>
3636

‎launch/tier4_map_launch/launch/map.launch.py

-223
This file was deleted.

0 commit comments

Comments
 (0)