From a35146ab616efc4affd8c81b9bf9f33cdbc5ec9c Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Thu, 27 Mar 2025 08:28:09 -0600
Subject: [PATCH] Various fixes (#17411)

* Remove initial requirement for history

* Clenaup conf

* Handle symlinks
---
 docker/tensorrt/Dockerfile.base                 | 17 +++++++++++++++--
 .../rootfs/etc/ld.so.conf.d/cuda_tensorrt.conf  |  3 +--
 frigate/data_processing/real_time/face.py       |  5 -----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/docker/tensorrt/Dockerfile.base b/docker/tensorrt/Dockerfile.base
index bd8738792..79a7f3c98 100644
--- a/docker/tensorrt/Dockerfile.base
+++ b/docker/tensorrt/Dockerfile.base
@@ -20,8 +20,21 @@ RUN --mount=type=bind,source=docker/tensorrt/detector/tensorrt_libyolo.sh,target
 # COPY required individual CUDA deps
 RUN mkdir -p /usr/local/cuda-deps
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
-      cp /usr/local/cuda-12.3/targets/x86_64-linux/lib/libcurand.s* /usr/local/cuda-deps/ && \
-      cp /usr/local/cuda-12.3/targets/x86_64-linux/lib/libnvrtc.s* /usr/local/cuda-deps/ ; \
+      cp /usr/local/cuda-12.3/targets/x86_64-linux/lib/libcurand.so.* /usr/local/cuda-deps/ && \
+      cp /usr/local/cuda-12.3/targets/x86_64-linux/lib/libnvrtc.so.* /usr/local/cuda-deps/ && \
+      cd /usr/local/cuda-deps/ && \
+      for lib in libnvrtc.so.*; do \
+        if [[ "$lib" =~ libnvrtc.so\.([0-9]+\.[0-9]+\.[0-9]+) ]]; then \
+          version="${BASH_REMATCH[1]}"; \
+          ln -sf "libnvrtc.so.$version" libnvrtc.so; \
+        fi; \
+      done && \
+      for lib in libcurand.so.*; do \
+        if [[ "$lib" =~ libcurand.so\.([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+) ]]; then \
+          version="${BASH_REMATCH[1]}"; \
+          ln -sf "libcurand.so.$version" libcurand.so; \
+        fi; \
+      done; \
     fi
 
 # Frigate w/ TensorRT Support as separate image
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 72eec56e0..f66af7dc6 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,7 @@
 /usr/local/lib
 /usr/local/cuda
+/usr/local/lib/python3.11/dist-packages/tensorrt
 /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/frigate/data_processing/real_time/face.py b/frigate/data_processing/real_time/face.py
index e3ebff079..d3fbc83df 100644
--- a/frigate/data_processing/real_time/face.py
+++ b/frigate/data_processing/real_time/face.py
@@ -390,11 +390,6 @@ class FaceRealTimeProcessor(RealTimeProcessorApi):
             self.person_face_history.pop(object_id)
 
     def weighted_average_by_area(self, results_list: list[tuple[str, float, int]]):
-        min_faces = 1 if self.requires_face_detection else 3
-
-        if len(results_list) < min_faces:
-            return "unknown", 0.0
-
         score_count = {}
         weighted_scores = {}
         total_face_areas = {}