Skip to content

Commit 1bf4036

Browse files
Merge branch 'main' into chore/update_nebula_version
2 parents 038acb5 + 4374782 commit 1bf4036

File tree

9 files changed

+30
-41
lines changed

9 files changed

+30
-41
lines changed

.github/workflows/autoware-base.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ jobs:
3636

3737
- name: Set up QEMU
3838
uses: docker/setup-qemu-action@v3
39+
with:
40+
image: tonistiigi/binfmt:qemu-v7.0.0
3941

4042
- name: Build Autoware's base images
4143
uses: ./.github/actions/docker-build-and-push-base

.github/workflows/health-check.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ on:
1212
workflow_dispatch:
1313

1414
jobs:
15-
label-check:
16-
uses: autowarefoundation/autoware-github-actions/.github/workflows/make-sure-label-is-present.yaml@v1
15+
require-label:
16+
uses: autowarefoundation/autoware-github-actions/.github/workflows/require-label.yaml@v1
1717
with:
1818
label: tag:run-health-check
1919

2020
load-env:
21-
needs: label-check
22-
if: ${{ needs.label-check.outputs.result == 'true' ||
21+
needs: require-label
22+
if: ${{ needs.require-label.outputs.result == 'true' ||
2323
github.event_name == 'schedule' ||
2424
github.event_name == 'workflow_dispatch' }}
2525
uses: ./.github/workflows/load-env.yaml

amd64.env

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ rmw_implementation=rmw_cyclonedds_cpp
33
base_image=ros:humble-ros-base-jammy
44
autoware_base_image=ghcr.io/autowarefoundation/autoware-base:latest
55
autoware_base_cuda_image=ghcr.io/autowarefoundation/autoware-base:cuda-latest
6-
cuda_version=12.3
7-
cudnn_version=8.9.5.29-1+cuda12.2
8-
tensorrt_version=8.6.1.6-1+cuda12.0
6+
cuda_version=12.4
7+
cudnn_version=8.9.7.29-1+cuda12.2
8+
tensorrt_version=10.8.0.43-1+cuda12.8
99
pre_commit_clang_format_version=17.0.5

ansible/roles/cuda/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# cuda
22

3-
This role installs [CUDA Toolkit](https://developer.nvidia.com/cuda-toolkit) following [this page](https://developer.nvidia.com/cuda-12-3-0-download-archive?target_os=Linux&target_arch=x86_64&Distribution=Ubuntu&target_version=22.04&target_type=deb_network) and [this page](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#post-installation-actions).
3+
This role installs [CUDA Toolkit](https://developer.nvidia.com/cuda-toolkit) following [this page](https://developer.nvidia.com/cuda-12-4-0-download-archive?target_os=Linux&target_arch=x86_64&Distribution=Ubuntu&target_version=22.04&target_type=deb_network) and [this page](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#post-installation-actions).
44

55
This role also registers Vulkan, OpenGL, and OpenCL GPU vendors for future use.
66

@@ -15,7 +15,7 @@ This role also registers Vulkan, OpenGL, and OpenCL GPU vendors for future use.
1515

1616
### Version compatibility
1717

18-
Autoware currently uses CUDA `12.3` and from this [CUDA Application Compatibility Support Matrix](https://docs.nvidia.com/deploy/cuda-compatibility/#use-the-right-compat-package) that only the NVIDIA driver version `545` is compatible with this version of CUDA.
18+
Autoware currently uses CUDA `12.4` which corresponds to the NVIDIA driver version `550` and is minimum required driver version.
1919

2020
#### 🛠️ For Advanced Users
2121

@@ -42,7 +42,7 @@ sudo dpkg -i cuda-keyring_1.1-1_all.deb
4242
sudo apt-get update
4343
cuda_version_dashed=$(eval sed -e "s/[.]/-/g" <<< "${cuda_version}")
4444
sudo apt-get -y install cuda-toolkit-${cuda_version_dashed}
45-
sudo apt-get install -y cuda-drivers-545
45+
sudo apt-get install -y cuda-drivers-550
4646
```
4747

4848
Perform the post installation actions:

ansible/roles/tensorrt/README.md

+6-10
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,24 @@ wget -O /tmp/amd64.env https://raw.githubusercontent.com/autowarefoundation/auto
1717

1818
sudo apt-get install -y \
1919
libcudnn8=${cudnn_version} \
20-
libnvinfer8=${tensorrt_version} \
21-
libnvinfer-plugin8=${tensorrt_version} \
22-
libnvparsers8=${tensorrt_version} \
23-
libnvonnxparsers8=${tensorrt_version} \
20+
libnvinfer10=${tensorrt_version} \
21+
libnvinfer-plugin10=${tensorrt_version} \
22+
libnvonnxparsers10=${tensorrt_version} \
2423
libcudnn8-dev=${cudnn_version} \
2524
libnvinfer-dev=${tensorrt_version} \
2625
libnvinfer-plugin-dev=${tensorrt_version} \
2726
libnvinfer-headers-dev=${tensorrt_version} \
2827
libnvinfer-headers-plugin-dev=${tensorrt_version} \
29-
libnvparsers-dev=${tensorrt_version} \
3028
libnvonnxparsers-dev=${tensorrt_version}
3129

3230
sudo apt-mark hold \
3331
libcudnn8 \
34-
libnvinfer8 \
35-
libnvinfer-plugin8 \
36-
libnvparsers8 \
37-
libnvonnxparsers8 \
32+
libnvinfer10 \
33+
libnvinfer-plugin10 \
34+
libnvonnxparsers10 \
3835
libcudnn8-dev \
3936
libnvinfer-dev \
4037
libnvinfer-plugin-dev \
41-
libnvparsers-dev \
4238
libnvonnxparsers-dev \
4339
libnvinfer-headers-dev \
4440
libnvinfer-headers-plugin-dev

ansible/roles/tensorrt/tasks/main.yaml

+6-10
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
ansible.builtin.apt:
44
name:
55
- libcudnn8={{ cudnn_version }}
6-
- libnvinfer8={{ tensorrt_version }}
7-
- libnvinfer-plugin8={{ tensorrt_version }}
8-
- libnvparsers8={{ tensorrt_version }}
9-
- libnvonnxparsers8={{ tensorrt_version }}
6+
- libnvinfer10={{ tensorrt_version }}
7+
- libnvinfer-plugin10={{ tensorrt_version }}
8+
- libnvonnxparsers10={{ tensorrt_version }}
109
allow_change_held_packages: true
1110
allow_downgrade: true
1211
update_cache: true
@@ -20,7 +19,6 @@
2019
- libnvinfer-plugin-dev={{ tensorrt_version }}
2120
- libnvinfer-headers-dev={{ tensorrt_version }}
2221
- libnvinfer-headers-plugin-dev={{ tensorrt_version }}
23-
- libnvparsers-dev={{ tensorrt_version }}
2422
- libnvonnxparsers-dev={{ tensorrt_version }}
2523
allow_change_held_packages: true
2624
allow_downgrade: true
@@ -35,10 +33,9 @@
3533
selection: hold
3634
with_items:
3735
- libcudnn8
38-
- libnvinfer8
39-
- libnvinfer-plugin8
40-
- libnvparsers8
41-
- libnvonnxparsers8
36+
- libnvinfer10
37+
- libnvinfer-plugin10
38+
- libnvonnxparsers10
4239

4340
- name: Prevent CUDA-related Dev packages from upgrading
4441
become: true
@@ -51,6 +48,5 @@
5148
- libnvinfer-plugin-dev
5249
- libnvinfer-headers-dev
5350
- libnvinfer-headers-plugin-dev
54-
- libnvparsers-dev
5551
- libnvonnxparsers-dev
5652
when: install_devel == 'y'

arm64.env

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
# Override amd64's settings
2-
cudnn_version=8.9.6.50-1+cuda12.2
3-
tensorrt_version=8.6.2.2-1+cuda12.0
2+
tensorrt_version=10.3.0.26-1+cuda12.5

autoware-nightly.repos

-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ repositories:
2323
type: git
2424
url: https://github.com/tier4/tier4_ad_api_adaptor.git
2525
version: tier4/universe
26-
universe/external/tier4_autoware_msgs:
27-
type: git
28-
url: https://github.com/tier4/tier4_autoware_msgs.git
29-
version: tier4/universe
3026
launcher/autoware_launch:
3127
type: git
3228
url: https://github.com/autowarefoundation/autoware_launch.git

autoware.repos

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ repositories:
4141
universe/external/tier4_autoware_msgs:
4242
type: git
4343
url: https://github.com/tier4/tier4_autoware_msgs.git
44-
version: v0.40.0
44+
version: tier4/universe
4545
# Fix the version not to merge https://github.com/MORAI-Autonomous/MORAI-ROS2_morai_msgs/pull/9
4646
universe/external/morai_msgs:
4747
type: git
@@ -107,19 +107,19 @@ repositories:
107107
sensor_kit/sample_sensor_kit_launch:
108108
type: git
109109
url: https://github.com/autowarefoundation/sample_sensor_kit_launch.git
110-
version: 0.40.0
110+
version: 0.41.0
111111
sensor_kit/external/awsim_sensor_kit_launch: # TODO: Integrate into sample_sensor_kit_launch
112112
type: git
113113
url: https://github.com/tier4/awsim_sensor_kit_launch.git
114-
version: 0.40.0
114+
version: 0.41.0
115115
sensor_kit/awsim_labs_sensor_kit_launch:
116116
type: git
117117
url: https://github.com/autowarefoundation/awsim_labs_sensor_kit_launch.git
118-
version: 0.39.0
118+
version: 0.41.1
119119
sensor_kit/single_lidar_sensor_kit_launch:
120120
type: git
121121
url: https://github.com/autowarefoundation/single_lidar_sensor_kit_launch.git
122-
version: 0.39.0
122+
version: 0.41.0
123123
# vehicle
124124
vehicle/sample_vehicle_launch:
125125
type: git

0 commit comments

Comments
 (0)