Skip to content

Commit b5b8afd

Browse files
authored
Merge branch 'main' into feat/tier4_state_rviz_plugin/sub_by_polling
2 parents 572e660 + a6b5f27 commit b5b8afd

File tree

131 files changed

+1443
-426
lines changed

Some content is hidden

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

131 files changed

+1443
-426
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ common/geography_utils/** koji.minoda@tier4.jp
1616
common/global_parameter_loader/** ryohsuke.mitsudome@tier4.jp
1717
common/glog_component/** takamasa.horibe@tier4.jp
1818
common/goal_distance_calculator/** taiki.tanaka@tier4.jp
19-
common/grid_map_utils/** maxime.clement@tier4.jp
19+
common/autoware_grid_map_utils/** maxime.clement@tier4.jp
2020
common/interpolation/** fumiya.watanabe@tier4.jp takayuki.murooka@tier4.jp
2121
common/kalman_filter/** koji.minoda@tier4.jp takeshi.ishita@tier4.jp yukihiro.saito@tier4.jp
2222
common/motion_utils/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp

.github/workflows/cancel-previous-workflows.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Cancel previous runs
11-
uses: styfle/cancel-workflow-action@0.12.0
11+
uses: styfle/cancel-workflow-action@0.12.1
1212
with:
1313
workflow_id: all
1414
all_but_latest: true

.github/workflows/check-build-depends.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
build-depends-repos: build_depends.repos
2121
steps:
2222
- name: Check out repository
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v3
2424

2525
- name: Remove exec_depend
2626
uses: autowarefoundation/autoware-github-actions/remove-exec-depend@v1

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

+15-7
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,29 @@ on:
55
types:
66
- opened
77
- synchronize
8+
- reopened
89
- labeled
910

1011
jobs:
11-
prevent-no-label-execution:
12-
uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
12+
make-sure-label-is-present:
13+
uses: autowarefoundation/autoware-github-actions/.github/workflows/make-sure-label-is-present.yaml@v1
1314
with:
1415
label: tag:run-clang-tidy-differential
1516

1617
clang-tidy-differential:
17-
needs: prevent-no-label-execution
18-
if: ${{ needs.prevent-no-label-execution.outputs.run == 'true' }}
18+
needs: make-sure-label-is-present
19+
if: ${{ needs.make-sure-label-is-present.outputs.result == 'true' }}
1920
runs-on: ubuntu-latest
2021
container: ghcr.io/autowarefoundation/autoware:latest-prebuilt-cuda
2122
steps:
22-
- name: Check out repository
23+
- name: Set PR fetch depth
24+
run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}"
25+
26+
- name: Checkout PR branch and all PR commits
2327
uses: actions/checkout@v4
2428
with:
25-
fetch-depth: 0
29+
ref: ${{ github.event.pull_request.head.sha }}
30+
fetch-depth: ${{ env.PR_FETCH_DEPTH }}
2631

2732
- name: Show disk space before the tasks
2833
run: df -h
@@ -36,7 +41,7 @@ jobs:
3641

3742
- name: Get modified files
3843
id: get-modified-files
39-
uses: tj-actions/changed-files@v35
44+
uses: tj-actions/changed-files@v42
4045
with:
4146
files: |
4247
**/*.cpp
@@ -51,3 +56,6 @@ jobs:
5156
target-files: ${{ steps.get-modified-files.outputs.all_changed_files }}
5257
clang-tidy-config-url: https://raw.githubusercontent.com/autowarefoundation/autoware/main/.clang-tidy
5358
build-depends-repos: build_depends.repos
59+
60+
- name: Show disk space after the tasks
61+
run: df -h

.github/workflows/clang-tidy-pr-comments-manually.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out repository
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v3
1515

1616
- name: Download analysis results
1717
run: |
@@ -36,7 +36,7 @@ jobs:
3636
3737
- name: Check out PR head
3838
if: ${{ steps.check-fixes-yaml-existence.outputs.exists == 'true' }}
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v3
4040
with:
4141
repository: ${{ steps.set-variables.outputs.pr-head-repo }}
4242
ref: ${{ steps.set-variables.outputs.pr-head-ref }}

.github/workflows/clang-tidy-pr-comments.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Check out repository
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v3
1717

1818
- name: Download analysis results
1919
run: |
@@ -37,7 +37,7 @@ jobs:
3737
3838
- name: Check out PR head
3939
if: ${{ steps.check-fixes-yaml-existence.outputs.exists == 'true' }}
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v3
4141
with:
4242
repository: ${{ steps.set-variables.outputs.pr-head-repo }}
4343
ref: ${{ steps.set-variables.outputs.pr-head-ref }}

.github/workflows/delete-closed-pr-docs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Check out repository
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v3
1414
with:
1515
fetch-depth: 0
1616

.github/workflows/deploy-docs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Check out repository
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v3
3434
with:
3535
fetch-depth: 0
3636
ref: ${{ github.event.pull_request.head.sha }}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: pre-commit-autoupdate
2+
3+
on:
4+
schedule:
5+
- cron: 0 0 * * *
6+
workflow_dispatch:
7+
8+
jobs:
9+
check-secret:
10+
uses: autowarefoundation/autoware-github-actions/.github/workflows/check-secret.yaml@v1
11+
secrets:
12+
secret: ${{ secrets.APP_ID }}
13+
14+
pre-commit-autoupdate:
15+
needs: check-secret
16+
if: ${{ needs.check-secret.outputs.set == 'true' }}
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Generate token
20+
id: generate-token
21+
uses: tibdex/github-app-token@v2
22+
with:
23+
app_id: ${{ secrets.APP_ID }}
24+
private_key: ${{ secrets.PRIVATE_KEY }}
25+
26+
- name: Run pre-commit-autoupdate
27+
uses: autowarefoundation/autoware-github-actions/pre-commit-autoupdate@v1
28+
with:
29+
token: ${{ steps.generate-token.outputs.token }}
30+
pre-commit-config: .pre-commit-config.yaml
31+
pr-labels: |
32+
tag:bot
33+
tag:pre-commit-autoupdate
34+
pr-branch: pre-commit-autoupdate
35+
pr-title: "ci(pre-commit): autoupdate"
36+
pr-commit-message: "ci(pre-commit): autoupdate"
37+
auto-merge-method: squash

.github/workflows/pre-commit.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- name: Generate token
1212
id: generate-token
13-
uses: tibdex/github-app-token@v1
13+
uses: tibdex/github-app-token@v2
1414
with:
1515
app_id: ${{ secrets.APP_ID }}
1616
private_key: ${{ secrets.PRIVATE_KEY }}
+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: spell-check-daily
2+
3+
on:
4+
schedule:
5+
- cron: 0 0 * * *
6+
workflow_dispatch:
7+
8+
jobs:
9+
spell-check-daily:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check out repository
13+
uses: actions/checkout@v4
14+
15+
- name: Run spell-check
16+
uses: autowarefoundation/autoware-github-actions/spell-check@v1
17+
with:
18+
local-cspell-json: .cspell.json
19+
incremental-files-only: false
20+
cspell-json-url: https://raw.githubusercontent.com/tier4/autoware-spell-check-dict/main/.cspell.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: spell-check-differential
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
spell-check-differential:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Check out repository
11+
uses: actions/checkout@v4
12+
13+
- name: Run spell-check
14+
uses: autowarefoundation/autoware-github-actions/spell-check@v1
15+
with:
16+
local-cspell-json: .cspell.json
17+
cspell-json-url: https://raw.githubusercontent.com/tier4/autoware-spell-check-dict/main/.cspell.json

.github/workflows/sync-files.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- name: Generate token
2020
id: generate-token
21-
uses: tibdex/github-app-token@v1
21+
uses: tibdex/github-app-token@v2
2222
with:
2323
app_id: ${{ secrets.APP_ID }}
2424
private_key: ${{ secrets.PRIVATE_KEY }}

.github/workflows/update-codeowners-from-packages.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- name: Generate token
2020
id: generate-token
21-
uses: tibdex/github-app-token@v1
21+
uses: tibdex/github-app-token@v2
2222
with:
2323
app_id: ${{ secrets.APP_ID }}
2424
private_key: ${{ secrets.PRIVATE_KEY }}

.markdownlint.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ MD029:
77
style: ordered
88
MD033: false
99
MD041: false
10+
MD045: false
1011
MD046: false
1112
MD049: false

.pre-commit-config-optional.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/tcort/markdown-link-check
3-
rev: v3.11.2
3+
rev: v3.12.2
44
hooks:
55
- id: markdown-link-check
66
args: [--quiet, --config=.markdown-link-check.json]

.pre-commit-config.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ci:
33

44
repos:
55
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v4.4.0
6+
rev: v4.6.0
77
hooks:
88
- id: check-json
99
- id: check-merge-conflict
@@ -18,18 +18,18 @@ repos:
1818
args: [--markdown-linebreak-ext=md]
1919

2020
- repo: https://github.com/igorshubovych/markdownlint-cli
21-
rev: v0.33.0
21+
rev: v0.41.0
2222
hooks:
2323
- id: markdownlint
2424
args: [-c, .markdownlint.yaml, --fix]
2525

2626
- repo: https://github.com/pre-commit/mirrors-prettier
27-
rev: v3.0.0-alpha.6
27+
rev: v4.0.0-alpha.8
2828
hooks:
2929
- id: prettier
3030

3131
- repo: https://github.com/adrienverge/yamllint
32-
rev: v1.30.0
32+
rev: v1.35.1
3333
hooks:
3434
- id: yamllint
3535

@@ -44,29 +44,29 @@ repos:
4444
- id: sort-package-xml
4545

4646
- repo: https://github.com/shellcheck-py/shellcheck-py
47-
rev: v0.9.0.2
47+
rev: v0.10.0.1
4848
hooks:
4949
- id: shellcheck
5050

5151
- repo: https://github.com/scop/pre-commit-shfmt
52-
rev: v3.6.0-2
52+
rev: v3.8.0-1
5353
hooks:
5454
- id: shfmt
5555
args: [-w, -s, -i=4]
5656

5757
- repo: https://github.com/pycqa/isort
58-
rev: 5.12.0
58+
rev: 5.13.2
5959
hooks:
6060
- id: isort
6161

6262
- repo: https://github.com/psf/black
63-
rev: 23.3.0
63+
rev: 24.4.2
6464
hooks:
6565
- id: black
6666
args: [--line-length=100]
6767

6868
- repo: https://github.com/pre-commit/mirrors-clang-format
69-
rev: v16.0.0
69+
rev: v18.1.6
7070
hooks:
7171
- id: clang-format
7272
types_or: [c++, c, cuda]
@@ -79,7 +79,7 @@ repos:
7979
exclude: .cu
8080

8181
- repo: https://github.com/python-jsonschema/check-jsonschema
82-
rev: 0.23.2
82+
rev: 0.28.5
8383
hooks:
8484
- id: check-metaschema
8585
files: ^.+/schema/.*schema\.json$

common/.pages

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ nav:
77
- 'Common Libraries':
88
- 'autoware_auto_common':
99
- 'comparisons': common/autoware_auto_common/design/comparisons
10+
- 'autoware_grid_map_utils': common/autoware_grid_map_utils
1011
- 'autoware_point_types': common/autoware_point_types
1112
- 'Cuda Utils': common/cuda_utils
1213
- 'Geography Utils': common/geography_utils
1314
- 'Global Parameter Loader': common/global_parameter_loader/Readme
1415
- 'Glog Component': common/glog_component
15-
- 'grid_map_utils': common/grid_map_utils
1616
- 'interpolation': common/interpolation
1717
- 'Kalman Filter': common/kalman_filter
1818
- 'Motion Utils': common/motion_utils

common/grid_map_utils/CMakeLists.txt common/autoware_grid_map_utils/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.5)
2-
project(grid_map_utils)
2+
project(autoware_grid_map_utils)
33

44
if(NOT CMAKE_CXX_STANDARD)
55
set(CMAKE_CXX_STANDARD 17)

common/grid_map_utils/README.md common/autoware_grid_map_utils/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ More details on the scan line algorithm can be found in the References.
1919

2020
## API
2121

22-
The `grid_map_utils::PolygonIterator` follows the same API as the original [`grid_map::PolygonIterator`](https://docs.ros.org/en/kinetic/api/grid_map_core/html/classgrid__map_1_1PolygonIterator.html).
22+
The `autoware::grid_map_utils::PolygonIterator` follows the same API as the original [`grid_map::PolygonIterator`](https://docs.ros.org/en/kinetic/api/grid_map_core/html/classgrid__map_1_1PolygonIterator.html).
2323

2424
## Assumptions
2525

26-
The behavior of the `grid_map_utils::PolygonIterator` is only guaranteed to match the `grid_map::PolygonIterator` if edges of the polygon do not _exactly_ cross any cell center.
26+
The behavior of the `autoware::grid_map_utils::PolygonIterator` is only guaranteed to match the `grid_map::PolygonIterator` if edges of the polygon do not _exactly_ cross any cell center.
2727
In such a case, whether the crossed cell is considered inside or outside of the polygon can vary due to floating precision error.
2828

2929
## Performances
3030

31-
Benchmarking code is implemented in `test/benchmarking.cpp` and is also used to validate that the `grid_map_utils::PolygonIterator` behaves exactly like the `grid_map::PolygonIterator`.
31+
Benchmarking code is implemented in `test/benchmarking.cpp` and is also used to validate that the `autoware::grid_map_utils::PolygonIterator` behaves exactly like the `grid_map::PolygonIterator`.
3232

33-
The following figure shows a comparison of the runtime between the implementation of this package (`grid_map_utils`) and the original implementation (`grid_map`).
33+
The following figure shows a comparison of the runtime between the implementation of this package (`autoware_grid_map_utils`) and the original implementation (`grid_map`).
3434
The time measured includes the construction of the iterator and the iteration over all indexes and is shown using a logarithmic scale.
3535
Results were obtained varying the side size of a square grid map with `100 <= n <= 1000` (size=`n` means a grid of `n x n` cells),
3636
random polygons with a number of vertices `3 <= m <= 100` and with each parameter `(n,m)` repeated 10 times.

common/grid_map_utils/include/grid_map_utils/polygon_iterator.hpp common/autoware_grid_map_utils/include/autoware_grid_map_utils/polygon_iterator.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef GRID_MAP_UTILS__POLYGON_ITERATOR_HPP_
16-
#define GRID_MAP_UTILS__POLYGON_ITERATOR_HPP_
15+
#ifndef AUTOWARE_GRID_MAP_UTILS__POLYGON_ITERATOR_HPP_
16+
#define AUTOWARE_GRID_MAP_UTILS__POLYGON_ITERATOR_HPP_
1717

1818
#include "grid_map_core/TypeDefs.hpp"
1919

@@ -24,7 +24,7 @@
2424
#include <utility>
2525
#include <vector>
2626

27-
namespace grid_map_utils
27+
namespace autoware::grid_map_utils
2828
{
2929

3030
/// @brief Representation of a polygon edge made of 2 vertices
@@ -124,6 +124,6 @@ class PolygonIterator
124124
int current_col_;
125125
int current_to_col_;
126126
};
127-
} // namespace grid_map_utils
127+
} // namespace autoware::grid_map_utils
128128

129-
#endif // GRID_MAP_UTILS__POLYGON_ITERATOR_HPP_
129+
#endif // AUTOWARE_GRID_MAP_UTILS__POLYGON_ITERATOR_HPP_

0 commit comments

Comments
 (0)