From 8274b733daafb31692558092a20bac5a3b420daf Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Fri, 23 May 2025 14:27:37 -0600 Subject: [PATCH] Fix Jetson ONNXRuntime (#18370) * Correctly save jetson wheel * Temp docker build --- .github/workflows/ci.yml | 6 ++++++ docker/tensorrt/Dockerfile.arm64 | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b787b273..2714ff7c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,7 @@ on: branches: - dev - master + - fix-jetson-ort paths-ignore: - "docs/**" @@ -19,6 +20,7 @@ env: jobs: amd64_build: + if: false runs-on: ubuntu-22.04 name: AMD64 Build steps: @@ -42,6 +44,7 @@ jobs: tags: ${{ steps.setup.outputs.image-name }}-amd64 cache-from: type=registry,ref=${{ steps.setup.outputs.cache-name }}-amd64 arm64_build: + if: false runs-on: ubuntu-22.04-arm name: ARM Build steps: @@ -136,6 +139,7 @@ jobs: *.cache-from=type=registry,ref=${{ steps.setup.outputs.cache-name }}-jp6 *.cache-to=type=registry,ref=${{ steps.setup.outputs.cache-name }}-jp6,mode=max amd64_extra_builds: + if: false runs-on: ubuntu-22.04 name: AMD64 Extra Build needs: @@ -178,6 +182,7 @@ jobs: *.cache-to=type=registry,ref=${{ steps.setup.outputs.cache-name }}-rocm,mode=max *.cache-from=type=gha arm64_extra_builds: + if: false runs-on: ubuntu-22.04-arm name: ARM Extra Build needs: @@ -205,6 +210,7 @@ jobs: # The majority of users running arm64 are rpi users, so the rpi # build should be the primary arm64 image assemble_default_build: + if: false runs-on: ubuntu-22.04 name: Assemble and push default build needs: diff --git a/docker/tensorrt/Dockerfile.arm64 b/docker/tensorrt/Dockerfile.arm64 index 6e2e0280f..f334f0711 100644 --- a/docker/tensorrt/Dockerfile.arm64 +++ b/docker/tensorrt/Dockerfile.arm64 @@ -47,12 +47,11 @@ RUN --mount=type=bind,source=docker/tensorrt/detector/build_python_tensorrt.sh,t && TENSORRT_VER=$(cat /etc/TENSORRT_VER) /deps/build_python_tensorrt.sh COPY docker/tensorrt/requirements-arm64.txt /requirements-tensorrt.txt -# See https://elinux.org/Jetson_Zoo#ONNX_Runtime -ADD https://nvidia.box.com/shared/static/9yvw05k6u343qfnkhdv2x6xhygze0aq1.whl /tmp/onnxruntime_gpu-1.19.0-cp311-cp311-linux_aarch64.whl -RUN pip3 uninstall -y onnxruntime-openvino \ - && pip3 wheel --wheel-dir=/trt-wheels -r /requirements-tensorrt.txt \ - && pip3 install --no-deps /tmp/onnxruntime_gpu-1.19.0-cp311-cp311-linux_aarch64.whl +RUN pip3 wheel --wheel-dir=/trt-wheels -r /requirements-tensorrt.txt + +# See https://elinux.org/Jetson_Zoo#ONNX_Runtime +ADD https://nvidia.box.com/shared/static/9yvw05k6u343qfnkhdv2x6xhygze0aq1.whl /trt-wheels/onnxruntime_gpu-1.19.0-cp311-cp311-linux_aarch64.whl FROM build-wheels AS trt-model-wheels ARG DEBIAN_FRONTEND @@ -93,7 +92,8 @@ RUN mkdir -p /etc/ld.so.conf.d && echo /usr/lib/ffmpeg/jetson/lib/ > /etc/ld.so. COPY --from=trt-wheels /etc/TENSORRT_VER /etc/TENSORRT_VER RUN --mount=type=bind,from=trt-wheels,source=/trt-wheels,target=/deps/trt-wheels \ --mount=type=bind,from=trt-model-wheels,source=/trt-model-wheels,target=/deps/trt-model-wheels \ - pip3 install -U /deps/trt-wheels/*.whl /deps/trt-model-wheels/*.whl \ + pip3 uninstall -y onnxruntime-openvino \ + && pip3 install -U /deps/trt-wheels/*.whl /deps/trt-model-wheels/*.whl \ && ldconfig WORKDIR /opt/frigate/