diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh index 1dfe62ec9..f8f68398f 100755 --- a/docker/main/install_deps.sh +++ b/docker/main/install_deps.sh @@ -72,10 +72,6 @@ if [[ "${TARGETARCH}" == "amd64" ]]; then libva-drm2 \ mesa-va-drivers radeontop - # something about this dependency requires it to be installed in a separate call rather than in the line above - apt-get -qq install --no-install-recommends --no-install-suggests -y \ - i965-va-driver-shaders - # intel packages use zst compression so we need to update dpkg apt-get install -y dpkg diff --git a/docker/tensorrt/Dockerfile.amd64 b/docker/tensorrt/Dockerfile.amd64 index 3dcb42658..f90912a52 100644 --- a/docker/tensorrt/Dockerfile.amd64 +++ b/docker/tensorrt/Dockerfile.amd64 @@ -7,6 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive FROM wheels as trt-wheels ARG DEBIAN_FRONTEND ARG TARGETARCH +RUN python3 -m pip config set global.break-system-packages true # Add TensorRT wheels to another folder COPY docker/tensorrt/requirements-amd64.txt /requirements-tensorrt.txt @@ -20,20 +21,20 @@ ARG COMPUTE_LEVEL RUN apt-get update \ && apt-get install -y git build-essential -RUN wget https://developer.download.nvidia.com/compute/cuda/repos/debian11/x86_64/cuda-keyring_1.1-1_all.deb \ +RUN wget https://developer.download.nvidia.com/compute/cuda/repos/debian12/x86_64/cuda-keyring_1.1-1_all.deb \ && dpkg -i cuda-keyring_1.1-1_all.deb \ && apt-get update \ && apt-get -y install cuda-toolkit \ && rm -rf /var/lib/apt/lists/* FROM tensorrt-base AS frigate-tensorrt -ENV TRT_VER=8.5.3 +ENV TRT_VER=8.6.1 +RUN python3 -m pip config set global.break-system-packages true RUN --mount=type=bind,from=trt-wheels,source=/trt-wheels,target=/deps/trt-wheels \ - pip3 install -U /deps/trt-wheels/*.whl && \ + pip3 install -U /deps/trt-wheels/*.whl --break-system-packages && \ ldconfig COPY --from=cudnn-deps /usr/local/cuda-12.6 /usr/local/cuda -ENV LD_LIBRARY_PATH=/usr/local/lib/python3.9/dist-packages/tensorrt:/usr/local/cuda/lib64:/usr/local/lib/python3.9/dist-packages/nvidia/cufft/lib WORKDIR /opt/frigate/ COPY --from=rootfs / / @@ -46,4 +47,4 @@ COPY --from=cudnn-deps /usr/local/cuda-12.6 /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 + pip3 install -U /deps/trt-wheels/*.whl --break-system-packages diff --git a/docker/tensorrt/detector/rootfs/etc/ld.so.conf.d/cuda_tensorrt.conf b/docker/tensorrt/detector/rootfs/etc/ld.so.conf.d/cuda_tensorrt.conf index fe16ed9c5..561b7bcd4 100644 --- a/docker/tensorrt/detector/rootfs/etc/ld.so.conf.d/cuda_tensorrt.conf +++ b/docker/tensorrt/detector/rootfs/etc/ld.so.conf.d/cuda_tensorrt.conf @@ -1,6 +1,8 @@ /usr/local/lib -/usr/local/lib/python3.9/dist-packages/nvidia/cudnn/lib -/usr/local/lib/python3.9/dist-packages/nvidia/cuda_runtime/lib -/usr/local/lib/python3.9/dist-packages/nvidia/cublas/lib -/usr/local/lib/python3.9/dist-packages/nvidia/cuda_nvrtc/lib -/usr/local/lib/python3.9/dist-packages/tensorrt \ No newline at end of file +/usr/local/cuda/lib64 +/usr/local/lib/python3.11/dist-packages/nvidia/cudnn/lib +/usr/local/lib/python3.11/dist-packages/nvidia/cuda_runtime/lib +/usr/local/lib/python3.11/dist-packages/nvidia/cublas/lib +/usr/local/lib/python3.11/dist-packages/nvidia/cuda_nvrtc/lib +/usr/local/lib/python3.11/dist-packages/tensorrt +/usr/local/lib/python3.11/dist-packages/nvidia/cufft/lib \ No newline at end of file diff --git a/docker/tensorrt/requirements-amd64.txt b/docker/tensorrt/requirements-amd64.txt index df276a613..9b1ee6a0e 100644 --- a/docker/tensorrt/requirements-amd64.txt +++ b/docker/tensorrt/requirements-amd64.txt @@ -1,8 +1,8 @@ # NVidia TensorRT Support (amd64 only) --extra-index-url 'https://pypi.nvidia.com' numpy < 1.24; platform_machine == 'x86_64' -tensorrt == 8.5.3.*; platform_machine == 'x86_64' -cuda-python == 11.8; platform_machine == 'x86_64' +tensorrt == 8.6.1.*; platform_machine == 'x86_64' +cuda-python == 11.8.*; platform_machine == 'x86_64' cython == 0.29.*; platform_machine == 'x86_64' nvidia-cuda-runtime-cu12 == 12.1.*; platform_machine == 'x86_64' nvidia-cuda-runtime-cu11 == 11.8.*; platform_machine == 'x86_64'