Skip to content

Commit d322b38

Browse files
authored
Merge branch 'main' into fix/segmentation_pointcloud_fusion/fix_mask_size
2 parents 3f0d0d9 + bcad7b9 commit d322b38

File tree

267 files changed

+3125
-1749
lines changed

Some content is hidden

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

267 files changed

+3125
-1749
lines changed

.cppcheck_suppressions

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
*:*/test/*
22

3-
arrayIndexThenCheck
43
checkersReport
5-
constParameterPointer
64
constParameterReference
7-
constVariable
85
constVariableReference
9-
containerOutOfBounds
6+
// cspell: ignore cstyle
107
cstyleCast
118
duplicateBranch
12-
duplicateBreak
139
funcArgNamesDifferent
1410
functionConst
1511
functionStatic
@@ -23,18 +19,16 @@ noValidConfiguration
2319
passedByValue
2420
preprocessorErrorDirective
2521
redundantInitialization
26-
returnByReference
27-
shadowArgument
2822
shadowFunction
2923
shadowVariable
3024
syntaxError
25+
// cspell: ignore uninit
3126
uninitMemberVar
3227
unknownMacro
3328
unmatchedSuppression
3429
unreadVariable
3530
unusedFunction
3631
unusedStructMember
37-
unusedVariable
3832
useInitializationList
3933
useStlAlgorithm
4034
uselessOverride

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,12 @@ planning/behavior_velocity_planner/autoware_behavior_velocity_occlusion_spot_mod
185185
planning/behavior_velocity_planner/autoware_behavior_velocity_planner/** kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp makoto.kurihara@tier4.jp mamoru.sobue@tier4.jp maxime.clement@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
186186
planning/behavior_velocity_planner/autoware_behavior_velocity_planner_common/** fumiya.watanabe@tier4.jp isamu.takagi@tier4.jp mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
187187
planning/behavior_velocity_planner/autoware_behavior_velocity_run_out_module/** kosuke.takeuchi@tier4.jp makoto.kurihara@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
188+
planning/behavior_velocity_planner/autoware_behavior_velocity_speed_bump_module/** mdogru@leodrive.ai shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
188189
planning/behavior_velocity_planner/autoware_behavior_velocity_stop_line_module/** fumiya.watanabe@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp zhe.shen@tier4.jp
189190
planning/behavior_velocity_planner/autoware_behavior_velocity_template_module/** daniel.sanchez@tier4.jp
190191
planning/behavior_velocity_planner/autoware_behavior_velocity_traffic_light_module/** mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
191192
planning/behavior_velocity_planner/autoware_behavior_velocity_virtual_traffic_light_module/** kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
192193
planning/behavior_velocity_planner/autoware_behavior_velocity_walkway_module/** satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp
193-
planning/behavior_velocity_planner/behavior_velocity_speed_bump_module/** mdogru@leodrive.ai shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
194194
planning/motion_velocity_planner/autoware_motion_velocity_dynamic_obstacle_stop_module/** mamoru.sobue@tier4.jp maxime.clement@tier4.jp
195195
planning/motion_velocity_planner/autoware_motion_velocity_obstacle_velocity_limiter_module/** maxime.clement@tier4.jp
196196
planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/** maxime.clement@tier4.jp shumpei.wakabayashi@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp

.github/PULL_REQUEST_TEMPLATE.md

-8
This file was deleted.

.github/PULL_REQUEST_TEMPLATE/small-change.md

-44
This file was deleted.

.github/PULL_REQUEST_TEMPLATE/standard-change.md

-63
This file was deleted.

.github/pull_request_template.md

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
## Description
2+
3+
## Related links
4+
5+
**Parent Issue:**
6+
7+
- Link
8+
9+
<!-- ⬇️🟢
10+
**Private Links:**
11+
12+
- [CompanyName internal link]()
13+
⬆️🟢 -->
14+
15+
## How was this PR tested?
16+
17+
## Notes for reviewers
18+
19+
None.
20+
21+
## Interface changes
22+
23+
None.
24+
25+
<!-- ⬇️🔴
26+
27+
### Topic changes
28+
29+
#### Additions and removals
30+
31+
| Change type | Topic Type | Topic Name | Message Type | Description |
32+
|:--------------|:----------------|:--------------|:--------------------|:------------------|
33+
| Added/Removed | Pub/Sub/Srv/Cli | `/topic_name` | `std_msgs/String` | Topic description |
34+
35+
#### Modifications
36+
37+
| Version | Topic Type | Topic Name | Message Type | Description |
38+
|:--------|:----------------|:------------------|:--------------------|:------------------|
39+
| Old | Pub/Sub/Srv/Cli | `/old_topic_name` | `sensor_msgs/Image` | Topic description |
40+
| New | Pub/Sub/Srv/Cli | `/new_topic_name` | `sensor_msgs/Image` | Topic description |
41+
42+
### ROS Parameter Changes
43+
44+
#### Additions and removals
45+
46+
| Change type | Parameter Name | Type | Default Value | Description |
47+
|:--------------|:---------------|:---------|:--------------|:------------------|
48+
| Added/Removed | `param_name` | `double` | `1.0` | Param description |
49+
50+
#### Modifications
51+
52+
| Version | Parameter Name | Type | Default Value | Description |
53+
|:--------|:-----------------|:---------|:--------------|:------------------|
54+
| Old | `old_param_name` | `double` | `1.0` | Param description |
55+
| New | `new_param_name` | `double` | `1.0` | Param description |
56+
57+
🔴⬆️ -->
58+
59+
## Effects on system behavior
60+
61+
None.

.github/sync-files.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
- source: .github/ISSUE_TEMPLATE/bug.yaml
88
- source: .github/ISSUE_TEMPLATE/config.yml
99
- source: .github/ISSUE_TEMPLATE/task.yaml
10-
- source: .github/PULL_REQUEST_TEMPLATE.md
11-
- source: .github/PULL_REQUEST_TEMPLATE/small-change.md
12-
- source: .github/PULL_REQUEST_TEMPLATE/standard-change.md
1310
- source: .github/dependabot.yaml
1411
- source: .github/stale.yml
1512
- source: .github/workflows/cancel-previous-workflows.yaml

.github/workflows/build-and-test-daily-arm64.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,24 @@ jobs:
3737
id: get-self-packages
3838
uses: autowarefoundation/autoware-github-actions/get-self-packages@v1
3939

40+
- name: Export CUDA state as a variable for adding to cache key
41+
run: |
42+
build_type_cuda_state=nocuda
43+
if [[ "${{ matrix.container-suffix }}" == "-cuda" ]]; then
44+
build_type_cuda_state=cuda
45+
fi
46+
echo "BUILD_TYPE_CUDA_STATE=$build_type_cuda_state" >> "${GITHUB_ENV}"
47+
echo "::notice::BUILD_TYPE_CUDA_STATE=$build_type_cuda_state"
48+
shell: bash
49+
4050
- name: Build
4151
if: ${{ steps.get-self-packages.outputs.self-packages != '' }}
4252
uses: autowarefoundation/autoware-github-actions/colcon-build@v1
4353
with:
4454
rosdistro: ${{ matrix.rosdistro }}
4555
target-packages: ${{ steps.get-self-packages.outputs.self-packages }}
4656
build-depends-repos: ${{ matrix.build-depends-repos }}
57+
cache-key-element: ${{ env.BUILD_TYPE_CUDA_STATE }}
4758

4859
- name: Test
4960
if: ${{ steps.get-self-packages.outputs.self-packages != '' }}

.github/workflows/build-and-test-daily.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,24 @@ jobs:
3737
id: get-self-packages
3838
uses: autowarefoundation/autoware-github-actions/get-self-packages@v1
3939

40+
- name: Export CUDA state as a variable for adding to cache key
41+
run: |
42+
build_type_cuda_state=nocuda
43+
if [[ "${{ matrix.container-suffix }}" == "-cuda" ]]; then
44+
build_type_cuda_state=cuda
45+
fi
46+
echo "BUILD_TYPE_CUDA_STATE=$build_type_cuda_state" >> "${GITHUB_ENV}"
47+
echo "::notice::BUILD_TYPE_CUDA_STATE=$build_type_cuda_state"
48+
shell: bash
49+
4050
- name: Build
4151
if: ${{ steps.get-self-packages.outputs.self-packages != '' }}
4252
uses: autowarefoundation/autoware-github-actions/colcon-build@v1
4353
with:
4454
rosdistro: ${{ matrix.rosdistro }}
4555
target-packages: ${{ steps.get-self-packages.outputs.self-packages }}
4656
build-depends-repos: ${{ matrix.build-depends-repos }}
57+
cache-key-element: ${{ env.BUILD_TYPE_CUDA_STATE }}
4758

4859
- name: Test
4960
if: ${{ steps.get-self-packages.outputs.self-packages != '' }}

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

+11
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,24 @@ jobs:
5151
id: get-modified-packages
5252
uses: autowarefoundation/autoware-github-actions/get-modified-packages@v1
5353

54+
- name: Export CUDA state as a variable for adding to cache key
55+
run: |
56+
build_type_cuda_state=nocuda
57+
if [[ "${{ matrix.container-suffix }}" == "-cuda" ]]; then
58+
build_type_cuda_state=cuda
59+
fi
60+
echo "BUILD_TYPE_CUDA_STATE=$build_type_cuda_state" >> "${GITHUB_ENV}"
61+
echo "::notice::BUILD_TYPE_CUDA_STATE=$build_type_cuda_state"
62+
shell: bash
63+
5464
- name: Build
5565
if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
5666
uses: autowarefoundation/autoware-github-actions/colcon-build@v1
5767
with:
5868
rosdistro: ${{ matrix.rosdistro }}
5969
target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }}
6070
build-depends-repos: ${{ matrix.build-depends-repos }}
71+
cache-key-element: ${{ env.BUILD_TYPE_CUDA_STATE }}
6172

6273
- name: Test
6374
id: test

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

+55
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,24 @@ jobs:
7474
run: du -sh ${CCACHE_DIR} && ccache -s
7575
shell: bash
7676

77+
- name: Export CUDA state as a variable for adding to cache key
78+
run: |
79+
build_type_cuda_state=nocuda
80+
if [[ "${{ matrix.container-suffix }}" == "-cuda" ]]; then
81+
build_type_cuda_state=cuda
82+
fi
83+
echo "BUILD_TYPE_CUDA_STATE=$build_type_cuda_state" >> "${GITHUB_ENV}"
84+
echo "::notice::BUILD_TYPE_CUDA_STATE=$build_type_cuda_state"
85+
shell: bash
86+
7787
- name: Build
7888
if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
7989
uses: autowarefoundation/autoware-github-actions/colcon-build@v1
8090
with:
8191
rosdistro: ${{ matrix.rosdistro }}
8292
target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }}
8393
build-depends-repos: ${{ matrix.build-depends-repos }}
94+
cache-key-element: ${{ env.BUILD_TYPE_CUDA_STATE }}
8495

8596
- name: Show ccache stats after build
8697
run: du -sh ${CCACHE_DIR} && ccache -s
@@ -106,3 +117,47 @@ jobs:
106117

107118
- name: Show disk space after the tasks
108119
run: df -h
120+
121+
clang-tidy-differential:
122+
needs: build-and-test-differential
123+
runs-on: ubuntu-latest
124+
container: ghcr.io/autowarefoundation/autoware:latest-prebuilt-cuda
125+
steps:
126+
- name: Set PR fetch depth
127+
run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}"
128+
129+
- name: Checkout PR branch and all PR commits
130+
uses: actions/checkout@v4
131+
with:
132+
ref: ${{ github.event.pull_request.head.sha }}
133+
fetch-depth: ${{ env.PR_FETCH_DEPTH }}
134+
135+
- name: Show disk space before the tasks
136+
run: df -h
137+
138+
- name: Remove exec_depend
139+
uses: autowarefoundation/autoware-github-actions/remove-exec-depend@v1
140+
141+
- name: Get modified packages
142+
id: get-modified-packages
143+
uses: autowarefoundation/autoware-github-actions/get-modified-packages@v1
144+
145+
- name: Get changed files (existing files only)
146+
id: get-changed-files
147+
run: |
148+
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
149+
shell: bash
150+
151+
- name: Run clang-tidy
152+
if: ${{ steps.get-changed-files.outputs.changed-files != '' }}
153+
uses: autowarefoundation/autoware-github-actions/clang-tidy@v1
154+
with:
155+
rosdistro: humble
156+
target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }}
157+
target-files: ${{ steps.get-changed-files.outputs.changed-files }}
158+
clang-tidy-config-url: https://raw.githubusercontent.com/autowarefoundation/autoware/main/.clang-tidy
159+
build-depends-repos: build_depends.repos
160+
cache-key-element: cuda
161+
162+
- name: Show disk space after the tasks
163+
run: df -h

0 commit comments

Comments
 (0)