From 99760e19391069ac8386970800d695c207b6821f Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Sat, 7 Jun 2025 11:01:47 -0600 Subject: [PATCH] Remove unused deps for amd64 build --- docker/tensorrt/Dockerfile.amd64 | 12 ++++-------- docker/tensorrt/requirements-amd64.txt | 7 ------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/docker/tensorrt/Dockerfile.amd64 b/docker/tensorrt/Dockerfile.amd64 index e6429aa90..3ae927018 100644 --- a/docker/tensorrt/Dockerfile.amd64 +++ b/docker/tensorrt/Dockerfile.amd64 @@ -6,13 +6,14 @@ ARG DEBIAN_FRONTEND=noninteractive # Globally set pip break-system-packages option to avoid having to specify it every time ARG PIP_BREAK_SYSTEM_PACKAGES=1 -FROM tensorrt-base AS frigate-tensorrt +FROM wheels AS trt-wheels ARG PIP_BREAK_SYSTEM_PACKAGES -ENV TRT_VER=8.6.1 # Install TensorRT wheels COPY docker/tensorrt/requirements-amd64.txt /requirements-tensorrt.txt -RUN pip3 install -U -r /requirements-tensorrt.txt && ldconfig +RUN pip3 uninstall -y onnxruntime-openvino \ + && pip3 install -U -r /requirements-tensorrt.txt \ + && ldconfig WORKDIR /opt/frigate/ COPY --from=rootfs / / @@ -20,10 +21,5 @@ COPY --from=rootfs / / # Dev Container w/ TRT FROM devcontainer AS devcontainer-trt -COPY --from=trt-deps /usr/local/lib/libyolo_layer.so /usr/local/lib/libyolo_layer.so -COPY --from=trt-deps /usr/local/src/tensorrt_demos /usr/local/src/tensorrt_demos -COPY --from=trt-deps /usr/local/cuda-12.1 /usr/local/cuda -COPY docker/tensorrt/detector/rootfs/ / -COPY --from=trt-deps /usr/local/lib/libyolo_layer.so /usr/local/lib/libyolo_layer.so RUN --mount=type=bind,from=trt-wheels,source=/trt-wheels,target=/deps/trt-wheels \ pip3 install -U /deps/trt-wheels/*.whl diff --git a/docker/tensorrt/requirements-amd64.txt b/docker/tensorrt/requirements-amd64.txt index 7bfd7f8d8..a53e3cc6e 100644 --- a/docker/tensorrt/requirements-amd64.txt +++ b/docker/tensorrt/requirements-amd64.txt @@ -1,16 +1,9 @@ # NVidia TensorRT Support (amd64 only) --extra-index-url 'https://pypi.nvidia.com' numpy < 1.24; platform_machine == 'x86_64' -tensorrt == 8.6.1; platform_machine == 'x86_64' -tensorrt_bindings == 8.6.1; platform_machine == 'x86_64' -cuda-python == 11.8.*; platform_machine == 'x86_64' cython == 3.0.*; platform_machine == 'x86_64' nvidia-cuda-runtime-cu12 == 12.1.*; platform_machine == 'x86_64' -nvidia-cuda-runtime-cu11 == 11.8.*; platform_machine == 'x86_64' -nvidia-cublas-cu11 == 11.11.3.6; platform_machine == 'x86_64' -nvidia-cudnn-cu11 == 8.6.0.*; platform_machine == 'x86_64' nvidia-cudnn-cu12 == 9.5.0.*; platform_machine == 'x86_64' -nvidia-cufft-cu11==10.*; platform_machine == 'x86_64' nvidia-cufft-cu12==11.*; platform_machine == 'x86_64' onnx==1.16.*; platform_machine == 'x86_64' onnxruntime-gpu==1.22.*; platform_machine == 'x86_64'