Skip to content

Commit 314242d

Browse files
solderzzcsolderzzc
authored
Merge pull request #143 from SharpAI/develop
Develop
2 parents 3079f24 + 95ac283 commit 314242d

File tree

8 files changed

+763
-17
lines changed

8 files changed

+763
-17
lines changed

‎skills/analysis/homesafe-bench/deploy.bat‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@echo off
2+
REM HomeSafe-Bench deployment script (Windows)
3+
REM Runs npm install to fetch openai SDK dependency
4+
5+
cd /d "%~dp0"
6+
7+
where npm >nul 2>&1
8+
if %errorlevel% neq 0 (
9+
echo ERROR: npm not found. Install Node.js from https://nodejs.org and retry.
10+
exit /b 1
11+
)
12+
13+
npm install
14+
if %errorlevel% neq 0 (
15+
echo ERROR: npm install failed
16+
exit /b 1
17+
)
18+
19+
echo HomeSafe-Bench dependencies installed
20+
exit /b 0

‎skills/analysis/smarthome-bench/deploy.bat‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
@echo off
2+
REM SmartHome-Bench deployment script (Windows)
3+
REM Called by Aegis deployment agent during skill installation
4+
5+
setlocal enabledelayedexpansion
6+
7+
set "SKILL_DIR=%~dp0"
8+
if "%SKILL_DIR:~-1%"=="\" set "SKILL_DIR=%SKILL_DIR:~0,-1%"
9+
echo Deploying SmartHome-Bench from: %SKILL_DIR%
10+
11+
REM ── Check system dependencies ────────────────────────────────────────────────
12+
13+
echo Checking system dependencies...
14+
15+
where yt-dlp >nul 2>&1
16+
if %errorlevel% neq 0 (
17+
echo WARNING: yt-dlp not found. Attempting install via pip...
18+
where pip >nul 2>&1
19+
if !errorlevel! equ 0 (
20+
pip install yt-dlp
21+
) else (
22+
where pip3 >nul 2>&1
23+
if !errorlevel! equ 0 (
24+
pip3 install yt-dlp
25+
) else (
26+
echo ERROR: Cannot install yt-dlp automatically. Please install manually:
27+
echo pip install yt-dlp
28+
echo OR download from https://github.com/yt-dlp/yt-dlp/releases
29+
exit /b 1
30+
)
31+
)
32+
)
33+
34+
REM Verify yt-dlp is now available
35+
where yt-dlp >nul 2>&1
36+
if %errorlevel% neq 0 (
37+
echo ERROR: yt-dlp installation failed
38+
exit /b 1
39+
)
40+
for /f "tokens=*" %%V in ('yt-dlp --version 2^>nul') do echo yt-dlp: %%V
41+
42+
where ffmpeg >nul 2>&1
43+
if %errorlevel% neq 0 (
44+
echo ERROR: ffmpeg not found. Please install manually:
45+
echo winget install ffmpeg
46+
echo OR download from https://ffmpeg.org/download.html
47+
exit /b 1
48+
)
49+
for /f "tokens=1-3" %%A in ('ffmpeg -version 2^>^&1') do (
50+
if "%%A"=="ffmpeg" echo ffmpeg: %%B %%C
51+
goto :ffmpeg_done
52+
)
53+
:ffmpeg_done
54+
55+
REM ── Install npm dependencies ─────────────────────────────────────────────────
56+
57+
echo Installing npm dependencies...
58+
59+
where npm >nul 2>&1
60+
if %errorlevel% neq 0 (
61+
echo ERROR: npm not found. Install Node.js from https://nodejs.org and retry.
62+
exit /b 1
63+
)
64+
65+
cd /d "%SKILL_DIR%"
66+
npm install --production
67+
if %errorlevel% neq 0 (
68+
echo ERROR: npm install failed
69+
exit /b 1
70+
)
71+
72+
echo SmartHome-Bench deployed successfully
73+
74+
endlocal
75+
exit /b 0

‎skills/detection/yolo-detection-2026/SKILL.md‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,15 @@ parameters:
6666
description: "Auto-convert model to optimized format for faster inference"
6767
group: Performance
6868

69+
- name: compute_units
70+
label: "Apple Compute Units"
71+
type: select
72+
options: ["auto", "cpu_and_ne", "all", "cpu_only", "cpu_and_gpu"]
73+
default: "auto"
74+
description: "CoreML compute target — 'auto' routes to Neural Engine (NPU), leaving GPU free for LLM/VLM"
75+
group: Performance
76+
platform: macos
77+
6978
capabilities:
7079
live_detection:
7180
script: scripts/detect.py
@@ -89,13 +98,15 @@ Real-time object detection using the latest YOLO 2026 models. Detects 80+ COCO o
8998

9099
The skill uses [`env_config.py`](../../lib/env_config.py) to **automatically detect hardware** and convert the model to the fastest format for your platform. Conversion happens once during deployment and is cached.
91100

92-
| Platform | Backend | Optimized Format | Expected Speedup |
93-
|----------|---------|------------------|:----------------:|
94-
| NVIDIA GPU | CUDA | TensorRT `.engine` | ~3-5x |
95-
| Apple Silicon (M1+) | MPS | CoreML `.mlpackage` | ~2x |
96-
| Intel CPU/GPU/NPU | OpenVINO | OpenVINO IR `.xml` | ~2-3x |
97-
| AMD GPU | ROCm | ONNX Runtime | ~1.5-2x |
98-
| CPU (any) | CPU | ONNX Runtime | ~1.5x |
101+
| Platform | Backend | Optimized Format | Compute Units | Expected Speedup |
102+
|----------|---------|------------------|:-------------:|:----------------:|
103+
| NVIDIA GPU | CUDA | TensorRT `.engine` | GPU | ~3-5x |
104+
| Apple Silicon (M1+) | MPS | CoreML `.mlpackage` | **Neural Engine** (NPU) | ~2x |
105+
| Intel CPU/GPU/NPU | OpenVINO | OpenVINO IR `.xml` | CPU/GPU/NPU | ~2-3x |
106+
| AMD GPU | ROCm | ONNX Runtime | GPU | ~1.5-2x |
107+
| CPU (any) | CPU | ONNX Runtime | CPU | ~1.5x |
108+
109+
> **Apple Silicon Note**: Detection defaults to `cpu_and_ne` (CPU + Neural Engine), keeping the GPU free for LLM/VLM inference. Set `compute_units: all` to include GPU if not running local LLM.
99110
100111
### How It Works
101112

‎skills/detection/yolo-detection-2026/deploy.bat‎

Lines changed: 221 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,221 @@
1+
@echo off
2+
REM deploy.bat — Zero-assumption bootstrapper for YOLO 2026 Detection Skill (Windows)
3+
REM
4+
REM Probes the system for Python, GPU backends, and installs the minimum
5+
REM viable stack. Called by Aegis skill-runtime-manager during installation.
6+
REM
7+
REM Uses skills\lib\env_config.py for hardware detection and model optimization.
8+
REM
9+
REM Exit codes:
10+
REM 0 = success
11+
REM 1 = fatal error (no Python found)
12+
REM 2 = partial success (CPU-only fallback)
13+
14+
setlocal enabledelayedexpansion
15+
16+
set "SKILL_DIR=%~dp0"
17+
REM Remove trailing backslash
18+
if "%SKILL_DIR:~-1%"=="\" set "SKILL_DIR=%SKILL_DIR:~0,-1%"
19+
set "VENV_DIR=%SKILL_DIR%\.venv"
20+
set "LOG_PREFIX=[YOLO-2026-deploy]"
21+
22+
REM Resolve lib dir (two levels up + lib)
23+
set "LIB_DIR="
24+
if exist "%SKILL_DIR%\..\..\lib\env_config.py" (
25+
pushd "%SKILL_DIR%\..\..\lib"
26+
set "LIB_DIR=!CD!"
27+
popd
28+
)
29+
30+
REM ─── Step 1: Find Python ───────────────────────────────────────────────────
31+
32+
echo %LOG_PREFIX% Searching for Python...>&2
33+
34+
set "PYTHON_CMD="
35+
36+
REM Try the Windows Python launcher (py.exe) first — ships with python.org installer
37+
for %%V in (3.12 3.11 3.10 3.9) do (
38+
if not defined PYTHON_CMD (
39+
py -%%V --version >nul 2>&1
40+
if !errorlevel! equ 0 (
41+
set "PYTHON_CMD=py -%%V"
42+
)
43+
)
44+
)
45+
46+
REM Fallback: bare python3 / python on PATH
47+
if not defined PYTHON_CMD (
48+
python3 --version >nul 2>&1
49+
if !errorlevel! equ 0 (
50+
REM Verify version >= 3.9
51+
for /f "tokens=2 delims= " %%A in ('python3 --version 2^>^&1') do set "_pyver=%%A"
52+
for /f "tokens=1,2 delims=." %%A in ("!_pyver!") do (
53+
if %%A geq 3 if %%B geq 9 set "PYTHON_CMD=python3"
54+
)
55+
)
56+
)
57+
58+
if not defined PYTHON_CMD (
59+
python --version >nul 2>&1
60+
if !errorlevel! equ 0 (
61+
for /f "tokens=2 delims= " %%A in ('python --version 2^>^&1') do set "_pyver=%%A"
62+
for /f "tokens=1,2 delims=." %%A in ("!_pyver!") do (
63+
if %%A geq 3 if %%B geq 9 set "PYTHON_CMD=python"
64+
)
65+
)
66+
)
67+
68+
if not defined PYTHON_CMD (
69+
echo %LOG_PREFIX% ERROR: No Python ^>=3.9 found. Install Python 3.9+ and retry.>&2
70+
echo {"event": "error", "stage": "python", "message": "No Python >=3.9 found"}
71+
exit /b 1
72+
)
73+
74+
for /f "tokens=*" %%A in ('!PYTHON_CMD! --version 2^>^&1') do set "PY_VERSION=%%A"
75+
echo %LOG_PREFIX% Using Python: %PYTHON_CMD% (%PY_VERSION%)>&2
76+
echo {"event": "progress", "stage": "python", "message": "Found %PY_VERSION%"}
77+
78+
REM ─── Step 2: Create virtual environment ────────────────────────────────────
79+
80+
if not exist "%VENV_DIR%\Scripts\python.exe" (
81+
echo %LOG_PREFIX% Creating virtual environment...>&2
82+
%PYTHON_CMD% -m venv "%VENV_DIR%"
83+
if !errorlevel! neq 0 (
84+
echo %LOG_PREFIX% ERROR: Failed to create virtual environment>&2
85+
echo {"event": "error", "stage": "venv", "message": "Failed to create venv"}
86+
exit /b 1
87+
)
88+
)
89+
90+
set "PIP=%VENV_DIR%\Scripts\pip.exe"
91+
set "VPYTHON=%VENV_DIR%\Scripts\python.exe"
92+
93+
"%PIP%" install --upgrade pip -q >nul 2>&1
94+
95+
echo {"event": "progress", "stage": "venv", "message": "Virtual environment ready"}
96+
97+
REM ─── Step 2.5: Bundle env_config.py alongside detect.py ────────────────────
98+
99+
if defined LIB_DIR (
100+
if exist "%LIB_DIR%\env_config.py" (
101+
copy /Y "%LIB_DIR%\env_config.py" "%SKILL_DIR%\scripts\env_config.py" >nul 2>&1
102+
echo %LOG_PREFIX% Bundled env_config.py into scripts\>&2
103+
)
104+
)
105+
106+
REM ─── Step 3: Detect hardware via env_config ────────────────────────────────
107+
108+
set "BACKEND=cpu"
109+
110+
REM Find env_config.py — bundled copy or repo lib\
111+
set "ENV_CONFIG_DIR="
112+
if exist "%SKILL_DIR%\scripts\env_config.py" (
113+
set "ENV_CONFIG_DIR=%SKILL_DIR%\scripts"
114+
) else if defined LIB_DIR (
115+
if exist "%LIB_DIR%\env_config.py" (
116+
set "ENV_CONFIG_DIR=%LIB_DIR%"
117+
)
118+
)
119+
120+
if defined ENV_CONFIG_DIR (
121+
echo %LOG_PREFIX% Detecting hardware via env_config.py...>&2
122+
123+
REM Run env_config detection via Python
124+
for /f "tokens=*" %%B in ('"%VPYTHON%" -c "import sys; sys.path.insert(0, r'!ENV_CONFIG_DIR!'); from env_config import HardwareEnv; env = HardwareEnv.detect(); print(env.backend)" 2^>nul') do (
125+
set "DETECTED_BACKEND=%%B"
126+
)
127+
128+
REM Validate backend value (Windows: only cuda, intel, cpu are realistic)
129+
if "!DETECTED_BACKEND!"=="cuda" (
130+
set "BACKEND=cuda"
131+
) else if "!DETECTED_BACKEND!"=="intel" (
132+
set "BACKEND=intel"
133+
) else if "!DETECTED_BACKEND!"=="cpu" (
134+
set "BACKEND=cpu"
135+
) else (
136+
echo %LOG_PREFIX% env_config returned '!DETECTED_BACKEND!', falling back to heuristic>&2
137+
set "BACKEND=cpu"
138+
)
139+
140+
echo %LOG_PREFIX% env_config detected backend: !BACKEND!>&2
141+
) else (
142+
echo %LOG_PREFIX% env_config.py not found, using heuristic detection...>&2
143+
144+
REM Fallback: inline GPU detection via nvidia-smi
145+
where nvidia-smi >nul 2>&1
146+
if !errorlevel! equ 0 (
147+
for /f "tokens=*" %%G in ('nvidia-smi --query-gpu^=driver_version --format^=csv^,noheader 2^>nul') do (
148+
if not "%%G"=="" (
149+
set "BACKEND=cuda"
150+
echo %LOG_PREFIX% Detected NVIDIA GPU ^(driver: %%G^)>&2
151+
)
152+
)
153+
)
154+
)
155+
156+
echo {"event": "progress", "stage": "gpu", "backend": "!BACKEND!", "message": "Compute backend: !BACKEND!"}
157+
158+
REM ─── Step 4: Install requirements ──────────────────────────────────────────
159+
160+
set "REQ_FILE=%SKILL_DIR%\requirements_!BACKEND!.txt"
161+
162+
if not exist "!REQ_FILE!" (
163+
echo %LOG_PREFIX% WARNING: !REQ_FILE! not found, falling back to CPU>&2
164+
set "REQ_FILE=%SKILL_DIR%\requirements_cpu.txt"
165+
set "BACKEND=cpu"
166+
)
167+
168+
echo %LOG_PREFIX% Installing dependencies from !REQ_FILE! ...>&2
169+
echo {"event": "progress", "stage": "install", "message": "Installing !BACKEND! dependencies..."}
170+
171+
if "!BACKEND!"=="cuda" (
172+
REM CUDA on Windows: install torch with CUDA index, then remaining deps
173+
"%PIP%" install torch torchvision --index-url https://download.pytorch.org/whl/cu124 -q 2>&1 | findstr /V "^$" >nul
174+
if !errorlevel! neq 0 (
175+
echo %LOG_PREFIX% WARNING: CUDA torch install failed, trying cu121...>&2
176+
"%PIP%" install torch torchvision --index-url https://download.pytorch.org/whl/cu121 -q 2>&1 | findstr /V "^$" >nul
177+
)
178+
REM Install remaining requirements (ultralytics, etc.)
179+
"%PIP%" install -r "!REQ_FILE!" -q 2>&1 | findstr /V "^$" >nul
180+
) else (
181+
"%PIP%" install -r "!REQ_FILE!" -q 2>&1 | findstr /V "^$" >nul
182+
)
183+
184+
REM ─── Step 5: Pre-convert model to optimized format ─────────────────────────
185+
186+
if "!BACKEND!" neq "cpu" (
187+
echo %LOG_PREFIX% Pre-converting model to optimized format for !BACKEND!...>&2
188+
echo {"event": "progress", "stage": "optimize", "message": "Converting model for !BACKEND! (~30-120s)..."}
189+
190+
"%VPYTHON%" -c "import sys; sys.path.insert(0, r'!ENV_CONFIG_DIR!'); from env_config import HardwareEnv; env = HardwareEnv.detect(); from ultralytics import YOLO; model = YOLO('yolo26n.pt'); result = env.export_model(model, 'yolo26n'); print(f'Optimized model exported: {result}' if result else 'Export skipped or failed')" 2>&1
191+
192+
if !errorlevel! equ 0 (
193+
echo {"event": "progress", "stage": "optimize", "message": "Model optimization complete"}
194+
) else (
195+
echo %LOG_PREFIX% WARNING: Model optimization failed, will use PyTorch at runtime>&2
196+
echo {"event": "progress", "stage": "optimize", "message": "Optimization failed — PyTorch fallback"}
197+
)
198+
) else if exist "%SKILL_DIR%\requirements_cpu.txt" (
199+
echo %LOG_PREFIX% Pre-converting model to ONNX for CPU...>&2
200+
echo {"event": "progress", "stage": "optimize", "message": "Converting model for cpu (~30-120s)..."}
201+
202+
"%VPYTHON%" -c "import sys; sys.path.insert(0, r'!ENV_CONFIG_DIR!'); from env_config import HardwareEnv; env = HardwareEnv.detect(); from ultralytics import YOLO; model = YOLO('yolo26n.pt'); result = env.export_model(model, 'yolo26n'); print(f'Optimized model exported: {result}' if result else 'Export skipped or failed')" 2>&1
203+
204+
if !errorlevel! equ 0 (
205+
echo {"event": "progress", "stage": "optimize", "message": "Model optimization complete"}
206+
) else (
207+
echo %LOG_PREFIX% WARNING: Model optimization failed, will use PyTorch at runtime>&2
208+
echo {"event": "progress", "stage": "optimize", "message": "Optimization failed — PyTorch fallback"}
209+
)
210+
)
211+
212+
REM ─── Step 6: Verify installation ───────────────────────────────────────────
213+
214+
echo %LOG_PREFIX% Verifying installation...>&2
215+
"%VPYTHON%" -c "import sys, json; sys.path.insert(0, r'!ENV_CONFIG_DIR!'); from env_config import HardwareEnv; env = HardwareEnv.detect(); print(json.dumps(env.to_dict(), indent=2))" 2>&1
216+
217+
echo {"event": "complete", "backend": "!BACKEND!", "message": "YOLO 2026 skill installed (!BACKEND! backend)"}
218+
echo %LOG_PREFIX% Done! Backend: !BACKEND!>&2
219+
220+
endlocal
221+
exit /b 0

‎skills/detection/yolo-detection-2026/scripts/detect.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def main():
248248
perf.model_load_ms = env.load_ms
249249
perf.export_ms = env.export_ms
250250

251-
emit({
251+
ready_event = {
252252
"event": "ready",
253253
"model": f"yolo2026{model_size[0]}",
254254
"model_size": model_size,
@@ -260,7 +260,10 @@ def main():
260260
"fps": fps,
261261
"model_load_ms": round(env.load_ms, 1),
262262
"available_sizes": list(MODEL_SIZE_MAP.keys()),
263-
})
263+
}
264+
if hasattr(env, 'compute_units') and env.backend == "mps":
265+
ready_event["compute_units"] = env.compute_units
266+
emit(ready_event)
264267
except Exception as e:
265268
emit({"event": "error", "message": f"Failed to load model: {e}", "retriable": False})
266269
sys.exit(1)

0 commit comments

Comments
 (0)