From 9d9853045ab08c0b52d46eb8d1e12647241eafbd Mon Sep 17 00:00:00 2001 From: Hiroki OTA Date: Mon, 15 Aug 2022 18:58:43 +0900 Subject: [PATCH 1/5] chore(clang-tidy): add SharedFuture in performance-unnecessary-value-param.AllowedTypes (#2794) * feat(clang-tidy): add SharedFuture in performance-unnecessary-value-param.AllowedTypes Signed-off-by: h-ohta * fix: add .* Signed-off-by: h-ohta Signed-off-by: h-ohta --- .clang-tidy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index 5d5692a74b5..4c9cefe6626 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -418,7 +418,7 @@ CheckOptions: - key: performance-unnecessary-copy-initialization.AllowedTypes value: "" - key: performance-unnecessary-value-param.AllowedTypes - value: ".*Ptr" + value: ".*Ptr;.*SharedFuture" - key: performance-unnecessary-value-param.IncludeStyle value: google - key: portability-simd-intrinsics.Std From 89645b979172ea69cf875a471e58e211d677da1b Mon Sep 17 00:00:00 2001 From: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> Date: Tue, 16 Aug 2022 18:24:15 +0900 Subject: [PATCH 2/5] ci(docker-build-and-push): use tentative if-condition for scheduled events (#2798) Signed-off-by: Kenji Miyake Signed-off-by: Kenji Miyake --- .github/actions/docker-build-and-push/action.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml index 9af377c04e1..d2bc5dbba42 100644 --- a/.github/actions/docker-build-and-push/action.yaml +++ b/.github/actions/docker-build-and-push/action.yaml @@ -97,7 +97,8 @@ runs: - name: Build and push uses: docker/bake-action@v2 with: - push: ${{ github.ref_name == github.event.repository.default_branch }} + # Checking event_name for https://github.com/autowarefoundation/autoware/issues/2796 + push: ${{ github.event_name == 'schedule' || github.ref_name == github.event.repository.default_branch }} files: | docker/${{ inputs.bake-target }}/docker-bake.hcl bake.json From 4d34e482450c6cd55875401fac6f0242d876af4c Mon Sep 17 00:00:00 2001 From: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> Date: Thu, 18 Aug 2022 16:31:33 +0900 Subject: [PATCH 3/5] ci(setup-universe): remove --no-nvidia (#2808) Signed-off-by: Kenji Miyake Signed-off-by: Kenji Miyake --- .github/workflows/setup-universe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/setup-universe.yaml b/.github/workflows/setup-universe.yaml index b67da515b19..0081abd5d63 100644 --- a/.github/workflows/setup-universe.yaml +++ b/.github/workflows/setup-universe.yaml @@ -13,4 +13,4 @@ jobs: - name: Run setup script run: | - ./setup-dev-env.sh -y -v --no-nvidia universe + ./setup-dev-env.sh -y -v universe From e108b8fa9e47307b1f2573be5d0dde828235bcb0 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com> Date: Thu, 18 Aug 2022 16:50:30 +0900 Subject: [PATCH 4/5] revert: install each package of tensorrt (#2807) * revert: install each package of tensorrt Signed-off-by: Daisuke Nishimatsu * ci(pre-commit): autofix * fix: update trt version Signed-off-by: Daisuke Nishimatsu Signed-off-by: Daisuke Nishimatsu Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com> --- amd64.env | 2 +- ansible/roles/tensorrt/tasks/main.yaml | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/amd64.env b/amd64.env index 64464a8a21c..dad15c2106b 100644 --- a/amd64.env +++ b/amd64.env @@ -4,4 +4,4 @@ base_image=ubuntu:20.04 cuda_base_image=nvidia/cuda:11.6.2-devel-ubuntu20.04 cuda_version=11.6 cudnn_version=8.4.1.50-1+cuda11.6 -tensorrt_version=8.4.2.4-1+cuda11.6 +tensorrt_version=8.4.2-1+cuda11.6 diff --git a/ansible/roles/tensorrt/tasks/main.yaml b/ansible/roles/tensorrt/tasks/main.yaml index e37c128fdc9..50b0b71b5bd 100644 --- a/ansible/roles/tensorrt/tasks/main.yaml +++ b/ansible/roles/tensorrt/tasks/main.yaml @@ -4,7 +4,16 @@ name: - libcudnn8={{ cudnn_version }} - libcudnn8-dev={{ cudnn_version }} - - tensorrt={{ tensorrt_version }} + - libnvinfer8={{ tensorrt_version }} + - libnvinfer-plugin8={{ tensorrt_version }} + - libnvparsers8={{ tensorrt_version }} + - libnvonnxparsers8={{ tensorrt_version }} + - libnvinfer-bin={{ tensorrt_version }} + - libnvinfer-dev={{ tensorrt_version }} + - libnvinfer-plugin-dev={{ tensorrt_version }} + - libnvparsers-dev={{ tensorrt_version }} + - libnvonnxparsers-dev={{ tensorrt_version }} + - libnvinfer-samples={{ tensorrt_version }} allow_downgrade: true update_cache: true @@ -17,4 +26,13 @@ with_items: - libcudnn8 - libcudnn8-dev - - tensorrt + - libnvinfer8 + - libnvinfer-plugin8 + - libnvparsers8 + - libnvonnxparsers8 + - libnvinfer-bin + - libnvinfer-dev + - libnvinfer-plugin-dev + - libnvparsers-dev + - libnvonnxparsers-dev + - libnvinfer-samples From b1e2f6ef5982ccbe9434bff49397b2783713cb98 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimatsu <42202095+wep21@users.noreply.github.com> Date: Fri, 19 Aug 2022 17:15:18 +0900 Subject: [PATCH 5/5] fix: remove bin and samples to keep backward compatibility (#2810) --- ansible/roles/tensorrt/tasks/main.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ansible/roles/tensorrt/tasks/main.yaml b/ansible/roles/tensorrt/tasks/main.yaml index 50b0b71b5bd..c81059edb9b 100644 --- a/ansible/roles/tensorrt/tasks/main.yaml +++ b/ansible/roles/tensorrt/tasks/main.yaml @@ -8,12 +8,10 @@ - libnvinfer-plugin8={{ tensorrt_version }} - libnvparsers8={{ tensorrt_version }} - libnvonnxparsers8={{ tensorrt_version }} - - libnvinfer-bin={{ tensorrt_version }} - libnvinfer-dev={{ tensorrt_version }} - libnvinfer-plugin-dev={{ tensorrt_version }} - libnvparsers-dev={{ tensorrt_version }} - libnvonnxparsers-dev={{ tensorrt_version }} - - libnvinfer-samples={{ tensorrt_version }} allow_downgrade: true update_cache: true @@ -30,9 +28,7 @@ - libnvinfer-plugin8 - libnvparsers8 - libnvonnxparsers8 - - libnvinfer-bin - libnvinfer-dev - libnvinfer-plugin-dev - libnvparsers-dev - libnvonnxparsers-dev - - libnvinfer-samples