Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
Signed-off-by: Oguz Ozturk <oguzkaganozt@gmail.com>
  • Loading branch information
oguzkaganozt committed Feb 19, 2024
2 parents 1d3651f + af0fbe3 commit 99db0d2
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 140 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
- name: Generate token
id: generate-token
uses: tibdex/github-app-token@v1
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-ansible-autoupdate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- name: Generate token
id: generate-token
uses: tibdex/github-app-token@v1
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-autoupdate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- name: Generate token
id: generate-token
uses: tibdex/github-app-token@v1
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-optional-autoupdate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- name: Generate token
id: generate-token
uses: tibdex/github-app-token@v1
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- name: Generate token
id: generate-token
uses: tibdex/github-app-token@v1
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- name: Generate token
id: generate-token
uses: tibdex/github-app-token@v1
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-tool-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: Generate token
id: generate-token
uses: tibdex/github-app-token@v1
uses: tibdex/github-app-token@v2
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion amd64.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ base_image=ros:humble-ros-base-jammy
cuda_version=12.3
cudnn_version=8.9.5.29-1+cuda12.2
tensorrt_version=8.6.1.6-1+cuda12.0
pre_commit_clang_format_version=17.0.5
pre_commit_clang_format_version=17.0.6
22 changes: 0 additions & 22 deletions ansible/roles/artifacts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,6 @@ $ wget -P ~/autoware_data/lidar_centerpoint/ \
https://awf.ml.dev.web.auto/perception/models/centerpoint/v2/pts_backbone_neck_head_centerpoint_tiny.onnx


# tensorrt_yolo

$ mkdir -p ~/autoware_data/tensorrt_yolo/
$ wget -P ~/autoware_data/tensorrt_yolo/ \
https://awf.ml.dev.web.auto/perception/models/yolov3.onnx \
https://awf.ml.dev.web.auto/perception/models/yolov4.onnx \
https://awf.ml.dev.web.auto/perception/models/yolov4-tiny.onnx \
https://awf.ml.dev.web.auto/perception/models/yolov5s.onnx \
https://awf.ml.dev.web.auto/perception/models/yolov5m.onnx \
https://awf.ml.dev.web.auto/perception/models/yolov5l.onnx \
https://awf.ml.dev.web.auto/perception/models/yolov5x.onnx \
https://awf.ml.dev.web.auto/perception/models/coco.names


# tensorrt_yolox

$ mkdir -p ~/autoware_data/tensorrt_yolox/
Expand Down Expand Up @@ -97,14 +83,6 @@ $ wget -P ~/autoware_data/traffic_light_fine_detector/ \
https://awf.ml.dev.web.auto/perception/models/tlr_yolox_s/v3/tlr_labels.txt


# traffic_light_ssd_fine_detector

$ mkdir -p ~/autoware_data/traffic_light_ssd_fine_detector/
$ wget -P ~/autoware_data/traffic_light_ssd_fine_detector/ \
https://awf.ml.dev.web.auto/perception/models/mb2-ssd-lite-tlr.onnx \
https://awf.ml.dev.web.auto/perception/models/voc_labels_tl.txt


# tvm_utility

$ mkdir -p ~/autoware_data/tvm_utility/models/yolo_v2_tiny
Expand Down
16 changes: 0 additions & 16 deletions ansible/roles/artifacts/SHA256SUMS
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,6 @@ dc1a876580d86ee7a341d543f8ade2ede7f43bd032dc5b44155b1f0175405764 ./lidar_center
2c53465715c1fd2e9dc5727ef3fca74f4cdf0538f74286b0946e219d0ca5693b ./lidar_centerpoint/pts_voxel_encoder_centerpoint_tiny.onnx
3840b6b3590984e8115d66b12061aea3a2cfaed70b4e8d59457f04b0d6f6a1fc ./lidar_centerpoint_tvm/centerpoint_backbone-x86_64-llvm-3.0.0-20221221.tar.gz
41e19de43f30549c325968aee06b4ad0d9701220be819e79d37efdfa86b918d0 ./lidar_centerpoint_tvm/centerpoint_encoder-x86_64-llvm-3.0.0-20221221.tar.gz
634a1132eb33f8091d60f2c346ababe8b905ae08387037aed883953b7329af84 ./tensorrt_yolo/coco.names
61e922f76918dd3d8e0abdc5fb7406f390609e08bd8ab9e5d3b97afb00f30f8c ./tensorrt_yolo/yolov3.onnx
0e877c716fbf8a2b431ee3e57f6c7411a6741319b52c32c6dafc53c7e1b17027 ./tensorrt_yolo/yolov4-tiny.onnx
7c7343156c1bd4b397fd1e44b27334691a6219db3ce2e29a03b72af65ddb8f39 ./tensorrt_yolo/yolov4.onnx
a627e5f70180a8746482b572194090466db62c8d1256602c1cd20374dd960e34 ./tensorrt_yolo/yolov5l.onnx
ee6f67f7c00a34cc4cef2fdd9db30dd714df1a4fb2d7e9fc1731cfe85b673133 ./tensorrt_yolo/yolov5m.onnx
be335ff7746957debf1a6903a61fa3f568b780b4afe4958edf2d4bc98e9e0825 ./tensorrt_yolo/yolov5s.onnx
d7cb4cd7078f87bda22a37828d72867accecedf9f74d0d87b5cc1f6f1180a019 ./tensorrt_yolo/yolov5x.onnx
3540a365bfd6d8afb1b5d8df4ec47f82cb984760d3270c9b41dbbb3422d09a0c ./tensorrt_yolox/label.txt
cc378d327db5616b0b3a4d077bf37100c25a50ecd22d2b542f54098da100f34c ./tensorrt_yolox/yolox-sPlus-T4-960x960-pseudo-finetune.EntropyV2-calibration.table
f5054e8a890c3be86dc1b4b89a5a36fb2279d4f6110b0159e793be062641bf65 ./tensorrt_yolox/yolox-sPlus-T4-960x960-pseudo-finetune.onnx
b9e9d7da33342262ccaea4469b4d02b8abb32b6d7bf737f9e0883fece1b8f580 ./tensorrt_yolox/yolox-sPlus-opt.EntropyV2-calibration.table
36b0832177b01e6b278e00c7369f1de71e616c36261cbae50f0753d41289da01 ./tensorrt_yolox/yolox-sPlus-opt.onnx
471a665f4243e654dff62578394e508db22ee29fe65d9e389dfc3b0f2dee1255 ./tensorrt_yolox/yolox-tiny.onnx
1a5a49eeec5593963eab8d70f48b8a01bfb07e753e9688eb1510ad26e803579d ./traffic_light_classifier/lamp_labels.txt
55ebb0d117a5e8943f8d1c6769f1d856b533079d4d871d8e923255cc992ad48a ./traffic_light_classifier/traffic_light_classifier_efficientNet_b1_batch_1.onnx
684e29843e3128eadb774018730644b3ab9b0a06dc4cdaeed579c2f3fa5d5265 ./traffic_light_classifier/traffic_light_classifier_efficientNet_b1_batch_4.onnx
Expand All @@ -35,7 +21,5 @@ a41e6e3324e32c30b3b2fe38908eaf3471e2bfdaeb9e14ca0c1c3bc0275119c6 ./traffic_ligh
922839fcf22bd32ae5065146fcec193e9d6360ca03bd4c83faea835045daf8eb ./traffic_light_fine_detector/tlr_yolox_s_batch_1.onnx
b3c6e00acc6ff547d165469684ffb620a9a6330e9d591d445f50c4cf5cb4e292 ./traffic_light_fine_detector/tlr_yolox_s_batch_4.onnx
2824d4c5b7ab5f6bfd41e43e82747107c53e1c727b1cf1dd6746bc49e6749128 ./traffic_light_fine_detector/tlr_yolox_s_batch_6.onnx
e29e6ee68751a270fb285fd037713939ca7f61a897b4c3a7ab22b0d6a9a21ddf ./traffic_light_ssd_fine_detector/mb2-ssd-lite-tlr.onnx
a41e6e3324e32c30b3b2fe38908eaf3471e2bfdaeb9e14ca0c1c3bc0275119c6 ./traffic_light_ssd_fine_detector/voc_labels_tl.txt
66b3ca668e577393b657fbe1ed626538d89ca3adccd5862de6c7fa190238dbca ./tvm_utility/yolo_v2_tiny-x86_64-llvm-3.0.0-20221221.tar.gz
1f660e15f95074bade32b1f80dbf618e9cee1f0b9f76d3f4671cb9be7f56eb3a ./yabloc_pose_initializer/resources.tar.gz
94 changes: 0 additions & 94 deletions ansible/roles/artifacts/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,77 +111,6 @@
mode: "644"
checksum: sha256:9bb0b634f3664bd098ce7d6a3d8a9fb7cc8d9b8252b27f302c71e43316bab551

# tensorrt_yolo
- name: Create tensorrt_yolo directory inside {{ data_dir }}
ansible.builtin.file:
path: "{{ data_dir }}/tensorrt_yolo"
mode: "755"
state: directory

- name: Download tensorrt_yolo/yolov3.onnx
become: true
ansible.builtin.get_url:
url: https://awf.ml.dev.web.auto/perception/models/yolov3.onnx
dest: "{{ data_dir }}/tensorrt_yolo/yolov3.onnx"
mode: "644"
checksum: sha256:61e922f76918dd3d8e0abdc5fb7406f390609e08bd8ab9e5d3b97afb00f30f8c

- name: Download tensorrt_yolo/yolov4.onnx
become: true
ansible.builtin.get_url:
url: https://awf.ml.dev.web.auto/perception/models/yolov4.onnx
dest: "{{ data_dir }}/tensorrt_yolo/yolov4.onnx"
mode: "644"
checksum: sha256:7c7343156c1bd4b397fd1e44b27334691a6219db3ce2e29a03b72af65ddb8f39

- name: Download tensorrt_yolo/yolov4-tiny.onnx
become: true
ansible.builtin.get_url:
url: https://awf.ml.dev.web.auto/perception/models/yolov4-tiny.onnx
dest: "{{ data_dir }}/tensorrt_yolo/yolov4-tiny.onnx"
mode: "644"
checksum: sha256:0e877c716fbf8a2b431ee3e57f6c7411a6741319b52c32c6dafc53c7e1b17027

- name: Download tensorrt_yolo/yolov5s.onnx
become: true
ansible.builtin.get_url:
url: https://awf.ml.dev.web.auto/perception/models/yolov5s.onnx
dest: "{{ data_dir }}/tensorrt_yolo/yolov5s.onnx"
mode: "644"
checksum: sha256:be335ff7746957debf1a6903a61fa3f568b780b4afe4958edf2d4bc98e9e0825

- name: Download tensorrt_yolo/yolov5m.onnx
become: true
ansible.builtin.get_url:
url: https://awf.ml.dev.web.auto/perception/models/yolov5m.onnx
dest: "{{ data_dir }}/tensorrt_yolo/yolov5m.onnx"
mode: "644"
checksum: sha256:ee6f67f7c00a34cc4cef2fdd9db30dd714df1a4fb2d7e9fc1731cfe85b673133

- name: Download tensorrt_yolo/yolov5l.onnx
become: true
ansible.builtin.get_url:
url: https://awf.ml.dev.web.auto/perception/models/yolov5l.onnx
dest: "{{ data_dir }}/tensorrt_yolo/yolov5l.onnx"
mode: "644"
checksum: sha256:a627e5f70180a8746482b572194090466db62c8d1256602c1cd20374dd960e34

- name: Download tensorrt_yolo/yolov5x.onnx
become: true
ansible.builtin.get_url:
url: https://awf.ml.dev.web.auto/perception/models/yolov5x.onnx
dest: "{{ data_dir }}/tensorrt_yolo/yolov5x.onnx"
mode: "644"
checksum: sha256:d7cb4cd7078f87bda22a37828d72867accecedf9f74d0d87b5cc1f6f1180a019

- name: Download tensorrt_yolo/coco.names
become: true
ansible.builtin.get_url:
url: https://awf.ml.dev.web.auto/perception/models/coco.names
dest: "{{ data_dir }}/tensorrt_yolo/coco.names"
mode: "644"
checksum: sha256:634a1132eb33f8091d60f2c346ababe8b905ae08387037aed883953b7329af84

# tensorrt_yolox
- name: Create tensorrt_yolox directory inside {{ data_dir }}
ansible.builtin.file:
Expand Down Expand Up @@ -371,29 +300,6 @@
mode: "644"
checksum: sha256:a2a91f5fe9c2e68e3e3647a272bb9bb25cd07631a1990a3fb15efddce7691131

# traffic_light_ssd_fine_detector
- name: Create traffic_light_ssd_fine_detector directory inside {{ data_dir }}
ansible.builtin.file:
path: "{{ data_dir }}/traffic_light_ssd_fine_detector"
mode: "755"
state: directory

- name: Download traffic_light_ssd_fine_detector/mb2-ssd-lite-tlr.onnx
become: true
ansible.builtin.get_url:
url: https://awf.ml.dev.web.auto/perception/models/mb2-ssd-lite-tlr.onnx
dest: "{{ data_dir }}/traffic_light_ssd_fine_detector/mb2-ssd-lite-tlr.onnx"
mode: "644"
checksum: sha256:e29e6ee68751a270fb285fd037713939ca7f61a897b4c3a7ab22b0d6a9a21ddf

- name: Download traffic_light_ssd_fine_detector/voc_labels_tl.txt
become: true
ansible.builtin.get_url:
url: https://awf.ml.dev.web.auto/perception/models/voc_labels_tl.txt
dest: "{{ data_dir }}/traffic_light_ssd_fine_detector/voc_labels_tl.txt"
mode: "644"
checksum: sha256:a41e6e3324e32c30b3b2fe38908eaf3471e2bfdaeb9e14ca0c1c3bc0275119c6

# tvm_utility
- name: Create tvm_utility/models directory inside {{ data_dir }}
ansible.builtin.file:
Expand Down
4 changes: 4 additions & 0 deletions autoware.repos
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ repositories:
type: git
url: https://github.com/MapIV/llh_converter.git
version: ros2
universe/external/ament_cmake: # TODO(mitsudome-r): remove when https://github.com/ament/ament_cmake/pull/448 is merged
type: git
url: https://github.com/autowarefoundation/ament_cmake.git
version: feat/faster_ament_libraries_deduplicate
# launcher
launcher/autoware_launch:
type: git
Expand Down
5 changes: 5 additions & 0 deletions tools.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
repositories:
tools:
type: git
url: https://github.com/autowarefoundation/autoware_tools.git
version: main

0 comments on commit 99db0d2

Please sign in to comment.