Skip to content

Commit

Permalink
fix grammar, adjust device defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
dennispg committed Dec 12, 2022
1 parent 1da28ea commit 68e001a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions docs/docs/configuration/detectors.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ When using CPU detectors, you can add one CPU detector per camera. Adding more d
The EdgeTPU detector type runs a TensorFlow Lite model utilizing the Google Coral delegate for hardware acceleration. To configure an EdgeTPU detector, set the `"type"` attribute to `"edgetpu"`.
The EdgeTPU device can specified using the `"device"` attribute according to the [Documentation for the TensorFlow Lite Python API](https://coral.ai/docs/edgetpu/multiple-edgetpu/#using-the-tensorflow-lite-python-api). If not set, the delegate will use the first device it finds.
The EdgeTPU device can be specified using the `"device"` attribute according to the [Documentation for the TensorFlow Lite Python API](https://coral.ai/docs/edgetpu/multiple-edgetpu/#using-the-tensorflow-lite-python-api). If not set, the delegate will use the first device it finds.
A TensorFlow Lite model is provided in the container at `/edgetpu_model.tflite` and is used by this detector type by default. To provide your own model, bind mount the file into the container and provide the path with `model.path`.

Expand Down Expand Up @@ -97,7 +97,7 @@ detectors:

The OpenVINO detector type runs an OpenVINO IR model on Intel CPU, GPU and VPU hardware. To configure an OpenVINO detector, set the `"type"` attribute to `"openvino"`.

The OpenVINO device plugin is specified using the `"device"` attribute according to naming conventions in the [Device Documentation](https://docs.openvino.ai/latest/openvino_docs_OV_UG_Working_with_devices.html). Other supported devices could be `AUTO`, `CPU`, `GPU`, `MYRIAD`, etc. If not specified, the default OpenVINO device will be selected by the `AUTO` plugin.
The OpenVINO device to be used is specified using the `"device"` attribute according to the naming conventions in the [Device Documentation](https://docs.openvino.ai/latest/openvino_docs_OV_UG_Working_with_devices.html). Other supported devices could be `AUTO`, `CPU`, `GPU`, `MYRIAD`, etc. If not specified, the default OpenVINO device will be selected by the `AUTO` plugin.

OpenVINO is supported on 6th Gen Intel platforms (Skylake) and newer. A supported Intel platform is required to use the `GPU` device with OpenVINO. The `MYRIAD` device may be run on any platform, including Arm devices. For detailed system requirements, see [OpenVINO System Requirements](https://www.intel.com/content/www/us/en/developer/tools/openvino-toolkit/system-requirements.html)

Expand Down
2 changes: 1 addition & 1 deletion frigate/detectors/plugins/edgetpu_tfl.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

class EdgeTpuDetectorConfig(BaseDetectorConfig):
type: Literal[DETECTOR_KEY]
device: str = Field(default="usb", title="Device Type")
device: str = Field(default=None, title="Device Type")


class EdgeTpuTfl(DetectionApi):
Expand Down
2 changes: 1 addition & 1 deletion frigate/detectors/plugins/openvino.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

class OvDetectorConfig(BaseDetectorConfig):
type: Literal[DETECTOR_KEY]
device: str = Field(default="AUTO", title="Device Type")
device: str = Field(default=None, title="Device Type")


class OvDetector(DetectionApi):
Expand Down
4 changes: 2 additions & 2 deletions frigate/test/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ def test_detector_custom_model_path(self):
assert runtime_config.detectors["openvino"].type == DetectorTypeEnum.openvino

assert runtime_config.detectors["cpu"].num_threads == 3
assert runtime_config.detectors["edgetpu"].device == "usb"
assert runtime_config.detectors["openvino"].device == "AUTO"
assert runtime_config.detectors["edgetpu"].device is None
assert runtime_config.detectors["openvino"].device is None

assert runtime_config.model.path == "/default.tflite"
assert runtime_config.detectors["cpu"].model.path == "/cpu_model.tflite"
Expand Down

0 comments on commit 68e001a

Please sign in to comment.