From 7fec3d6bb3963b1fdd2b063309e0ff3cba7cb147 Mon Sep 17 00:00:00 2001 From: Amadeusz Szymko Date: Wed, 5 Feb 2025 09:42:24 +0900 Subject: [PATCH] fix(ansible): dependencies for arm64 Signed-off-by: Amadeusz Szymko --- ansible/roles/tensorrt/README.md | 33 -------------------------- ansible/roles/tensorrt/tasks/main.yaml | 7 +++--- arm64.env | 3 +-- 3 files changed, 4 insertions(+), 39 deletions(-) diff --git a/ansible/roles/tensorrt/README.md b/ansible/roles/tensorrt/README.md index 26d1233fe07..c7506b23079 100644 --- a/ansible/roles/tensorrt/README.md +++ b/ansible/roles/tensorrt/README.md @@ -11,8 +11,6 @@ This role installs TensorRT and cuDNN following [the official NVIDIA TensorRT In ## Manual Installation -### AMD64 - ```bash # For the environment variables wget -O /tmp/amd64.env https://raw.githubusercontent.com/autowarefoundation/autoware/main/amd64.env && source /tmp/amd64.env @@ -41,34 +39,3 @@ libnvonnxparsers-dev \ libnvinfer-headers-dev \ libnvinfer-headers-plugin-dev ``` - -### ARM64 - -```bash -# For the environment variables -wget -O /tmp/arm64.env https://raw.githubusercontent.com/autowarefoundation/autoware/main/arm64.env && source /tmp/arm64.env - -sudo apt-get install -y \ -libcudnn9-cuda-12=${cudnn_version} \ -libnvinfer10=${tensorrt_version} \ -libnvinfer-plugin10=${tensorrt_version} \ -libnvonnxparsers10=${tensorrt_version} \ -libcudnn9-dev-cuda-12=${cudnn_version} \ -libnvinfer-dev=${tensorrt_version} \ -libnvinfer-plugin-dev=${tensorrt_version} \ -libnvinfer-headers-dev=${tensorrt_version} \ -libnvinfer-headers-plugin-dev=${tensorrt_version} \ -libnvonnxparsers-dev=${tensorrt_version} - -sudo apt-mark hold \ -libcudnn9-cuda-12 \ -libnvinfer10 \ -libnvinfer-plugin10 \ -libnvonnxparsers10 \ -libcudnn9-dev-cuda-12 \ -libnvinfer-dev \ -libnvinfer-plugin-dev \ -libnvonnxparsers-dev \ -libnvinfer-headers-dev \ -libnvinfer-headers-plugin-dev -``` diff --git a/ansible/roles/tensorrt/tasks/main.yaml b/ansible/roles/tensorrt/tasks/main.yaml index c49aff90dc0..16c46e5abd8 100644 --- a/ansible/roles/tensorrt/tasks/main.yaml +++ b/ansible/roles/tensorrt/tasks/main.yaml @@ -2,7 +2,7 @@ become: true ansible.builtin.apt: name: - - "{{ 'libcudnn9-cuda-12=' + cudnn_version if ansible_architecture == 'aarch64' else 'libcudnn8=' + cudnn_version }}" + - libcudnn8={{ cudnn_version }} - libnvinfer10={{ tensorrt_version }} - libnvinfer-plugin10={{ tensorrt_version }} - libnvonnxparsers10={{ tensorrt_version }} @@ -14,7 +14,7 @@ become: true ansible.builtin.apt: name: - - "{{ 'libcudnn9-dev-cuda-12=' + cudnn_version if ansible_architecture == 'aarch64' else 'libcudnn8-dev=' + cudnn_version }}" + - libcudnn8-dev={{ cudnn_version }} - libnvinfer-dev={{ tensorrt_version }} - libnvinfer-plugin-dev={{ tensorrt_version }} - libnvinfer-headers-dev={{ tensorrt_version }} @@ -32,7 +32,6 @@ name: "{{ item }}" selection: hold with_items: - - "{{ 'libcudnn9-cuda-12' if ansible_architecture == 'aarch64' else 'libcudnn8' }}" - libcudnn8 - libnvinfer10 - libnvinfer-plugin10 @@ -44,7 +43,7 @@ name: "{{ item }}" selection: hold with_items: - - "{{ 'libcudnn9-dev-cuda-12' if ansible_architecture == 'aarch64' else 'libcudnn8-dev' }}" + - libcudnn8-dev - libnvinfer-dev - libnvinfer-plugin-dev - libnvinfer-headers-dev diff --git a/arm64.env b/arm64.env index 32dd2dc0469..f9c2f5b5104 100644 --- a/arm64.env +++ b/arm64.env @@ -1,3 +1,2 @@ # Override amd64's settings -cudnn_version=9.3.0.75-1 -tensorrt_version=10.3.0.30-1+cuda12.5 +tensorrt_version=10.3.0.26-1+cuda12.5