Skip to content

Commit

Permalink
Merge branch 'blakeblackshear:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
weitheng authored Nov 4, 2024
2 parents 0c29cfa + 156e7cc commit 1053d49
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
16 changes: 9 additions & 7 deletions docs/docs/configuration/semantic_search.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,17 @@ The CLIP models are downloaded in ONNX format, and the `large` model can be acce

If the correct build is used for your GPU and the `large` model is configured, then the GPU will be detected and used automatically.

**AMD**
- ROCm will automatically be detected and used for semantic search in the `-rocm` Frigate image.
**NOTE:** Object detection and Semantic Search are independent features. If you want to use your GPU with Semantic Search, you must choose the appropriate Frigate Docker image for your GPU.

**Intel**
- OpenVINO will automatically be detected and used as a detector in the default Frigate image.
- **AMD**
- ROCm will automatically be detected and used for semantic search in the `-rocm` Frigate image.

**Nvidia**
- Nvidia GPUs will automatically be detected and used as a detector in the `-tensorrt` Frigate image.
- Jetson devices will automatically be detected and used as a detector in the `-tensorrt-jp(4/5)` Frigate image.
- **Intel**
- OpenVINO will automatically be detected and used for semantic search in the default Frigate image.

- **Nvidia**
- Nvidia GPUs will automatically be detected and used for semantic search in the `-tensorrt` Frigate image.
- Jetson devices will automatically be detected and used for semantic search in the `-tensorrt-jp(4/5)` Frigate image.

:::

Expand Down
3 changes: 2 additions & 1 deletion frigate/object_processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,8 @@ def should_retain_recording(self, camera: str, obj: TrackedObject):
)
and (
not review_config.detections.required_zones
or set(obj.entered_zones) & set(review_config.alerts.required_zones)
or set(obj.entered_zones)
& set(review_config.detections.required_zones)
)
)
):
Expand Down

0 comments on commit 1053d49

Please sign in to comment.