ultralytics 8.3.134 Fix ReID duplicated hooks when persist is False (#20618)
Signed-off-by: Mohammed Yasin <32206511+Y-T-G@users.noreply.github.com> Signed-off-by: Glenn Jocher <glenn.jocher@ultralytics.com> Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
This commit is contained in:
parent
58d84cd4b7
commit
449cd689aa
@ -1,6 +1,6 @@
|
||||
# Ultralytics 🚀 AGPL-3.0 License - https://ultralytics.com/license
|
||||
|
||||
__version__ = "8.3.133"
|
||||
__version__ = "8.3.134"
|
||||
|
||||
import os
|
||||
|
||||
|
||||
@ -51,7 +51,7 @@ class DetectionPredictor(BasePredictor):
|
||||
>>> results = predictor.predict("path/to/image.jpg")
|
||||
>>> processed_results = predictor.postprocess(preds, img, orig_imgs)
|
||||
"""
|
||||
save_feats = getattr(self, "save_feats", False)
|
||||
save_feats = getattr(self, "_feats", None) is not None
|
||||
preds = ops.non_max_suppression(
|
||||
preds,
|
||||
self.args.conf,
|
||||
|
||||
@ -45,7 +45,8 @@ def on_predict_start(predictor: object, persist: bool = False) -> None:
|
||||
raise AssertionError(f"Only 'bytetrack' and 'botsort' are supported for now, but got '{cfg.tracker_type}'")
|
||||
|
||||
predictor._feats = None # reset in case used earlier
|
||||
predictor.save_feats = False
|
||||
if hasattr(predictor, "_hook"):
|
||||
predictor._hook.remove()
|
||||
if cfg.tracker_type == "botsort" and cfg.with_reid and cfg.model == "auto":
|
||||
from ultralytics.nn.modules.head import Detect
|
||||
|
||||
@ -56,13 +57,11 @@ def on_predict_start(predictor: object, persist: bool = False) -> None:
|
||||
):
|
||||
cfg.model = "yolo11n-cls.pt"
|
||||
else:
|
||||
predictor.save_feats = True
|
||||
|
||||
# Register hook to extract input of Detect layer
|
||||
def pre_hook(module, input):
|
||||
predictor._feats = [t.clone() for t in input[0]]
|
||||
predictor._feats = list(input[0]) # unroll to new list to avoid mutation in forward
|
||||
|
||||
predictor.model.model.model[-1].register_forward_pre_hook(pre_hook)
|
||||
predictor._hook = predictor.model.model.model[-1].register_forward_pre_hook(pre_hook)
|
||||
|
||||
trackers = []
|
||||
for _ in range(predictor.dataset.bs):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user