Skip to content

Develop #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solderzzc merged 2 commits into from
Apr 17, 2026
Merged

Develop #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d91938d
fix(yolo-skill): defer ultralytics import in optimized hardware mode …
Apr 17, 2026
37de701
Merge pull request #194 from Interstellar-Apexx/feature/fix-yolo-opti…
solderzzc Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions skills/detection/yolo-detection-2026/scripts/env_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,8 +781,6 @@ def load_optimized(self, model_name: str, use_optimized: bool = True):
Returns:
(model, format_str) — the YOLO model and its format name
"""
from ultralytics import YOLO

t0 = time.perf_counter()

if use_optimized and self.framework_ok:
Expand All @@ -794,6 +792,7 @@ def load_optimized(self, model_name: str, use_optimized: bool = True):
if self.backend == "mps":
model = self._load_onnx_coreml(str(optimized_path))
else:
from ultralytics import YOLO
model = YOLO(str(optimized_path))
self.load_ms = (time.perf_counter() - t0) * 1000
_log(f"Loaded {self.export_format} model ({self.load_ms:.0f}ms)")
Expand All @@ -807,6 +806,7 @@ def load_optimized(self, model_name: str, use_optimized: bool = True):
if self.backend == "mps":
model = self._load_onnx_coreml(str(optimized_path))
else:
from ultralytics import YOLO
model = YOLO(str(optimized_path))
self.load_ms = (time.perf_counter() - t0) * 1000
_log(f"Loaded HuggingFace ONNX model ({self.load_ms:.0f}ms)")
Expand All @@ -815,6 +815,7 @@ def load_optimized(self, model_name: str, use_optimized: bool = True):
_log(f"Failed to load HF-downloaded model: {e}")

# Try exporting then loading
from ultralytics import YOLO
pt_model = YOLO(f"{model_name}.pt")
exported = self.export_model(pt_model, model_name)
if exported:
Expand All @@ -823,6 +824,7 @@ def load_optimized(self, model_name: str, use_optimized: bool = True):
if self.backend == "mps":
model = self._load_onnx_coreml(str(exported))
else:
from ultralytics import YOLO
model = YOLO(str(exported))
self.load_ms = (time.perf_counter() - t0) * 1000
_log(f"Loaded freshly exported {self.export_format} model ({self.load_ms:.0f}ms)")
Expand All @@ -847,6 +849,7 @@ def load_optimized(self, model_name: str, use_optimized: bool = True):
return pt_model, "pytorch"

# No optimization requested or framework missing
from ultralytics import YOLO
model = YOLO(f"{model_name}.pt")
fallback_device = self.device
if fallback_device == "cuda":
Expand Down
7 changes: 5 additions & 2 deletions skills/lib/env_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,8 +781,6 @@ def load_optimized(self, model_name: str, use_optimized: bool = True):
Returns:
(model, format_str) — the YOLO model and its format name
"""
from ultralytics import YOLO

t0 = time.perf_counter()

if use_optimized and self.framework_ok:
Expand All @@ -794,6 +792,7 @@ def load_optimized(self, model_name: str, use_optimized: bool = True):
if self.backend == "mps":
model = self._load_onnx_coreml(str(optimized_path))
else:
from ultralytics import YOLO
model = YOLO(str(optimized_path))
self.load_ms = (time.perf_counter() - t0) * 1000
_log(f"Loaded {self.export_format} model ({self.load_ms:.0f}ms)")
Expand All @@ -807,6 +806,7 @@ def load_optimized(self, model_name: str, use_optimized: bool = True):
if self.backend == "mps":
model = self._load_onnx_coreml(str(optimized_path))
else:
from ultralytics import YOLO
model = YOLO(str(optimized_path))
self.load_ms = (time.perf_counter() - t0) * 1000
_log(f"Loaded HuggingFace ONNX model ({self.load_ms:.0f}ms)")
Expand All @@ -815,6 +815,7 @@ def load_optimized(self, model_name: str, use_optimized: bool = True):
_log(f"Failed to load HF-downloaded model: {e}")

# Try exporting then loading
from ultralytics import YOLO
pt_model = YOLO(f"{model_name}.pt")
exported = self.export_model(pt_model, model_name)
if exported:
Expand All @@ -823,6 +824,7 @@ def load_optimized(self, model_name: str, use_optimized: bool = True):
if self.backend == "mps":
model = self._load_onnx_coreml(str(exported))
else:
from ultralytics import YOLO
model = YOLO(str(exported))
self.load_ms = (time.perf_counter() - t0) * 1000
_log(f"Loaded freshly exported {self.export_format} model ({self.load_ms:.0f}ms)")
Expand All @@ -847,6 +849,7 @@ def load_optimized(self, model_name: str, use_optimized: bool = True):
return pt_model, "pytorch"

# No optimization requested or framework missing
from ultralytics import YOLO
model = YOLO(f"{model_name}.pt")
fallback_device = self.device
if fallback_device == "cuda":
Expand Down