From e3894280680c969f5caf1439ca8b544a211ee672 Mon Sep 17 00:00:00 2001 From: Weitheng Haw Date: Sat, 21 Dec 2024 11:41:30 +0000 Subject: [PATCH] Revert "Update base image (#15103)" This reverts commit 73332cb8 --- docker/hailo8l/Dockerfile | 2 - docker/hailo8l/install_hailort.sh | 2 +- docker/main/Dockerfile | 38 ++++++++++------ docker/main/build_nginx.sh | 3 +- docker/main/build_ov_model.py | 2 +- docker/main/build_sqlite_vec.sh | 3 +- docker/main/install_deps.sh | 43 +++++++++++-------- docker/rockchip/Dockerfile | 3 +- docker/rockchip/requirements-wheels-rk.txt | 2 +- docker/rocm/Dockerfile | 19 ++++---- docker/rpi/install_deps.sh | 2 +- docker/tensorrt/Dockerfile.amd64 | 11 +++-- docker/tensorrt/Dockerfile.arm64 | 4 +- .../etc/ld.so.conf.d/cuda_tensorrt.conf | 12 +++--- docker/tensorrt/requirements-amd64.txt | 6 +-- frigate/log.py | 7 --- 16 files changed, 83 insertions(+), 76 deletions(-) diff --git a/docker/hailo8l/Dockerfile b/docker/hailo8l/Dockerfile index 33b5b08f0d..959e7692ed 100644 --- a/docker/hailo8l/Dockerfile +++ b/docker/hailo8l/Dockerfile @@ -5,7 +5,6 @@ ARG DEBIAN_FRONTEND=noninteractive # Build Python wheels FROM wheels AS h8l-wheels -RUN python3 -m pip config set global.break-system-packages true COPY docker/main/requirements-wheels.txt /requirements-wheels.txt COPY docker/hailo8l/requirements-wheels-h8l.txt /requirements-wheels-h8l.txt @@ -31,7 +30,6 @@ COPY --from=hailort /hailo-wheels /deps/hailo-wheels COPY --from=hailort /rootfs/ / # Install the wheels -RUN python3 -m pip config set global.break-system-packages true RUN pip3 install -U /deps/h8l-wheels/*.whl RUN pip3 install -U /deps/hailo-wheels/*.whl diff --git a/docker/hailo8l/install_hailort.sh b/docker/hailo8l/install_hailort.sh index efcc4f541f..62eba96115 100755 --- a/docker/hailo8l/install_hailort.sh +++ b/docker/hailo8l/install_hailort.sh @@ -15,5 +15,5 @@ wget -qO- "https://github.com/frigate-nvr/hailort/releases/download/v${hailo_ver mkdir -p /hailo-wheels -wget -P /hailo-wheels/ "https://github.com/frigate-nvr/hailort/releases/download/v${hailo_version}/hailort-${hailo_version}-cp311-cp311-linux_${arch}.whl" +wget -P /hailo-wheels/ "https://github.com/frigate-nvr/hailort/releases/download/v${hailo_version}/hailort-${hailo_version}-cp39-cp39-linux_${arch}.whl" diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile index 34c7f331df..9d2f442f08 100644 --- a/docker/main/Dockerfile +++ b/docker/main/Dockerfile @@ -3,12 +3,12 @@ # https://askubuntu.com/questions/972516/debian-frontend-environment-variable ARG DEBIAN_FRONTEND=noninteractive -ARG BASE_IMAGE=debian:12 -ARG SLIM_BASE=debian:12-slim +ARG BASE_IMAGE=debian:11 +ARG SLIM_BASE=debian:11-slim FROM ${BASE_IMAGE} AS base -FROM --platform=${BUILDPLATFORM} debian:12 AS base_host +FROM --platform=${BUILDPLATFORM} debian:11 AS base_host FROM ${SLIM_BASE} AS slim-base @@ -66,8 +66,8 @@ COPY docker/main/requirements-ov.txt /requirements-ov.txt RUN apt-get -qq update \ && apt-get -qq install -y wget python3 python3-dev python3-distutils gcc pkg-config libhdf5-dev \ && wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \ - && python3 get-pip.py "pip" --break-system-packages \ - && pip install --break-system-packages -r /requirements-ov.txt + && python3 get-pip.py "pip" \ + && pip install -r /requirements-ov.txt # Get OpenVino Model RUN --mount=type=bind,source=docker/main/build_ov_model.py,target=/build_ov_model.py \ @@ -139,17 +139,24 @@ ARG TARGETARCH # Use a separate container to build wheels to prevent build dependencies in final image RUN apt-get -qq update \ && apt-get -qq install -y \ - apt-transport-https wget \ + apt-transport-https \ + gnupg \ + wget \ + # the key fingerprint can be obtained from https://ftp-master.debian.org/keys.html + && wget -qO- "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA4285295FC7B1A81600062A9605C66F00D6C9793" | \ + gpg --dearmor > /usr/share/keyrings/debian-archive-bullseye-stable.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/debian-archive-bullseye-stable.gpg] http://deb.debian.org/debian bullseye main contrib non-free" | \ + tee /etc/apt/sources.list.d/debian-bullseye-nonfree.list \ && apt-get -qq update \ && apt-get -qq install -y \ - python3 \ - python3-dev \ + python3.9 \ + python3.9-dev \ # opencv dependencies build-essential cmake git pkg-config libgtk-3-dev \ libavcodec-dev libavformat-dev libswscale-dev libv4l-dev \ libxvidcore-dev libx264-dev libjpeg-dev libpng-dev libtiff-dev \ gfortran openexr libatlas-base-dev libssl-dev\ - libtbbmalloc2 libtbb-dev libdc1394-dev libopenexr-dev \ + libtbb2 libtbb-dev libdc1394-22-dev libopenexr-dev \ libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev \ # sqlite3 dependencies tclsh \ @@ -157,11 +164,14 @@ RUN apt-get -qq update \ gcc gfortran libopenblas-dev liblapack-dev && \ rm -rf /var/lib/apt/lists/* +# Ensure python3 defaults to python3.9 +RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1 + RUN wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \ - && python3 get-pip.py "pip" --break-system-packages + && python3 get-pip.py "pip" COPY docker/main/requirements.txt /requirements.txt -RUN pip3 install -r /requirements.txt --break-system-packages +RUN pip3 install -r /requirements.txt # Build pysqlite3 from source COPY docker/main/build_pysqlite3.sh /build_pysqlite3.sh @@ -212,8 +222,8 @@ RUN --mount=type=bind,source=docker/main/install_deps.sh,target=/deps/install_de /deps/install_deps.sh RUN --mount=type=bind,from=wheels,source=/wheels,target=/deps/wheels \ - python3 -m pip install --upgrade pip --break-system-packages && \ - pip3 install -U /deps/wheels/*.whl --break-system-packages + python3 -m pip install --upgrade pip && \ + pip3 install -U /deps/wheels/*.whl COPY --from=deps-rootfs / / @@ -260,7 +270,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* RUN --mount=type=bind,source=./docker/main/requirements-dev.txt,target=/workspace/frigate/requirements-dev.txt \ - pip3 install -r requirements-dev.txt --break-system-packages + pip3 install -r requirements-dev.txt HEALTHCHECK NONE diff --git a/docker/main/build_nginx.sh b/docker/main/build_nginx.sh index 505b19071e..e97f6bbe0c 100755 --- a/docker/main/build_nginx.sh +++ b/docker/main/build_nginx.sh @@ -8,7 +8,8 @@ SECURE_TOKEN_MODULE_VERSION="1.5" SET_MISC_MODULE_VERSION="v0.33" NGX_DEVEL_KIT_VERSION="v0.3.3" -sed -i '/^Types:/s/deb/& deb-src/' /etc/apt/sources.list.d/debian.sources +cp /etc/apt/sources.list /etc/apt/sources.list.d/sources-src.list +sed -i 's|deb http|deb-src http|g' /etc/apt/sources.list.d/sources-src.list apt-get update apt-get -yqq build-dep nginx diff --git a/docker/main/build_ov_model.py b/docker/main/build_ov_model.py index 2888d87a85..9e110ad9f9 100644 --- a/docker/main/build_ov_model.py +++ b/docker/main/build_ov_model.py @@ -4,7 +4,7 @@ ov_model = mo.convert_model( "/models/ssdlite_mobilenet_v2_coco_2018_05_09/frozen_inference_graph.pb", compress_to_fp16=True, - transformations_config="/usr/local/lib/python3.11/dist-packages/openvino/tools/mo/front/tf/ssd_v2_support.json", + transformations_config="/usr/local/lib/python3.9/dist-packages/openvino/tools/mo/front/tf/ssd_v2_support.json", tensorflow_object_detection_api_pipeline_config="/models/ssdlite_mobilenet_v2_coco_2018_05_09/pipeline.config", reverse_input_channels=True, ) diff --git a/docker/main/build_sqlite_vec.sh b/docker/main/build_sqlite_vec.sh index 4893a0db19..3dc28bcbf7 100755 --- a/docker/main/build_sqlite_vec.sh +++ b/docker/main/build_sqlite_vec.sh @@ -4,7 +4,8 @@ set -euxo pipefail SQLITE_VEC_VERSION="0.1.3" -sed -i '/^Types:/s/deb/& deb-src/' /etc/apt/sources.list.d/debian.sources +cp /etc/apt/sources.list /etc/apt/sources.list.d/sources-src.list +sed -i 's|deb http|deb-src http|g' /etc/apt/sources.list.d/sources-src.list apt-get update apt-get -yqq build-dep sqlite3 gettext git diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh index f8f68398f3..af349fd84d 100755 --- a/docker/main/install_deps.sh +++ b/docker/main/install_deps.sh @@ -11,34 +11,35 @@ apt-get -qq install --no-install-recommends -y \ lbzip2 \ procps vainfo \ unzip locales tzdata libxml2 xz-utils \ - python3 \ + python3.9 \ python3-pip \ curl \ lsof \ jq \ nethogs \ libgl1 \ - libglib2.0-0 \ - libusb-1.0.0 + libglib2.0-0 + +# ensure python3 defaults to python3.9 +update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1 mkdir -p -m 600 /root/.gnupg -# install coral runtime -wget -q -O /tmp/libedgetpu1-max.deb "https://github.com/feranick/libedgetpu/releases/download/16.0TF2.17.0-1/libedgetpu1-max_16.0tf2.17.0-1.bookworm_${TARGETARCH}.deb" -unset DEBIAN_FRONTEND -yes | dpkg -i /tmp/libedgetpu1-max.deb && export DEBIAN_FRONTEND=noninteractive -rm /tmp/libedgetpu1-max.deb +# add coral repo +curl -fsSLo - https://packages.cloud.google.com/apt/doc/apt-key.gpg | \ + gpg --dearmor -o /etc/apt/trusted.gpg.d/google-cloud-packages-archive-keyring.gpg +echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" | tee /etc/apt/sources.list.d/coral-edgetpu.list +echo "libedgetpu1-max libedgetpu/accepted-eula select true" | debconf-set-selections -# install python3 & tflite runtime -if [[ "${TARGETARCH}" == "amd64" ]]; then - pip3 install --break-system-packages https://github.com/feranick/TFlite-builds/releases/download/v2.17.0/tflite_runtime-2.17.0-cp311-cp311-linux_x86_64.whl - pip3 install --break-system-packages https://github.com/feranick/pycoral/releases/download/2.0.2TF2.17.0/pycoral-2.0.2-cp311-cp311-linux_x86_64.whl +# enable non-free repo in Debian +if grep -q "Debian" /etc/issue; then + sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list fi -if [[ "${TARGETARCH}" == "arm64" ]]; then - pip3 install --break-system-packages https://github.com/feranick/TFlite-builds/releases/download/v2.17.0/tflite_runtime-2.17.0-cp311-cp311-linux_aarch64.whl - pip3 install --break-system-packages https://github.com/feranick/pycoral/releases/download/2.0.2TF2.17.0/pycoral-2.0.2-cp311-cp311-linux_aarch64.whl -fi +# coral drivers +apt-get -qq update +apt-get -qq install --no-install-recommends --no-install-suggests -y \ + libedgetpu1-max python3-tflite-runtime python3-pycoral # btbn-ffmpeg -> amd64 if [[ "${TARGETARCH}" == "amd64" ]]; then @@ -66,15 +67,23 @@ fi # arch specific packages if [[ "${TARGETARCH}" == "amd64" ]]; then - # install amd / intel-i965 driver packages + # use debian bookworm for amd / intel-i965 driver packages + echo 'deb https://deb.debian.org/debian bookworm main contrib non-free' >/etc/apt/sources.list.d/debian-bookworm.list + apt-get -qq update apt-get -qq install --no-install-recommends --no-install-suggests -y \ i965-va-driver intel-gpu-tools onevpl-tools \ 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 + rm -f /etc/apt/sources.list.d/debian-bookworm.list + # use intel apt intel packages wget -qO - https://repositories.intel.com/gpu/intel-graphics.key | gpg --yes --dearmor --output /usr/share/keyrings/intel-graphics.gpg echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy client" | tee /etc/apt/sources.list.d/intel-gpu-jammy.list diff --git a/docker/rockchip/Dockerfile b/docker/rockchip/Dockerfile index 0fde75aa8b..e1b43c2553 100644 --- a/docker/rockchip/Dockerfile +++ b/docker/rockchip/Dockerfile @@ -7,14 +7,13 @@ FROM wheels as rk-wheels COPY docker/main/requirements-wheels.txt /requirements-wheels.txt COPY docker/rockchip/requirements-wheels-rk.txt /requirements-wheels-rk.txt RUN sed -i "/https:\/\//d" /requirements-wheels.txt -RUN python3 -m pip config set global.break-system-packages true RUN pip3 wheel --wheel-dir=/rk-wheels -c /requirements-wheels.txt -r /requirements-wheels-rk.txt FROM deps AS rk-frigate ARG TARGETARCH RUN --mount=type=bind,from=rk-wheels,source=/rk-wheels,target=/deps/rk-wheels \ - pip3 install -U /deps/rk-wheels/*.whl --break-system-packages + pip3 install -U /deps/rk-wheels/*.whl WORKDIR /opt/frigate/ COPY --from=rootfs / / diff --git a/docker/rockchip/requirements-wheels-rk.txt b/docker/rockchip/requirements-wheels-rk.txt index 71a9f58d13..c56b69b66d 100644 --- a/docker/rockchip/requirements-wheels-rk.txt +++ b/docker/rockchip/requirements-wheels-rk.txt @@ -1 +1 @@ -rknn-toolkit-lite2 @ https://github.com/MarcA711/rknn-toolkit2/releases/download/v2.0.0/rknn_toolkit_lite2-2.0.0b0-cp311-cp311-linux_aarch64.whl \ No newline at end of file +rknn-toolkit-lite2 @ https://github.com/MarcA711/rknn-toolkit2/releases/download/v2.0.0/rknn_toolkit_lite2-2.0.0b0-cp39-cp39-linux_aarch64.whl \ No newline at end of file diff --git a/docker/rocm/Dockerfile b/docker/rocm/Dockerfile index 34c7efffb0..eebe048788 100644 --- a/docker/rocm/Dockerfile +++ b/docker/rocm/Dockerfile @@ -34,7 +34,7 @@ RUN mkdir -p /opt/rocm-dist/etc/ld.so.conf.d/ RUN echo /opt/rocm/lib|tee /opt/rocm-dist/etc/ld.so.conf.d/rocm.conf ####################################################################### -FROM --platform=linux/amd64 debian:12 as debian-base +FROM --platform=linux/amd64 debian:11 as debian-base RUN apt-get update && apt-get -y upgrade RUN apt-get -y install --no-install-recommends libelf1 libdrm2 libdrm-amdgpu1 libnuma1 kmod @@ -51,7 +51,7 @@ COPY --from=rocm /opt/rocm-$ROCM /opt/rocm-$ROCM RUN ln -s /opt/rocm-$ROCM /opt/rocm RUN apt-get -y install g++ cmake -RUN apt-get -y install python3-pybind11 python3-distutils python3-dev +RUN apt-get -y install python3-pybind11 python3.9-distutils python3-dev WORKDIR /opt/build @@ -70,11 +70,10 @@ RUN apt-get -y install libnuma1 WORKDIR /opt/frigate/ COPY --from=rootfs / / -# Temporarily disabled to see if a new wheel can be built to support py3.11 -#COPY docker/rocm/requirements-wheels-rocm.txt /requirements.txt -#RUN python3 -m pip install --upgrade pip \ -# && pip3 uninstall -y onnxruntime-openvino \ -# && pip3 install -r /requirements.txt +COPY docker/rocm/requirements-wheels-rocm.txt /requirements.txt +RUN python3 -m pip install --upgrade pip \ + && pip3 uninstall -y onnxruntime-openvino \ + && pip3 install -r /requirements.txt ####################################################################### FROM scratch AS rocm-dist @@ -87,12 +86,12 @@ COPY --from=rocm /opt/rocm-$ROCM/share/miopen/db/*$AMDGPU* /opt/rocm-$ROCM/share COPY --from=rocm /opt/rocm-$ROCM/share/miopen/db/*gfx908* /opt/rocm-$ROCM/share/miopen/db/ COPY --from=rocm /opt/rocm-$ROCM/lib/rocblas/library/*$AMDGPU* /opt/rocm-$ROCM/lib/rocblas/library/ COPY --from=rocm /opt/rocm-dist/ / -COPY --from=debian-build /opt/rocm/lib/migraphx.cpython-311-x86_64-linux-gnu.so /opt/rocm-$ROCM/lib/ +COPY --from=debian-build /opt/rocm/lib/migraphx.cpython-39-x86_64-linux-gnu.so /opt/rocm-$ROCM/lib/ ####################################################################### FROM deps-prelim AS rocm-prelim-hsa-override0 -\ - ENV HSA_ENABLE_SDMA=0 + +ENV HSA_ENABLE_SDMA=0 COPY --from=rocm-dist / / diff --git a/docker/rpi/install_deps.sh b/docker/rpi/install_deps.sh index 76da198fc0..9716623cae 100755 --- a/docker/rpi/install_deps.sh +++ b/docker/rpi/install_deps.sh @@ -24,7 +24,7 @@ sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list if [[ "${TARGETARCH}" == "arm64" ]]; then # add raspberry pi repo gpg --no-default-keyring --keyring /usr/share/keyrings/raspbian.gpg --keyserver keyserver.ubuntu.com --recv-keys 82B129927FA3303E - echo "deb [signed-by=/usr/share/keyrings/raspbian.gpg] https://archive.raspberrypi.org/debian/ bookworm main" | tee /etc/apt/sources.list.d/raspi.list + echo "deb [signed-by=/usr/share/keyrings/raspbian.gpg] https://archive.raspberrypi.org/debian/ bullseye main" | tee /etc/apt/sources.list.d/raspi.list apt-get -qq update apt-get -qq install --no-install-recommends --no-install-suggests -y ffmpeg fi diff --git a/docker/tensorrt/Dockerfile.amd64 b/docker/tensorrt/Dockerfile.amd64 index f90912a527..3dcb426589 100644 --- a/docker/tensorrt/Dockerfile.amd64 +++ b/docker/tensorrt/Dockerfile.amd64 @@ -7,7 +7,6 @@ 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 @@ -21,20 +20,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/debian12/x86_64/cuda-keyring_1.1-1_all.deb \ +RUN wget https://developer.download.nvidia.com/compute/cuda/repos/debian11/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.6.1 -RUN python3 -m pip config set global.break-system-packages true +ENV TRT_VER=8.5.3 RUN --mount=type=bind,from=trt-wheels,source=/trt-wheels,target=/deps/trt-wheels \ - pip3 install -U /deps/trt-wheels/*.whl --break-system-packages && \ + pip3 install -U /deps/trt-wheels/*.whl && \ 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 / / @@ -47,4 +46,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 --break-system-packages + pip3 install -U /deps/trt-wheels/*.whl diff --git a/docker/tensorrt/Dockerfile.arm64 b/docker/tensorrt/Dockerfile.arm64 index ba2638fcb6..23a2459ace 100644 --- a/docker/tensorrt/Dockerfile.arm64 +++ b/docker/tensorrt/Dockerfile.arm64 @@ -41,11 +41,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 -ADD https://nvidia.box.com/shared/static/psl23iw3bh7hlgku0mjo1xekxpego3e3.whl /tmp/onnxruntime_gpu-1.15.1-cp311-cp311-linux_aarch64.whl +ADD https://nvidia.box.com/shared/static/9aemm4grzbbkfaesg5l7fplgjtmswhj8.whl /tmp/onnxruntime_gpu-1.15.1-cp39-cp39-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.15.1-cp311-cp311-linux_aarch64.whl + && pip3 install --no-deps /tmp/onnxruntime_gpu-1.15.1-cp39-cp39-linux_aarch64.whl FROM build-wheels AS trt-model-wheels ARG DEBIAN_FRONTEND 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 561b7bcd48..fe16ed9c51 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,8 +1,6 @@ /usr/local/lib -/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 +/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 diff --git a/docker/tensorrt/requirements-amd64.txt b/docker/tensorrt/requirements-amd64.txt index fc919aaff7..df276a613e 100644 --- a/docker/tensorrt/requirements-amd64.txt +++ b/docker/tensorrt/requirements-amd64.txt @@ -1,9 +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' -cuda-python == 11.8.*; platform_machine == 'x86_64' -cython == 3.0.*; platform_machine == 'x86_64' +tensorrt == 8.5.3.*; 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' nvidia-cublas-cu11 == 11.11.3.6; platform_machine == 'x86_64' diff --git a/frigate/log.py b/frigate/log.py index 53e9004f53..079fc61076 100644 --- a/frigate/log.py +++ b/frigate/log.py @@ -18,19 +18,12 @@ ) ) -# filter out norfair warning LOG_HANDLER.addFilter( lambda record: not record.getMessage().startswith( "You are using a scalar distance function" ) ) -# filter out tflite logging -LOG_HANDLER.addFilter( - lambda record: "Created TensorFlow Lite XNNPACK delegate for CPU." - not in record.getMessage() -) - log_listener: Optional[QueueListener] = None