Skip to content

Commit 7ef1cc2

Browse files
vividfvividf
committed
Merge branch 'vividf-feature/distortion_corrector_unit_test'
2 parents a7e83ff + 9288506 commit 7ef1cc2

File tree

381 files changed

+10477
-6793
lines changed

Some content is hidden

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

381 files changed

+10477
-6793
lines changed

‎.cppcheck_suppressions

-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
checkersReport
44
constParameterReference
5-
constVariable
65
constVariableReference
7-
containerOutOfBounds
86
// cspell: ignore cstyle
97
cstyleCast
10-
duplicateBranch
11-
duplicateBreak
128
funcArgNamesDifferent
139
functionConst
1410
functionStatic
@@ -32,7 +28,6 @@ unmatchedSuppression
3228
unreadVariable
3329
unusedFunction
3430
unusedStructMember
35-
unusedVariable
3631
useInitializationList
3732
useStlAlgorithm
3833
uselessOverride

‎.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

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

+12
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 != '' }}
@@ -62,6 +73,7 @@ jobs:
6273
fail_ci_if_error: false
6374
verbose: true
6475
flags: total-arm64
76+
token: ${{ secrets.CODECOV_TOKEN }}
6577

6678
- name: Show disk space after the tasks
6779
run: df -h

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

+12
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 != '' }}
@@ -62,6 +73,7 @@ jobs:
6273
fail_ci_if_error: false
6374
verbose: true
6475
flags: total
76+
token: ${{ secrets.CODECOV_TOKEN }}
6577

6678
- name: Show disk space after the tasks
6779
run: df -h

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

+12
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
@@ -76,6 +87,7 @@ jobs:
7687
fail_ci_if_error: false
7788
verbose: true
7889
flags: differential-arm64
90+
token: ${{ secrets.CODECOV_TOKEN }}
7991

8092
- name: Show disk space after the tasks
8193
run: df -h

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

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

107163
- name: Show disk space after the tasks
108164
run: df -h

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

+12
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,24 @@ jobs:
6666
run: du -sh ${CCACHE_DIR} && ccache -s
6767
shell: bash
6868

69+
- name: Export CUDA state as a variable for adding to cache key
70+
run: |
71+
build_type_cuda_state=nocuda
72+
if [[ "${{ matrix.container-suffix }}" == "-cuda" ]]; then
73+
build_type_cuda_state=cuda
74+
fi
75+
echo "BUILD_TYPE_CUDA_STATE=$build_type_cuda_state" >> "${GITHUB_ENV}"
76+
echo "::notice::BUILD_TYPE_CUDA_STATE=$build_type_cuda_state"
77+
shell: bash
78+
6979
- name: Build
7080
if: ${{ steps.get-self-packages.outputs.self-packages != '' }}
7181
uses: autowarefoundation/autoware-github-actions/colcon-build@v1
7282
with:
7383
rosdistro: ${{ matrix.rosdistro }}
7484
target-packages: ${{ steps.get-self-packages.outputs.self-packages }}
7585
build-depends-repos: ${{ matrix.build-depends-repos }}
86+
cache-key-element: ${{ env.BUILD_TYPE_CUDA_STATE }}
7687

7788
- name: Show ccache stats after build
7889
run: du -sh ${CCACHE_DIR} && ccache -s
@@ -104,6 +115,7 @@ jobs:
104115
fail_ci_if_error: false
105116
verbose: true
106117
flags: total
118+
token: ${{ secrets.CODECOV_TOKEN }}
107119

108120
- name: Show disk space after the tasks
109121
run: df -h

‎.github/workflows/clang-tidy-differential.yaml

-55
This file was deleted.

‎.github/workflows/cppcheck-daily.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
continue-on-error: true
2323
id: cppcheck
2424
run: |
25-
cppcheck --enable=all --inconclusive --check-level=exhaustive --suppress=*:*/test/* --error-exitcode=1 --xml . 2> cppcheck-report.xml
25+
cppcheck --enable=all --inconclusive --check-level=exhaustive --suppress=*:*/test/* --error-exitcode=1 --xml --inline-suppr . 2> cppcheck-report.xml
2626
shell: bash
2727

2828
- name: Count errors by error ID and severity

‎.github/workflows/cppcheck-differential.yaml

+27-11
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ jobs:
2222
sudo apt-get update
2323
sudo apt-get install -y git
2424
25+
- name: Install colcon
26+
run: |
27+
sudo sh -c 'echo "deb [arch=amd64,arm64] http://repo.ros2.org/ubuntu/main `lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-latest.list'
28+
curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
29+
sudo apt update
30+
sudo apt install python3-colcon-common-extensions
31+
2532
# cppcheck from apt does not yet support --check-level args, and thus install from snap
2633
- name: Install Cppcheck from snap
2734
run: |
@@ -31,33 +38,42 @@ jobs:
3138
run: git fetch origin ${{ github.base_ref }}
3239
shell: bash
3340

34-
- name: Get changed files (existing files only)
35-
id: get-changed-files
41+
- name: Get modified packages
42+
id: get-modified-packages
43+
uses: autowarefoundation/autoware-github-actions/get-modified-packages@v1
44+
45+
- name: Get full paths of modified packages
46+
id: get-full-paths
3647
run: |
37-
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
38-
shell: bash
48+
modified_packages="${{ steps.get-modified-packages.outputs.modified-packages }}"
49+
paths=""
50+
for pkg in $modified_packages; do
51+
path=$(colcon list --packages-select $pkg | awk '{print $2}' | xargs realpath)
52+
paths="$paths $path"
53+
done
54+
echo "full-paths=$paths" >> $GITHUB_OUTPUT
3955
40-
- name: Run Cppcheck on changed files
41-
if: ${{ steps.get-changed-files.outputs.changed-files != '' }}
56+
- name: Run Cppcheck on modified packages
57+
if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
4258
continue-on-error: true
4359
id: cppcheck
4460
run: |
45-
echo "Running Cppcheck on changed files: ${{ steps.get-changed-files.outputs.changed-files }}"
46-
cppcheck --enable=all --inconclusive --check-level=exhaustive --error-exitcode=1 --suppressions-list=.cppcheck_suppressions ${{ steps.get-changed-files.outputs.changed-files }} 2> cppcheck-report.txt
61+
echo "Running Cppcheck on modified packages: ${{ steps.get-modified-packages.outputs.modified-packages }}"
62+
cppcheck --enable=all --inconclusive --check-level=exhaustive --error-exitcode=1 --suppressions-list=.cppcheck_suppressions --inline-suppr ${{ steps.get-full-paths.outputs.full-paths }} 2> cppcheck-report.txt
4763
shell: bash
4864

4965
- name: Show cppcheck-report result
50-
if: ${{ steps.get-changed-files.outputs.changed-files != '' }}
66+
if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
5167
run: |
5268
cat cppcheck-report.txt
5369
5470
- name: Upload Cppcheck report
55-
if: ${{ steps.get-changed-files.outputs.changed-files != '' }}
71+
if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
5672
uses: actions/upload-artifact@v2
5773
with:
5874
name: cppcheck-report
5975
path: cppcheck-report.txt
6076

6177
- name: Fail the job if Cppcheck failed
62-
if: ${{ steps.get-changed-files.outputs.changed-files != '' && steps.cppcheck.outcome == 'failure' }}
78+
if: ${{ steps.get-modified-packages.outputs.modified-packages != '' && steps.cppcheck.outcome == 'failure' }}
6379
run: exit 1

‎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

‎common/autoware_overlay_rviz_plugin/autoware_overlay_rviz_plugin/assets/images/wheel.png

4.07 KB
Loading

0 commit comments

Comments
 (0)