Add ability to customize order of output for edge tpu detector models #9455
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
✅ Deploy Preview for frigate-docs canceled.
|
NickM-27
requested changes
Jan 26, 2024
| @@ -44,6 +44,7 @@ def __init__(self, detector_config: EdgeTpuDetectorConfig): | |||
| model_path=detector_config.model.path, | |||
| experimental_delegates=[edge_tpu_delegate], | |||
| ) | |||
| self.order = detector_config.model.order | |||
There was a problem hiding this comment.
I don't think there is a reason to set self.order every time, just set it once in init
frigate/detectors/detector_config.py
Outdated
| @@ -51,6 +51,9 @@ class ModelConfig(BaseModel): | |||
| model_type: ModelTypeEnum = Field( | |||
| default=ModelTypeEnum.ssd, title="Object Detection Model Type" | |||
| ) | |||
| order: list[int] = Field( | |||
There was a problem hiding this comment.
this config would apply to every detector so it needs to be used for every detector or perhaps the default value should be None and the field changes to be called custom_model_output_order or something
frigate/detectors/detector_config.py
Outdated
| @@ -51,6 +51,9 @@ class ModelConfig(BaseModel): | |||
| model_type: ModelTypeEnum = Field( | |||
| default=ModelTypeEnum.ssd, title="Object Detection Model Type" | |||
| ) | |||
| order: list[int] = Field( | |||
There was a problem hiding this comment.
I think the name should be more descriptive like model_output_tensor_order or something
modified: frigate/detectors/plugins/cpu_tfl.py modified: frigate/detectors/plugins/edgetpu_tfl.py
|
Any update on this? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add order to config.model to allow the user the ability to specify the order of boxes, scores, class_ids, and count for their edge tpu detector output. The default value is the current setting.