masonhuang/cluster4npu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: masonhuang:Developer
Branches Tags
masonhuang:main
masonhuang:developer
masonhuang:Developer
..
compare: masonhuang:main
Branches Tags
masonhuang:main
masonhuang:developer
masonhuang:Developer

2 Commits
Developer ... main

Author SHA1 Message Date
Mason Huang
1f6ec0201a
Remove contributing and license sections from README 
Removed contributing guidelines and license section from README.
 2026-01-08 21:39:29 +08:00
HuangMason320
e2c55d993c feat: Implement multi-series dongle support 2025-08-11 11:31:33 +08:00
33 changed files with 5189 additions and 3546 deletions
Show Stats Expand all files Collapse all files

11
README.md
View File

@ -246,14 +246,3 @@ cluster4npu_ui/
├── tests/ # Test suite
└── resources/ # Assets and styling
```
### Contributing
1. Follow the TDD workflow defined in `CLAUDE.md`
2. Run tests before committing changes
3. Maintain the three-panel UI architecture
4. Document new node types and their properties
## License
This project is part of the Cluster4NPU ecosystem for parallel AI inference on Kneron NPU hardware.

110
check_multi_series_config.py
View File

@ -1,110 +0,0 @@
#!/usr/bin/env python3
"""
Check current multi-series configuration in saved .mflow files
"""
import json
import os
import glob
def check_mflow_files():
"""Check .mflow files for multi-series configuration"""
# Look for .mflow files in common locations
search_paths = [
"*.mflow",
"flows/*.mflow",
"examples/*.mflow",
"../*.mflow"
]
mflow_files = []
for pattern in search_paths:
mflow_files.extend(glob.glob(pattern))
if not mflow_files:
print("No .mflow files found in current directory")
return
print(f"Found {len(mflow_files)} .mflow file(s):")
for mflow_file in mflow_files:
print(f"\n=== Checking {mflow_file} ===")
try:
with open(mflow_file, 'r') as f:
data = json.load(f)
# Look for nodes with type "Model" or "ExactModelNode"
nodes = data.get('nodes', [])
model_nodes = [node for node in nodes if node.get('type') in ['Model', 'ExactModelNode']]
if not model_nodes:
print(" No Model nodes found")
continue
for i, node in enumerate(model_nodes):
print(f"\n Model Node {i+1}:")
print(f" Name: {node.get('name', 'Unnamed')}")
# Check both custom_properties and properties for multi-series config
custom_properties = node.get('custom_properties', {})
properties = node.get('properties', {})
# Multi-series config is typically in custom_properties
config_props = custom_properties if custom_properties else properties
# Check multi-series configuration
multi_series_mode = config_props.get('multi_series_mode', False)
enabled_series = config_props.get('enabled_series', [])
print(f" multi_series_mode: {multi_series_mode}")
print(f" enabled_series: {enabled_series}")
if multi_series_mode:
print(" Multi-series port configurations:")
for series in ['520', '720', '630', '730', '540']:
port_ids = config_props.get(f'kl{series}_port_ids', '')
if port_ids:
print(f" kl{series}_port_ids: '{port_ids}'")
assets_folder = config_props.get('assets_folder', '')
if assets_folder:
print(f" assets_folder: '{assets_folder}'")
else:
print(" assets_folder: (not set)")
else:
print(" Multi-series mode is DISABLED")
print(" Current single-series configuration:")
port_ids = properties.get('port_ids', [])
model_path = properties.get('model_path', '')
print(f" port_ids: {port_ids}")
print(f" model_path: '{model_path}'")
except Exception as e:
print(f" Error reading file: {e}")
def print_configuration_guide():
"""Print guide for setting up multi-series configuration"""
print("\n" + "="*60)
print("MULTI-SERIES CONFIGURATION GUIDE")
print("="*60)
print()
print("To enable multi-series inference, set these properties in your Model Node:")
print()
print("1. multi_series_mode = True")
print("2. enabled_series = ['520', '720']")
print("3. kl520_port_ids = '28,32'")
print("4. kl720_port_ids = '4'")
print("5. assets_folder = (optional, for auto model/firmware detection)")
print()
print("Expected devices found:")
print(" KL520 devices on ports: 28, 32")
print(" KL720 device on port: 4")
print()
print("If multi_series_mode is False or not set, the system will use")
print("single-series mode with only the first available device.")
if __name__ == "__main__":
check_mflow_files()
print_configuration_guide()

30
core/functions/InferencePipeline.py
View File

@ -19,8 +19,6 @@ class StageConfig:
model_path: str
upload_fw: bool
max_queue_size: int = 50
# Multi-series support
multi_series_config: Optional[Dict[str, Any]] = None # For multi-series mode
# Inter-stage processing
input_preprocessor: Optional[PreProcessor] = None # Before this stage
output_postprocessor: Optional[PostProcessor] = None # After this stage
@ -45,25 +43,15 @@ class PipelineStage:
self.stage_id = config.stage_id
# Initialize MultiDongle for this stage
if config.multi_series_config:
# Multi-series mode
self.multidongle = MultiDongle(
multi_series_config=config.multi_series_config,
max_queue_size=config.max_queue_size
)
print(f"[Stage {self.stage_id}] Initialized in multi-series mode with config: {list(config.multi_series_config.keys())}")
else:
# Single-series mode (legacy)
self.multidongle = MultiDongle(
port_id=config.port_ids,
scpu_fw_path=config.scpu_fw_path,
ncpu_fw_path=config.ncpu_fw_path,
model_path=config.model_path,
upload_fw=config.upload_fw,
auto_detect=config.auto_detect if hasattr(config, 'auto_detect') else False,
max_queue_size=config.max_queue_size
)
print(f"[Stage {self.stage_id}] Initialized in single-series mode")
self.multidongle = MultiDongle(
port_id=config.port_ids,
scpu_fw_path=config.scpu_fw_path,
ncpu_fw_path=config.ncpu_fw_path,
model_path=config.model_path,
upload_fw=config.upload_fw,
auto_detect=config.auto_detect if hasattr(config, 'auto_detect') else False,
max_queue_size=config.max_queue_size
)
# Store preprocessor and postprocessor for later use
self.stage_preprocessor = config.stage_preprocessor

701
core/functions/Multidongle.py
View File

@ -10,39 +10,7 @@ import kp
import cv2
import time
from abc import ABC, abstractmethod
from typing import Callable, Optional, Any, Dict, List
from dataclasses import dataclass
from collections import defaultdict
@dataclass
class InferenceTask:
sequence_id: int
image_data: np.ndarray
image_format: Any # kp.ImageFormat
timestamp: float
@dataclass
class InferenceResult:
sequence_id: int
result: Any
series_name: str
timestamp: float
class DongleSeriesSpec:
"""Dongle series specifications with GOPS capacity for load balancing"""
KL520_GOPS = 2
KL720_GOPS = 28
SERIES_SPECS = {
"KL520": {"product_id": 0x100, "gops": KL520_GOPS},
"KL720": {"product_id": 0x720, "gops": KL720_GOPS},
"KL630": {"product_id": 0x630, "gops": 400},
"KL730": {"product_id": 0x730, "gops": 1600},
# "KL540": {"product_id": 0x540, "gops": 800}
}
from typing import Callable, Optional, Any, Dict
class DataProcessor(ABC):
@ -115,7 +83,7 @@ class MultiDongle:
"0x720": "KL720",
"0x630": "KL630",
"0x730": "KL730",
# "0x540": "KL540",
"0x540": "KL540",
}
@staticmethod
@ -208,8 +176,8 @@ class MultiDongle:
return 'KL630'
elif chip == kp.ModelNefDescriptor.KP_CHIP_KL730:
return 'KL730'
# elif chip == kp.ModelNefDescriptor.KP_CHIP_KL540:
# return 'KL540'
elif chip == kp.ModelNefDescriptor.KP_CHIP_KL540:
return 'KL540'
# Final fallback
return 'Unknown'
@ -254,111 +222,17 @@ class MultiDongle:
except kp.ApiKPException as exception:
raise Exception(f'Failed to connect devices: {str(exception)}')
def __init__(self, port_id: list = None, scpu_fw_path: str = None, ncpu_fw_path: str = None,
model_path: str = None, upload_fw: bool = False, auto_detect: bool = False,
max_queue_size: int = 0, multi_series_config: dict = None):
def __init__(self, port_id: list = None, scpu_fw_path: str = None, ncpu_fw_path: str = None, model_path: str = None, upload_fw: bool = False, auto_detect: bool = False, max_queue_size: int = 0):
"""
Initialize the MultiDongle class with support for both single and multi-series configurations.
:param port_id: List of USB port IDs for single-series (legacy). If None and auto_detect=True, will auto-detect.
:param scpu_fw_path: Path to the SCPU firmware file for single-series (legacy).
:param ncpu_fw_path: Path to the NCPU firmware file for single-series (legacy).
:param model_path: Path to the model file for single-series (legacy).
:param upload_fw: Flag to indicate whether to upload firmware for single-series (legacy).
:param auto_detect: Flag to auto-detect and connect to available devices for single-series (legacy).
Initialize the MultiDongle class.
:param port_id: List of USB port IDs for the same layer's devices. If None and auto_detect=True, will auto-detect devices.
:param scpu_fw_path: Path to the SCPU firmware file.
:param ncpu_fw_path: Path to the NCPU firmware file.
:param model_path: Path to the model file.
:param upload_fw: Flag to indicate whether to upload firmware.
:param auto_detect: Flag to auto-detect and connect to available devices.
:param max_queue_size: Maximum size for internal queues. If 0, unlimited queues are used.
:param multi_series_config: Multi-series configuration dict. Format:
{
"KL520": {
"port_ids": [28, 32],
"model_path": "path/to/kl520_model.nef",
"firmware_paths": { # Optional
"scpu": "path/to/kl520_scpu.bin",
"ncpu": "path/to/kl520_ncpu.bin"
}
}
}
"""
# Determine if we're using multi-series mode
self.multi_series_mode = multi_series_config is not None
if self.multi_series_mode:
# Multi-series initialization
self._init_multi_series(multi_series_config, max_queue_size)
else:
# Legacy single-series initialization
self._init_single_series(port_id, scpu_fw_path, ncpu_fw_path, model_path,
upload_fw, auto_detect, max_queue_size)
def _init_multi_series(self, multi_series_config: dict, max_queue_size: int):
"""Initialize multi-series configuration"""
self.series_config = multi_series_config
self.series_groups = {} # series_name -> config
self.device_groups = {} # series_name -> device_group
self.model_descriptors = {} # series_name -> model descriptor
self.gops_weights = {} # series_name -> normalized weight
self.current_loads = {} # series_name -> current queue size
# Set up series groups and calculate weights
total_gops = 0
for series_name, config in multi_series_config.items():
if series_name not in DongleSeriesSpec.SERIES_SPECS:
raise ValueError(f"Unknown series: {series_name}")
self.series_groups[series_name] = config
self.current_loads[series_name] = 0
# Calculate effective GOPS (series GOPS * number of devices)
port_count = len(config.get("port_ids", []))
series_gops = DongleSeriesSpec.SERIES_SPECS[series_name]["gops"]
effective_gops = series_gops * port_count
total_gops += effective_gops
# Calculate normalized weights
for series_name, config in multi_series_config.items():
port_count = len(config.get("port_ids", []))
series_gops = DongleSeriesSpec.SERIES_SPECS[series_name]["gops"]
effective_gops = series_gops * port_count
self.gops_weights[series_name] = effective_gops / total_gops if total_gops > 0 else 0
# Multi-series threading and queues
if max_queue_size > 0:
self._input_queue = queue.Queue(maxsize=max_queue_size)
self._ordered_output_queue = queue.Queue(maxsize=max_queue_size)
else:
self._input_queue = queue.Queue()
self._ordered_output_queue = queue.Queue()
# Create output queue for legacy compatibility
self._output_queue = self._ordered_output_queue # Point to the same queue
self.result_queues = {} # series_name -> queue
for series_name in multi_series_config.keys():
self.result_queues[series_name] = queue.Queue()
# Sequence management for ordered results
self.sequence_counter = 0
self.sequence_lock = threading.Lock()
self.pending_results = {} # sequence_id -> InferenceResult
self.next_output_sequence = 0
# Threading
self._stop_event = threading.Event()
self.dispatcher_thread = None
self.send_threads = {} # series_name -> thread
self.receive_threads = {} # series_name -> thread
self.result_ordering_thread = None
# Legacy attributes for compatibility
self.port_id = []
self.device_group = None
self.model_nef_descriptor = None
self.generic_inference_input_descriptor = None
self._inference_counter = 0
def _init_single_series(self, port_id: list, scpu_fw_path: str, ncpu_fw_path: str,
model_path: str, upload_fw: bool, auto_detect: bool, max_queue_size: int):
"""Initialize legacy single-series configuration"""
self.auto_detect = auto_detect
self.connected_devices_info = []
@ -384,8 +258,8 @@ class MultiDongle:
# generic_inference_input_descriptor will be prepared in initialize
self.model_nef_descriptor = None
self.generic_inference_input_descriptor = None
# Queues for data
# Input queue for images to be sent
if max_queue_size > 0:
self._input_queue = queue.Queue(maxsize=max_queue_size)
self._output_queue = queue.Queue(maxsize=max_queue_size)
@ -396,137 +270,15 @@ class MultiDongle:
# Threading attributes
self._send_thread = None
self._receive_thread = None
self._stop_event = threading.Event()
self._stop_event = threading.Event() # Event to signal threads to stop
self._inference_counter = 0
# Convert single-series to multi-series format internally for unified processing
self._convert_single_to_multi_series()
def _convert_single_to_multi_series(self):
"""
Convert single-series configuration to multi-series format internally
This allows unified processing regardless of initialization mode
"""
if not self.port_id:
# No ports specified, create empty structure
self.series_groups = {}
self.gops_weights = {}
self.current_loads = {}
return
# Detect series from connected devices or use default
detected_series = self._detect_series_from_ports(self.port_id)
# Create multi-series config format
self.series_groups = {
detected_series: {
"port_ids": self.port_id.copy(),
"model_path": self.model_path,
"firmware_paths": {
"scpu": self.scpu_fw_path,
"ncpu": self.ncpu_fw_path
} if self.scpu_fw_path and self.ncpu_fw_path else {}
}
}
# Calculate GOPS weights (100% since it's single series)
self.gops_weights = {detected_series: 1.0}
# Initialize load tracking
self.current_loads = {detected_series: 0}
print(f"Single-series config converted to multi-series format: {detected_series}")
def _detect_series_from_ports(self, port_ids: List[int]) -> str:
"""
Detect series from port IDs by scanning connected devices
Falls back to KL520 if unable to detect
"""
try:
# Try to scan devices and match port IDs
devices_info = self.scan_devices()
for device_info in devices_info:
if device_info['port_id'] in port_ids:
series = device_info.get('series', 'Unknown')
if series != 'Unknown':
return series
# If scanning didn't work, try to auto-detect from the first available device
if self.auto_detect and self.connected_devices_info:
for device_info in self.connected_devices_info:
series = device_info.get('series', 'Unknown')
if series != 'Unknown':
return series
except Exception as e:
print(f"Warning: Could not detect series from devices: {e}")
# Fallback to KL520 (most common series)
print("Warning: Could not detect device series, defaulting to KL520")
return "KL520"
def _select_optimal_series(self) -> Optional[str]:
"""
Select optimal series based on current load and GOPS capacity with performance bias
Returns the series name with the best load/capacity ratio, favoring high-performance dongles
"""
if not self.multi_series_mode or not self.series_groups:
return None
best_score = float('inf')
selected_series = None
# Get series GOPS values for performance bias
series_gops = {}
for series_name in self.series_groups.keys():
# Extract GOPS from DongleSeriesSpec
for spec_name, spec_info in DongleSeriesSpec.SERIES_SPECS.items():
if spec_name == series_name:
series_gops[series_name] = spec_info["gops"]
break
for series_name in self.series_groups.keys():
current_load = self.current_loads.get(series_name, 0)
weight = self.gops_weights.get(series_name, 0)
gops = series_gops.get(series_name, 1)
if weight <= 0:
continue
# Calculate load ratio (lower is better)
load_ratio = current_load / weight
# Add performance bias: penalize low-GOPS devices more heavily
# This encourages using high-performance dongles even if they have slightly higher load
if gops < 10: # Low-performance threshold (like KL520 with 2 GOPS)
performance_penalty = 2.0 # 2x penalty for slow devices
else:
performance_penalty = 1.0
# Combined score considers both load and performance
combined_score = load_ratio * performance_penalty
if combined_score < best_score:
best_score = combined_score
selected_series = series_name
return selected_series
def initialize(self):
"""
Connect devices, upload firmware (if upload_fw is True), and upload model.
Must be called before start().
"""
if self.multi_series_mode:
# Multi-series initialization
self._initialize_multi_series()
else:
# Legacy single-series initialization
self._initialize_single_series()
def _initialize_single_series(self):
"""Initialize single-series (legacy) mode"""
# Connect device and assign to self.device_group
try:
print('[Connect Device]')
@ -590,102 +342,6 @@ class MultiDongle:
print("Warning: Could not get generic inference input descriptor from model.")
self.generic_inference_input_descriptor = None
def _initialize_multi_series(self):
"""Initialize multi-series mode"""
print('[Multi-Series Initialization]')
# Initialize each series separately
for series_name, config in self.series_config.items():
print(f'[Initializing {series_name}]')
# Get port IDs for this series
port_ids = config.get('port_ids', [])
if not port_ids:
print(f'Warning: No port IDs configured for {series_name}, skipping')
continue
# Connect devices for this series
try:
print(f' [Connect Devices] Port IDs: {port_ids}')
device_group = kp.core.connect_devices(usb_port_ids=port_ids)
self.device_groups[series_name] = device_group
print(f' - Success ({len(port_ids)} devices)')
except kp.ApiKPException as exception:
print(f'Error: connect devices failed for {series_name}, port IDs = {port_ids}, error = {str(exception)}')
continue
# Upload firmware if available
firmware_paths = config.get('firmware_paths')
if firmware_paths and 'scpu' in firmware_paths and 'ncpu' in firmware_paths:
try:
print(f' [Upload Firmware]')
kp.core.load_firmware_from_file(
device_group=device_group,
scpu_fw_path=firmware_paths['scpu'],
ncpu_fw_path=firmware_paths['ncpu']
)
print(f' - Success')
except kp.ApiKPException as exception:
print(f'Error: upload firmware failed for {series_name}, error = {str(exception)}')
continue
else:
print(f' [Upload Firmware] - Skipped (no firmware paths configured)')
# Upload model
model_path = config.get('model_path')
if model_path:
try:
print(f' [Upload Model]')
model_descriptor = kp.core.load_model_from_file(
device_group=device_group,
file_path=model_path
)
self.model_descriptors[series_name] = model_descriptor
print(f' - Success')
# Extract model input dimensions for this series
if model_descriptor and model_descriptor.models:
model = model_descriptor.models[0]
if hasattr(model, 'input_nodes') and model.input_nodes:
input_node = model.input_nodes[0]
shape = input_node.tensor_shape_info.data.shape_npu
model_input_shape = (shape[3], shape[2]) # (width, height)
model_input_channels = shape[1] # 3 for RGB
print(f' Model input shape: {model_input_shape}, channels: {model_input_channels}')
# Store series-specific model info
self.series_groups[series_name]['model_input_shape'] = model_input_shape
self.series_groups[series_name]['model_input_channels'] = model_input_channels
except kp.ApiKPException as exception:
print(f'Error: upload model failed for {series_name}, error = {str(exception)}')
continue
else:
print(f' [Upload Model] - Skipped (no model path configured)')
print('[Multi-Series Initialization Complete]')
# Set up legacy compatibility attributes using the first series
if self.device_groups:
first_series = next(iter(self.device_groups.keys()))
self.device_group = self.device_groups[first_series]
self.model_nef_descriptor = self.model_descriptors.get(first_series)
# Set up generic inference descriptor from first series
if self.model_nef_descriptor:
self.generic_inference_input_descriptor = kp.GenericImageInferenceDescriptor(
model_id=self.model_nef_descriptor.models[0].id,
)
# Set model input shape from first series
if first_series in self.series_groups:
series_info = self.series_groups[first_series]
self.model_input_shape = series_info.get('model_input_shape', (640, 640))
self.model_input_channels = series_info.get('model_input_channels', 3)
else:
self.model_input_shape = (640, 640)
self.model_input_channels = 3
def preprocess_frame(self, frame: np.ndarray, target_format: str = 'BGR565') -> np.ndarray:
"""
Preprocess frame for inference
@ -835,13 +491,6 @@ class MultiDongle:
Start the send and receive threads.
Must be called after initialize().
"""
if self.multi_series_mode:
self._start_multi_series()
else:
self._start_single_series()
def _start_single_series(self):
"""Start single-series (legacy) mode"""
if self.device_group is None:
raise RuntimeError("MultiDongle not initialized. Call initialize() first.")
@ -856,62 +505,11 @@ class MultiDongle:
self._receive_thread.start()
print("Receive thread started.")
def _start_multi_series(self):
"""Start multi-series mode"""
if not self.device_groups:
raise RuntimeError("MultiDongle not initialized. Call initialize() first.")
print("[Starting Multi-Series Threads]")
self._stop_event.clear()
# Start dispatcher thread
if self.dispatcher_thread is None or not self.dispatcher_thread.is_alive():
self.dispatcher_thread = threading.Thread(target=self._dispatcher_thread_func, daemon=True)
self.dispatcher_thread.start()
print("Dispatcher thread started.")
# Start send/receive threads for each series
for series_name in self.device_groups.keys():
# Start send thread for this series
if series_name not in self.send_threads or not self.send_threads[series_name].is_alive():
send_thread = threading.Thread(
target=self._multi_series_send_thread_func,
args=(series_name,),
daemon=True
)
self.send_threads[series_name] = send_thread
send_thread.start()
print(f"Send thread started for {series_name}.")
# Start receive thread for this series
if series_name not in self.receive_threads or not self.receive_threads[series_name].is_alive():
receive_thread = threading.Thread(
target=self._multi_series_receive_thread_func,
args=(series_name,),
daemon=True
)
self.receive_threads[series_name] = receive_thread
receive_thread.start()
print(f"Receive thread started for {series_name}.")
# Start result ordering thread
if self.result_ordering_thread is None or not self.result_ordering_thread.is_alive():
self.result_ordering_thread = threading.Thread(target=self._result_ordering_thread_func, daemon=True)
self.result_ordering_thread.start()
print("Result ordering thread started.")
def stop(self):
"""Improved stop method with better cleanup"""
if self._stop_event.is_set():
return # Already stopping
if self.multi_series_mode:
self._stop_multi_series()
else:
self._stop_single_series()
def _stop_single_series(self):
"""Stop single-series (legacy) mode"""
print("Stopping threads...")
self._stop_event.set()
@ -941,248 +539,6 @@ class MultiDongle:
print(f"Error disconnecting device group: {e}")
self.device_group = None
def _stop_multi_series(self):
"""Stop multi-series mode"""
print("[Stopping Multi-Series Threads]")
self._stop_event.set()
# Clear input queue to unblock dispatcher
while not self._input_queue.empty():
try:
self._input_queue.get_nowait()
except queue.Empty:
break
# Signal dispatcher thread to wake up
self._input_queue.put(None)
# Clear series result queues
for series_name, result_queue in self.result_queues.items():
while not result_queue.empty():
try:
result_queue.get_nowait()
except queue.Empty:
break
# Stop all send threads
for series_name, send_thread in self.send_threads.items():
if send_thread and send_thread.is_alive():
send_thread.join(timeout=2.0)
if send_thread.is_alive():
print(f"Warning: Send thread for {series_name} didn't stop cleanly")
# Stop all receive threads
for series_name, receive_thread in self.receive_threads.items():
if receive_thread and receive_thread.is_alive():
receive_thread.join(timeout=2.0)
if receive_thread.is_alive():
print(f"Warning: Receive thread for {series_name} didn't stop cleanly")
# Stop dispatcher thread
if self.dispatcher_thread and self.dispatcher_thread.is_alive():
self.dispatcher_thread.join(timeout=2.0)
if self.dispatcher_thread.is_alive():
print("Warning: Dispatcher thread didn't stop cleanly")
# Stop result ordering thread
if self.result_ordering_thread and self.result_ordering_thread.is_alive():
self.result_ordering_thread.join(timeout=2.0)
if self.result_ordering_thread.is_alive():
print("Warning: Result ordering thread didn't stop cleanly")
# Disconnect all device groups
print("Disconnecting device groups...")
for series_name, device_group in self.device_groups.items():
try:
kp.core.disconnect_devices(device_group=device_group)
print(f"Device group for {series_name} disconnected successfully.")
except kp.ApiKPException as e:
print(f"Error disconnecting device group for {series_name}: {e}")
self.device_groups.clear()
def _dispatcher_thread_func(self):
"""Dispatcher thread: assigns tasks to dongles based on load balancing"""
print("Dispatcher thread started")
while not self._stop_event.is_set():
try:
task = self._input_queue.get(timeout=0.1)
if task is None: # Sentinel value
continue
# Select optimal dongle based on current load and capacity
selected_series = self._select_optimal_series()
if selected_series is None:
print("Warning: No series available for task dispatch")
continue
# Enqueue to selected series
self.result_queues[selected_series].put(task)
self.current_loads[selected_series] += 1
except queue.Empty:
continue
except Exception as e:
print(f"Error in dispatcher: {e}")
if not self._stop_event.is_set():
self._stop_event.set()
print("Dispatcher thread stopped")
def _multi_series_send_thread_func(self, series_name: str):
"""Send thread for specific dongle series - with tuple handling fix"""
print(f"Send worker started for {series_name}")
device_group = self.device_groups[series_name]
result_queue = self.result_queues[series_name]
model_descriptor = self.model_descriptors[series_name]
while not self._stop_event.is_set():
try:
task = result_queue.get(timeout=0.1)
if task is None:
continue
# Handle both tuple and dict formats
if isinstance(task, tuple):
# Legacy single-series format: (image_data, image_format)
image_data, image_format = task
sequence_id = getattr(self, '_inference_counter', 0)
self._inference_counter = sequence_id + 1
elif isinstance(task, dict):
# Multi-series format: dict with keys
image_data = task.get('image_data')
image_format = task.get('image_format', kp.ImageFormat.KP_IMAGE_FORMAT_RGB565)
sequence_id = task.get('sequence_id', 0)
else:
print(f"Error: Unknown task format: {type(task)}")
continue
if image_data is None:
print(f"Error: No image data in task")
continue
# Create inference descriptor for this task
inference_descriptor = kp.GenericImageInferenceDescriptor(
model_id=model_descriptor.models[0].id,
)
inference_descriptor.inference_number = sequence_id
inference_descriptor.input_node_image_list = [
kp.GenericInputNodeImage(
image=image_data,
image_format=image_format,
resize_mode=kp.ResizeMode.KP_RESIZE_ENABLE,
padding_mode=kp.PaddingMode.KP_PADDING_CORNER,
normalize_mode=kp.NormalizeMode.KP_NORMALIZE_KNERON
)
]
# Send inference
kp.inference.generic_image_inference_send(
device_group=device_group,
generic_inference_input_descriptor=inference_descriptor
)
except queue.Empty:
continue
except kp.ApiKPException as e:
print(f"Error in {series_name} send worker: {e}")
if not self._stop_event.is_set():
self._stop_event.set()
except Exception as e:
print(f"Unexpected error in {series_name} send worker: {e}")
if not self._stop_event.is_set():
self._stop_event.set()
print(f"Send worker stopped for {series_name}")
def _multi_series_receive_thread_func(self, series_name: str):
"""Receive thread for specific dongle series"""
print(f"Receive worker started for {series_name}")
device_group = self.device_groups[series_name]
while not self._stop_event.is_set():
try:
# Receive inference result
raw_result = kp.inference.generic_image_inference_receive(device_group=device_group)
# Create result object
result = {
'sequence_id': raw_result.header.inference_number,
'result': raw_result,
'dongle_series': series_name,
'timestamp': time.time()
}
# Add to pending results for ordering
self.pending_results[result['sequence_id']] = result
self.current_loads[series_name] = max(0, self.current_loads[series_name] - 1)
except kp.ApiKPException as e:
if not self._stop_event.is_set():
print(f"Error in {series_name} receive worker: {e}")
self._stop_event.set()
except Exception as e:
print(f"Unexpected error in {series_name} receive worker: {e}")
print(f"Receive worker stopped for {series_name}")
def _result_ordering_thread_func(self):
"""Result ordering thread: ensures results are output in sequence order"""
print("Result ordering worker started")
# Track when we started waiting for each sequence
sequence_wait_times = {}
MAX_WAIT_TIME = 2.0 # Maximum wait time for slow sequences (seconds)
while not self._stop_event.is_set():
current_time = time.time()
# Check if next expected result is available
if self.next_output_sequence in self.pending_results:
result = self.pending_results.pop(self.next_output_sequence)
self._ordered_output_queue.put(result)
# Remove from wait tracking
sequence_wait_times.pop(self.next_output_sequence, None)
self.next_output_sequence += 1
# Clean up old pending results to prevent memory bloat
if len(self.pending_results) > 1000: # result_buffer_size
oldest_sequences = sorted(self.pending_results.keys())[:500]
for seq_id in oldest_sequences:
if seq_id < self.next_output_sequence:
self.pending_results.pop(seq_id, None)
else:
# Track how long we've been waiting for this sequence
if self.next_output_sequence not in sequence_wait_times:
sequence_wait_times[self.next_output_sequence] = current_time
# Check if we've been waiting too long
wait_time = current_time - sequence_wait_times[self.next_output_sequence]
if wait_time > MAX_WAIT_TIME:
print(f"Warning: Skipping sequence {self.next_output_sequence} after {wait_time:.2f}s timeout")
# Create a timeout result
timeout_result = {
'sequence_id': self.next_output_sequence,
'result': {'error': 'timeout', 'probability': 0.0, 'result_string': 'Timeout'},
'dongle_series': 'timeout',
'timestamp': current_time
}
self._ordered_output_queue.put(timeout_result)
# Remove from wait tracking and advance sequence
sequence_wait_times.pop(self.next_output_sequence, None)
self.next_output_sequence += 1
else:
time.sleep(0.001) # Small delay to prevent busy waiting
print("Result ordering worker stopped")
def put_input(self, image: Union[str, np.ndarray], format: str, target_size: Tuple[int, int] = None):
"""
Put an image into the input queue with flexible preprocessing
@ -1204,22 +560,7 @@ class MultiDongle:
else:
raise ValueError(f"Unsupported format: {format}")
if self.multi_series_mode:
# In multi-series mode, create a task with sequence ID
with self.sequence_lock:
sequence_id = self.sequence_counter
self.sequence_counter += 1
task = {
'sequence_id': sequence_id,
'image_data': image_data,
'image_format': image_format_enum,
'timestamp': time.time()
}
self._input_queue.put(task)
else:
# In single-series mode, use the original format
self._input_queue.put((image_data, image_format_enum))
self._input_queue.put((image_data, image_format_enum))
def get_output(self, timeout: float = None):
"""
@ -1229,15 +570,7 @@ class MultiDongle:
:return: Received data (e.g., kp.GenericInferenceOutputDescriptor) or None if no data available within timeout.
"""
try:
if self.multi_series_mode:
# In multi-series mode, use the ordered output queue
result = self._ordered_output_queue.get(block=timeout is not None, timeout=timeout)
if result and isinstance(result, dict):
return result.get('result') # Extract the actual inference result
return result
else:
# In single-series mode, use the regular output queue
return self._output_queue.get(block=timeout is not None, timeout=timeout)
return self._output_queue.get(block=timeout is not None, timeout=timeout)
except queue.Empty:
return None
@ -1304,7 +637,7 @@ class MultiDongle:
'kl720': 'KL720',
'kl630': 'KL630',
'kl730': 'KL730',
# 'kl540': 'KL540',
'kl540': 'KL540',
}
if isinstance(chip_id, str):

375
core/functions/demo_topology_clean.py Normal file
View File

@ -0,0 +1,375 @@
#!/usr/bin/env python3
"""
智慧拓撲排序算法演示 (獨立版本)
不依賴外部模組，純粹展示拓撲排序算法的核心功能
"""
import json
from typing import List, Dict, Any, Tuple
from collections import deque
class TopologyDemo:
"""演示拓撲排序算法的類別"""
def __init__(self):
self.stage_order = []
def analyze_pipeline(self, pipeline_data: Dict[str, Any]):
"""分析pipeline並執行拓撲排序"""
print("Starting intelligent pipeline topology analysis...")
# 提取模型節點
model_nodes = [node for node in pipeline_data.get('nodes', [])
if 'model' in node.get('type', '').lower()]
connections = pipeline_data.get('connections', [])
if not model_nodes:
print(" Warning: No model nodes found!")
return []
# 建立依賴圖
dependency_graph = self._build_dependency_graph(model_nodes, connections)
# 檢測循環
cycles = self._detect_cycles(dependency_graph)
if cycles:
print(f" Warning: Found {len(cycles)} cycles!")
dependency_graph = self._resolve_cycles(dependency_graph, cycles)
# 執行拓撲排序
sorted_stages = self._topological_sort_with_optimization(dependency_graph, model_nodes)
# 計算指標
metrics = self._calculate_pipeline_metrics(sorted_stages, dependency_graph)
self._display_pipeline_analysis(sorted_stages, metrics)
return sorted_stages
def _build_dependency_graph(self, model_nodes: List[Dict], connections: List[Dict]) -> Dict[str, Dict]:
"""建立依賴圖"""
print(" Building dependency graph...")
graph = {}
for node in model_nodes:
graph[node['id']] = {
'node': node,
'dependencies': set(),
'dependents': set(),
'depth': 0
}
# 分析連接
for conn in connections:
output_node_id = conn.get('output_node')
input_node_id = conn.get('input_node')
if output_node_id in graph and input_node_id in graph:
graph[input_node_id]['dependencies'].add(output_node_id)
graph[output_node_id]['dependents'].add(input_node_id)
dep_count = sum(len(data['dependencies']) for data in graph.values())
print(f" Graph built: {len(graph)} nodes, {dep_count} dependencies")
return graph
def _detect_cycles(self, graph: Dict[str, Dict]) -> List[List[str]]:
"""檢測循環"""
print(" Checking for dependency cycles...")
cycles = []
visited = set()
rec_stack = set()
def dfs_cycle_detect(node_id, path):
if node_id in rec_stack:
cycle_start = path.index(node_id)
cycle = path[cycle_start:] + [node_id]
cycles.append(cycle)
return True
if node_id in visited:
return False
visited.add(node_id)
rec_stack.add(node_id)
path.append(node_id)
for dependent in graph[node_id]['dependents']:
if dfs_cycle_detect(dependent, path):
return True
path.pop()
rec_stack.remove(node_id)
return False
for node_id in graph:
if node_id not in visited:
dfs_cycle_detect(node_id, [])
if cycles:
print(f" Warning: Found {len(cycles)} cycles")
else:
print(" No cycles detected")
return cycles
def _resolve_cycles(self, graph: Dict[str, Dict], cycles: List[List[str]]) -> Dict[str, Dict]:
"""解決循環"""
print(" Resolving dependency cycles...")
for cycle in cycles:
node_names = [graph[nid]['node']['name'] for nid in cycle]
print(f" Breaking cycle: {' → '.join(node_names)}")
if len(cycle) >= 2:
node_to_break = cycle[-2]
dependent_to_break = cycle[-1]
graph[dependent_to_break]['dependencies'].discard(node_to_break)
graph[node_to_break]['dependents'].discard(dependent_to_break)
print(f" Broke dependency: {graph[node_to_break]['node']['name']} → {graph[dependent_to_break]['node']['name']}")
return graph
def _topological_sort_with_optimization(self, graph: Dict[str, Dict], model_nodes: List[Dict]) -> List[Dict]:
"""執行優化的拓撲排序"""
print(" Performing optimized topological sort...")
# 計算深度層級
self._calculate_depth_levels(graph)
# 按深度分組
depth_groups = self._group_by_depth(graph)
# 排序
sorted_nodes = []
for depth in sorted(depth_groups.keys()):
group_nodes = depth_groups[depth]
group_nodes.sort(key=lambda nid: (
len(graph[nid]['dependencies']),
-len(graph[nid]['dependents']),
graph[nid]['node']['name']
))
for node_id in group_nodes:
sorted_nodes.append(graph[node_id]['node'])
print(f" Sorted {len(sorted_nodes)} stages into {len(depth_groups)} execution levels")
return sorted_nodes
def _calculate_depth_levels(self, graph: Dict[str, Dict]):
"""計算深度層級"""
print(" Calculating execution depth levels...")
no_deps = [nid for nid, data in graph.items() if not data['dependencies']]
queue = deque([(nid, 0) for nid in no_deps])
while queue:
node_id, depth = queue.popleft()
if graph[node_id]['depth'] < depth:
graph[node_id]['depth'] = depth
for dependent in graph[node_id]['dependents']:
queue.append((dependent, depth + 1))
def _group_by_depth(self, graph: Dict[str, Dict]) -> Dict[int, List[str]]:
"""按深度分組"""
depth_groups = {}
for node_id, data in graph.items():
depth = data['depth']
if depth not in depth_groups:
depth_groups[depth] = []
depth_groups[depth].append(node_id)
return depth_groups
def _calculate_pipeline_metrics(self, sorted_stages: List[Dict], graph: Dict[str, Dict]) -> Dict[str, Any]:
"""計算指標"""
print(" Calculating pipeline metrics...")
total_stages = len(sorted_stages)
max_depth = max([data['depth'] for data in graph.values()]) + 1 if graph else 1
depth_distribution = {}
for data in graph.values():
depth = data['depth']
depth_distribution[depth] = depth_distribution.get(depth, 0) + 1
max_parallel = max(depth_distribution.values()) if depth_distribution else 1
critical_path = self._find_critical_path(graph)
return {
'total_stages': total_stages,
'pipeline_depth': max_depth,
'max_parallel_stages': max_parallel,
'parallelization_efficiency': (total_stages / max_depth) if max_depth > 0 else 1.0,
'critical_path_length': len(critical_path),
'critical_path': critical_path
}
def _find_critical_path(self, graph: Dict[str, Dict]) -> List[str]:
"""找出關鍵路徑"""
longest_path = []
def dfs_longest_path(node_id, current_path):
nonlocal longest_path
current_path.append(node_id)
if not graph[node_id]['dependents']:
if len(current_path) > len(longest_path):
longest_path = current_path.copy()
else:
for dependent in graph[node_id]['dependents']:
dfs_longest_path(dependent, current_path)
current_path.pop()
for node_id, data in graph.items():
if not data['dependencies']:
dfs_longest_path(node_id, [])
return longest_path
def _display_pipeline_analysis(self, sorted_stages: List[Dict], metrics: Dict[str, Any]):
"""顯示分析結果"""
print("\n" + "="*60)
print("INTELLIGENT PIPELINE TOPOLOGY ANALYSIS COMPLETE")
print("="*60)
print(f"Pipeline Metrics:")
print(f" Total Stages: {metrics['total_stages']}")
print(f" Pipeline Depth: {metrics['pipeline_depth']} levels")
print(f" Max Parallel Stages: {metrics['max_parallel_stages']}")
print(f" Parallelization Efficiency: {metrics['parallelization_efficiency']:.1%}")
print(f"\nOptimized Execution Order:")
for i, stage in enumerate(sorted_stages, 1):
print(f" {i:2d}. {stage['name']} (ID: {stage['id'][:8]}...)")
if metrics['critical_path']:
print(f"\nCritical Path ({metrics['critical_path_length']} stages):")
critical_names = []
for node_id in metrics['critical_path']:
node_name = next((stage['name'] for stage in sorted_stages if stage['id'] == node_id), 'Unknown')
critical_names.append(node_name)
print(f" {' → '.join(critical_names)}")
print(f"\nPerformance Insights:")
if metrics['parallelization_efficiency'] > 0.8:
print(" Excellent parallelization potential!")
elif metrics['parallelization_efficiency'] > 0.6:
print(" Good parallelization opportunities available")
else:
print(" Limited parallelization - consider pipeline redesign")
if metrics['pipeline_depth'] <= 3:
print(" Low latency pipeline - great for real-time applications")
elif metrics['pipeline_depth'] <= 6:
print(" Balanced pipeline depth - good throughput/latency trade-off")
else:
print(" Deep pipeline - optimized for maximum throughput")
print("="*60 + "\n")
def create_demo_pipelines():
"""創建演示用的pipeline"""
# Demo 1: 簡單線性pipeline
simple_pipeline = {
"project_name": "Simple Linear Pipeline",
"nodes": [
{"id": "model_001", "name": "Object Detection", "type": "ExactModelNode"},
{"id": "model_002", "name": "Fire Classification", "type": "ExactModelNode"},
{"id": "model_003", "name": "Result Verification", "type": "ExactModelNode"}
],
"connections": [
{"output_node": "model_001", "input_node": "model_002"},
{"output_node": "model_002", "input_node": "model_003"}
]
}
# Demo 2: 並行pipeline
parallel_pipeline = {
"project_name": "Parallel Processing Pipeline",
"nodes": [
{"id": "model_001", "name": "RGB Processor", "type": "ExactModelNode"},
{"id": "model_002", "name": "IR Processor", "type": "ExactModelNode"},
{"id": "model_003", "name": "Depth Processor", "type": "ExactModelNode"},
{"id": "model_004", "name": "Fusion Engine", "type": "ExactModelNode"}
],
"connections": [
{"output_node": "model_001", "input_node": "model_004"},
{"output_node": "model_002", "input_node": "model_004"},
{"output_node": "model_003", "input_node": "model_004"}
]
}
# Demo 3: 複雜多層pipeline
complex_pipeline = {
"project_name": "Advanced Multi-Stage Fire Detection Pipeline",
"nodes": [
{"id": "model_rgb_001", "name": "RGB Feature Extractor", "type": "ExactModelNode"},
{"id": "model_edge_002", "name": "Edge Feature Extractor", "type": "ExactModelNode"},
{"id": "model_thermal_003", "name": "Thermal Feature Extractor", "type": "ExactModelNode"},
{"id": "model_fusion_004", "name": "Feature Fusion", "type": "ExactModelNode"},
{"id": "model_attention_005", "name": "Attention Mechanism", "type": "ExactModelNode"},
{"id": "model_classifier_006", "name": "Fire Classifier", "type": "ExactModelNode"}
],
"connections": [
{"output_node": "model_rgb_001", "input_node": "model_fusion_004"},
{"output_node": "model_edge_002", "input_node": "model_fusion_004"},
{"output_node": "model_thermal_003", "input_node": "model_attention_005"},
{"output_node": "model_fusion_004", "input_node": "model_classifier_006"},
{"output_node": "model_attention_005", "input_node": "model_classifier_006"}
]
}
# Demo 4: 有循環的pipeline (測試循環檢測)
cycle_pipeline = {
"project_name": "Pipeline with Cycles (Testing)",
"nodes": [
{"id": "model_A", "name": "Model A", "type": "ExactModelNode"},
{"id": "model_B", "name": "Model B", "type": "ExactModelNode"},
{"id": "model_C", "name": "Model C", "type": "ExactModelNode"}
],
"connections": [
{"output_node": "model_A", "input_node": "model_B"},
{"output_node": "model_B", "input_node": "model_C"},
{"output_node": "model_C", "input_node": "model_A"} # 創建循環!
]
}
return [simple_pipeline, parallel_pipeline, complex_pipeline, cycle_pipeline]
def main():
"""主演示函數"""
print("INTELLIGENT PIPELINE TOPOLOGY SORTING DEMONSTRATION")
print("="*60)
print("This demo showcases our advanced pipeline analysis capabilities:")
print("• Automatic dependency resolution")
print("• Parallel execution optimization")
print("• Cycle detection and prevention")
print("• Critical path analysis")
print("• Performance metrics calculation")
print("="*60 + "\n")
demo = TopologyDemo()
pipelines = create_demo_pipelines()
demo_names = ["Simple Linear", "Parallel Processing", "Complex Multi-Stage", "Cycle Detection"]
for i, (pipeline, name) in enumerate(zip(pipelines, demo_names), 1):
print(f"DEMO {i}: {name} Pipeline")
print("="*50)
demo.analyze_pipeline(pipeline)
print("\n")
print("ALL DEMONSTRATIONS COMPLETED SUCCESSFULLY!")
print("Ready for production deployment and progress reporting!")
if __name__ == "__main__":
main()

201
core/functions/mflow_converter.py
View File

@ -463,72 +463,6 @@ class MFlowConverter:
print("="*60 + "\n")
def _build_multi_series_config_from_properties(self, properties: Dict[str, Any]) -> Dict[str, Any]:
"""Build multi-series configuration from node properties"""
try:
enabled_series = properties.get('enabled_series', [])
assets_folder = properties.get('assets_folder', '')
if not enabled_series:
print("Warning: No enabled_series found in multi-series mode")
return {}
multi_series_config = {}
for series in enabled_series:
# Get port IDs for this series
port_ids_str = properties.get(f'kl{series}_port_ids', '')
if not port_ids_str or not port_ids_str.strip():
print(f"Warning: No port IDs configured for KL{series}")
continue
# Parse port IDs (comma-separated string to list of integers)
try:
port_ids = [int(pid.strip()) for pid in port_ids_str.split(',') if pid.strip()]
if not port_ids:
continue
except ValueError:
print(f"Warning: Invalid port IDs for KL{series}: {port_ids_str}")
continue
# Build series configuration
series_config = {
"port_ids": port_ids
}
# Add model path if assets folder is configured
if assets_folder:
import os
model_folder = os.path.join(assets_folder, 'Models', f'KL{series}')
if os.path.exists(model_folder):
# Look for .nef files in the model folder
nef_files = [f for f in os.listdir(model_folder) if f.endswith('.nef')]
if nef_files:
series_config["model_path"] = os.path.join(model_folder, nef_files[0])
print(f"Found model for KL{series}: {series_config['model_path']}")
# Add firmware paths if available
firmware_folder = os.path.join(assets_folder, 'Firmware', f'KL{series}')
if os.path.exists(firmware_folder):
scpu_path = os.path.join(firmware_folder, 'fw_scpu.bin')
ncpu_path = os.path.join(firmware_folder, 'fw_ncpu.bin')
if os.path.exists(scpu_path) and os.path.exists(ncpu_path):
series_config["firmware_paths"] = {
"scpu": scpu_path,
"ncpu": ncpu_path
}
print(f"Found firmware for KL{series}: scpu={scpu_path}, ncpu={ncpu_path}")
multi_series_config[f'KL{series}'] = series_config
print(f"Configured KL{series} with {len(port_ids)} devices on ports {port_ids}")
return multi_series_config if multi_series_config else {}
except Exception as e:
print(f"Error building multi-series config from properties: {e}")
return {}
def _create_stage_configs(self, model_nodes: List[Dict], preprocess_nodes: List[Dict],
postprocess_nodes: List[Dict], connections: List[Dict]) -> List[StageConfig]:
"""Create StageConfig objects for each model node"""
@ -568,38 +502,16 @@ class MFlowConverter:
# Queue size
max_queue_size = properties.get('max_queue_size', 50)
# Check if multi-series mode is enabled
multi_series_mode = properties.get('multi_series_mode', False)
multi_series_config = None
if multi_series_mode:
# Build multi-series config from node properties
multi_series_config = self._build_multi_series_config_from_properties(properties)
print(f"Multi-series config for {stage_id}: {multi_series_config}")
# Create StageConfig for multi-series mode
stage_config = StageConfig(
stage_id=stage_id,
port_ids=[], # Will be handled by multi_series_config
scpu_fw_path='', # Will be handled by multi_series_config
ncpu_fw_path='', # Will be handled by multi_series_config
model_path='', # Will be handled by multi_series_config
upload_fw=upload_fw,
max_queue_size=max_queue_size,
multi_series_config=multi_series_config
)
else:
# Create StageConfig for single-series mode (legacy)
stage_config = StageConfig(
stage_id=stage_id,
port_ids=port_ids,
scpu_fw_path=scpu_fw_path,
ncpu_fw_path=ncpu_fw_path,
model_path=model_path,
upload_fw=upload_fw,
max_queue_size=max_queue_size,
multi_series_config=None
)
# Create StageConfig
stage_config = StageConfig(
stage_id=stage_id,
port_ids=port_ids,
scpu_fw_path=scpu_fw_path,
ncpu_fw_path=ncpu_fw_path,
model_path=model_path,
upload_fw=upload_fw,
max_queue_size=max_queue_size
)
stage_configs.append(stage_config)
@ -713,87 +625,22 @@ class MFlowConverter:
"""Validate individual stage configuration"""
errors = []
# Check if this is multi-series configuration
if stage_config.multi_series_config:
# Multi-series validation
errors.extend(self._validate_multi_series_config(stage_config.multi_series_config, stage_num))
else:
# Single-series validation (legacy)
# Check model path
if not stage_config.model_path:
errors.append(f"Stage {stage_num}: Model path is required")
elif not os.path.exists(stage_config.model_path):
errors.append(f"Stage {stage_num}: Model file not found: {stage_config.model_path}")
# Check model path
if not stage_config.model_path:
errors.append(f"Stage {stage_num}: Model path is required")
elif not os.path.exists(stage_config.model_path):
errors.append(f"Stage {stage_num}: Model file not found: {stage_config.model_path}")
# Check firmware paths if upload_fw is True
if stage_config.upload_fw:
if not os.path.exists(stage_config.scpu_fw_path):
errors.append(f"Stage {stage_num}: SCPU firmware not found: {stage_config.scpu_fw_path}")
if not os.path.exists(stage_config.ncpu_fw_path):
errors.append(f"Stage {stage_num}: NCPU firmware not found: {stage_config.ncpu_fw_path}")
# Check firmware paths if upload_fw is True
if stage_config.upload_fw:
if not os.path.exists(stage_config.scpu_fw_path):
errors.append(f"Stage {stage_num}: SCPU firmware not found: {stage_config.scpu_fw_path}")
if not os.path.exists(stage_config.ncpu_fw_path):
errors.append(f"Stage {stage_num}: NCPU firmware not found: {stage_config.ncpu_fw_path}")
# Check port IDs
if not stage_config.port_ids:
errors.append(f"Stage {stage_num}: At least one port ID is required")
return errors
def _validate_multi_series_config(self, multi_series_config: Dict[str, Any], stage_num: int) -> List[str]:
"""Validate multi-series configuration"""
errors = []
if not multi_series_config:
errors.append(f"Stage {stage_num}: Multi-series configuration is empty")
return errors
print(f"Validating multi-series config for stage {stage_num}: {list(multi_series_config.keys())}")
# Check each series configuration
for series_name, series_config in multi_series_config.items():
if not isinstance(series_config, dict):
errors.append(f"Stage {stage_num}: Invalid configuration for {series_name}")
continue
# Check port IDs
port_ids = series_config.get('port_ids', [])
if not port_ids:
errors.append(f"Stage {stage_num}: {series_name} has no port IDs configured")
continue
if not isinstance(port_ids, list) or not all(isinstance(p, int) for p in port_ids):
errors.append(f"Stage {stage_num}: {series_name} port IDs must be a list of integers")
continue
print(f" {series_name}: {len(port_ids)} ports configured")
# Check model path
model_path = series_config.get('model_path')
if model_path:
if not os.path.exists(model_path):
errors.append(f"Stage {stage_num}: {series_name} model file not found: {model_path}")
else:
print(f" {series_name}: Model validated: {model_path}")
else:
print(f" {series_name}: No model path specified (optional for multi-series)")
# Check firmware paths if specified
firmware_paths = series_config.get('firmware_paths')
if firmware_paths and isinstance(firmware_paths, dict):
scpu_path = firmware_paths.get('scpu')
ncpu_path = firmware_paths.get('ncpu')
if scpu_path and not os.path.exists(scpu_path):
errors.append(f"Stage {stage_num}: {series_name} SCPU firmware not found: {scpu_path}")
elif scpu_path:
print(f" {series_name}: SCPU firmware validated: {scpu_path}")
if ncpu_path and not os.path.exists(ncpu_path):
errors.append(f"Stage {stage_num}: {series_name} NCPU firmware not found: {ncpu_path}")
elif ncpu_path:
print(f" {series_name}: NCPU firmware validated: {ncpu_path}")
if not errors:
print(f"Stage {stage_num}: Multi-series configuration validation passed")
# Check port IDs
if not stage_config.port_ids:
errors.append(f"Stage {stage_num}: At least one port ID is required")
return errors

398
core/functions/multi_series_converter.py Normal file
View File

@ -0,0 +1,398 @@
"""
Multi-Series UI Bridge Converter
This module provides a simplified bridge between the UI pipeline data and the
MultiSeriesDongleManager system, making it easy to convert UI configurations
to working multi-series inference pipelines.
Key Features:
- Direct conversion from UI pipeline data to MultiSeriesDongleManager config
- Simplified interface for deployment system
- Automatic validation and configuration generation
- Support for both folder-based and individual file configurations
Usage:
from multi_series_converter import MultiSeriesConverter
converter = MultiSeriesConverter()
manager = converter.create_multi_series_manager(pipeline_data, ui_config)
manager.start()
sequence_id = manager.put_input(image, 'BGR565')
result = manager.get_result()
"""
import os
import sys
from typing import Dict, Any, List, Tuple, Optional
# Add parent directory to path for imports
current_dir = os.path.dirname(__file__)
parent_dir = os.path.dirname(os.path.dirname(current_dir))
sys.path.insert(0, parent_dir)
try:
from multi_series_dongle_manager import MultiSeriesDongleManager, DongleSeriesSpec
MULTI_SERIES_AVAILABLE = True
except ImportError as e:
print(f"MultiSeriesDongleManager not available: {e}")
MULTI_SERIES_AVAILABLE = False
class MultiSeriesConverter:
"""Simplified converter for UI to MultiSeriesDongleManager bridge"""
def __init__(self):
self.series_specs = DongleSeriesSpec.SERIES_SPECS if MULTI_SERIES_AVAILABLE else {
0x100: {"name": "KL520", "gops": 3},
0x720: {"name": "KL720", "gops": 28},
0x630: {"name": "KL630", "gops": 400},
0x730: {"name": "KL730", "gops": 1600},
0x540: {"name": "KL540", "gops": 800}
}
def create_multi_series_manager(self, pipeline_data: Dict[str, Any],
multi_series_config: Dict[str, Any]) -> Optional[MultiSeriesDongleManager]:
"""
Create and configure MultiSeriesDongleManager from UI data
Args:
pipeline_data: Pipeline data from UI (.mflow format)
multi_series_config: Configuration from MultiSeriesConfigDialog
Returns:
Configured MultiSeriesDongleManager or None if creation fails
"""
if not MULTI_SERIES_AVAILABLE:
print("MultiSeriesDongleManager not available")
return None
try:
# Extract firmware and model paths
firmware_paths, model_paths = self._extract_paths(multi_series_config)
if not firmware_paths or not model_paths:
print("Insufficient firmware or model paths")
return None
# Create and initialize manager
manager = MultiSeriesDongleManager(
max_queue_size=multi_series_config.get('max_queue_size', 100),
result_buffer_size=multi_series_config.get('result_buffer_size', 1000)
)
# Initialize devices
success = manager.scan_and_initialize_devices(firmware_paths, model_paths)
if not success:
print("Failed to initialize multi-series devices")
return None
print("Multi-series manager created and initialized successfully")
return manager
except Exception as e:
print(f"Error creating multi-series manager: {e}")
return None
def _extract_paths(self, multi_series_config: Dict[str, Any]) -> Tuple[Dict[str, Dict[str, str]], Dict[str, str]]:
"""Extract firmware and model paths from multi-series config"""
config_mode = multi_series_config.get('config_mode', 'folder')
enabled_series = multi_series_config.get('enabled_series', [])
firmware_paths = {}
model_paths = {}
if config_mode == 'folder':
firmware_paths, model_paths = self._extract_folder_paths(multi_series_config, enabled_series)
else:
firmware_paths, model_paths = self._extract_individual_paths(multi_series_config, enabled_series)
return firmware_paths, model_paths
def _extract_folder_paths(self, config: Dict[str, Any], enabled_series: List[str]) -> Tuple[Dict[str, Dict[str, str]], Dict[str, str]]:
"""Extract paths from folder-based configuration"""
assets_folder = config.get('assets_folder', '')
if not assets_folder or not os.path.exists(assets_folder):
print(f"Assets folder not found: {assets_folder}")
return {}, {}
firmware_base = os.path.join(assets_folder, 'Firmware')
models_base = os.path.join(assets_folder, 'Models')
firmware_paths = {}
model_paths = {}
for series in enabled_series:
series_name = f'KL{series}' if series.isdigit() else series
# Firmware paths
series_fw_dir = os.path.join(firmware_base, series_name)
if os.path.exists(series_fw_dir):
scpu_path = os.path.join(series_fw_dir, 'fw_scpu.bin')
ncpu_path = os.path.join(series_fw_dir, 'fw_ncpu.bin')
if os.path.exists(scpu_path) and os.path.exists(ncpu_path):
firmware_paths[series_name] = {
'scpu': scpu_path,
'ncpu': ncpu_path
}
else:
print(f"Warning: Missing firmware files for {series_name}")
# Model paths - find first .nef file
series_model_dir = os.path.join(models_base, series_name)
if os.path.exists(series_model_dir):
model_files = [f for f in os.listdir(series_model_dir) if f.endswith('.nef')]
if model_files:
model_paths[series_name] = os.path.join(series_model_dir, model_files[0])
else:
print(f"Warning: No .nef model files found for {series_name}")
return firmware_paths, model_paths
def _extract_individual_paths(self, config: Dict[str, Any], enabled_series: List[str]) -> Tuple[Dict[str, Dict[str, str]], Dict[str, str]]:
"""Extract paths from individual file configuration"""
individual_paths = config.get('individual_paths', {})
firmware_paths = {}
model_paths = {}
for series in enabled_series:
series_name = f'KL{series}' if series.isdigit() else series
if series_name in individual_paths:
series_config = individual_paths[series_name]
# Firmware paths
scpu_path = series_config.get('scpu', '')
ncpu_path = series_config.get('ncpu', '')
if scpu_path and ncpu_path and os.path.exists(scpu_path) and os.path.exists(ncpu_path):
firmware_paths[series_name] = {
'scpu': scpu_path,
'ncpu': ncpu_path
}
else:
print(f"Warning: Invalid firmware paths for {series_name}")
# Model path
model_path = series_config.get('model', '')
if model_path and os.path.exists(model_path):
model_paths[series_name] = model_path
else:
print(f"Warning: Invalid model path for {series_name}")
return firmware_paths, model_paths
def validate_multi_series_config(self, multi_series_config: Dict[str, Any]) -> Tuple[bool, List[str]]:
"""
Validate multi-series configuration
Args:
multi_series_config: Configuration to validate
Returns:
Tuple of (is_valid, list_of_issues)
"""
issues = []
# Check enabled series
enabled_series = multi_series_config.get('enabled_series', [])
if not enabled_series:
issues.append("No series enabled")
# Check configuration mode
config_mode = multi_series_config.get('config_mode', 'folder')
if config_mode not in ['folder', 'individual']:
issues.append("Invalid configuration mode")
# Validate paths
firmware_paths, model_paths = self._extract_paths(multi_series_config)
if not firmware_paths:
issues.append("No valid firmware paths found")
if not model_paths:
issues.append("No valid model paths found")
# Check if all enabled series have both firmware and models
for series in enabled_series:
series_name = f'KL{series}' if series.isdigit() else series
if series_name not in firmware_paths:
issues.append(f"Missing firmware for {series_name}")
if series_name not in model_paths:
issues.append(f"Missing model for {series_name}")
# Check port mapping
port_mapping = multi_series_config.get('port_mapping', {})
if not port_mapping:
issues.append("No port mappings configured")
return len(issues) == 0, issues
def generate_config_summary(self, multi_series_config: Dict[str, Any]) -> str:
"""Generate a human-readable summary of the configuration"""
enabled_series = multi_series_config.get('enabled_series', [])
config_mode = multi_series_config.get('config_mode', 'folder')
port_mapping = multi_series_config.get('port_mapping', {})
summary = ["Multi-Series Configuration Summary", "=" * 40, ""]
summary.append(f"Configuration Mode: {config_mode}")
summary.append(f"Enabled Series: {', '.join(enabled_series)}")
summary.append(f"Port Mappings: {len(port_mapping)}")
summary.append("")
# Firmware and model paths
firmware_paths, model_paths = self._extract_paths(multi_series_config)
summary.append("Firmware Configuration:")
for series, fw_config in firmware_paths.items():
summary.append(f" {series}:")
summary.append(f" SCPU: {fw_config.get('scpu', 'Not configured')}")
summary.append(f" NCPU: {fw_config.get('ncpu', 'Not configured')}")
summary.append("")
summary.append("Model Configuration:")
for series, model_path in model_paths.items():
model_name = os.path.basename(model_path) if model_path else "Not configured"
summary.append(f" {series}: {model_name}")
summary.append("")
# Port mapping
summary.append("Port Mapping:")
if port_mapping:
for port_id, series in port_mapping.items():
summary.append(f" Port {port_id}: {series}")
else:
summary.append(" No port mappings configured")
return "\n".join(summary)
def get_performance_estimate(self, multi_series_config: Dict[str, Any]) -> Dict[str, Any]:
"""Get estimated performance for the multi-series configuration"""
enabled_series = multi_series_config.get('enabled_series', [])
port_mapping = multi_series_config.get('port_mapping', {})
total_gops = 0
series_counts = {}
# Count devices per series
for port_id, series in port_mapping.items():
series_name = f'KL{series}' if series.isdigit() else series
series_counts[series_name] = series_counts.get(series_name, 0) + 1
# Calculate total GOPS
for series_name, count in series_counts.items():
# Find corresponding product_id
for product_id, spec in self.series_specs.items():
if spec["name"] == series_name:
gops = spec["gops"] * count
total_gops += gops
break
# Estimate FPS improvement
base_fps = 10 # Baseline single dongle FPS
estimated_fps = min(base_fps * (total_gops / 10), base_fps * 5) # Cap at 5x improvement
return {
'total_gops': total_gops,
'estimated_fps': estimated_fps,
'series_counts': series_counts,
'total_devices': len(port_mapping),
'load_balancing': 'automatic_by_gops'
}
# Convenience function for easy usage
def create_multi_series_manager_from_ui(pipeline_data: Dict[str, Any],
multi_series_config: Dict[str, Any]) -> Optional[MultiSeriesDongleManager]:
"""
Convenience function to create MultiSeriesDongleManager from UI data
Args:
pipeline_data: Pipeline data from UI (.mflow format)
multi_series_config: Configuration from MultiSeriesConfigDialog
Returns:
Configured MultiSeriesDongleManager or None if creation fails
"""
converter = MultiSeriesConverter()
return converter.create_multi_series_manager(pipeline_data, multi_series_config)
# Example usage and testing
if __name__ == "__main__":
# Example configuration for testing
example_multi_series_config = {
'language': 'en',
'enabled_series': ['KL520', 'KL720'],
'config_mode': 'folder',
'assets_folder': r'C:\MyProject\Assets',
'port_mapping': {
28: 'KL520',
32: 'KL720'
},
'max_queue_size': 100,
'result_buffer_size': 1000
}
example_pipeline_data = {
'project_name': 'Test Multi-Series Pipeline',
'description': 'Testing multi-series configuration',
'nodes': [
{'id': '1', 'type': 'input', 'name': 'Camera Input'},
{'id': '2', 'type': 'model', 'name': 'Detection Model',
'custom_properties': {'multi_series_mode': True}},
{'id': '3', 'type': 'output', 'name': 'Display Output'}
]
}
try:
converter = MultiSeriesConverter()
# Validate configuration
is_valid, issues = converter.validate_multi_series_config(example_multi_series_config)
print("Multi-Series Converter Test")
print("=" * 30)
print(f"Configuration valid: {is_valid}")
if issues:
print("Issues found:")
for issue in issues:
print(f" - {issue}")
# Generate summary
print("\nConfiguration Summary:")
print(converter.generate_config_summary(example_multi_series_config))
# Get performance estimate
performance = converter.get_performance_estimate(example_multi_series_config)
print(f"\nPerformance Estimate:")
print(f" Total GOPS: {performance['total_gops']}")
print(f" Estimated FPS: {performance['estimated_fps']:.1f}")
print(f" Total devices: {performance['total_devices']}")
# Try to create manager (will fail without hardware)
if MULTI_SERIES_AVAILABLE:
manager = converter.create_multi_series_manager(
example_pipeline_data,
example_multi_series_config
)
if manager:
print("\n✓ MultiSeriesDongleManager created successfully")
manager.stop() # Clean shutdown
else:
print("\n✗ Failed to create MultiSeriesDongleManager (expected without hardware)")
else:
print("\n⚠ MultiSeriesDongleManager not available")
except Exception as e:
print(f"Error testing multi-series converter: {e}")
import traceback
traceback.print_exc()

443
core/functions/multi_series_mflow_converter.py Normal file
View File

@ -0,0 +1,443 @@
"""
Enhanced MFlow to Multi-Series API Converter
This module extends the MFlowConverter to support multi-series dongle configurations
by detecting multi-series model nodes and generating appropriate configurations for
the MultiSeriesDongleManager.
Key Features:
- Detect multi-series enabled model nodes
- Generate MultiSeriesStageConfig objects
- Maintain backward compatibility with single-series configurations
- Validate multi-series folder structures
- Optimize pipeline for mixed single/multi-series stages
Usage:
from multi_series_mflow_converter import MultiSeriesMFlowConverter
converter = MultiSeriesMFlowConverter()
pipeline_config = converter.load_and_convert("pipeline.mflow")
# Automatically creates appropriate pipeline type
if pipeline_config.has_multi_series:
pipeline = MultiSeriesInferencePipeline(pipeline_config.stage_configs)
else:
pipeline = InferencePipeline(pipeline_config.stage_configs)
"""
import json
import os
from typing import List, Dict, Any, Tuple, Union
from dataclasses import dataclass
# Import base converter and pipeline components
from .mflow_converter import MFlowConverter, PipelineConfig
from .multi_series_pipeline import MultiSeriesStageConfig, MultiSeriesInferencePipeline
from .InferencePipeline import StageConfig
@dataclass
class EnhancedPipelineConfig:
"""Enhanced pipeline configuration supporting both single and multi-series"""
stage_configs: List[Union[StageConfig, MultiSeriesStageConfig]]
pipeline_name: str
description: str
input_config: Dict[str, Any]
output_config: Dict[str, Any]
preprocessing_configs: List[Dict[str, Any]]
postprocessing_configs: List[Dict[str, Any]]
has_multi_series: bool = False
multi_series_count: int = 0
class MultiSeriesMFlowConverter(MFlowConverter):
"""Enhanced converter supporting multi-series configurations"""
def __init__(self, default_fw_path: str = "./firmware", default_assets_path: str = "./assets"):
"""
Initialize enhanced converter
Args:
default_fw_path: Default path for single-series firmware files
default_assets_path: Default path for multi-series assets folder structure
"""
super().__init__(default_fw_path)
self.default_assets_path = default_assets_path
def load_and_convert(self, mflow_file_path: str) -> EnhancedPipelineConfig:
"""
Load .mflow file and convert to enhanced API configuration
Args:
mflow_file_path: Path to the .mflow file
Returns:
EnhancedPipelineConfig: Configuration supporting both single and multi-series
"""
with open(mflow_file_path, 'r') as f:
mflow_data = json.load(f)
return self._convert_mflow_to_enhanced_config(mflow_data)
def _convert_mflow_to_enhanced_config(self, mflow_data: Dict[str, Any]) -> EnhancedPipelineConfig:
"""Convert loaded .mflow data to EnhancedPipelineConfig"""
# Extract basic metadata
pipeline_name = mflow_data.get('project_name', 'Enhanced Pipeline')
description = mflow_data.get('description', '')
nodes = mflow_data.get('nodes', [])
connections = mflow_data.get('connections', [])
# Build node lookup and categorize nodes
self._build_node_map(nodes)
model_nodes, input_nodes, output_nodes, preprocess_nodes, postprocess_nodes = self._categorize_nodes()
# Determine stage order based on connections
self._determine_stage_order(model_nodes, connections)
# Create enhanced stage configs (supporting both single and multi-series)
stage_configs, has_multi_series, multi_series_count = self._create_enhanced_stage_configs(
model_nodes, preprocess_nodes, postprocess_nodes, connections
)
# Extract input/output configurations
input_config = self._extract_input_config(input_nodes)
output_config = self._extract_output_config(output_nodes)
# Extract preprocessing/postprocessing configurations
preprocessing_configs = self._extract_preprocessing_configs(preprocess_nodes)
postprocessing_configs = self._extract_postprocessing_configs(postprocess_nodes)
return EnhancedPipelineConfig(
stage_configs=stage_configs,
pipeline_name=pipeline_name,
description=description,
input_config=input_config,
output_config=output_config,
preprocessing_configs=preprocessing_configs,
postprocessing_configs=postprocessing_configs,
has_multi_series=has_multi_series,
multi_series_count=multi_series_count
)
def _create_enhanced_stage_configs(self, model_nodes: List[Dict], preprocess_nodes: List[Dict],
postprocess_nodes: List[Dict], connections: List[Dict]
) -> Tuple[List[Union[StageConfig, MultiSeriesStageConfig]], bool, int]:
"""
Create stage configurations supporting both single and multi-series modes
Returns:
Tuple of (stage_configs, has_multi_series, multi_series_count)
"""
stage_configs = []
has_multi_series = False
multi_series_count = 0
for node in self.stage_order:
# Extract node properties - check both 'custom_properties' and 'custom' keys for compatibility
node_properties = node.get('custom_properties', {})
if not node_properties:
node_properties = node.get('custom', {})
# Check if this node is configured for multi-series mode
if node_properties.get('multi_series_mode', False):
# Create multi-series stage config
stage_config = self._create_multi_series_stage_config(node, preprocess_nodes, postprocess_nodes, connections)
stage_configs.append(stage_config)
has_multi_series = True
multi_series_count += 1
print(f"Created multi-series stage config for node: {node.get('name', 'Unknown')}")
else:
# Create single-series stage config (backward compatibility)
stage_config = self._create_single_series_stage_config(node, preprocess_nodes, postprocess_nodes, connections)
stage_configs.append(stage_config)
print(f"Created single-series stage config for node: {node.get('name', 'Unknown')}")
return stage_configs, has_multi_series, multi_series_count
def _create_multi_series_stage_config(self, node: Dict, preprocess_nodes: List[Dict],
postprocess_nodes: List[Dict], connections: List[Dict]) -> MultiSeriesStageConfig:
"""Create multi-series stage configuration from model node"""
# Extract node properties - check both 'custom_properties' and 'custom' keys for compatibility
node_properties = node.get('custom_properties', {})
if not node_properties:
node_properties = node.get('custom', {})
stage_id = node.get('name', f"stage_{node.get('id', 'unknown')}")
# Extract assets folder and validate structure
assets_folder = node_properties.get('assets_folder', '')
if not assets_folder or not os.path.exists(assets_folder):
raise ValueError(f"Multi-series assets folder not found or not specified for node {stage_id}: {assets_folder}")
# Get enabled series
enabled_series = node_properties.get('enabled_series', ['520', '720'])
if not enabled_series:
raise ValueError(f"No series enabled for multi-series node {stage_id}")
# Build firmware and model paths
firmware_paths = {}
model_paths = {}
firmware_folder = os.path.join(assets_folder, 'Firmware')
models_folder = os.path.join(assets_folder, 'Models')
for series in enabled_series:
series_name = f'KL{series}'
# Firmware paths
series_fw_folder = os.path.join(firmware_folder, series_name)
if os.path.exists(series_fw_folder):
firmware_paths[series_name] = {
'scpu': os.path.join(series_fw_folder, 'fw_scpu.bin'),
'ncpu': os.path.join(series_fw_folder, 'fw_ncpu.bin')
}
# Model paths - find the first .nef file
series_model_folder = os.path.join(models_folder, series_name)
if os.path.exists(series_model_folder):
model_files = [f for f in os.listdir(series_model_folder) if f.endswith('.nef')]
if model_files:
model_paths[series_name] = os.path.join(series_model_folder, model_files[0])
# Validate paths
if not firmware_paths:
raise ValueError(f"No firmware found for multi-series node {stage_id} in enabled series: {enabled_series}")
if not model_paths:
raise ValueError(f"No models found for multi-series node {stage_id} in enabled series: {enabled_series}")
return MultiSeriesStageConfig(
stage_id=stage_id,
multi_series_mode=True,
firmware_paths=firmware_paths,
model_paths=model_paths,
max_queue_size=node_properties.get('max_queue_size', 100),
result_buffer_size=node_properties.get('result_buffer_size', 1000),
# TODO: Add preprocessor/postprocessor support if needed
)
def _create_single_series_stage_config(self, node: Dict, preprocess_nodes: List[Dict],
postprocess_nodes: List[Dict], connections: List[Dict]) -> MultiSeriesStageConfig:
"""Create single-series stage configuration for backward compatibility"""
# Extract node properties - check both 'custom_properties' and 'custom' keys for compatibility
node_properties = node.get('custom_properties', {})
if not node_properties:
node_properties = node.get('custom', {})
stage_id = node.get('name', f"stage_{node.get('id', 'unknown')}")
# Extract single-series paths
model_path = node_properties.get('model_path', '')
scpu_fw_path = node_properties.get('scpu_fw_path', '')
ncpu_fw_path = node_properties.get('ncpu_fw_path', '')
# Validate single-series configuration
if not model_path:
raise ValueError(f"Model path required for single-series node {stage_id}")
return MultiSeriesStageConfig(
stage_id=stage_id,
multi_series_mode=False,
port_ids=[], # Will be auto-detected
scpu_fw_path=scpu_fw_path,
ncpu_fw_path=ncpu_fw_path,
model_path=model_path,
upload_fw=True if scpu_fw_path and ncpu_fw_path else False,
max_queue_size=node_properties.get('max_queue_size', 50),
# TODO: Add preprocessor/postprocessor support if needed
)
def validate_enhanced_config(self, config: EnhancedPipelineConfig) -> Tuple[bool, List[str]]:
"""
Validate enhanced pipeline configuration
Returns:
Tuple of (is_valid, list_of_error_messages)
"""
errors = []
# Basic validation
if not config.stage_configs:
errors.append("No stages configured")
if not config.pipeline_name:
errors.append("Pipeline name is required")
# Validate each stage
for i, stage_config in enumerate(config.stage_configs):
stage_errors = self._validate_stage_config(stage_config, i)
errors.extend(stage_errors)
# Multi-series specific validation
if config.has_multi_series:
multi_series_errors = self._validate_multi_series_configuration(config)
errors.extend(multi_series_errors)
return len(errors) == 0, errors
def _validate_stage_config(self, stage_config: Union[StageConfig, MultiSeriesStageConfig], stage_index: int) -> List[str]:
"""Validate individual stage configuration"""
errors = []
stage_name = getattr(stage_config, 'stage_id', f'Stage {stage_index}')
if isinstance(stage_config, MultiSeriesStageConfig):
if stage_config.multi_series_mode:
# Validate multi-series configuration
if not stage_config.firmware_paths:
errors.append(f"{stage_name}: No firmware paths configured for multi-series mode")
if not stage_config.model_paths:
errors.append(f"{stage_name}: No model paths configured for multi-series mode")
# Validate file existence
for series_name, fw_paths in (stage_config.firmware_paths or {}).items():
scpu_path = fw_paths.get('scpu')
ncpu_path = fw_paths.get('ncpu')
if not scpu_path or not os.path.exists(scpu_path):
errors.append(f"{stage_name}: SCPU firmware not found for {series_name}: {scpu_path}")
if not ncpu_path or not os.path.exists(ncpu_path):
errors.append(f"{stage_name}: NCPU firmware not found for {series_name}: {ncpu_path}")
for series_name, model_path in (stage_config.model_paths or {}).items():
if not model_path or not os.path.exists(model_path):
errors.append(f"{stage_name}: Model not found for {series_name}: {model_path}")
else:
# Validate single-series configuration
if not stage_config.model_path:
errors.append(f"{stage_name}: Model path is required for single-series mode")
elif not os.path.exists(stage_config.model_path):
errors.append(f"{stage_name}: Model file not found: {stage_config.model_path}")
return errors
def _validate_multi_series_configuration(self, config: EnhancedPipelineConfig) -> List[str]:
"""Validate multi-series specific requirements"""
errors = []
# Check for mixed configurations
single_series_count = len(config.stage_configs) - config.multi_series_count
if config.multi_series_count > 0 and single_series_count > 0:
# Mixed pipeline - add warning
print(f"Warning: Mixed pipeline detected - {config.multi_series_count} multi-series stages and {single_series_count} single-series stages")
# Additional multi-series validations can be added here
return errors
def create_enhanced_inference_pipeline(self, config: EnhancedPipelineConfig) -> Union[MultiSeriesInferencePipeline, 'InferencePipeline']:
"""
Create appropriate inference pipeline based on configuration
Returns:
MultiSeriesInferencePipeline if multi-series stages detected, otherwise regular InferencePipeline
"""
if config.has_multi_series:
print(f"Creating MultiSeriesInferencePipeline with {config.multi_series_count} multi-series stages")
return MultiSeriesInferencePipeline(
stage_configs=config.stage_configs,
pipeline_name=config.pipeline_name
)
else:
print("Creating standard InferencePipeline (single-series only)")
# Convert to standard StageConfig objects for backward compatibility
from .InferencePipeline import InferencePipeline
standard_configs = []
for stage_config in config.stage_configs:
if isinstance(stage_config, MultiSeriesStageConfig) and not stage_config.multi_series_mode:
# Convert to standard StageConfig
standard_config = StageConfig(
stage_id=stage_config.stage_id,
port_ids=stage_config.port_ids or [],
scpu_fw_path=stage_config.scpu_fw_path or '',
ncpu_fw_path=stage_config.ncpu_fw_path or '',
model_path=stage_config.model_path or '',
upload_fw=stage_config.upload_fw,
max_queue_size=stage_config.max_queue_size
)
standard_configs.append(standard_config)
return InferencePipeline(
stage_configs=standard_configs,
pipeline_name=config.pipeline_name
)
def create_assets_folder_structure(base_path: str, series_list: List[str] = None):
"""
Create the recommended folder structure for multi-series assets
Args:
base_path: Root path where assets folder should be created
series_list: List of series to create folders for (default: ['520', '720', '630', '730', '540'])
"""
if series_list is None:
series_list = ['520', '720', '630', '730', '540']
assets_path = os.path.join(base_path, 'Assets')
firmware_path = os.path.join(assets_path, 'Firmware')
models_path = os.path.join(assets_path, 'Models')
# Create main directories
os.makedirs(firmware_path, exist_ok=True)
os.makedirs(models_path, exist_ok=True)
# Create series-specific directories
for series in series_list:
series_name = f'KL{series}'
os.makedirs(os.path.join(firmware_path, series_name), exist_ok=True)
os.makedirs(os.path.join(models_path, series_name), exist_ok=True)
# Create README file explaining the structure
readme_content = """
# Multi-Series Assets Folder Structure
This folder contains firmware and models organized by dongle series for multi-series inference.
## Structure:
```
Assets/
├── Firmware/
│ ├── KL520/
│ │ ├── fw_scpu.bin
│ │ └── fw_ncpu.bin
│ ├── KL720/
│ │ ├── fw_scpu.bin
│ │ └── fw_ncpu.bin
│ └── [other series...]
└── Models/
├── KL520/
│ └── [model.nef files]
├── KL720/
│ └── [model.nef files]
└── [other series...]
```
## Usage:
1. Place firmware files (fw_scpu.bin, fw_ncpu.bin) in the appropriate series subfolder under Firmware/
2. Place model files (.nef) in the appropriate series subfolder under Models/
3. Configure your model node to use this Assets folder in multi-series mode
4. Select which series to enable in the model node properties
## Supported Series:
- KL520: Entry-level performance
- KL720: Mid-range performance
- KL630: High performance
- KL730: Very high performance
- KL540: Specialized performance
The multi-series system will automatically load balance inference across all enabled series
based on their GOPS capacity for optimal performance.
"""
with open(os.path.join(assets_path, 'README.md'), 'w') as f:
f.write(readme_content.strip())
print(f"Multi-series assets folder structure created at: {assets_path}")
print("Please copy your firmware and model files to the appropriate series subfolders.")

433
core/functions/multi_series_pipeline.py Normal file
View File

@ -0,0 +1,433 @@
"""
Multi-Series Inference Pipeline
This module extends the InferencePipeline to support multi-series dongle configurations
using the MultiSeriesDongleManager for improved performance across different dongle series.
Main Components:
- MultiSeriesPipelineStage: Pipeline stage supporting both single and multi-series modes
- Enhanced InferencePipeline with multi-series support
- Configuration adapters for seamless integration
Usage:
from core.functions.multi_series_pipeline import MultiSeriesInferencePipeline
# Multi-series configuration
config = MultiSeriesStageConfig(
stage_id="detection",
multi_series_mode=True,
firmware_paths={"KL520": {"scpu": "...", "ncpu": "..."}, ...},
model_paths={"KL520": "...", "KL720": "..."}
)
"""
from typing import List, Dict, Any, Optional, Callable, Union
import threading
import queue
import time
import traceback
import numpy as np
from dataclasses import dataclass
# Import existing pipeline components
from .InferencePipeline import (
PipelineData, InferencePipeline, PreProcessor, PostProcessor, DataProcessor
)
from .Multidongle import MultiDongle
# Import multi-series manager
import sys
import os
sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
from multi_series_dongle_manager import MultiSeriesDongleManager
@dataclass
class MultiSeriesStageConfig:
"""Enhanced configuration for multi-series pipeline stages"""
stage_id: str
max_queue_size: int = 100
# Multi-series mode configuration
multi_series_mode: bool = False
firmware_paths: Optional[Dict[str, Dict[str, str]]] = None # {"KL520": {"scpu": path, "ncpu": path}}
model_paths: Optional[Dict[str, str]] = None # {"KL520": model_path, "KL720": model_path}
result_buffer_size: int = 1000
# Single-series mode configuration (backward compatibility)
port_ids: Optional[List[int]] = None
scpu_fw_path: Optional[str] = None
ncpu_fw_path: Optional[str] = None
model_path: Optional[str] = None
upload_fw: bool = False
# Processing configuration
input_preprocessor: Optional[PreProcessor] = None
output_postprocessor: Optional[PostProcessor] = None
stage_preprocessor: Optional[PreProcessor] = None
stage_postprocessor: Optional[PostProcessor] = None
class MultiSeriesPipelineStage:
"""Enhanced pipeline stage supporting both single and multi-series modes"""
def __init__(self, config: MultiSeriesStageConfig):
self.config = config
self.stage_id = config.stage_id
# Initialize inference engine based on mode
if config.multi_series_mode:
# Multi-series mode using MultiSeriesDongleManager
self.inference_engine = MultiSeriesDongleManager(
max_queue_size=config.max_queue_size,
result_buffer_size=config.result_buffer_size
)
self.is_multi_series = True
else:
# Single-series mode using MultiDongle (backward compatibility)
self.inference_engine = MultiDongle(
port_id=config.port_ids or [],
scpu_fw_path=config.scpu_fw_path or "",
ncpu_fw_path=config.ncpu_fw_path or "",
model_path=config.model_path or "",
upload_fw=config.upload_fw,
max_queue_size=config.max_queue_size
)
self.is_multi_series = False
# Store processors
self.input_preprocessor = config.input_preprocessor
self.output_postprocessor = config.output_postprocessor
# Threading for this stage
self.input_queue = queue.Queue(maxsize=config.max_queue_size)
self.output_queue = queue.Queue(maxsize=config.max_queue_size)
self.worker_thread = None
self.running = False
self._stop_event = threading.Event()
# Statistics
self.processed_count = 0
self.error_count = 0
self.processing_times = []
def initialize(self):
"""Initialize the stage"""
print(f"[Stage {self.stage_id}] Initializing {'multi-series' if self.is_multi_series else 'single-series'} mode...")
try:
if self.is_multi_series:
# Initialize multi-series manager
if not self.inference_engine.scan_and_initialize_devices(
self.config.firmware_paths,
self.config.model_paths
):
raise RuntimeError("Failed to initialize multi-series dongles")
print(f"[Stage {self.stage_id}] Multi-series dongles initialized successfully")
else:
# Initialize single-series MultiDongle
self.inference_engine.initialize()
print(f"[Stage {self.stage_id}] Single-series dongle initialized successfully")
except Exception as e:
print(f"[Stage {self.stage_id}] Initialization failed: {e}")
raise
def start(self):
"""Start the stage worker thread"""
if self.worker_thread and self.worker_thread.is_alive():
return
self.running = True
self._stop_event.clear()
# Start inference engine
if self.is_multi_series:
self.inference_engine.start()
else:
self.inference_engine.start()
# Start worker thread
self.worker_thread = threading.Thread(target=self._worker_loop, daemon=True)
self.worker_thread.start()
print(f"[Stage {self.stage_id}] Worker thread started")
def stop(self):
"""Stop the stage gracefully"""
print(f"[Stage {self.stage_id}] Stopping...")
self.running = False
self._stop_event.set()
# Put sentinel to unblock worker
try:
self.input_queue.put(None, timeout=1.0)
except queue.Full:
pass
# Wait for worker thread
if self.worker_thread and self.worker_thread.is_alive():
self.worker_thread.join(timeout=3.0)
# Stop inference engine
if self.is_multi_series:
self.inference_engine.stop()
else:
self.inference_engine.stop()
print(f"[Stage {self.stage_id}] Stopped")
def _worker_loop(self):
"""Main worker loop for processing data"""
print(f"[Stage {self.stage_id}] Worker loop started")
while self.running and not self._stop_event.is_set():
try:
# Get input data
try:
pipeline_data = self.input_queue.get(timeout=1.0)
if pipeline_data is None: # Sentinel value
continue
except queue.Empty:
if self._stop_event.is_set():
break
continue
start_time = time.time()
# Process data through this stage
processed_data = self._process_data(pipeline_data)
# Only count and record timing for actual inference results
if processed_data and self._has_inference_result(processed_data):
processing_time = time.time() - start_time
self.processing_times.append(processing_time)
if len(self.processing_times) > 1000:
self.processing_times = self.processing_times[-500:]
self.processed_count += 1
# Put result to output queue
try:
self.output_queue.put(processed_data, block=False)
except queue.Full:
# Drop oldest and add new
try:
self.output_queue.get_nowait()
self.output_queue.put(processed_data, block=False)
except queue.Empty:
pass
except Exception as e:
self.error_count += 1
print(f"[Stage {self.stage_id}] Processing error: {e}")
traceback.print_exc()
print(f"[Stage {self.stage_id}] Worker loop stopped")
def _has_inference_result(self, processed_data) -> bool:
"""Check if processed_data contains a valid inference result"""
if not processed_data:
return False
try:
if hasattr(processed_data, 'stage_results') and processed_data.stage_results:
stage_result = processed_data.stage_results.get(self.stage_id)
if stage_result:
if isinstance(stage_result, tuple) and len(stage_result) == 2:
prob, result_str = stage_result
return prob is not None and result_str is not None and result_str != 'Processing'
elif isinstance(stage_result, dict):
if stage_result.get("status") in ["processing", "async"]:
return False
if stage_result.get("result") == "Processing":
return False
return True
else:
return stage_result is not None
except Exception:
pass
return False
def _process_data(self, pipeline_data: PipelineData) -> PipelineData:
"""Process data through this stage"""
try:
current_data = pipeline_data.data
# Step 1: Input preprocessing (inter-stage)
if self.input_preprocessor and isinstance(current_data, np.ndarray):
if self.is_multi_series:
# For multi-series, we may need different preprocessing
current_data = self.input_preprocessor.process(current_data, (640, 640), 'BGR565')
else:
current_data = self.input_preprocessor.process(
current_data,
self.inference_engine.model_input_shape,
'BGR565'
)
# Step 2: Inference
inference_result = None
if isinstance(current_data, np.ndarray) and len(current_data.shape) == 3:
if self.is_multi_series:
# Multi-series inference
sequence_id = self.inference_engine.put_input(current_data, 'BGR565')
# Try to get result (non-blocking for async processing)
result = self.inference_engine.get_result(timeout=0.1)
if result is not None:
# Extract actual inference data from MultiSeriesDongleManager result
if hasattr(result, 'result') and result.result:
if isinstance(result.result, tuple) and len(result.result) == 2:
inference_result = result.result
else:
inference_result = result.result
else:
inference_result = {'probability': 0.0, 'result': 'Processing', 'status': 'async'}
else:
inference_result = {'probability': 0.0, 'result': 'Processing', 'status': 'async'}
else:
# Single-series inference (existing behavior)
processed_data = self.inference_engine.preprocess_frame(current_data, 'BGR565')
if processed_data is not None:
self.inference_engine.put_input(processed_data, 'BGR565')
# Get inference result
result = self.inference_engine.get_latest_inference_result()
if result is not None:
if isinstance(result, tuple) and len(result) == 2:
inference_result = result
elif isinstance(result, dict) and result:
inference_result = result
else:
inference_result = result
else:
inference_result = {'probability': 0.0, 'result': 'Processing', 'status': 'async'}
# Step 3: Update pipeline data
if not inference_result:
inference_result = {'probability': 0.0, 'result': 'Processing', 'status': 'async'}
pipeline_data.stage_results[self.stage_id] = inference_result
pipeline_data.data = inference_result
pipeline_data.metadata[f'{self.stage_id}_timestamp'] = time.time()
return pipeline_data
except Exception as e:
print(f"[Stage {self.stage_id}] Data processing error: {e}")
pipeline_data.stage_results[self.stage_id] = {
'error': str(e),
'probability': 0.0,
'result': 'Processing Error'
}
return pipeline_data
def put_data(self, data: PipelineData, timeout: float = 1.0) -> bool:
"""Put data into this stage's input queue"""
try:
self.input_queue.put(data, timeout=timeout)
return True
except queue.Full:
return False
def get_result(self, timeout: float = 0.1) -> Optional[PipelineData]:
"""Get result from this stage's output queue"""
try:
return self.output_queue.get(timeout=timeout)
except queue.Empty:
return None
def get_statistics(self) -> Dict[str, Any]:
"""Get stage statistics"""
avg_processing_time = (
sum(self.processing_times) / len(self.processing_times)
if self.processing_times else 0.0
)
# Get engine-specific statistics
if self.is_multi_series:
engine_stats = self.inference_engine.get_statistics()
else:
engine_stats = self.inference_engine.get_statistics()
return {
'stage_id': self.stage_id,
'mode': 'multi-series' if self.is_multi_series else 'single-series',
'processed_count': self.processed_count,
'error_count': self.error_count,
'avg_processing_time': avg_processing_time,
'input_queue_size': self.input_queue.qsize(),
'output_queue_size': self.output_queue.qsize(),
'engine_stats': engine_stats
}
class MultiSeriesInferencePipeline(InferencePipeline):
"""Enhanced inference pipeline with multi-series support"""
def __init__(self, stage_configs: List[MultiSeriesStageConfig],
final_postprocessor: Optional[PostProcessor] = None,
pipeline_name: str = "MultiSeriesInferencePipeline"):
"""
Initialize multi-series inference pipeline
"""
self.pipeline_name = pipeline_name
self.stage_configs = stage_configs
self.final_postprocessor = final_postprocessor
# Create enhanced stages
self.stages: List[MultiSeriesPipelineStage] = []
for config in stage_configs:
stage = MultiSeriesPipelineStage(config)
self.stages.append(stage)
# Initialize other components from parent class
self.coordinator_thread = None
self.running = False
self._stop_event = threading.Event()
self.pipeline_input_queue = queue.Queue(maxsize=100)
self.pipeline_output_queue = queue.Queue(maxsize=100)
self.result_callback = None
self.error_callback = None
self.stats_callback = None
self.pipeline_counter = 0
self.completed_counter = 0
self.error_counter = 0
self.fps_start_time = None
self.fps_lock = threading.Lock()
def create_multi_series_config_from_model_node(model_config: Dict[str, Any]) -> MultiSeriesStageConfig:
"""
Create MultiSeriesStageConfig from model node configuration
"""
if model_config.get('multi_series_mode', False):
# Multi-series configuration
return MultiSeriesStageConfig(
stage_id=model_config.get('node_name', 'inference_stage'),
multi_series_mode=True,
firmware_paths=model_config.get('firmware_paths'),
model_paths=model_config.get('model_paths'),
max_queue_size=model_config.get('max_queue_size', 100),
result_buffer_size=model_config.get('result_buffer_size', 1000)
)
else:
# Single-series configuration (backward compatibility)
return MultiSeriesStageConfig(
stage_id=model_config.get('node_name', 'inference_stage'),
multi_series_mode=False,
port_ids=[], # Will be auto-detected
scpu_fw_path=model_config.get('scpu_fw_path'),
ncpu_fw_path=model_config.get('ncpu_fw_path'),
model_path=model_config.get('model_path'),
upload_fw=True,
max_queue_size=model_config.get('max_queue_size', 50)
)

531
core/nodes/exact_nodes.py
View File

@ -5,18 +5,37 @@ This module provides node implementations that exactly match the original
properties and behavior from the monolithic UI.py file.
"""
import os
try:
from NodeGraphQt import BaseNode
NODEGRAPH_AVAILABLE = True
except ImportError:
NODEGRAPH_AVAILABLE = False
# Create a mock base class
# Create a mock base class with property support
class BaseNode:
def __init__(self):
self._properties = {}
def create_property(self, name, value):
self._properties[name] = value
def set_property(self, name, value):
self._properties[name] = value
def get_property(self, name):
return self._properties.get(name, None)
def add_input(self, *args, **kwargs):
pass
def add_output(self, *args, **kwargs):
pass
def set_color(self, *args, **kwargs):
pass
def name(self):
return getattr(self, 'NODE_NAME', 'Unknown Node')
class ExactInputNode(BaseNode):
"""Input data source node - exact match to original."""
@ -75,9 +94,6 @@ class ExactInputNode(BaseNode):
def get_business_properties(self):
"""Get all business properties for serialization."""
if not NODEGRAPH_AVAILABLE:
return {}
properties = {}
for prop_name in self._property_options.keys():
try:
@ -102,75 +118,51 @@ class ExactModelNode(BaseNode):
def __init__(self):
super().__init__()
# Setup node connections (NodeGraphQt specific)
if NODEGRAPH_AVAILABLE:
# Setup node connections - exact match
self.add_input('input', multi_input=False, color=(255, 140, 0))
self.add_output('output', color=(0, 255, 0))
self.set_color(65, 84, 102)
# Original properties - exact match
self.create_property('model_path', '')
self.create_property('scpu_fw_path', '')
self.create_property('ncpu_fw_path', '')
self.create_property('dongle_series', '520')
self.create_property('num_dongles', 1)
self.create_property('port_id', '')
self.create_property('upload_fw', True)
# Create properties (always, regardless of NodeGraphQt availability)
self.create_property('multi_series_mode', False)
# Multi-series properties
self.create_property('assets_folder', '')
self.create_property('enabled_series', ['520', '720'])
self.create_property('port_mapping', {})
# Single-series properties (original)
self.create_property('model_path', '')
self.create_property('scpu_fw_path', '')
self.create_property('ncpu_fw_path', '')
self.create_property('dongle_series', '520')
self.create_property('num_dongles', 1)
self.create_property('port_id', '')
self.create_property('upload_fw', True)
# Property options with multi-series support (always available)
self._property_options = {
# Multi-series properties
self.create_property('multi_series_mode', False)
self.create_property('assets_folder', '')
self.create_property('enabled_series', ['520', '720'])
'multi_series_mode': {'type': 'bool', 'default': False, 'description': 'Enable multi-series dongle support'},
'assets_folder': {'type': 'file_path', 'filter': 'Directories', 'mode': 'directory'},
'enabled_series': ['520', '720', '630', '730', '540'],
'port_mapping': {'type': 'dict', 'description': 'Port ID to series mapping'},
# Series-specific port ID configurations
self.create_property('kl520_port_ids', '')
self.create_property('kl720_port_ids', '')
self.create_property('kl630_port_ids', '')
self.create_property('kl730_port_ids', '')
# self.create_property('kl540_port_ids', '')
# Single-series properties (original)
'dongle_series': ['520', '720', '1080', 'Custom'],
'num_dongles': {'min': 1, 'max': 16},
'model_path': {'type': 'file_path', 'filter': 'NEF Model files (*.nef)'},
'scpu_fw_path': {'type': 'file_path', 'filter': 'SCPU Firmware files (*.bin)'},
'ncpu_fw_path': {'type': 'file_path', 'filter': 'NCPU Firmware files (*.bin)'},
'port_id': {'placeholder': 'e.g., 8080 or auto'},
'upload_fw': {'type': 'bool', 'default': True, 'description': 'Upload firmware to dongle if needed'}
}
self.create_property('max_queue_size', 100)
self.create_property('result_buffer_size', 1000)
self.create_property('batch_size', 1)
self.create_property('enable_preprocessing', False)
self.create_property('enable_postprocessing', False)
# Original property options - exact match
self._property_options = {
'dongle_series': ['520', '720'],
'num_dongles': {'min': 1, 'max': 16},
'model_path': {'type': 'file_path', 'filter': 'NEF Model files (*.nef)'},
'scpu_fw_path': {'type': 'file_path', 'filter': 'SCPU Firmware files (*.bin)'},
'ncpu_fw_path': {'type': 'file_path', 'filter': 'NCPU Firmware files (*.bin)'},
'port_id': {'placeholder': 'e.g., 8080 or auto'},
'upload_fw': {'type': 'bool', 'default': True, 'description': 'Upload firmware to dongle if needed'},
# Multi-series property options
'multi_series_mode': {'type': 'bool', 'default': False, 'description': 'Enable multi-series dongle support'},
'assets_folder': {'type': 'file_path', 'filter': 'Folder', 'mode': 'directory'},
'enabled_series': {'type': 'list', 'options': ['520', '720', '630', '730', '540'], 'default': ['520', '720']},
# Series-specific port ID options
'kl520_port_ids': {'placeholder': 'e.g., 28,32 (comma-separated port IDs for KL520)', 'description': 'Port IDs for KL520 dongles'},
'kl720_port_ids': {'placeholder': 'e.g., 30,34 (comma-separated port IDs for KL720)', 'description': 'Port IDs for KL720 dongles'},
'kl630_port_ids': {'placeholder': 'e.g., 36,38 (comma-separated port IDs for KL630)', 'description': 'Port IDs for KL630 dongles'},
'kl730_port_ids': {'placeholder': 'e.g., 40,42 (comma-separated port IDs for KL730)', 'description': 'Port IDs for KL730 dongles'},
# 'kl540_port_ids': {'placeholder': 'e.g., 44,46 (comma-separated port IDs for KL540)', 'description': 'Port IDs for KL540 dongles'},
'max_queue_size': {'min': 1, 'max': 1000, 'default': 100},
'result_buffer_size': {'min': 100, 'max': 10000, 'default': 1000},
'batch_size': {'min': 1, 'max': 32, 'default': 1},
'enable_preprocessing': {'type': 'bool', 'default': False},
'enable_postprocessing': {'type': 'bool', 'default': False}
}
# Create custom properties dictionary for UI compatibility
# Create custom properties dictionary for UI compatibility (NodeGraphQt specific)
if NODEGRAPH_AVAILABLE:
self._populate_custom_properties()
# Set up custom property handlers for folder selection
if NODEGRAPH_AVAILABLE:
self._setup_custom_property_handlers()
def _populate_custom_properties(self):
"""Populate the custom properties dictionary for UI compatibility."""
if not NODEGRAPH_AVAILABLE:
@ -195,9 +187,6 @@ class ExactModelNode(BaseNode):
def get_business_properties(self):
"""Get all business properties for serialization."""
if not NODEGRAPH_AVAILABLE:
return {}
properties = {}
for prop_name in self._property_options.keys():
try:
@ -208,400 +197,19 @@ class ExactModelNode(BaseNode):
def get_display_properties(self):
"""Return properties that should be displayed in the UI panel."""
if not NODEGRAPH_AVAILABLE:
return []
# Base properties that are always shown
base_props = ['multi_series_mode']
# Check if multi-series mode is enabled
multi_series_enabled = False
try:
# Check if we're in multi-series mode
multi_series_mode = self.get_property('multi_series_mode')
if multi_series_mode:
# Multi-series mode: show multi-series specific properties
multi_props = ['assets_folder', 'enabled_series']
# Add port ID configurations for enabled series
try:
enabled_series = self.get_property('enabled_series') or []
for series in enabled_series:
port_prop = f'kl{series}_port_ids'
if port_prop not in multi_props: # Avoid duplicates
multi_props.append(port_prop)
except:
pass # If can't get enabled_series, just show basic properties
# Add other multi-series properties
multi_props.extend([
'max_queue_size', 'result_buffer_size', 'batch_size',
'enable_preprocessing', 'enable_postprocessing'
])
return base_props + multi_props
else:
# Single-series mode: show traditional properties
return base_props + [
'model_path', 'scpu_fw_path', 'ncpu_fw_path',
'dongle_series', 'num_dongles', 'port_id', 'upload_fw'
]
multi_series_enabled = self.get_property('multi_series_mode')
except:
# Fallback to single-series mode if property access fails
return base_props + [
'model_path', 'scpu_fw_path', 'ncpu_fw_path',
'dongle_series', 'num_dongles', 'port_id', 'upload_fw'
]
def get_inference_config(self):
"""Get configuration for inference pipeline"""
if not NODEGRAPH_AVAILABLE:
return {}
try:
multi_series_mode = self.get_property('multi_series_mode')
if multi_series_mode:
# Multi-series configuration with series-specific port IDs
config = {
'multi_series_mode': True,
'assets_folder': self.get_property('assets_folder'),
'enabled_series': self.get_property('enabled_series'),
'max_queue_size': self.get_property('max_queue_size'),
'result_buffer_size': self.get_property('result_buffer_size'),
'batch_size': self.get_property('batch_size'),
'enable_preprocessing': self.get_property('enable_preprocessing'),
'enable_postprocessing': self.get_property('enable_postprocessing')
}
# Build multi-series config for MultiDongle
multi_series_config = self._build_multi_series_config()
if multi_series_config:
config['multi_series_config'] = multi_series_config
return config
else:
# Single-series configuration
return {
'multi_series_mode': False,
'model_path': self.get_property('model_path'),
'scpu_fw_path': self.get_property('scpu_fw_path'),
'ncpu_fw_path': self.get_property('ncpu_fw_path'),
'dongle_series': self.get_property('dongle_series'),
'num_dongles': self.get_property('num_dongles'),
'port_id': self.get_property('port_id'),
'upload_fw': self.get_property('upload_fw')
}
except:
# Fallback to single-series configuration
return {
'multi_series_mode': False,
'model_path': self.get_property('model_path', ''),
'scpu_fw_path': self.get_property('scpu_fw_path', ''),
'ncpu_fw_path': self.get_property('ncpu_fw_path', ''),
'dongle_series': self.get_property('dongle_series', '520'),
'num_dongles': self.get_property('num_dongles', 1),
'port_id': self.get_property('port_id', ''),
'upload_fw': self.get_property('upload_fw', True)
}
def _build_multi_series_config(self):
"""Build multi-series configuration for MultiDongle"""
try:
enabled_series = self.get_property('enabled_series') or []
assets_folder = self.get_property('assets_folder') or ''
if not enabled_series:
return None
multi_series_config = {}
for series in enabled_series:
# Get port IDs for this series
port_ids_str = self.get_property(f'kl{series}_port_ids') or ''
if not port_ids_str.strip():
continue # Skip series without port IDs
# Parse port IDs (comma-separated string to list of integers)
try:
port_ids = [int(pid.strip()) for pid in port_ids_str.split(',') if pid.strip()]
if not port_ids:
continue
except ValueError:
print(f"Warning: Invalid port IDs for KL{series}: {port_ids_str}")
continue
# Build series configuration
series_config = {
"port_ids": port_ids
}
# Add model path if assets folder is configured
if assets_folder:
import os
model_folder = os.path.join(assets_folder, 'Models', f'KL{series}')
if os.path.exists(model_folder):
# Look for .nef files in the model folder
nef_files = [f for f in os.listdir(model_folder) if f.endswith('.nef')]
if nef_files:
series_config["model_path"] = os.path.join(model_folder, nef_files[0])
# Add firmware paths if available
firmware_folder = os.path.join(assets_folder, 'Firmware', f'KL{series}')
if os.path.exists(firmware_folder):
scpu_path = os.path.join(firmware_folder, 'fw_scpu.bin')
ncpu_path = os.path.join(firmware_folder, 'fw_ncpu.bin')
if os.path.exists(scpu_path) and os.path.exists(ncpu_path):
series_config["firmware_paths"] = {
"scpu": scpu_path,
"ncpu": ncpu_path
}
multi_series_config[f'KL{series}'] = series_config
return multi_series_config if multi_series_config else None
except Exception as e:
print(f"Error building multi-series config: {e}")
return None
def get_hardware_requirements(self):
"""Get hardware requirements for this node"""
if not NODEGRAPH_AVAILABLE:
return {}
try:
multi_series_mode = self.get_property('multi_series_mode')
if multi_series_mode:
enabled_series = self.get_property('enabled_series')
return {
'multi_series_mode': True,
'required_series': enabled_series,
'estimated_dongles': len(enabled_series) * 2 # Assume 2 dongles per series
}
else:
dongle_series = self.get_property('dongle_series')
num_dongles = self.get_property('num_dongles')
return {
'multi_series_mode': False,
'required_series': [f'KL{dongle_series}'],
'estimated_dongles': num_dongles
}
except:
return {'multi_series_mode': False, 'required_series': ['KL520'], 'estimated_dongles': 1}
def _setup_custom_property_handlers(self):
"""Setup custom property handlers, especially for folder selection."""
try:
# For assets_folder, we want to trigger folder selection dialog
# This might require custom widget or property handling
# For now, we'll use the standard approach but add validation
# You can override the property widget here if needed
# This is a placeholder for custom folder selection implementation
pass
except Exception as e:
print(f"Warning: Could not setup custom property handlers: {e}")
def select_assets_folder(self):
"""Method to open folder selection dialog for assets folder using improved utility."""
if not NODEGRAPH_AVAILABLE:
return ""
try:
from utils.folder_dialog import select_assets_folder
# Get current folder path as initial directory
current_folder = ""
try:
current_folder = self.get_property('assets_folder') or ""
except:
pass
# Use the specialized assets folder dialog with validation
result = select_assets_folder(initial_dir=current_folder)
if result['path']:
# Set the property
if NODEGRAPH_AVAILABLE:
self.set_property('assets_folder', result['path'])
# Print validation results
if result['valid']:
print(f"✓ Valid Assets folder set to: {result['path']}")
if 'details' in result and 'available_series' in result['details']:
series = result['details']['available_series']
print(f" Available series: {', '.join(series)}")
else:
print(f"⚠ Assets folder set to: {result['path']}")
print(f" Warning: {result['message']}")
print(" Expected structure: Assets/Firmware/ and Assets/Models/ with series subfolders")
return result['path']
else:
print("No folder selected")
return ""
except ImportError:
print("utils.folder_dialog not available, falling back to simple input")
# Fallback to manual input
folder_path = input("Enter Assets folder path: ").strip()
if folder_path and NODEGRAPH_AVAILABLE:
self.set_property('assets_folder', folder_path)
return folder_path
except Exception as e:
print(f"Error selecting assets folder: {e}")
return ""
def _validate_assets_folder(self, folder_path):
"""Validate that the assets folder has the expected structure."""
try:
import os
# Check if Firmware and Models folders exist
firmware_path = os.path.join(folder_path, 'Firmware')
models_path = os.path.join(folder_path, 'Models')
has_firmware = os.path.exists(firmware_path) and os.path.isdir(firmware_path)
has_models = os.path.exists(models_path) and os.path.isdir(models_path)
if not (has_firmware and has_models):
return False
# Check for at least one series subfolder
expected_series = ['KL520', 'KL720', 'KL630', 'KL730']
firmware_series = [d for d in os.listdir(firmware_path)
if os.path.isdir(os.path.join(firmware_path, d)) and d in expected_series]
models_series = [d for d in os.listdir(models_path)
if os.path.isdir(os.path.join(models_path, d)) and d in expected_series]
# At least one series should exist in both firmware and models
return len(firmware_series) > 0 and len(models_series) > 0
except Exception as e:
print(f"Error validating assets folder: {e}")
return False
def get_assets_folder_info(self):
"""Get information about the configured assets folder."""
if not NODEGRAPH_AVAILABLE:
return {}
try:
folder_path = self.get_property('assets_folder')
if not folder_path:
return {'status': 'not_set', 'message': 'No assets folder selected'}
if not os.path.exists(folder_path):
return {'status': 'invalid', 'message': 'Selected folder does not exist'}
info = {'status': 'valid', 'path': folder_path, 'series': []}
# Get available series
firmware_path = os.path.join(folder_path, 'Firmware')
models_path = os.path.join(folder_path, 'Models')
if os.path.exists(firmware_path):
firmware_series = [d for d in os.listdir(firmware_path)
if os.path.isdir(os.path.join(firmware_path, d))]
info['firmware_series'] = firmware_series
if os.path.exists(models_path):
models_series = [d for d in os.listdir(models_path)
if os.path.isdir(os.path.join(models_path, d))]
info['models_series'] = models_series
# Find common series
if 'firmware_series' in info and 'models_series' in info:
common_series = list(set(info['firmware_series']) & set(info['models_series']))
info['available_series'] = common_series
if not common_series:
info['status'] = 'incomplete'
info['message'] = 'No series found with both firmware and models'
return info
except Exception as e:
return {'status': 'error', 'message': f'Error reading assets folder: {e}'}
def validate_configuration(self) -> tuple[bool, str]:
"""
Validate the current node configuration.
Returns:
Tuple of (is_valid, error_message)
"""
if not NODEGRAPH_AVAILABLE:
return True, ""
try:
multi_series_mode = self.get_property('multi_series_mode')
if multi_series_mode:
# Multi-series validation
enabled_series = self.get_property('enabled_series')
if not enabled_series:
return False, "No series enabled in multi-series mode"
# Check if at least one series has port IDs configured
has_valid_series = False
for series in enabled_series:
port_ids_str = self.get_property(f'kl{series}_port_ids', '')
if port_ids_str and port_ids_str.strip():
# Validate port ID format
try:
port_ids = [int(pid.strip()) for pid in port_ids_str.split(',') if pid.strip()]
if port_ids:
has_valid_series = True
print(f"Valid series config found for KL{series}: ports {port_ids}")
except ValueError:
print(f"Warning: Invalid port ID format for KL{series}: {port_ids_str}")
continue
if not has_valid_series:
return False, "At least one series must have valid port IDs configured"
# Assets folder validation (optional for multi-series)
assets_folder = self.get_property('assets_folder')
if assets_folder:
if not os.path.exists(assets_folder):
print(f"Warning: Assets folder does not exist: {assets_folder}")
else:
# Validate assets folder structure if provided
assets_info = self.get_assets_folder_info()
if assets_info.get('status') == 'error':
print(f"Warning: Assets folder issue: {assets_info.get('message', 'Unknown error')}")
print("Multi-series mode validation passed")
return True, ""
else:
# Single-series validation (legacy)
model_path = self.get_property('model_path')
if not model_path:
return False, "Model path is required"
if not os.path.exists(model_path):
return False, f"Model file does not exist: {model_path}"
# Check dongle series
dongle_series = self.get_property('dongle_series')
if dongle_series not in ['520', '720', '1080', 'Custom']:
return False, f"Invalid dongle series: {dongle_series}"
# Check number of dongles
num_dongles = self.get_property('num_dongles')
if not isinstance(num_dongles, int) or num_dongles < 1:
return False, "Number of dongles must be at least 1"
return True, ""
except Exception as e:
return False, f"Validation error: {str(e)}"
if multi_series_enabled:
# Multi-series mode properties
return ['multi_series_mode', 'assets_folder', 'enabled_series', 'port_mapping']
else:
# Single-series mode properties (original)
return ['multi_series_mode', 'model_path', 'scpu_fw_path', 'ncpu_fw_path', 'dongle_series', 'num_dongles', 'port_id', 'upload_fw']
class ExactPreprocessNode(BaseNode):
@ -660,9 +268,6 @@ class ExactPreprocessNode(BaseNode):
def get_business_properties(self):
"""Get all business properties for serialization."""
if not NODEGRAPH_AVAILABLE:
return {}
properties = {}
for prop_name in self._property_options.keys():
try:
@ -728,9 +333,6 @@ class ExactPostprocessNode(BaseNode):
def get_business_properties(self):
"""Get all business properties for serialization."""
if not NODEGRAPH_AVAILABLE:
return {}
properties = {}
for prop_name in self._property_options.keys():
try:
@ -795,9 +397,6 @@ class ExactOutputNode(BaseNode):
def get_business_properties(self):
"""Get all business properties for serialization."""
if not NODEGRAPH_AVAILABLE:
return {}
properties = {}
for prop_name in self._property_options.keys():
try:

58
debug_deployment.py
View File

@ -1,58 +0,0 @@
#!/usr/bin/env python3
"""
Debug deployment error
"""
import sys
import os
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
def simulate_deployment():
"""Simulate the deployment process to find the Optional error"""
try:
print("Testing export_pipeline_data equivalent...")
# Simulate creating a node and getting properties
from core.nodes.exact_nodes import ExactModelNode
# This would be similar to what dashboard does
node = ExactModelNode()
print("Node created")
# Check if node has get_business_properties
if hasattr(node, 'get_business_properties'):
print("Node has get_business_properties")
try:
props = node.get_business_properties()
print(f"Properties extracted: {type(props)}")
except Exception as e:
print(f"Error in get_business_properties: {e}")
import traceback
traceback.print_exc()
# Test the mflow converter directly
print("\nTesting MFlowConverter...")
from core.functions.mflow_converter import MFlowConverter
converter = MFlowConverter(default_fw_path='.')
print("MFlowConverter created successfully")
# Test multi-series config building
test_props = {
'multi_series_mode': True,
'enabled_series': ['520', '720'],
'kl520_port_ids': '28,32',
'kl720_port_ids': '4'
}
config = converter._build_multi_series_config_from_properties(test_props)
print(f"Multi-series config: {config}")
print("All tests passed!")
except Exception as e:
print(f"Error: {e}")
import traceback
traceback.print_exc()
if __name__ == "__main__":
simulate_deployment()

90
debug_multi_series_flow.py
View File

@ -1,90 +0,0 @@
#!/usr/bin/env python3
"""
Debug the multi-series configuration flow
"""
import sys
import os
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
def test_full_flow():
"""Test the complete multi-series configuration flow"""
print("=== Testing Multi-Series Configuration Flow ===")
# Simulate node properties as they would appear in the UI
mock_node_properties = {
'multi_series_mode': True,
'enabled_series': ['520', '720'],
'kl520_port_ids': '28,32',
'kl720_port_ids': '4',
'assets_folder': '',
'max_queue_size': 100
}
print(f"1. Mock node properties: {mock_node_properties}")
# Test the mflow converter building multi-series config
try:
from core.functions.mflow_converter import MFlowConverter
converter = MFlowConverter(default_fw_path='.')
config = converter._build_multi_series_config_from_properties(mock_node_properties)
print(f"2. Multi-series config built: {config}")
if config:
print(" [OK] Multi-series config successfully built")
# Test StageConfig creation
from core.functions.InferencePipeline import StageConfig
stage_config = StageConfig(
stage_id="test_stage",
port_ids=[], # Not used in multi-series
scpu_fw_path='',
ncpu_fw_path='',
model_path='',
upload_fw=False,
multi_series_mode=True,
multi_series_config=config
)
print(f"3. StageConfig created with multi_series_mode: {stage_config.multi_series_mode}")
print(f" Multi-series config: {stage_config.multi_series_config}")
# Test what would happen in PipelineStage initialization
print("4. Testing PipelineStage initialization logic:")
if stage_config.multi_series_mode and stage_config.multi_series_config:
print(" [OK] Would initialize MultiDongle with multi_series_config")
print(f" MultiDongle(multi_series_config={stage_config.multi_series_config})")
else:
print(" [ERROR] Would fall back to single-series mode")
else:
print(" [ERROR] Multi-series config is None - this is the problem!")
except Exception as e:
print(f"Error in flow test: {e}")
import traceback
traceback.print_exc()
def test_node_direct():
"""Test creating a node directly and getting its inference config"""
print("\n=== Testing Node Direct Configuration ===")
try:
from core.nodes.exact_nodes import ExactModelNode
# This won't work without NodeGraphQt, but let's see what happens
node = ExactModelNode()
print("Node created (mock mode)")
# Test the get_business_properties method that would be called during export
props = node.get_business_properties()
print(f"Business properties: {props}")
except Exception as e:
print(f"Error in node test: {e}")
if __name__ == "__main__":
test_full_flow()
test_node_direct()

142
force_cleanup.py
View File

@ -1,142 +0,0 @@
"""
Force cleanup of all app data and processes
"""
import psutil
import os
import sys
import time
import tempfile
def kill_all_python_processes():
"""Force kill ALL Python processes (use with caution)"""
killed_processes = []
for proc in psutil.process_iter(['pid', 'name', 'cmdline']):
try:
if 'python' in proc.info['name'].lower():
print(f"Killing Python process: {proc.info['pid']} - {proc.info['name']}")
proc.kill()
killed_processes.append(proc.info['pid'])
except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
pass
if killed_processes:
print(f"Killed {len(killed_processes)} Python processes")
time.sleep(3) # Give more time for cleanup
else:
print("No Python processes found")
def clear_shared_memory():
"""Clear Qt shared memory"""
try:
from PyQt5.QtCore import QSharedMemory
app_names = ["Cluster4NPU", "cluster4npu", "main"]
for app_name in app_names:
shared_mem = QSharedMemory(app_name)
if shared_mem.attach():
shared_mem.detach()
print(f"Cleared shared memory for: {app_name}")
except Exception as e:
print(f"Could not clear shared memory: {e}")
def clean_all_temp_files():
"""Remove all possible lock and temp files"""
possible_files = [
'app.lock',
'.app.lock',
'cluster4npu.lock',
'.cluster4npu.lock',
'main.lock',
'.main.lock'
]
# Check in current directory
current_dir_files = []
for filename in possible_files:
filepath = os.path.join(os.getcwd(), filename)
if os.path.exists(filepath):
try:
os.remove(filepath)
current_dir_files.append(filepath)
print(f"Removed: {filepath}")
except Exception as e:
print(f"Could not remove {filepath}: {e}")
# Check in temp directory
temp_dir = tempfile.gettempdir()
temp_files = []
for filename in possible_files:
filepath = os.path.join(temp_dir, filename)
if os.path.exists(filepath):
try:
os.remove(filepath)
temp_files.append(filepath)
print(f"Removed: {filepath}")
except Exception as e:
print(f"Could not remove {filepath}: {e}")
# Check in user home directory
home_dir = os.path.expanduser('~')
home_files = []
for filename in possible_files:
filepath = os.path.join(home_dir, filename)
if os.path.exists(filepath):
try:
os.remove(filepath)
home_files.append(filepath)
print(f"Removed: {filepath}")
except Exception as e:
print(f"Could not remove {filepath}: {e}")
total_removed = len(current_dir_files) + len(temp_files) + len(home_files)
if total_removed == 0:
print("No lock files found")
def force_unlock_files():
"""Try to unlock any locked files"""
try:
# On Windows, try to reset file handles
import subprocess
result = subprocess.run(['tasklist', '/FI', 'IMAGENAME eq python.exe'],
capture_output=True, text=True, timeout=10)
if result.returncode == 0:
lines = result.stdout.strip().split('\n')
for line in lines[3:]: # Skip header lines
if 'python.exe' in line:
parts = line.split()
if len(parts) >= 2:
pid = parts[1]
try:
subprocess.run(['taskkill', '/F', '/PID', pid], timeout=5)
print(f"Force killed PID: {pid}")
except:
pass
except Exception as e:
print(f"Could not force unlock files: {e}")
if __name__ == '__main__':
print("FORCE CLEANUP - This will kill ALL Python processes!")
print("=" * 60)
response = input("Are you sure? This will close ALL Python programs (y/N): ")
if response.lower() in ['y', 'yes']:
print("\n1. Killing all Python processes...")
kill_all_python_processes()
print("\n2. Clearing shared memory...")
clear_shared_memory()
print("\n3. Removing lock files...")
clean_all_temp_files()
print("\n4. Force unlocking files...")
force_unlock_files()
print("\n" + "=" * 60)
print("FORCE CLEANUP COMPLETE!")
print("All Python processes killed and lock files removed.")
print("You can now start the app with 'python main.py'")
else:
print("Cleanup cancelled.")

121
gentle_cleanup.py
View File

@ -1,121 +0,0 @@
"""
Gentle cleanup of app data (safer approach)
"""
import psutil
import os
import sys
import time
def find_and_kill_app_processes():
"""Find and kill only the Cluster4NPU app processes"""
killed_processes = []
for proc in psutil.process_iter(['pid', 'name', 'cmdline', 'cwd']):
try:
if 'python' in proc.info['name'].lower():
cmdline = proc.info['cmdline']
cwd = proc.info['cwd']
# Check if this is our app
if (cmdline and
(any('main.py' in arg for arg in cmdline) or
any('cluster4npu' in arg.lower() for arg in cmdline) or
(cwd and 'cluster4npu' in cwd.lower()))):
print(f"Found app process: {proc.info['pid']}")
print(f" Command: {' '.join(cmdline) if cmdline else 'N/A'}")
print(f" Working dir: {cwd}")
# Try gentle termination first
proc.terminate()
time.sleep(2)
# If still running, force kill
if proc.is_running():
proc.kill()
print(f" Force killed: {proc.info['pid']}")
else:
print(f" Gently terminated: {proc.info['pid']}")
killed_processes.append(proc.info['pid'])
except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
pass
if killed_processes:
print(f"\nKilled {len(killed_processes)} app processes")
time.sleep(2)
else:
print("No app processes found")
def clear_app_locks():
"""Remove only app-specific lock files"""
app_specific_locks = [
'cluster4npu.lock',
'.cluster4npu.lock',
'Cluster4NPU.lock',
'main.lock',
'.main.lock'
]
locations = [
os.getcwd(), # Current directory
os.path.expanduser('~'), # User home
os.path.join(os.path.expanduser('~'), '.cluster4npu'), # App data dir
'C:\\temp' if os.name == 'nt' else '/tmp', # System temp
]
removed_files = []
for location in locations:
if not os.path.exists(location):
continue
for lock_name in app_specific_locks:
lock_path = os.path.join(location, lock_name)
if os.path.exists(lock_path):
try:
os.remove(lock_path)
removed_files.append(lock_path)
print(f"Removed lock: {lock_path}")
except Exception as e:
print(f"Could not remove {lock_path}: {e}")
if not removed_files:
print("No lock files found")
def reset_shared_memory():
"""Reset Qt shared memory for the app"""
try:
from PyQt5.QtCore import QSharedMemory
shared_mem = QSharedMemory("Cluster4NPU")
if shared_mem.attach():
print("Found shared memory, detaching...")
shared_mem.detach()
# Try to create and destroy to fully reset
if shared_mem.create(1):
shared_mem.detach()
print("Reset shared memory")
except Exception as e:
print(f"Could not reset shared memory: {e}")
if __name__ == '__main__':
print("Gentle App Cleanup")
print("=" * 30)
print("\n1. Looking for app processes...")
find_and_kill_app_processes()
print("\n2. Clearing app locks...")
clear_app_locks()
print("\n3. Resetting shared memory...")
reset_shared_memory()
print("\n" + "=" * 30)
print("Cleanup complete!")
print("You can now start the app with 'python main.py'")

66
kill_app_processes.py
View File

@ -1,66 +0,0 @@
"""
Kill any running app processes and clean up locks
"""
import psutil
import os
import sys
import time
def kill_python_processes():
"""Kill any Python processes that might be running the app"""
killed_processes = []
for proc in psutil.process_iter(['pid', 'name', 'cmdline']):
try:
# Check if it's a Python process
if 'python' in proc.info['name'].lower():
cmdline = proc.info['cmdline']
if cmdline and any('main.py' in arg for arg in cmdline):
print(f"Killing process: {proc.info['pid']} - {' '.join(cmdline)}")
proc.kill()
killed_processes.append(proc.info['pid'])
except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
pass
if killed_processes:
print(f"Killed {len(killed_processes)} Python processes")
time.sleep(2) # Give processes time to cleanup
else:
print("No running app processes found")
def clean_lock_files():
"""Remove any lock files that might prevent app startup"""
possible_lock_files = [
'app.lock',
'.app.lock',
'cluster4npu.lock',
os.path.expanduser('~/.cluster4npu.lock'),
'/tmp/cluster4npu.lock',
'C:\\temp\\cluster4npu.lock'
]
removed_files = []
for lock_file in possible_lock_files:
try:
if os.path.exists(lock_file):
os.remove(lock_file)
removed_files.append(lock_file)
print(f"Removed lock file: {lock_file}")
except Exception as e:
print(f"Could not remove {lock_file}: {e}")
if removed_files:
print(f"Removed {len(removed_files)} lock files")
else:
print("No lock files found")
if __name__ == '__main__':
print("Cleaning up app processes and lock files...")
print("=" * 50)
kill_python_processes()
clean_lock_files()
print("=" * 50)
print("Cleanup complete! You can now start the app with 'python main.py'")

340
main.py
View File

@ -41,194 +41,119 @@ from ui.windows.login import DashboardLogin
class SingleInstance:
"""Enhanced single instance handler with better error recovery."""
"""Ensure only one instance of the application can run."""
def __init__(self, app_name="Cluster4NPU"):
self.app_name = app_name
self.shared_memory = QSharedMemory(app_name)
self.lock_file = None
self.lock_fd = None
self.process_check_enabled = True
def _cleanup_stale_lock(self):
"""Clean up stale lock files from previous crashes."""
try:
lock_path = os.path.join(tempfile.gettempdir(), f"{self.app_name}.lock")
if os.path.exists(lock_path):
# Try to remove stale lock file
if HAS_FCNTL:
# On Unix systems, try to acquire lock to check if process is still alive
try:
test_fd = os.open(lock_path, os.O_RDWR)
fcntl.lockf(test_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
# If we got the lock, previous process is dead
os.close(test_fd)
os.unlink(lock_path)
except (OSError, IOError):
# Lock is held by another process
pass
else:
# On Windows, just try to remove the file
# If it's locked by another process, this will fail
try:
os.unlink(lock_path)
except OSError:
pass
except Exception:
pass
def is_running(self):
"""Check if another instance is already running with recovery mechanisms."""
# First, try to detect and clean up stale instances
if self._detect_and_cleanup_stale_instances():
print("Cleaned up stale application instances")
"""Check if another instance is already running."""
# First, clean up any stale locks
self._cleanup_stale_lock()
# Try shared memory approach
if self._check_shared_memory():
return True
# Try file locking approach
if self._check_file_lock():
return True
return False
def _detect_and_cleanup_stale_instances(self):
"""Detect and clean up stale instances that might have crashed."""
cleaned_up = False
try:
import psutil
# Check if there are any actual running processes
app_processes = []
for proc in psutil.process_iter(['pid', 'name', 'cmdline', 'create_time']):
try:
if 'python' in proc.info['name'].lower():
cmdline = proc.info['cmdline']
if cmdline and any('main.py' in arg for arg in cmdline):
app_processes.append(proc)
except (psutil.NoSuchProcess, psutil.AccessDenied):
continue
# If no actual app processes are running, clean up stale locks
if not app_processes:
cleaned_up = self._force_cleanup_locks()
except ImportError:
# psutil not available, try basic cleanup
cleaned_up = self._force_cleanup_locks()
except Exception as e:
print(f"Warning: Could not detect stale instances: {e}")
return cleaned_up
def _force_cleanup_locks(self):
"""Force cleanup of stale locks."""
cleaned_up = False
# Try to clean up shared memory
try:
if self.shared_memory.attach():
# Try to attach to existing shared memory
if self.shared_memory.attach():
# Try to write to shared memory to verify it's valid
try:
# If we can attach but can't access, it might be stale
self.shared_memory.detach()
cleaned_up = True
except:
pass
# Try to clean up lock file
try:
lock_file = os.path.join(tempfile.gettempdir(), f"{self.app_name}.lock")
if os.path.exists(lock_file):
os.unlink(lock_file)
cleaned_up = True
except:
pass
return cleaned_up
def _check_shared_memory(self):
"""Check shared memory for running instance."""
try:
# Try to attach to existing shared memory
if self.shared_memory.attach():
# Check if the shared memory is actually valid
try:
# Try to read from it to verify it's not corrupted
data = self.shared_memory.data()
if data is not None:
return True # Valid instance found
else:
# Corrupted shared memory, clean it up
self.shared_memory.detach()
except:
# Error reading, clean up
self.shared_memory.detach()
# Try to create new shared memory
# Try to create new shared memory
if self.shared_memory.create(1):
# Successfully created, no other instance
pass
else:
# Failed to create, another instance exists
return True
except:
# Shared memory is stale, try to create new one
if not self.shared_memory.create(1):
return True
else:
# Try to create the shared memory
if not self.shared_memory.create(1):
# Could not create, but attachment failed too - might be corruption
return False
# Failed to create, likely another instance exists
return True
except Exception as e:
print(f"Warning: Shared memory check failed: {e}")
return False
return False
def _check_file_lock(self):
"""Check file lock for running instance."""
# Also use file locking as backup
try:
self.lock_file = os.path.join(tempfile.gettempdir(), f"{self.app_name}.lock")
if HAS_FCNTL:
# Unix-like systems
try:
self.lock_fd = os.open(self.lock_file, os.O_CREAT | os.O_EXCL | os.O_RDWR)
fcntl.lockf(self.lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
return False # Successfully locked, no other instance
except (OSError, IOError):
return True # Could not lock, another instance exists
self.lock_fd = os.open(self.lock_file, os.O_CREAT | os.O_WRONLY, 0o644)
fcntl.lockf(self.lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
# Write PID to lock file
os.write(self.lock_fd, str(os.getpid()).encode())
os.fsync(self.lock_fd)
else:
# Windows
try:
self.lock_fd = os.open(self.lock_file, os.O_CREAT | os.O_EXCL | os.O_RDWR)
return False # Successfully created, no other instance
except (OSError, IOError):
# File exists, but check if the process that created it is still running
if self._is_lock_file_stale():
# Stale lock file, remove it and try again
try:
os.unlink(self.lock_file)
self.lock_fd = os.open(self.lock_file, os.O_CREAT | os.O_EXCL | os.O_RDWR)
return False
except:
pass
return True
# On Windows, use exclusive create
self.lock_fd = os.open(self.lock_file, os.O_CREAT | os.O_EXCL | os.O_RDWR)
os.write(self.lock_fd, str(os.getpid()).encode())
except (OSError, IOError):
# Another instance is running or we can't create lock
self._cleanup_on_error()
return True
except Exception as e:
print(f"Warning: File lock check failed: {e}")
return False
return False
def _is_lock_file_stale(self):
"""Check if the lock file is from a stale process."""
try:
if not os.path.exists(self.lock_file):
return True
# Check file age - if older than 5 minutes, consider it stale
import time
file_age = time.time() - os.path.getmtime(self.lock_file)
if file_age > 300: # 5 minutes
return True
# On Windows, we can't easily check if the process is still running
# without additional information, so we rely on age check
return False
except:
return True # If we can't check, assume it's stale
def cleanup(self):
"""Enhanced cleanup with better error handling."""
def _cleanup_on_error(self):
"""Clean up resources when instance check fails."""
try:
if self.shared_memory.isAttached():
self.shared_memory.detach()
except Exception as e:
print(f"Warning: Could not detach shared memory: {e}")
try:
if self.lock_fd is not None:
if HAS_FCNTL:
fcntl.lockf(self.lock_fd, fcntl.LOCK_UN)
if self.lock_fd:
os.close(self.lock_fd)
self.lock_fd = None
except Exception as e:
print(f"Warning: Could not close lock file descriptor: {e}")
except:
pass
def cleanup(self):
"""Clean up resources."""
try:
if self.lock_file and os.path.exists(self.lock_file):
os.unlink(self.lock_file)
except Exception as e:
print(f"Warning: Could not remove lock file: {e}")
if self.shared_memory.isAttached():
self.shared_memory.detach()
def force_cleanup(self):
"""Force cleanup of all locks (use when app crashed)."""
print("Force cleaning up application locks...")
self._force_cleanup_locks()
print("Force cleanup completed")
if self.lock_fd:
try:
if HAS_FCNTL:
fcntl.lockf(self.lock_fd, fcntl.LOCK_UN)
os.close(self.lock_fd)
if self.lock_file and os.path.exists(self.lock_file):
os.unlink(self.lock_file)
except Exception:
pass
finally:
self.lock_fd = None
except Exception:
pass
def setup_application():
@ -259,58 +184,24 @@ def setup_application():
def main():
"""Main application entry point."""
# Check for command line arguments
if '--force-cleanup' in sys.argv or '--cleanup' in sys.argv:
print("Force cleanup mode enabled")
single_instance = SingleInstance()
single_instance.force_cleanup()
print("Cleanup completed. You can now start the application normally.")
sys.exit(0)
# Check for help argument
if '--help' in sys.argv or '-h' in sys.argv:
print("Cluster4NPU Application")
print("Usage: python main.py [options]")
print("Options:")
print(" --force-cleanup, --cleanup Force cleanup of stale application locks")
print(" --help, -h Show this help message")
sys.exit(0)
# Create a minimal QApplication first for the message box
temp_app = QApplication(sys.argv) if not QApplication.instance() else QApplication.instance()
# Check for single instance
single_instance = SingleInstance()
if single_instance.is_running():
reply = QMessageBox.question(
None,
"Application Already Running",
"Cluster4NPU is already running. \n\n"
"Would you like to:\n"
"• Click 'Yes' to force cleanup and restart\n"
"• Click 'No' to cancel startup",
QMessageBox.Yes | QMessageBox.No,
QMessageBox.No
)
if reply == QMessageBox.Yes:
print("User requested force cleanup...")
single_instance.force_cleanup()
print("Cleanup completed, proceeding with startup...")
# Create a new instance checker after cleanup
single_instance = SingleInstance()
if single_instance.is_running():
QMessageBox.critical(
None,
"Cleanup Failed",
"Could not clean up the existing instance. Please restart your computer."
)
sys.exit(1)
else:
sys.exit(0)
single_instance = None
try:
# Create a minimal QApplication first for the message box
temp_app = QApplication(sys.argv) if not QApplication.instance() else QApplication.instance()
# Check for single instance
single_instance = SingleInstance()
if single_instance.is_running():
QMessageBox.warning(
None,
"Application Already Running",
"Cluster4NPU is already running. Please check your taskbar or system tray.",
)
single_instance.cleanup()
sys.exit(0)
# Setup the full application
app = setup_application()
@ -318,18 +209,37 @@ def main():
dashboard = DashboardLogin()
dashboard.show()
# Clean up single instance on app exit
# Set up cleanup handlers
app.aboutToQuit.connect(single_instance.cleanup)
# Also handle system signals for cleanup
import signal
def signal_handler(signum, frame):
print(f"Received signal {signum}, cleaning up...")
single_instance.cleanup()
sys.exit(0)
signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler)
# Start the application event loop
sys.exit(app.exec_())
exit_code = app.exec_()
# Ensure cleanup even if aboutToQuit wasn't called
single_instance.cleanup()
sys.exit(exit_code)
except Exception as e:
print(f"Error starting application: {e}")
import traceback
traceback.print_exc()
single_instance.cleanup()
if single_instance:
single_instance.cleanup()
sys.exit(1)
finally:
# Final cleanup attempt
if single_instance:
single_instance.cleanup()
if __name__ == '__main__':

193
mutliseries.py Normal file
View File

@ -0,0 +1,193 @@
import kp
from collections import defaultdict
from typing import Union
import os
import sys
import argparse
import time
import threading
import queue
import numpy as np
import cv2
# PWD = os.path.dirname(os.path.abspath(__file__))
# sys.path.insert(1, os.path.join(PWD, '..'))
IMAGE_FILE_PATH = r"c:\Users\mason\Downloads\kneron_plus_v3.1.2\kneron_plus\res\images\people_talk_in_street_640x640.bmp"
LOOP_TIME = 100
def _image_send_function(_device_group: kp.DeviceGroup,
_loop_time: int,
_generic_inference_input_descriptor: kp.GenericImageInferenceDescriptor,
_image: Union[bytes, np.ndarray],
_image_format: kp.ImageFormat) -> None:
for _loop in range(_loop_time):
try:
_generic_inference_input_descriptor.inference_number = _loop
_generic_inference_input_descriptor.input_node_image_list = [kp.GenericInputNodeImage(
image=_image,
image_format=_image_format,
resize_mode=kp.ResizeMode.KP_RESIZE_ENABLE,
padding_mode=kp.PaddingMode.KP_PADDING_CORNER,
normalize_mode=kp.NormalizeMode.KP_NORMALIZE_KNERON
)]
kp.inference.generic_image_inference_send(device_group=device_groups[1],
generic_inference_input_descriptor=_generic_inference_input_descriptor)
except kp.ApiKPException as exception:
print(' - Error: inference failed, error = {}'.format(exception))
exit(0)
def _result_receive_function(_device_group: kp.DeviceGroup,
_loop_time: int,
_result_queue: queue.Queue) -> None:
_generic_raw_result = None
for _loop in range(_loop_time):
try:
_generic_raw_result = kp.inference.generic_image_inference_receive(device_group=device_groups[1])
if _generic_raw_result.header.inference_number != _loop:
print(' - Error: incorrect inference_number {} at frame {}'.format(
_generic_raw_result.header.inference_number, _loop))
print('.', end='', flush=True)
except kp.ApiKPException as exception:
print(' - Error: inference failed, error = {}'.format(exception))
exit(0)
_result_queue.put(_generic_raw_result)
model_path = ["C:\\Users\\mason\\Downloads\\kneron_plus_v3.1.2\\kneron_plus\\res\\models\\KL520\\yolov5-noupsample_w640h640_kn-model-zoo\\kl520_20005_yolov5-noupsample_w640h640.nef", r"C:\Users\mason\Downloads\kneron_plus_v3.1.2\kneron_plus\res\models\KL720\yolov5-noupsample_w640h640_kn-model-zoo\kl720_20005_yolov5-noupsample_w640h640.nef"]
SCPU_FW_PATH_520 = "C:\\Users\\mason\\Downloads\\kneron_plus_v3.1.2\\kneron_plus\\res\\firmware\\KL520\\fw_scpu.bin"
NCPU_FW_PATH_520 = "C:\\Users\\mason\\Downloads\\kneron_plus_v3.1.2\\kneron_plus\\res\\firmware\\KL520\\fw_ncpu.bin"
SCPU_FW_PATH_720 = "C:\\Users\\mason\\Downloads\\kneron_plus_v3.1.2\\kneron_plus\\res\\firmware\\KL720\\fw_scpu.bin"
NCPU_FW_PATH_720 = "C:\\Users\\mason\\Downloads\\kneron_plus_v3.1.2\\kneron_plus\\res\\firmware\\KL720\\fw_ncpu.bin"
device_list = kp.core.scan_devices()
grouped_devices = defaultdict(list)
for device in device_list.device_descriptor_list:
grouped_devices[device.product_id].append(device.usb_port_id)
print(f"Found device groups: {dict(grouped_devices)}")
device_groups = []
for product_id, usb_port_id in grouped_devices.items():
try:
group = kp.core.connect_devices(usb_port_id)
device_groups.append(group)
print(f"Successfully connected to group for product ID {product_id} with ports{usb_port_id}")
except kp.ApiKPException as e:
print(f"Failed to connect to group for product ID {product_id}: {e}")
print(device_groups)
print('[Set Device Timeout]')
kp.core.set_timeout(device_group=device_groups[0], milliseconds=5000)
kp.core.set_timeout(device_group=device_groups[1], milliseconds=5000)
print(' - Success')
try:
print('[Upload Firmware]')
kp.core.load_firmware_from_file(device_group=device_groups[0],
scpu_fw_path=SCPU_FW_PATH_520,
ncpu_fw_path=NCPU_FW_PATH_520)
kp.core.load_firmware_from_file(device_group=device_groups[1],
scpu_fw_path=SCPU_FW_PATH_720,
ncpu_fw_path=NCPU_FW_PATH_720)
print(' - Success')
except kp.ApiKPException as exception:
print('Error: upload firmware failed, error = \'{}\''.format(str(exception)))
exit(0)
print('[Upload Model]')
model_nef_descriptors = []
# for group in device_groups:
model_nef_descriptor = kp.core.load_model_from_file(device_group=device_groups[0], file_path=model_path[0])
model_nef_descriptors.append(model_nef_descriptor)
model_nef_descriptor = kp.core.load_model_from_file(device_group=device_groups[1], file_path=model_path[1])
model_nef_descriptors.append(model_nef_descriptor)
print(' - Success')
"""
prepare the image
"""
print('[Read Image]')
img = cv2.imread(filename=IMAGE_FILE_PATH)
img_bgr565 = cv2.cvtColor(src=img, code=cv2.COLOR_BGR2BGR565)
print(' - Success')
"""
prepare generic image inference input descriptor
"""
print(model_nef_descriptors)
generic_inference_input_descriptor = kp.GenericImageInferenceDescriptor(
model_id=model_nef_descriptors[1].models[0].id,
)
"""
starting inference work
"""
print('[Starting Inference Work]')
print(' - Starting inference loop {} times'.format(LOOP_TIME))
print(' - ', end='')
result_queue = queue.Queue()
send_thread = threading.Thread(target=_image_send_function, args=(device_groups[1],
LOOP_TIME,
generic_inference_input_descriptor,
img_bgr565,
kp.ImageFormat.KP_IMAGE_FORMAT_RGB565))
receive_thread = threading.Thread(target=_result_receive_function, args=(device_groups[1],
LOOP_TIME,
result_queue))
start_inference_time = time.time()
send_thread.start()
receive_thread.start()
try:
while send_thread.is_alive():
send_thread.join(1)
while receive_thread.is_alive():
receive_thread.join(1)
except (KeyboardInterrupt, SystemExit):
print('\n - Received keyboard interrupt, quitting threads.')
exit(0)
end_inference_time = time.time()
time_spent = end_inference_time - start_inference_time
try:
generic_raw_result = result_queue.get(timeout=3)
except Exception as exception:
print('Error: Result queue is empty !')
exit(0)
print()
print('[Result]')
print(" - Total inference {} images".format(LOOP_TIME))
print(" - Time spent: {:.2f} secs, FPS = {:.1f}".format(time_spent, LOOP_TIME / time_spent))
"""
retrieve inference node output
"""
print('[Retrieve Inference Node Output ]')
inf_node_output_list = []
for node_idx in range(generic_raw_result.header.num_output_node):
inference_float_node_output = kp.inference.generic_inference_retrieve_float_node(node_idx=node_idx,
generic_raw_result=generic_raw_result,
channels_ordering=kp.ChannelOrdering.KP_CHANNEL_ORDERING_CHW)
inf_node_output_list.append(inference_float_node_output)
print(' - Success')
print('[Result]')
print(inf_node_output_list)

37
simple_test.py
View File

@ -1,37 +0,0 @@
#!/usr/bin/env python3
"""
Simple test for port ID configuration
"""
import sys
import os
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
from core.nodes.exact_nodes import ExactModelNode
def main():
print("Creating ExactModelNode...")
node = ExactModelNode()
print("Testing property options...")
if hasattr(node, '_property_options'):
port_props = [k for k in node._property_options.keys() if 'port_ids' in k]
print(f"Found port ID properties: {port_props}")
else:
print("No _property_options found")
print("Testing _build_multi_series_config method...")
if hasattr(node, '_build_multi_series_config'):
print("Method exists")
try:
config = node._build_multi_series_config()
print(f"Config result: {config}")
except Exception as e:
print(f"Error calling method: {e}")
else:
print("Method does not exist")
print("Test completed!")
if __name__ == "__main__":
main()

69
test_folder_selection.py
View File

@ -1,69 +0,0 @@
"""
Test tkinter folder selection functionality
"""
import sys
import os
# Add project root to path
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
from utils.folder_dialog import select_folder, select_assets_folder
def test_basic_folder_selection():
"""Test basic folder selection"""
print("Testing basic folder selection...")
folder = select_folder("Select any folder for testing")
if folder:
print(f"Selected folder: {folder}")
print(f" Exists: {os.path.exists(folder)}")
print(f" Is directory: {os.path.isdir(folder)}")
return True
else:
print("No folder selected")
return False
def test_assets_folder_selection():
"""Test Assets folder selection with validation"""
print("\nTesting Assets folder selection...")
result = select_assets_folder()
print(f"Selected path: {result['path']}")
print(f"Valid: {result['valid']}")
print(f"Message: {result['message']}")
if 'details' in result:
details = result['details']
print(f"Details:")
print(f" Has Firmware folder: {details.get('has_firmware_folder', False)}")
print(f" Has Models folder: {details.get('has_models_folder', False)}")
print(f" Firmware series: {details.get('firmware_series', [])}")
print(f" Models series: {details.get('models_series', [])}")
print(f" Available series: {details.get('available_series', [])}")
print(f" Series with files: {details.get('series_with_files', [])}")
return result['valid']
if __name__ == "__main__":
print("Testing Folder Selection Dialog")
print("=" * 40)
# Test basic functionality
basic_works = test_basic_folder_selection()
# Test Assets folder functionality
assets_works = test_assets_folder_selection()
print("\n" + "=" * 40)
print("Test Results:")
print(f"Basic folder selection: {'PASS' if basic_works else 'FAIL'}")
print(f"Assets folder selection: {'PASS' if assets_works else 'FAIL'}")
if basic_works:
print("\ntkinter folder selection is working!")
print("You can now use this in your ExactModelNode.")
else:
print("\ntkinter might not be available or there's an issue.")
print("Consider using PyQt5 QFileDialog as fallback.")

134
test_multi_series_fix.py
View File

@ -1,134 +0,0 @@
#!/usr/bin/env python3
"""
Test script to verify multi-series configuration fix
"""
import sys
import os
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
# Test the mflow_converter functionality
def test_multi_series_config_building():
"""Test building multi-series config from properties"""
print("Testing multi-series config building...")
from core.functions.mflow_converter import MFlowConverter
# Create converter instance
converter = MFlowConverter(default_fw_path='.')
# Mock properties data that would come from a node
test_properties = {
'multi_series_mode': True,
'enabled_series': ['520', '720'],
'kl520_port_ids': '28,32',
'kl720_port_ids': '4',
'assets_folder': '', # Empty for this test
'max_queue_size': 100
}
# Test building config
config = converter._build_multi_series_config_from_properties(test_properties)
print(f"Generated config: {config}")
if config:
# Verify structure
assert 'KL520' in config, "KL520 should be in config"
assert 'KL720' in config, "KL720 should be in config"
# Check KL520 config
kl520_config = config['KL520']
assert 'port_ids' in kl520_config, "KL520 should have port_ids"
assert kl520_config['port_ids'] == [28, 32], f"KL520 port_ids should be [28, 32], got {kl520_config['port_ids']}"
# Check KL720 config
kl720_config = config['KL720']
assert 'port_ids' in kl720_config, "KL720 should have port_ids"
assert kl720_config['port_ids'] == [4], f"KL720 port_ids should be [4], got {kl720_config['port_ids']}"
print("[OK] Multi-series config structure is correct")
else:
print("[ERROR] Config building returned None")
return False
# Test with invalid port IDs
invalid_properties = {
'multi_series_mode': True,
'enabled_series': ['520'],
'kl520_port_ids': 'invalid,port,ids',
'assets_folder': ''
}
invalid_config = converter._build_multi_series_config_from_properties(invalid_properties)
assert invalid_config is None, "Invalid port IDs should result in None config"
print("[OK] Invalid port IDs handled correctly")
return True
def test_stage_config():
"""Test StageConfig with multi-series support"""
print("\\nTesting StageConfig with multi-series...")
from core.functions.InferencePipeline import StageConfig
# Test creating StageConfig with multi-series
multi_series_config = {
"KL520": {"port_ids": [28, 32]},
"KL720": {"port_ids": [4]}
}
stage_config = StageConfig(
stage_id="test_stage",
port_ids=[], # Not used in multi-series mode
scpu_fw_path='',
ncpu_fw_path='',
model_path='',
upload_fw=False,
multi_series_mode=True,
multi_series_config=multi_series_config
)
print(f"Created StageConfig with multi_series_mode: {stage_config.multi_series_mode}")
print(f"Multi-series config: {stage_config.multi_series_config}")
assert stage_config.multi_series_mode == True, "multi_series_mode should be True"
assert stage_config.multi_series_config == multi_series_config, "multi_series_config should match"
print("[OK] StageConfig supports multi-series configuration")
return True
def main():
"""Run all tests"""
print("Testing Multi-Series Configuration Fix")
print("=" * 50)
try:
# Test config building
if not test_multi_series_config_building():
print("[ERROR] Config building test failed")
return False
# Test StageConfig
if not test_stage_config():
print("[ERROR] StageConfig test failed")
return False
print("\\n" + "=" * 50)
print("[SUCCESS] All tests passed!")
print("\\nThe fix should now properly:")
print("1. Detect multi_series_mode from node properties")
print("2. Build multi_series_config from series-specific port IDs")
print("3. Pass the config to MultiDongle for true multi-series operation")
return True
except Exception as e:
print(f"[ERROR] Test failed with exception: {e}")
import traceback
traceback.print_exc()
return False
if __name__ == "__main__":
success = main()
sys.exit(0 if success else 1)

347
test_multi_series_integration.py Normal file
View File

@ -0,0 +1,347 @@
"""
Test Multi-Series Dongle Integration
This test script validates the complete multi-series dongle integration
including the enhanced model node, converter, and pipeline components.
Usage:
python test_multi_series_integration.py
This will create a test assets folder structure and validate all components.
"""
import os
import sys
import json
import tempfile
from pathlib import Path
# Add project root to path
project_root = Path(__file__).parent
sys.path.insert(0, str(project_root))
def test_exact_model_node():
"""Test the enhanced ExactModelNode functionality"""
print("🧪 Testing ExactModelNode...")
try:
from core.nodes.exact_nodes import ExactModelNode, NODEGRAPH_AVAILABLE
if not NODEGRAPH_AVAILABLE:
print("⚠️ NodeGraphQt not available, testing limited functionality")
# Test basic instantiation
node = ExactModelNode()
print("✅ ExactModelNode basic instantiation works")
return True
# Create node and test properties
node = ExactModelNode()
# Test single-series mode (default)
assert node.get_property('multi_series_mode') == False
assert node.get_property('dongle_series') == '520'
assert node.get_property('max_queue_size') == 100
# Test property display logic
display_props = node.get_display_properties()
expected_single_series = [
'multi_series_mode', 'model_path', 'scpu_fw_path', 'ncpu_fw_path',
'dongle_series', 'num_dongles', 'port_id', 'upload_fw'
]
assert display_props == expected_single_series
# Test multi-series mode
node.set_property('multi_series_mode', True)
display_props = node.get_display_properties()
expected_multi_series = [
'multi_series_mode', 'assets_folder', 'enabled_series',
'max_queue_size', 'result_buffer_size', 'batch_size',
'enable_preprocessing', 'enable_postprocessing'
]
assert display_props == expected_multi_series
# Test inference config generation
config = node.get_inference_config()
assert config['multi_series_mode'] == True
assert 'enabled_series' in config
# Test hardware requirements
hw_req = node.get_hardware_requirements()
assert hw_req['multi_series_mode'] == True
print("✅ ExactModelNode functionality tests passed")
return True
except Exception as e:
print(f"❌ ExactModelNode test failed: {e}")
import traceback
traceback.print_exc()
return False
def test_multi_series_setup_utility():
"""Test the multi-series setup utility"""
print("🧪 Testing multi-series setup utility...")
try:
from utils.multi_series_setup import MultiSeriesSetup
# Create temporary directory for testing
with tempfile.TemporaryDirectory() as temp_dir:
# Test folder structure creation
success = MultiSeriesSetup.create_folder_structure(temp_dir, ['520', '720'])
assert success, "Failed to create folder structure"
assets_path = os.path.join(temp_dir, 'Assets')
assert os.path.exists(assets_path), "Assets folder not created"
# Check structure
firmware_path = os.path.join(assets_path, 'Firmware')
models_path = os.path.join(assets_path, 'Models')
assert os.path.exists(firmware_path), "Firmware folder not created"
assert os.path.exists(models_path), "Models folder not created"
# Check series folders
for series in ['520', '720']:
series_fw = os.path.join(firmware_path, f'KL{series}')
series_model = os.path.join(models_path, f'KL{series}')
assert os.path.exists(series_fw), f"KL{series} firmware folder not created"
assert os.path.exists(series_model), f"KL{series} models folder not created"
# Test validation (should fail initially - no files)
is_valid, issues = MultiSeriesSetup.validate_folder_structure(assets_path)
assert not is_valid, "Validation should fail with empty folders"
assert len(issues) > 0, "Should have validation issues"
# Test series listing
series_info = MultiSeriesSetup.list_available_series(assets_path)
assert len(series_info) == 0, "Should have no valid series initially"
print("✅ Multi-series setup utility tests passed")
return True
except Exception as e:
print(f"❌ Multi-series setup utility test failed: {e}")
import traceback
traceback.print_exc()
return False
def test_multi_series_converter():
"""Test the multi-series MFlow converter"""
print("🧪 Testing multi-series converter...")
try:
from core.functions.multi_series_mflow_converter import MultiSeriesMFlowConverter
# Create test mflow data
test_mflow_data = {
"project_name": "Test Multi-Series Pipeline",
"description": "Test pipeline with multi-series configuration",
"nodes": [
{
"id": "input_1",
"name": "Input Node",
"type": "input_node",
"custom": {
"source_type": "Camera",
"resolution": "640x480"
}
},
{
"id": "model_1",
"name": "Multi-Series Model",
"type": "model_node",
"custom": {
"multi_series_mode": True,
"assets_folder": "/test/assets",
"enabled_series": ["520", "720"],
"max_queue_size": 100,
"result_buffer_size": 1000
}
},
{
"id": "output_1",
"name": "Output Node",
"type": "output_node",
"custom": {
"output_type": "Display"
}
}
],
"connections": [
{"input_node": "input_1", "output_node": "model_1"},
{"input_node": "model_1", "output_node": "output_1"}
]
}
# Test converter instantiation
converter = MultiSeriesMFlowConverter()
# Test basic conversion (will fail validation due to missing files, but should parse)
try:
config = converter._convert_mflow_to_enhanced_config(test_mflow_data)
# Check basic structure
assert config.pipeline_name == "Test Multi-Series Pipeline"
assert len(config.stage_configs) > 0
assert config.has_multi_series == True
assert config.multi_series_count == 1
print("✅ Multi-series converter basic parsing works")
except ValueError as e:
# Expected to fail validation due to missing assets folder
if "not found" in str(e):
print("✅ Multi-series converter correctly validates missing assets")
else:
raise
print("✅ Multi-series converter tests passed")
return True
except Exception as e:
print(f"❌ Multi-series converter test failed: {e}")
import traceback
traceback.print_exc()
return False
def test_pipeline_components():
"""Test multi-series pipeline components"""
print("🧪 Testing pipeline components...")
try:
from core.functions.multi_series_pipeline import (
MultiSeriesStageConfig,
MultiSeriesPipelineStage,
create_multi_series_config_from_model_node
)
# Test MultiSeriesStageConfig creation
config = MultiSeriesStageConfig(
stage_id="test_stage",
multi_series_mode=True,
firmware_paths={"KL520": {"scpu": "test.bin", "ncpu": "test.bin"}},
model_paths={"KL520": "test.nef"},
max_queue_size=100
)
assert config.stage_id == "test_stage"
assert config.multi_series_mode == True
assert config.max_queue_size == 100
# Test config creation from model node
model_config = {
'multi_series_mode': True,
'node_name': 'test_node',
'firmware_paths': {"KL520": {"scpu": "test.bin", "ncpu": "test.bin"}},
'model_paths': {"KL520": "test.nef"},
'max_queue_size': 50
}
stage_config = create_multi_series_config_from_model_node(model_config)
assert stage_config.multi_series_mode == True
assert stage_config.stage_id == 'test_node'
print("✅ Pipeline components tests passed")
return True
except Exception as e:
print(f"❌ Pipeline components test failed: {e}")
import traceback
traceback.print_exc()
return False
def create_test_assets_structure():
"""Create a complete test assets structure for manual testing"""
print("🏗️ Creating test assets structure...")
try:
from utils.multi_series_setup import MultiSeriesSetup
# Create test structure in project directory
test_assets_path = os.path.join(project_root, "test_assets")
if os.path.exists(test_assets_path):
import shutil
shutil.rmtree(test_assets_path)
# Create structure
success = MultiSeriesSetup.create_folder_structure(
project_root,
series_list=['520', '720', '730']
)
if success:
assets_full_path = os.path.join(project_root, "Assets")
print(f"✅ Test assets structure created at: {assets_full_path}")
print("\n📋 To complete the setup:")
print("1. Copy your firmware files to Assets/Firmware/KLxxx/ folders")
print("2. Copy your model files to Assets/Models/KLxxx/ folders")
print("3. Run validation: python -m utils.multi_series_setup validate --path Assets")
print("4. Configure your model node to use the Assets folder")
return assets_full_path
else:
print("❌ Failed to create test assets structure")
return None
except Exception as e:
print(f"❌ Error creating test assets structure: {e}")
return None
def run_all_tests():
"""Run all integration tests"""
print("🚀 Starting Multi-Series Dongle Integration Tests\n")
tests = [
("ExactModelNode", test_exact_model_node),
("Setup Utility", test_multi_series_setup_utility),
("Converter", test_multi_series_converter),
("Pipeline Components", test_pipeline_components)
]
results = {}
for test_name, test_func in tests:
print(f"\n{'='*50}")
print(f"Testing: {test_name}")
print(f"{'='*50}")
try:
result = test_func()
results[test_name] = result
except Exception as e:
print(f"❌ {test_name} test crashed: {e}")
results[test_name] = False
print()
# Print summary
print(f"\n{'='*50}")
print("📊 TEST SUMMARY")
print(f"{'='*50}")
passed = sum(1 for r in results.values() if r)
total = len(results)
for test_name, result in results.items():
status = "✅ PASS" if result else "❌ FAIL"
print(f"{test_name:<20} {status}")
print(f"\nResults: {passed}/{total} tests passed")
if passed == total:
print("🎉 All tests passed! Multi-series integration is ready.")
# Offer to create test structure
response = input("\n❓ Create test assets structure for manual testing? (y/n): ")
if response.lower() in ['y', 'yes']:
create_test_assets_structure()
return True
else:
print("⚠️ Some tests failed. Check the output above for details.")
return False
if __name__ == "__main__":
success = run_all_tests()
sys.exit(0 if success else 1)

203
test_multi_series_integration_final.py
View File

@ -1,203 +0,0 @@
"""
Final Integration Test for Multi-Series Multidongle
Comprehensive test suite for the completed multi-series integration
"""
import unittest
import sys
import os
# Add project root to path
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'core', 'functions'))
from Multidongle import MultiDongle, DongleSeriesSpec
class TestMultiSeriesIntegration(unittest.TestCase):
def setUp(self):
"""Set up test fixtures"""
self.multi_series_config = {
"KL520": {
"port_ids": [28, 32],
"model_path": "/path/to/kl520_model.nef",
"firmware_paths": {
"scpu": "/path/to/kl520_scpu.bin",
"ncpu": "/path/to/kl520_ncpu.bin"
}
},
"KL720": {
"port_ids": [40, 44],
"model_path": "/path/to/kl720_model.nef",
"firmware_paths": {
"scpu": "/path/to/kl720_scpu.bin",
"ncpu": "/path/to/kl720_ncpu.bin"
}
}
}
def test_multi_series_initialization_success(self):
"""Test that multi-series initialization works correctly"""
multidongle = MultiDongle(multi_series_config=self.multi_series_config)
# Should be in multi-series mode
self.assertTrue(multidongle.multi_series_mode)
# Should have series groups configured
self.assertIsNotNone(multidongle.series_groups)
self.assertIn("KL520", multidongle.series_groups)
self.assertIn("KL720", multidongle.series_groups)
# Should have correct configuration for each series
kl520_config = multidongle.series_groups["KL520"]
self.assertEqual(kl520_config["port_ids"], [28, 32])
self.assertEqual(kl520_config["model_path"], "/path/to/kl520_model.nef")
kl720_config = multidongle.series_groups["KL720"]
self.assertEqual(kl720_config["port_ids"], [40, 44])
self.assertEqual(kl720_config["model_path"], "/path/to/kl720_model.nef")
# Should have GOPS weights calculated
self.assertIsNotNone(multidongle.gops_weights)
self.assertIn("KL520", multidongle.gops_weights)
self.assertIn("KL720", multidongle.gops_weights)
# KL720 should have higher weight due to higher GOPS (28 vs 3 GOPS)
# But since both have 2 devices: KL520=3*2=6 total GOPS, KL720=28*2=56 total GOPS
# Total = 62 GOPS, so KL520 weight = 6/62 ≈ 0.097, KL720 weight = 56/62 ≈ 0.903
self.assertGreater(multidongle.gops_weights["KL720"],
multidongle.gops_weights["KL720"])
# Weights should sum to 1.0
total_weight = sum(multidongle.gops_weights.values())
self.assertAlmostEqual(total_weight, 1.0, places=5)
print("Multi-series initialization test passed")
def test_single_series_to_multi_series_conversion_success(self):
"""Test that single-series config gets converted to multi-series internally"""
# Legacy single-series initialization
multidongle = MultiDongle(
port_id=[28, 32],
scpu_fw_path="/path/to/scpu.bin",
ncpu_fw_path="/path/to/ncpu.bin",
model_path="/path/to/model.nef",
upload_fw=True
)
# Should NOT be in explicit multi-series mode (legacy mode)
self.assertFalse(multidongle.multi_series_mode)
# But should internally convert to multi-series format
self.assertIsNotNone(multidongle.series_groups)
self.assertEqual(len(multidongle.series_groups), 1)
# Should auto-detect series (will be KL520 based on available devices or fallback)
series_keys = list(multidongle.series_groups.keys())
self.assertEqual(len(series_keys), 1)
detected_series = series_keys[0]
self.assertIn(detected_series, DongleSeriesSpec.SERIES_SPECS.keys())
# Should have correct port configuration
series_config = multidongle.series_groups[detected_series]
self.assertEqual(series_config["port_ids"], [28, 32])
self.assertEqual(series_config["model_path"], "/path/to/model.nef")
# Should have 100% weight since it's single series
self.assertEqual(multidongle.gops_weights[detected_series], 1.0)
print(f"Single-to-multi-series conversion test passed (detected: {detected_series})")
def test_load_balancing_success(self):
"""Test that load balancing works based on GOPS weights"""
multidongle = MultiDongle(multi_series_config=self.multi_series_config)
# Should have load balancing method
optimal_series = multidongle._select_optimal_series()
self.assertIsNotNone(optimal_series)
self.assertIn(optimal_series, ["KL520", "KL720"])
# With zero load, should select the series with highest weight (KL720)
self.assertEqual(optimal_series, "KL720")
# Test load balancing under different conditions
# Simulate high load on KL720
multidongle.current_loads["KL720"] = 100
multidongle.current_loads["KL520"] = 0
# Now should prefer KL520 despite lower GOPS due to lower load
optimal_series_with_load = multidongle._select_optimal_series()
self.assertEqual(optimal_series_with_load, "KL520")
print("Load balancing test passed")
def test_backward_compatibility_maintained(self):
"""Test that existing single-series API still works perfectly"""
# This should work exactly as before
multidongle = MultiDongle(
port_id=[28, 32],
scpu_fw_path="/path/to/scpu.bin",
ncpu_fw_path="/path/to/ncpu.bin",
model_path="/path/to/model.nef"
)
# Legacy properties should still exist and work
self.assertIsNotNone(multidongle.port_id)
self.assertEqual(multidongle.port_id, [28, 32])
self.assertEqual(multidongle.model_path, "/path/to/model.nef")
self.assertEqual(multidongle.scpu_fw_path, "/path/to/scpu.bin")
self.assertEqual(multidongle.ncpu_fw_path, "/path/to/ncpu.bin")
# Legacy attributes should be available
self.assertIsNotNone(multidongle.device_group) # Will be None initially
self.assertIsNotNone(multidongle._input_queue)
self.assertIsNotNone(multidongle._output_queue)
print("Backward compatibility test passed")
def test_series_specs_are_correct(self):
"""Test that series specifications match expected values"""
specs = DongleSeriesSpec.SERIES_SPECS
# Check that all expected series are present
expected_series = ["KL520", "KL720", "KL630", "KL730", "KL540"]
for series in expected_series:
self.assertIn(series, specs)
# Check GOPS values are reasonable
self.assertEqual(specs["KL520"]["gops"], 3)
self.assertEqual(specs["KL720"]["gops"], 28)
self.assertEqual(specs["KL630"]["gops"], 400)
self.assertEqual(specs["KL730"]["gops"], 1600)
self.assertEqual(specs["KL540"]["gops"], 800)
print("Series specifications test passed")
def test_edge_cases(self):
"""Test various edge cases and error handling"""
# Test with empty port list (single-series)
multidongle_empty = MultiDongle(port_id=[])
self.assertEqual(len(multidongle_empty.series_groups), 0)
# Test with unknown series (should raise error)
with self.assertRaises(ValueError):
MultiDongle(multi_series_config={"UNKNOWN_SERIES": {"port_ids": [1, 2]}})
# Test with no port IDs in multi-series config
config_no_ports = {
"KL520": {
"port_ids": [],
"model_path": "/path/to/model.nef"
}
}
multidongle_no_ports = MultiDongle(multi_series_config=config_no_ports)
self.assertEqual(multidongle_no_ports.gops_weights["KL520"], 0.0) # 0 weight due to no devices
print("Edge cases test passed")
if __name__ == '__main__':
print("Running Multi-Series Integration Tests")
print("=" * 50)
unittest.main(verbosity=2)

170
test_multi_series_multidongle.py
View File

@ -1,170 +0,0 @@
"""
Test Multi-Series Integration for Multidongle
Testing the integration of multi-series functionality into the existing Multidongle class
following TDD principles.
"""
import unittest
import sys
import os
from unittest.mock import Mock, patch, MagicMock
# Add project root to path
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'core', 'functions'))
from Multidongle import MultiDongle
class TestMultiSeriesMultidongle(unittest.TestCase):
def setUp(self):
"""Set up test fixtures"""
self.multi_series_config = {
"KL520": {
"port_ids": [28, 32],
"model_path": "/path/to/kl520_model.nef",
"firmware_paths": {
"scpu": "/path/to/kl520_scpu.bin",
"ncpu": "/path/to/kl520_ncpu.bin"
}
},
"KL720": {
"port_ids": [40, 44],
"model_path": "/path/to/kl720_model.nef",
"firmware_paths": {
"scpu": "/path/to/kl720_scpu.bin",
"ncpu": "/path/to/kl720_ncpu.bin"
}
}
}
def test_multi_series_initialization_should_fail(self):
"""
Test that multi-series initialization accepts config and sets up series groups
This should FAIL initially since the functionality doesn't exist yet
"""
# This should work but will fail initially
try:
multidongle = MultiDongle(multi_series_config=self.multi_series_config)
# Should have series groups configured
self.assertIsNotNone(multidongle.series_groups)
self.assertIn("KL520", multidongle.series_groups)
self.assertIn("KL720", multidongle.series_groups)
# Should have GOPS weights calculated
self.assertIsNotNone(multidongle.gops_weights)
self.assertIn("KL520", multidongle.gops_weights)
self.assertIn("KL720", multidongle.gops_weights)
# KL720 should have higher weight due to higher GOPS
self.assertGreater(multidongle.gops_weights["KL720"],
multidongle.gops_weights["KL520"])
self.fail("Multi-series initialization should not work yet - test should fail")
except (AttributeError, TypeError) as e:
# Expected to fail at this stage
print(f"Expected failure: {e}")
self.assertTrue(True, "Multi-series initialization correctly fails (not implemented yet)")
def test_single_series_to_multi_series_conversion_should_fail(self):
"""
Test that single-series config gets converted to multi-series internally
This should FAIL initially
"""
try:
# Legacy single-series initialization
multidongle = MultiDongle(
port_id=[28, 32],
scpu_fw_path="/path/to/scpu.bin",
ncpu_fw_path="/path/to/ncpu.bin",
model_path="/path/to/model.nef",
upload_fw=True
)
# Should internally convert to multi-series format
self.assertIsNotNone(multidongle.series_groups)
self.assertEqual(len(multidongle.series_groups), 1)
# Should auto-detect series from device scan or use default
series_keys = list(multidongle.series_groups.keys())
self.assertEqual(len(series_keys), 1)
self.fail("Single to multi-series conversion should not work yet")
except (AttributeError, TypeError) as e:
# Expected to fail at this stage
print(f"Expected failure: {e}")
self.assertTrue(True, "Single-series conversion correctly fails (not implemented yet)")
def test_load_balancing_should_fail(self):
"""
Test that load balancing works based on GOPS weights
This should FAIL initially
"""
try:
multidongle = MultiDongle(multi_series_config=self.multi_series_config)
# Should have load balancing method
optimal_series = multidongle._select_optimal_series()
self.assertIsNotNone(optimal_series)
self.assertIn(optimal_series, ["KL520", "KL720"])
self.fail("Load balancing should not work yet")
except (AttributeError, TypeError) as e:
# Expected to fail at this stage
print(f"Expected failure: {e}")
self.assertTrue(True, "Load balancing correctly fails (not implemented yet)")
def test_backward_compatibility_should_work(self):
"""
Test that existing single-series API still works
This should PASS (existing functionality)
"""
# This should still work with existing code
try:
multidongle = MultiDongle(
port_id=[28, 32],
scpu_fw_path="/path/to/scpu.bin",
ncpu_fw_path="/path/to/ncpu.bin",
model_path="/path/to/model.nef"
)
# Basic properties should still exist
self.assertIsNotNone(multidongle.port_id)
self.assertEqual(multidongle.port_id, [28, 32])
self.assertEqual(multidongle.model_path, "/path/to/model.nef")
print("Backward compatibility test passed")
except Exception as e:
self.fail(f"Backward compatibility should work: {e}")
def test_multi_series_device_grouping_should_fail(self):
"""
Test that devices are properly grouped by series
This should FAIL initially
"""
try:
multidongle = MultiDongle(multi_series_config=self.multi_series_config)
multidongle.initialize()
# Should have device groups for each series
self.assertIsNotNone(multidongle.device_groups)
self.assertEqual(len(multidongle.device_groups), 2)
# Each series should have its device group
for series_name, config in self.multi_series_config.items():
self.assertIn(series_name, multidongle.device_groups)
self.fail("Multi-series device grouping should not work yet")
except (AttributeError, TypeError) as e:
# Expected to fail
print(f"Expected failure: {e}")
self.assertTrue(True, "Device grouping correctly fails (not implemented yet)")
if __name__ == '__main__':
unittest.main()

46
test_multidongle_start.py
View File

@ -1,46 +0,0 @@
#!/usr/bin/env python3
"""
Test MultiDongle start/stop functionality
"""
import sys
import os
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
def test_multidongle_start():
"""Test MultiDongle start method"""
try:
from core.functions.Multidongle import MultiDongle
# Test multi-series configuration
multi_series_config = {
"KL520": {"port_ids": [28, 32]},
"KL720": {"port_ids": [4]}
}
print("Creating MultiDongle with multi-series config...")
multidongle = MultiDongle(multi_series_config=multi_series_config)
print(f"Multi-series mode: {multidongle.multi_series_mode}")
print(f"Has _start_multi_series method: {hasattr(multidongle, '_start_multi_series')}")
print(f"Has _stop_multi_series method: {hasattr(multidongle, '_stop_multi_series')}")
print("MultiDongle created successfully!")
# Test that the required attributes exist
expected_attrs = ['send_threads', 'receive_threads', 'dispatcher_thread', 'result_ordering_thread']
for attr in expected_attrs:
if hasattr(multidongle, attr):
print(f"[OK] Has attribute: {attr}")
else:
print(f"[ERROR] Missing attribute: {attr}")
print("Test completed successfully!")
except Exception as e:
print(f"Error: {e}")
import traceback
traceback.print_exc()
if __name__ == "__main__":
test_multidongle_start()

201
test_port_id_config.py
View File

@ -1,201 +0,0 @@
#!/usr/bin/env python3
"""
Test script for new series-specific port ID configuration functionality
"""
import sys
import os
# Add the project root to Python path
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
try:
from core.nodes.exact_nodes import ExactModelNode
print("[OK] Successfully imported ExactModelNode")
except ImportError as e:
print(f"[ERROR] Failed to import ExactModelNode: {e}")
sys.exit(1)
def test_port_id_properties():
"""Test that new port ID properties are created correctly"""
print("\n=== Testing Port ID Properties Creation ===")
try:
node = ExactModelNode()
# Test that all series port ID properties exist
series_properties = ['kl520_port_ids', 'kl720_port_ids', 'kl630_port_ids', 'kl730_port_ids', 'kl540_port_ids']
for prop in series_properties:
if hasattr(node, 'get_property'):
try:
value = node.get_property(prop)
print(f"[OK] Property {prop} exists with value: '{value}'")
except:
print(f"[ERROR] Property {prop} does not exist or cannot be accessed")
else:
print(f"[WARN] Node does not have get_property method (NodeGraphQt not available)")
break
# Test property options
if hasattr(node, '_property_options'):
for prop in series_properties:
if prop in node._property_options:
options = node._property_options[prop]
print(f"[OK] Property options for {prop}: {options}")
else:
print(f"[ERROR] No property options found for {prop}")
else:
print("[WARN] Node does not have _property_options")
except Exception as e:
print(f"[ERROR] Error testing port ID properties: {e}")
def test_display_properties():
"""Test that display properties work correctly"""
print("\n=== Testing Display Properties ===")
try:
node = ExactModelNode()
if not hasattr(node, 'get_display_properties'):
print("[WARN] Node does not have get_display_properties method (NodeGraphQt not available)")
return
# Test single-series mode
if hasattr(node, 'set_property'):
node.set_property('multi_series_mode', False)
single_props = node.get_display_properties()
print(f"[OK] Single-series display properties: {single_props}")
# Test multi-series mode
node.set_property('multi_series_mode', True)
node.set_property('enabled_series', ['520', '720'])
multi_props = node.get_display_properties()
print(f"[OK] Multi-series display properties: {multi_props}")
# Check if port ID properties are included
expected_port_props = ['kl520_port_ids', 'kl720_port_ids']
found_port_props = [prop for prop in multi_props if prop in expected_port_props]
print(f"[OK] Found port ID properties in display: {found_port_props}")
# Test with different enabled series
node.set_property('enabled_series', ['630', '730'])
multi_props_2 = node.get_display_properties()
print(f"[OK] Display properties with KL630/730: {multi_props_2}")
else:
print("[WARN] Node does not have set_property method (NodeGraphQt not available)")
except Exception as e:
print(f"[ERROR] Error testing display properties: {e}")
def test_multi_series_config():
"""Test multi-series configuration building"""
print("\n=== Testing Multi-Series Config Building ===")
try:
node = ExactModelNode()
if not hasattr(node, '_build_multi_series_config'):
print("[ERROR] Node does not have _build_multi_series_config method")
return
if not hasattr(node, 'set_property'):
print("[WARN] Node does not have set_property method (NodeGraphQt not available)")
return
# Test with sample configuration
node.set_property('enabled_series', ['520', '720'])
node.set_property('kl520_port_ids', '28,32')
node.set_property('kl720_port_ids', '30,34')
node.set_property('assets_folder', '/fake/assets/path')
# Build multi-series config
config = node._build_multi_series_config()
print(f"[OK] Generated multi-series config: {config}")
# Verify structure
if config:
expected_keys = ['KL520', 'KL720']
for key in expected_keys:
if key in config:
series_config = config[key]
print(f"[OK] {key} config: {series_config}")
if 'port_ids' in series_config:
print(f" - Port IDs: {series_config['port_ids']}")
else:
print(f" [ERROR] Missing port_ids in {key} config")
else:
print(f"[ERROR] Missing {key} in config")
else:
print("[ERROR] Generated config is None or empty")
# Test with invalid port IDs
node.set_property('kl520_port_ids', 'invalid,port,ids')
config_invalid = node._build_multi_series_config()
print(f"[OK] Config with invalid port IDs: {config_invalid}")
except Exception as e:
print(f"[ERROR] Error testing multi-series config: {e}")
def test_inference_config():
"""Test inference configuration"""
print("\n=== Testing Inference Config ===")
try:
node = ExactModelNode()
if not hasattr(node, 'get_inference_config'):
print("[ERROR] Node does not have get_inference_config method")
return
if not hasattr(node, 'set_property'):
print("[WARN] Node does not have set_property method (NodeGraphQt not available)")
return
# Test multi-series inference config
node.set_property('multi_series_mode', True)
node.set_property('enabled_series', ['520', '720'])
node.set_property('kl520_port_ids', '28,32')
node.set_property('kl720_port_ids', '30,34')
node.set_property('assets_folder', '/fake/assets')
node.set_property('max_queue_size', 50)
inference_config = node.get_inference_config()
print(f"[OK] Inference config: {inference_config}")
# Check if multi_series_config is included
if 'multi_series_config' in inference_config:
ms_config = inference_config['multi_series_config']
print(f"[OK] Multi-series config included: {ms_config}")
else:
print("[WARN] Multi-series config not found in inference config")
# Test single-series mode
node.set_property('multi_series_mode', False)
node.set_property('model_path', '/fake/model.nef')
node.set_property('port_id', '28')
single_config = node.get_inference_config()
print(f"[OK] Single-series config: {single_config}")
except Exception as e:
print(f"[ERROR] Error testing inference config: {e}")
def main():
"""Run all tests"""
print("Testing Series-Specific Port ID Configuration")
print("=" * 50)
test_port_id_properties()
test_display_properties()
test_multi_series_config()
test_inference_config()
print("\n" + "=" * 50)
print("Test completed!")
if __name__ == "__main__":
main()

167
test_ui_folder_selection.py Normal file
View File

@ -0,0 +1,167 @@
"""
Test UI Folder Selection
Simple test to verify that the folder selection UI works correctly
for the assets_folder property in multi-series mode.
Usage:
python test_ui_folder_selection.py
"""
import sys
import os
from pathlib import Path
# Add project root to path
project_root = Path(__file__).parent
sys.path.insert(0, str(project_root))
try:
from PyQt5.QtWidgets import QApplication, QMainWindow, QVBoxLayout, QWidget, QLabel
from PyQt5.QtCore import Qt
PYQT_AVAILABLE = True
except ImportError:
PYQT_AVAILABLE = False
def test_folder_selection_ui():
"""Test the folder selection UI components"""
if not PYQT_AVAILABLE:
print("❌ PyQt5 not available, cannot test UI components")
return False
try:
from core.nodes.exact_nodes import ExactModelNode, NODEGRAPH_AVAILABLE
if not NODEGRAPH_AVAILABLE:
print("❌ NodeGraphQt not available, cannot test node properties UI")
return False
# Create QApplication
app = QApplication(sys.argv) if not QApplication.instance() else QApplication.instance()
# Create test node
node = ExactModelNode()
# Enable multi-series mode
node.set_property('multi_series_mode', True)
# Test property access
assets_folder = node.get_property('assets_folder')
enabled_series = node.get_property('enabled_series')
print(f"✅ Node created successfully")
print(f" - assets_folder: '{assets_folder}'")
print(f" - enabled_series: {enabled_series}")
print(f" - multi_series_mode: {node.get_property('multi_series_mode')}")
# Get property options
property_options = node._property_options
assets_folder_options = property_options.get('assets_folder', {})
enabled_series_options = property_options.get('enabled_series', {})
print(f"✅ Property options configured correctly")
print(f" - assets_folder type: {assets_folder_options.get('type')}")
print(f" - enabled_series type: {enabled_series_options.get('type')}")
print(f" - enabled_series options: {enabled_series_options.get('options')}")
# Test display properties
display_props = node.get_display_properties()
print(f"✅ Display properties for multi-series mode: {display_props}")
# Verify multi-series specific properties are included
expected_props = ['assets_folder', 'enabled_series']
missing_props = [prop for prop in expected_props if prop not in display_props]
if missing_props:
print(f"❌ Missing properties in display: {missing_props}")
return False
print(f"✅ All multi-series properties present in UI")
return True
except Exception as e:
print(f"❌ Test failed: {e}")
import traceback
traceback.print_exc()
return False
def create_test_assets_folder():
"""Create a test assets folder for UI testing"""
try:
from utils.multi_series_setup import MultiSeriesSetup
test_path = os.path.join(project_root, "test_ui_assets")
# Remove existing test folder
if os.path.exists(test_path):
import shutil
shutil.rmtree(test_path)
# Create new test structure
success = MultiSeriesSetup.create_folder_structure(
project_root.parent, # Create in parent directory to avoid clutter
series_list=['520', '720']
)
if success:
assets_path = os.path.join(project_root.parent, "Assets")
print(f"✅ Test assets folder created: {assets_path}")
print("📋 You can now:")
print("1. Run your UI application")
print("2. Create a Model Node")
print("3. Enable 'Multi-Series Mode'")
print("4. Use 'Browse Folder' button for 'Assets Folder'")
print(f"5. Select the folder: {assets_path}")
return assets_path
else:
print("❌ Failed to create test assets folder")
return None
except Exception as e:
print(f"❌ Error creating test assets: {e}")
return None
def main():
"""Main test function"""
print("🧪 Testing UI Folder Selection for Multi-Series Configuration\n")
# Test 1: Node property configuration
print("=" * 50)
print("Test 1: Node Property Configuration")
print("=" * 50)
success = test_folder_selection_ui()
if not success:
print("❌ UI component test failed")
return False
# Test 2: Create test assets folder
print("\n" + "=" * 50)
print("Test 2: Create Test Assets Folder")
print("=" * 50)
assets_path = create_test_assets_folder()
if assets_path:
print("\n🎉 UI folder selection test completed successfully!")
print("\n📋 Manual Testing Steps:")
print("1. Run: python main.py")
print("2. Create a new pipeline")
print("3. Add a Model Node")
print("4. In properties panel, enable 'Multi-Series Mode'")
print("5. Click 'Browse Folder' for 'Assets Folder'")
print(f"6. Select folder: {assets_path}")
print("7. Configure 'Enabled Series' checkboxes")
print("8. Save and deploy pipeline")
return True
else:
print("❌ Test assets creation failed")
return False
if __name__ == "__main__":
success = main()
sys.exit(0 if success else 1)

476
ui/dialogs/deployment.py
View File

@ -38,6 +38,22 @@ from PyQt5.QtGui import QFont, QColor, QPalette, QImage, QPixmap
# Import our converter and pipeline system
sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'core', 'functions'))
# Multi-series imports
try:
from ui.dialogs.multi_series_config import MultiSeriesConfigDialog
MULTI_SERIES_UI_AVAILABLE = True
except ImportError as e:
print(f"Warning: Multi-series UI not available: {e}")
MULTI_SERIES_UI_AVAILABLE = False
try:
from multi_series_dongle_manager import MultiSeriesDongleManager
from core.functions.multi_series_mflow_converter import MultiSeriesMFlowConverter
MULTI_SERIES_BACKEND_AVAILABLE = True
except ImportError as e:
print(f"Warning: Multi-series backend not available: {e}")
MULTI_SERIES_BACKEND_AVAILABLE = False
try:
from core.functions.mflow_converter import MFlowConverter, PipelineConfig
CONVERTER_AVAILABLE = True
@ -79,10 +95,8 @@ class StdoutCapture:
def write(self, text):
# Write to original stdout/stderr (so it still appears in terminal)
# Check if original exists (it might be None in PyInstaller builds)
if self.original is not None:
self.original.write(text)
self.original.flush()
self.original.write(text)
self.original.flush()
# Capture for GUI if it's a substantial message and not already emitting
if text.strip() and not self._emitting:
@ -93,9 +107,7 @@ class StdoutCapture:
self._emitting = False
def flush(self):
# Check if original exists before calling flush
if self.original is not None:
self.original.flush()
self.original.flush()
# Replace stdout and stderr with our tee writers
sys.stdout = TeeWriter(self.original_stdout, self.captured_output, self.signal_emitter)
@ -123,15 +135,112 @@ class DeploymentWorker(QThread):
result_updated = pyqtSignal(dict) # For inference results
terminal_output = pyqtSignal(str) # For terminal output in GUI
stdout_captured = pyqtSignal(str) # For captured stdout/stderr
multi_series_status = pyqtSignal(dict) # For multi-series dongle status
def __init__(self, pipeline_data: Dict[str, Any]):
def __init__(self, pipeline_data: Dict[str, Any], multi_series_config: Dict[str, Any] = None):
super().__init__()
self.pipeline_data = pipeline_data
self.multi_series_config = multi_series_config
self.should_stop = False
self.orchestrator = None
self.multi_series_manager = None
def run(self):
"""Main deployment workflow."""
try:
# Check if this is a multi-series deployment
is_multi_series = self._check_multi_series_mode()
if is_multi_series and self.multi_series_config:
self._run_multi_series_deployment()
else:
self._run_single_series_deployment()
except Exception as e:
self.error_occurred.emit(f"Deployment error: {str(e)}")
def _check_multi_series_mode(self) -> bool:
"""Check if any nodes are configured for multi-series mode"""
nodes = self.pipeline_data.get('nodes', [])
for node in nodes:
# Check for any Model node type (including ExactModelNode)
if 'Model' in node.get('type', ''):
# Check properties in order of preference
node_properties = node.get('properties', {}) # New format
if not node_properties:
node_properties = node.get('custom_properties', {}) # Fallback 1
if not node_properties:
node_properties = node.get('custom', {}) # Fallback 2
if node_properties.get('multi_series_mode', False):
print(f"Multi-series mode detected in node: {node.get('name', 'Unknown')}")
return True
return False
def _run_multi_series_deployment(self):
"""Run multi-series deployment workflow"""
try:
# Step 1: Convert to multi-series configuration
self.progress_updated.emit(10, "Converting to multi-series configuration...")
if not MULTI_SERIES_BACKEND_AVAILABLE:
self.error_occurred.emit("Multi-series backend not available. Please check installation.")
return
converter = MultiSeriesMFlowConverter()
multi_series_config = converter.convert_to_multi_series(
self.pipeline_data,
self.multi_series_config
)
# Step 2: Validate multi-series configuration
self.progress_updated.emit(30, "Validating multi-series configuration...")
is_valid, issues = converter.validate_multi_series_config(multi_series_config)
if not is_valid:
error_msg = "Multi-series configuration validation failed:\n" + "\n".join(issues)
self.error_occurred.emit(error_msg)
return
self.progress_updated.emit(50, "Configuration validation passed")
# Step 3: Initialize MultiSeriesDongleManager
self.progress_updated.emit(60, "Initializing multi-series dongle manager...")
self.multi_series_manager = converter.create_multi_series_manager(multi_series_config)
if not self.multi_series_manager:
self.error_occurred.emit("Failed to initialize multi-series dongle manager")
return
self.progress_updated.emit(80, "Starting multi-series inference...")
self.deployment_started.emit()
# Start the multi-series manager
self.multi_series_manager.start()
# Emit status
status_info = {
'type': 'multi_series',
'enabled_series': multi_series_config.enabled_series,
'total_gops': sum([
{'KL520': 3, 'KL720': 28, 'KL630': 400, 'KL730': 1600, 'KL540': 800}.get(series, 0)
for series in multi_series_config.enabled_series
]),
'port_mapping': multi_series_config.port_mapping
}
self.multi_series_status.emit(status_info)
self.progress_updated.emit(100, "Multi-series pipeline deployed successfully!")
self.deployment_completed.emit(True, f"Multi-series pipeline deployed with {len(multi_series_config.enabled_series)} series")
# Keep running and processing results
self._process_multi_series_results()
except Exception as e:
self.error_occurred.emit(f"Multi-series deployment failed: {str(e)}")
def _run_single_series_deployment(self):
"""Run single-series deployment workflow (original behavior)"""
try:
# Step 1: Convert .mflow to pipeline config
self.progress_updated.emit(10, "Converting pipeline configuration...")
@ -240,11 +349,56 @@ class DeploymentWorker(QThread):
except Exception as e:
self.error_occurred.emit(f"Deployment error: {str(e)}")
def _process_multi_series_results(self):
"""Process results from multi-series manager"""
import cv2
try:
while not self.should_stop:
# Get result from multi-series manager
result = self.multi_series_manager.get_result(timeout=0.1)
if result:
# Process result for UI display
result_dict = {
'sequence_id': result.sequence_id,
'dongle_series': result.dongle_series,
'timestamp': result.timestamp,
'stage_results': {
f'{result.dongle_series}_stage': result.result
}
}
# Emit result for GUI display
self.result_updated.emit(result_dict)
# Emit terminal output
terminal_text = f"[{result.dongle_series}] Sequence {result.sequence_id}: Processed"
self.terminal_output.emit(terminal_text)
# Get and emit statistics
stats = self.multi_series_manager.get_statistics()
status_info = {
'type': 'multi_series',
'stats': stats,
'current_loads': stats.get('current_loads', {}),
'total_processed': stats.get('total_completed', 0),
'queue_size': stats.get('input_queue_size', 0)
}
self.multi_series_status.emit(status_info)
self.msleep(10) # Small delay to prevent busy waiting
except Exception as e:
self.error_occurred.emit(f"Error processing multi-series results: {str(e)}")
def stop(self):
"""Stop the deployment process."""
self.should_stop = True
if self.orchestrator:
self.orchestrator.stop()
if self.multi_series_manager:
self.multi_series_manager.stop()
def _format_terminal_results(self, result_dict):
"""Format inference results for terminal display in GUI."""
@ -345,12 +499,75 @@ class DeploymentDialog(QDialog):
self.pipeline_data = pipeline_data
self.deployment_worker = None
self.pipeline_config = None
self.is_multi_series = self._check_multi_series_nodes()
self.setWindowTitle("Deploy Pipeline to Dongles")
# Extract multi-series configuration if needed
if self.is_multi_series:
self.multi_series_config = self._extract_multi_series_config()
else:
self.multi_series_config = None
title = "Deploy Multi-Series Pipeline" if self.is_multi_series else "Deploy Pipeline to Dongles"
self.setWindowTitle(title)
self.setMinimumSize(800, 600)
self.setup_ui()
self.apply_theme()
def _check_multi_series_nodes(self) -> bool:
"""Check if pipeline has multi-series enabled nodes"""
nodes = self.pipeline_data.get('nodes', [])
for node in nodes:
# Check for any Model node type (including ExactModelNode)
if 'Model' in node.get('type', ''):
# Check properties in order of preference
node_properties = node.get('properties', {}) # New format
if not node_properties:
node_properties = node.get('custom_properties', {}) # Fallback 1
if not node_properties:
node_properties = node.get('custom', {}) # Fallback 2
if node_properties.get('multi_series_mode', False):
print(f"Multi-series node detected: {node.get('name', 'Unknown')}")
return True
return False
def _extract_multi_series_config(self):
"""Extract multi-series configuration from node properties"""
multi_series_config = {
'language': 'en',
'enabled_series': [],
'config_mode': 'folder',
'assets_folder': '',
'port_mapping': {},
'individual_paths': {}
}
nodes = self.pipeline_data.get('nodes', [])
for node in nodes:
if 'Model' in node.get('type', ''):
# Check properties in order of preference
node_properties = node.get('properties', {})
if not node_properties:
node_properties = node.get('custom_properties', {})
if not node_properties:
node_properties = node.get('custom', {})
if node_properties.get('multi_series_mode', False):
# Extract multi-series configuration
multi_series_config['enabled_series'] = node_properties.get('enabled_series', [])
multi_series_config['assets_folder'] = node_properties.get('assets_folder', '')
multi_series_config['port_mapping'] = node_properties.get('port_mapping', {})
# Determine config mode based on assets_folder
if multi_series_config['assets_folder']:
multi_series_config['config_mode'] = 'folder'
else:
multi_series_config['config_mode'] = 'individual'
break
return multi_series_config
def setup_ui(self):
"""Setup the dialog UI."""
layout = QVBoxLayout(self)
@ -399,11 +616,18 @@ class DeploymentDialog(QDialog):
# Buttons
button_layout = QHBoxLayout()
# Multi-series configuration button (only for multi-series pipelines)
if self.is_multi_series:
self.configure_multi_series_btn = QPushButton("Configure Multi-Series")
self.configure_multi_series_btn.clicked.connect(self.configure_multi_series)
button_layout.addWidget(self.configure_multi_series_btn)
self.analyze_button = QPushButton("Analyze Pipeline")
self.analyze_button.clicked.connect(self.analyze_pipeline)
button_layout.addWidget(self.analyze_button)
self.deploy_button = QPushButton("Deploy to Dongles")
deploy_text = "Deploy Multi-Series Pipeline" if self.is_multi_series else "Deploy to Dongles"
self.deploy_button = QPushButton(deploy_text)
self.deploy_button.clicked.connect(self.start_deployment)
self.deploy_button.setEnabled(False)
button_layout.addWidget(self.deploy_button)
@ -425,6 +649,31 @@ class DeploymentDialog(QDialog):
# Populate initial data
self.populate_overview()
def configure_multi_series(self):
"""Open multi-series configuration dialog"""
if not MULTI_SERIES_UI_AVAILABLE:
QMessageBox.warning(
self,
"Configuration Error",
"Multi-series configuration UI not available. Please check installation."
)
return
# Create and show multi-series configuration dialog
config_dialog = MultiSeriesConfigDialog(self, self.multi_series_config)
if config_dialog.exec_() == config_dialog.Accepted:
self.multi_series_config = config_dialog.get_configuration()
# Update status
enabled_series = self.multi_series_config.get('enabled_series', [])
if enabled_series:
self.dongle_status.setText(f"Multi-series configured: {', '.join(enabled_series)}")
self.deploy_button.setEnabled(True)
else:
self.dongle_status.setText("No series configured")
self.deploy_button.setEnabled(False)
def create_overview_tab(self) -> QWidget:
"""Create pipeline overview tab."""
widget = QWidget()
@ -538,13 +787,33 @@ class DeploymentDialog(QDialog):
layout.addWidget(splitter)
# Dongle status (placeholder)
status_group = QGroupBox("Dongle Status")
status_layout = QVBoxLayout(status_group)
# Dongle status
if self.is_multi_series:
status_group = QGroupBox("Multi-Series Dongle Status")
status_layout = QVBoxLayout(status_group)
self.dongle_status = QLabel("No dongles detected")
self.dongle_status.setAlignment(Qt.AlignCenter)
status_layout.addWidget(self.dongle_status)
# Multi-series status table
self.multi_series_status_table = QTableWidget()
self.multi_series_status_table.setColumnCount(4)
self.multi_series_status_table.setHorizontalHeaderLabels([
"Series", "Port IDs", "Current Load", "Total Processed"
])
self.multi_series_status_table.horizontalHeader().setStretchLastSection(True)
self.multi_series_status_table.setMaximumHeight(150)
status_layout.addWidget(self.multi_series_status_table)
# Overall status
self.dongle_status = QLabel("Configure multi-series settings to begin")
self.dongle_status.setAlignment(Qt.AlignCenter)
status_layout.addWidget(self.dongle_status)
else:
status_group = QGroupBox("Dongle Status")
status_layout = QVBoxLayout(status_group)
self.dongle_status = QLabel("No dongles detected")
self.dongle_status.setAlignment(Qt.AlignCenter)
status_layout.addWidget(self.dongle_status)
layout.addWidget(status_group)
@ -626,32 +895,10 @@ Stage Configurations:
for i, stage_config in enumerate(config.stage_configs, 1):
analysis_text += f"\nStage {i}: {stage_config.stage_id}\n"
# Check if this is multi-series configuration
if stage_config.multi_series_config:
analysis_text += f" Mode: Multi-Series\n"
analysis_text += f" Series Configured: {list(stage_config.multi_series_config.keys())}\n"
# Show details for each series
for series_name, series_config in stage_config.multi_series_config.items():
analysis_text += f" \n {series_name} Configuration:\n"
analysis_text += f" Port IDs: {series_config.get('port_ids', [])}\n"
model_path = series_config.get('model_path', 'Not specified')
analysis_text += f" Model: {model_path}\n"
firmware_paths = series_config.get('firmware_paths', {})
if firmware_paths:
analysis_text += f" SCPU Firmware: {firmware_paths.get('scpu', 'Not specified')}\n"
analysis_text += f" NCPU Firmware: {firmware_paths.get('ncpu', 'Not specified')}\n"
else:
analysis_text += f" Firmware: Not specified\n"
else:
# Single-series (legacy) configuration
analysis_text += f" Mode: Single-Series\n"
analysis_text += f" Port IDs: {stage_config.port_ids}\n"
analysis_text += f" Model Path: {stage_config.model_path}\n"
analysis_text += f" SCPU Firmware: {stage_config.scpu_fw_path}\n"
analysis_text += f" NCPU Firmware: {stage_config.ncpu_fw_path}\n"
analysis_text += f" Port IDs: {stage_config.port_ids}\n"
analysis_text += f" Model Path: {stage_config.model_path}\n"
analysis_text += f" SCPU Firmware: {stage_config.scpu_fw_path}\n"
analysis_text += f" NCPU Firmware: {stage_config.ncpu_fw_path}\n"
analysis_text += f" Upload Firmware: {stage_config.upload_fw}\n"
analysis_text += f" Max Queue Size: {stage_config.max_queue_size}\n"
@ -689,66 +936,23 @@ Stage Configurations:
stage_group = QGroupBox(f"Stage {i}: {stage_config.stage_id}")
stage_layout = QFormLayout(stage_group)
# Check if this is multi-series configuration
if stage_config.multi_series_config:
# Multi-series configuration display
mode_edit = QLineEdit("Multi-Series")
mode_edit.setReadOnly(True)
stage_layout.addRow("Mode:", mode_edit)
# Create read-only fields for stage configuration
model_path_edit = QLineEdit(stage_config.model_path)
model_path_edit.setReadOnly(True)
stage_layout.addRow("Model Path:", model_path_edit)
series_edit = QLineEdit(str(list(stage_config.multi_series_config.keys())))
series_edit.setReadOnly(True)
stage_layout.addRow("Series:", series_edit)
scpu_fw_edit = QLineEdit(stage_config.scpu_fw_path)
scpu_fw_edit.setReadOnly(True)
stage_layout.addRow("SCPU Firmware:", scpu_fw_edit)
# Show details for each series
for series_name, series_config in stage_config.multi_series_config.items():
series_label = QLabel(f"--- {series_name} ---")
series_label.setStyleSheet("font-weight: bold; color: #89b4fa;")
stage_layout.addRow(series_label)
ncpu_fw_edit = QLineEdit(stage_config.ncpu_fw_path)
ncpu_fw_edit.setReadOnly(True)
stage_layout.addRow("NCPU Firmware:", ncpu_fw_edit)
port_ids_edit = QLineEdit(str(series_config.get('port_ids', [])))
port_ids_edit.setReadOnly(True)
stage_layout.addRow(f"{series_name} Port IDs:", port_ids_edit)
port_ids_edit = QLineEdit(str(stage_config.port_ids))
port_ids_edit.setReadOnly(True)
stage_layout.addRow("Port IDs:", port_ids_edit)
model_path = series_config.get('model_path', 'Not specified')
model_path_edit = QLineEdit(model_path)
model_path_edit.setReadOnly(True)
stage_layout.addRow(f"{series_name} Model:", model_path_edit)
firmware_paths = series_config.get('firmware_paths', {})
if firmware_paths:
scpu_path = firmware_paths.get('scpu', 'Not specified')
scpu_fw_edit = QLineEdit(scpu_path)
scpu_fw_edit.setReadOnly(True)
stage_layout.addRow(f"{series_name} SCPU FW:", scpu_fw_edit)
ncpu_path = firmware_paths.get('ncpu', 'Not specified')
ncpu_fw_edit = QLineEdit(ncpu_path)
ncpu_fw_edit.setReadOnly(True)
stage_layout.addRow(f"{series_name} NCPU FW:", ncpu_fw_edit)
else:
# Single-series configuration display
mode_edit = QLineEdit("Single-Series")
mode_edit.setReadOnly(True)
stage_layout.addRow("Mode:", mode_edit)
model_path_edit = QLineEdit(stage_config.model_path)
model_path_edit.setReadOnly(True)
stage_layout.addRow("Model Path:", model_path_edit)
scpu_fw_edit = QLineEdit(stage_config.scpu_fw_path)
scpu_fw_edit.setReadOnly(True)
stage_layout.addRow("SCPU Firmware:", scpu_fw_edit)
ncpu_fw_edit = QLineEdit(stage_config.ncpu_fw_path)
ncpu_fw_edit.setReadOnly(True)
stage_layout.addRow("NCPU Firmware:", ncpu_fw_edit)
port_ids_edit = QLineEdit(str(stage_config.port_ids))
port_ids_edit.setReadOnly(True)
stage_layout.addRow("Port IDs:", port_ids_edit)
# Common fields
queue_size_spin = QSpinBox()
queue_size_spin.setValue(stage_config.max_queue_size)
queue_size_spin.setReadOnly(True)
@ -774,11 +978,17 @@ Stage Configurations:
def start_deployment(self):
"""Start the deployment process."""
if not self.pipeline_config:
if not self.pipeline_config and not self.is_multi_series:
QMessageBox.warning(self, "Deployment Error",
"Please analyze the pipeline first.")
return
# For multi-series pipelines, check if configuration is done
if self.is_multi_series and not self.multi_series_config:
QMessageBox.warning(self, "Configuration Required",
"Please configure multi-series settings first.")
return
# Switch to deployment tab
self.tab_widget.setCurrentIndex(3)
@ -795,7 +1005,7 @@ Stage Configurations:
self.terminal_output_display.append("Pipeline deployment started - terminal output will appear here...")
# Create and start deployment worker
self.deployment_worker = DeploymentWorker(self.pipeline_data)
self.deployment_worker = DeploymentWorker(self.pipeline_data, self.multi_series_config)
self.deployment_worker.progress_updated.connect(self.update_progress)
self.deployment_worker.topology_analyzed.connect(self.update_topology_results)
self.deployment_worker.conversion_completed.connect(self.on_conversion_completed)
@ -806,6 +1016,7 @@ Stage Configurations:
self.deployment_worker.result_updated.connect(self.update_inference_results)
self.deployment_worker.terminal_output.connect(self.update_terminal_output)
self.deployment_worker.stdout_captured.connect(self.update_terminal_output)
self.deployment_worker.multi_series_status.connect(self.update_multi_series_status)
self.deployment_worker.start()
@ -986,6 +1197,71 @@ Stage Configurations:
except Exception as e:
print(f"Error updating terminal output: {e}")
def update_multi_series_status(self, status_info: dict):
"""Update multi-series dongle status display"""
try:
if not self.is_multi_series:
return
status_type = status_info.get('type', '')
if status_type == 'multi_series':
# Update overall status
enabled_series = status_info.get('enabled_series', [])
total_gops = status_info.get('total_gops', 0)
if enabled_series:
status_text = f"Running: {', '.join(enabled_series)} ({total_gops} total GOPS)"
self.dongle_status.setText(status_text)
# Update status table
stats = status_info.get('stats', {})
current_loads = status_info.get('current_loads', {})
port_mapping = status_info.get('port_mapping', {})
if hasattr(self, 'multi_series_status_table'):
# Group port IDs by series
series_ports = {}
for port_id, series in port_mapping.items():
if series not in series_ports:
series_ports[series] = []
series_ports[series].append(str(port_id))
# Update table
self.multi_series_status_table.setRowCount(len(enabled_series))
for i, series in enumerate(enabled_series):
# Series name
self.multi_series_status_table.setItem(i, 0, QTableWidgetItem(series))
# Port IDs
ports = series_ports.get(series, [])
ports_text = ", ".join(ports) if ports else "Not mapped"
self.multi_series_status_table.setItem(i, 1, QTableWidgetItem(ports_text))
# Current load
# Find product_id for this series
product_id = None
series_specs = {'KL520': 0x100, 'KL720': 0x720, 'KL630': 0x630, 'KL730': 0x730, 'KL540': 0x540}
product_id = series_specs.get(series)
if product_id and product_id in current_loads:
load = current_loads[product_id]
self.multi_series_status_table.setItem(i, 2, QTableWidgetItem(str(load)))
else:
self.multi_series_status_table.setItem(i, 2, QTableWidgetItem("0"))
# Total processed
dongle_stats = stats.get('dongle_stats', {})
if product_id and product_id in dongle_stats:
processed = dongle_stats[product_id].get('received', 0)
self.multi_series_status_table.setItem(i, 3, QTableWidgetItem(str(processed)))
else:
self.multi_series_status_table.setItem(i, 3, QTableWidgetItem("0"))
except Exception as e:
print(f"Error updating multi-series status: {e}")
def apply_theme(self):
"""Apply consistent theme to the dialog."""
self.setStyleSheet("""

1207
ui/dialogs/multi_series_config.py Normal file
View File

File diff suppressed because it is too large Load Diff

669
ui/windows/dashboard.py
View File

@ -43,7 +43,6 @@ except ImportError:
from config.theme import HARMONIOUS_THEME_STYLESHEET
from config.settings import get_settings
from utils.folder_dialog import select_assets_folder
try:
from core.nodes import (
InputNode, ModelNode, PreprocessNode, PostprocessNode, OutputNode,
@ -1141,10 +1140,16 @@ class IntegratedPipelineDashboard(QMainWindow):
# Get node properties - try different methods
try:
properties = {}
# Initialize variables that might be used later in form layout
node_type = node.__class__.__name__
multi_series_enabled = False
# Method 1: Try custom properties (for enhanced nodes)
if hasattr(node, 'get_business_properties'):
properties = node.get_business_properties()
# For Model nodes, check if multi-series is enabled
if 'Model' in node_type and hasattr(node, 'get_property'):
multi_series_enabled = node.get_property('multi_series_mode') if hasattr(node, 'get_property') else False
# Method 1.5: Try ExactNode properties (with _property_options)
elif hasattr(node, '_property_options') and node._property_options:
@ -1156,6 +1161,9 @@ class IntegratedPipelineDashboard(QMainWindow):
except:
# If property doesn't exist, use a default value
properties[prop_name] = None
# For Model nodes, check if multi-series is enabled
if 'Model' in node_type and hasattr(node, 'get_property'):
multi_series_enabled = node.get_property('multi_series_mode') if hasattr(node, 'get_property') else False
# Method 2: Try standard NodeGraphQt properties
elif hasattr(node, 'properties'):
@ -1164,10 +1172,15 @@ class IntegratedPipelineDashboard(QMainWindow):
for key, value in all_props.items():
if not key.startswith('_') and key not in ['name', 'selected', 'disabled', 'custom']:
properties[key] = value
# For Model nodes, check if multi-series is enabled
if 'Model' in node_type:
multi_series_enabled = properties.get('multi_series_mode', False)
# Method 3: Use exact original properties based on node type
else:
node_type = node.__class__.__name__
# Variables already initialized above
properties = {} # Initialize properties dict
if 'Input' in node_type:
# Exact InputNode properties from original
properties = {
@ -1178,16 +1191,31 @@ class IntegratedPipelineDashboard(QMainWindow):
'fps': node.get_property('fps') if hasattr(node, 'get_property') else 30
}
elif 'Model' in node_type:
# Exact ModelNode properties from original - including upload_fw checkbox
# Check if multi-series mode is enabled
multi_series_enabled = node.get_property('multi_series_mode') if hasattr(node, 'get_property') else False
# Basic properties always shown
properties = {
'model_path': node.get_property('model_path') if hasattr(node, 'get_property') else '',
'scpu_fw_path': node.get_property('scpu_fw_path') if hasattr(node, 'get_property') else '',
'ncpu_fw_path': node.get_property('ncpu_fw_path') if hasattr(node, 'get_property') else '',
'dongle_series': node.get_property('dongle_series') if hasattr(node, 'get_property') else '520',
'num_dongles': node.get_property('num_dongles') if hasattr(node, 'get_property') else 1,
'port_id': node.get_property('port_id') if hasattr(node, 'get_property') else '',
'upload_fw': node.get_property('upload_fw') if hasattr(node, 'get_property') else True
'multi_series_mode': multi_series_enabled
}
if multi_series_enabled:
# Multi-series mode properties
properties.update({
'assets_folder': node.get_property('assets_folder') if hasattr(node, 'get_property') else '',
'enabled_series': node.get_property('enabled_series') if hasattr(node, 'get_property') else ['520', '720']
})
else:
# Single-series mode properties (original)
properties.update({
'model_path': node.get_property('model_path') if hasattr(node, 'get_property') else '',
'scpu_fw_path': node.get_property('scpu_fw_path') if hasattr(node, 'get_property') else '',
'ncpu_fw_path': node.get_property('ncpu_fw_path') if hasattr(node, 'get_property') else '',
'dongle_series': node.get_property('dongle_series') if hasattr(node, 'get_property') else '520',
'num_dongles': node.get_property('num_dongles') if hasattr(node, 'get_property') else 1,
'port_id': node.get_property('port_id') if hasattr(node, 'get_property') else '',
'upload_fw': node.get_property('upload_fw') if hasattr(node, 'get_property') else True
})
elif 'Preprocess' in node_type:
# Exact PreprocessNode properties from original
properties = {
@ -1220,9 +1248,30 @@ class IntegratedPipelineDashboard(QMainWindow):
widget = self.create_property_widget_enhanced(node, prop_name, prop_value)
# Add to form with appropriate labels
if prop_name == 'upload_fw':
# For upload_fw, don't show a separate label since the checkbox has its own text
if prop_name in ['upload_fw', 'multi_series_mode']:
# For checkboxes with their own text, don't show a separate label
form_layout.addRow(widget)
elif prop_name == 'assets_folder':
form_layout.addRow("Assets Folder:", widget)
elif prop_name == 'enabled_series':
form_layout.addRow("Enabled Series:", widget)
# Add port mapping widget for multi-series mode
if 'Model' in node_type and multi_series_enabled:
port_mapping_widget = self.create_port_mapping_widget(node)
form_layout.addRow(port_mapping_widget)
elif prop_name == 'dongle_series':
form_layout.addRow("Dongle Series:", widget)
elif prop_name == 'num_dongles':
form_layout.addRow("Number of Dongles:", widget)
elif prop_name == 'port_id':
form_layout.addRow("Port ID:", widget)
elif prop_name == 'model_path':
form_layout.addRow("Model Path:", widget)
elif prop_name == 'scpu_fw_path':
form_layout.addRow("SCPU Firmware:", widget)
elif prop_name == 'ncpu_fw_path':
form_layout.addRow("NCPU Firmware:", widget)
else:
label = prop_name.replace('_', ' ').title()
form_layout.addRow(f"{label}:", widget)
@ -1324,75 +1373,9 @@ class IntegratedPipelineDashboard(QMainWindow):
if hasattr(node, '_property_options') and prop_name in node._property_options:
prop_options = node._property_options[prop_name]
# Special handling for assets_folder property
if prop_name == 'assets_folder':
# Assets folder property with validation and improved dialog
display_text = self.truncate_path_smart(str(prop_value)) if prop_value else 'Select Assets Folder...'
widget = QPushButton(display_text)
# Set fixed width and styling to prevent expansion
widget.setMaximumWidth(250)
widget.setMinimumWidth(200)
widget.setStyleSheet("""
QPushButton {
text-align: left;
padding: 5px 8px;
background-color: #45475a;
color: #cdd6f4;
border: 1px solid #585b70;
border-radius: 4px;
font-size: 10px;
}
QPushButton:hover {
background-color: #585b70;
border-color: #a6e3a1;
}
QPushButton:pressed {
background-color: #313244;
}
""")
# Store full path for tooltip and internal use
full_path = str(prop_value) if prop_value else ''
widget.setToolTip(f"Full path: {full_path}\n\nClick to browse for Assets folder\n(Should contain Firmware/ and Models/ subfolders)")
def browse_assets_folder():
# Use the specialized assets folder dialog with validation
result = select_assets_folder(initial_dir=full_path or '')
if result['path']:
# Update button text with truncated path
truncated_text = self.truncate_path_smart(result['path'])
widget.setText(truncated_text)
# Create detailed tooltip with validation results
tooltip_lines = [f"Full path: {result['path']}"]
if result['valid']:
tooltip_lines.append("✓ Valid Assets folder structure detected")
if 'details' in result and 'available_series' in result['details']:
series = result['details']['available_series']
tooltip_lines.append(f"Available series: {', '.join(series)}")
else:
tooltip_lines.append(f"⚠ {result['message']}")
tooltip_lines.append("\nClick to browse for Assets folder")
widget.setToolTip('\n'.join(tooltip_lines))
# Set property with full path
if hasattr(node, 'set_property'):
node.set_property(prop_name, result['path'])
# Show validation message to user
if not result['valid']:
QMessageBox.warning(self, "Assets Folder Validation",
f"Selected folder may not have the expected structure:\n\n{result['message']}\n\n"
"Expected structure:\nAssets/\n├── Firmware/\n│ └── KL520/, KL720/, etc.\n└── Models/\n └── KL520/, KL720/, etc.")
widget.clicked.connect(browse_assets_folder)
# Check for file path properties (from prop_options or name pattern)
elif (prop_options and isinstance(prop_options, dict) and prop_options.get('type') == 'file_path') or \
prop_name in ['model_path', 'source_path', 'destination']:
# Check for file path properties first (from prop_options or name pattern)
if (prop_options and isinstance(prop_options, dict) and prop_options.get('type') == 'file_path') or \
prop_name in ['model_path', 'source_path', 'destination', 'assets_folder']:
# File path property with smart truncation and width limits
display_text = self.truncate_path_smart(str(prop_value)) if prop_value else 'Select File...'
widget = QPushButton(display_text)
@ -1424,33 +1407,107 @@ class IntegratedPipelineDashboard(QMainWindow):
widget.setToolTip(f"Full path: {full_path}\n\nClick to browse for {prop_name.replace('_', ' ')}")
def browse_file():
# Use filter from prop_options if available, otherwise use defaults
if prop_options and 'filter' in prop_options:
file_filter = prop_options['filter']
# Handle assets_folder as folder dialog
if prop_name == 'assets_folder':
folder_path = QFileDialog.getExistingDirectory(
self,
'Select Multi-Series Assets Folder',
str(prop_value) if prop_value else os.path.expanduser("~")
)
if folder_path:
# Update button text with truncated path
truncated_text = self.truncate_path_smart(folder_path)
widget.setText(truncated_text)
# Update tooltip with full path
widget.setToolTip(f"Assets Folder: {folder_path}\n\nContains Firmware/ and Models/ subdirectories")
# Set property with full path
if hasattr(node, 'set_property'):
node.set_property(prop_name, folder_path)
else:
# Fallback to original filters
filters = {
'model_path': 'NEF Model files (*.nef)',
'scpu_fw_path': 'SCPU Firmware files (*.bin)',
'ncpu_fw_path': 'NCPU Firmware files (*.bin)',
'source_path': 'Media files (*.mp4 *.avi *.mov *.mkv *.wav *.mp3)',
'destination': 'Output files (*.json *.xml *.csv *.txt)'
}
file_filter = filters.get(prop_name, 'All files (*)')
# Use filter from prop_options if available, otherwise use defaults
if prop_options and 'filter' in prop_options:
file_filter = prop_options['filter']
else:
# Fallback to original filters
filters = {
'model_path': 'NEF Model files (*.nef)',
'scpu_fw_path': 'SCPU Firmware files (*.bin)',
'ncpu_fw_path': 'NCPU Firmware files (*.bin)',
'source_path': 'Media files (*.mp4 *.avi *.mov *.mkv *.wav *.mp3)',
'destination': 'Output files (*.json *.xml *.csv *.txt)'
}
file_filter = filters.get(prop_name, 'All files (*)')
file_path, _ = QFileDialog.getOpenFileName(self, f'Select {prop_name}', '', file_filter)
if file_path:
# Update button text with truncated path
truncated_text = self.truncate_path_smart(file_path)
widget.setText(truncated_text)
# Update tooltip with full path
widget.setToolTip(f"Full path: {file_path}\n\nClick to browse for {prop_name.replace('_', ' ')}")
# Set property with full path
if hasattr(node, 'set_property'):
node.set_property(prop_name, file_path)
file_path, _ = QFileDialog.getOpenFileName(self, f'Select {prop_name}', '', file_filter)
if file_path:
# Update button text with truncated path
truncated_text = self.truncate_path_smart(file_path)
widget.setText(truncated_text)
# Update tooltip with full path
widget.setToolTip(f"Full path: {file_path}\n\nClick to browse for {prop_name.replace('_', ' ')}")
# Set property with full path
if hasattr(node, 'set_property'):
node.set_property(prop_name, file_path)
widget.clicked.connect(browse_file)
# Check for enabled_series (special multi-select property)
elif prop_name == 'enabled_series':
# Create a custom widget for multi-series selection
widget = QWidget()
layout = QVBoxLayout(widget)
layout.setContentsMargins(0, 0, 0, 0)
layout.setSpacing(2)
# Available series options
available_series = ['KL520', 'KL720', 'KL630', 'KL730', 'KL540']
current_selection = prop_value if isinstance(prop_value, list) else [prop_value] if prop_value else []
# Convert to series names if they're just numbers
if current_selection and all(isinstance(x, str) and x.isdigit() for x in current_selection):
current_selection = [f'KL{x}' for x in current_selection]
checkboxes = []
for series in available_series:
checkbox = QCheckBox(f"{series}")
checkbox.setChecked(series in current_selection)
checkbox.setStyleSheet("""
QCheckBox {
color: #cdd6f4;
font-size: 10px;
padding: 2px;
}
QCheckBox::indicator {
width: 14px;
height: 14px;
border-radius: 2px;
border: 1px solid #45475a;
background-color: #313244;
}
QCheckBox::indicator:checked {
background-color: #a6e3a1;
border-color: #a6e3a1;
}
""")
layout.addWidget(checkbox)
checkboxes.append((series, checkbox))
# Update function for checkboxes
def update_enabled_series():
selected = []
for series, checkbox in checkboxes:
if checkbox.isChecked():
# Store just the number for compatibility
series_number = series.replace('KL', '')
selected.append(series_number)
if hasattr(node, 'set_property'):
node.set_property(prop_name, selected)
# Connect all checkboxes to update function
for _, checkbox in checkboxes:
checkbox.toggled.connect(update_enabled_series)
# Check for dropdown properties (list options from prop_options or predefined)
elif (prop_options and isinstance(prop_options, list)) or \
prop_name in ['source_type', 'dongle_series', 'output_format', 'format', 'output_type', 'resolution']:
@ -1522,7 +1579,7 @@ class IntegratedPipelineDashboard(QMainWindow):
widget = QCheckBox()
widget.setChecked(prop_value)
# Add special styling for upload_fw checkbox
# Add special styling and text for specific checkboxes
if prop_name == 'upload_fw':
widget.setText("Upload Firmware to Device")
widget.setStyleSheet("""
@ -1546,6 +1603,31 @@ class IntegratedPipelineDashboard(QMainWindow):
border-color: #74c7ec;
}
""")
elif prop_name == 'multi_series_mode':
widget.setText("Enable Multi-Series Mode")
widget.setStyleSheet("""
QCheckBox {
color: #f9e2af;
font-size: 12px;
font-weight: bold;
padding: 4px;
}
QCheckBox::indicator {
width: 18px;
height: 18px;
border-radius: 4px;
border: 2px solid #f9e2af;
background-color: #313244;
}
QCheckBox::indicator:checked {
background-color: #a6e3a1;
border-color: #a6e3a1;
}
QCheckBox::indicator:hover {
border-color: #f38ba8;
}
""")
widget.setToolTip("Enable multi-series mode to use different dongle models simultaneously")
else:
widget.setStyleSheet("""
QCheckBox {
@ -1573,6 +1655,12 @@ class IntegratedPipelineDashboard(QMainWindow):
if prop_name == 'upload_fw':
status = "enabled" if state == 2 else "disabled"
print(f"Upload Firmware {status} for {node.name()}")
# For multi_series_mode, refresh the properties panel
elif prop_name == 'multi_series_mode':
status = "enabled" if state == 2 else "disabled"
print(f"Multi-series mode {status} for {node.name()}")
# Trigger properties panel refresh to show/hide multi-series properties
self.update_node_properties_panel(node)
widget.stateChanged.connect(on_change)
@ -1778,42 +1866,152 @@ class IntegratedPipelineDashboard(QMainWindow):
def detect_dongles(self):
"""Detect available dongles using actual device scanning."""
"""Enhanced dongle detection supporting both single and multi-series configurations."""
if not self.dongles_list:
return
self.dongles_list.clear()
try:
# Import MultiDongle for device scanning
# Import both scanning methods
from core.functions.Multidongle import MultiDongle
import sys
import os
# Scan for available devices
# Add path for multi-series manager
current_dir = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
sys.path.insert(0, current_dir)
try:
from multi_series_dongle_manager import MultiSeriesDongleManager, DongleSeriesSpec
multi_series_available = True
except ImportError:
multi_series_available = False
# Scan using MultiDongle (existing method)
devices = MultiDongle.scan_devices()
if devices:
# Add detected devices to the list
# Group devices by series for better organization
series_groups = {}
for device in devices:
port_id = device['port_id']
series = device['series']
self.dongles_list.addItem(f"{series} Dongle - Port {port_id}")
if series not in series_groups:
series_groups[series] = []
series_groups[series].append(device)
# Add summary item
self.dongles_list.addItem(f"Total: {len(devices)} device(s) detected")
# Add header for device listing
self.dongles_list.addItem("=== Detected Kneron Dongles ===")
# Store device info for later use
# Display devices grouped by series
for series, device_list in series_groups.items():
# Add series header with capabilities
if multi_series_available:
# Find GOPS capacity for this series
gops_capacity = "Unknown"
for product_id, spec in DongleSeriesSpec.SERIES_SPECS.items():
if spec["name"] == series:
gops_capacity = f"{spec['gops']} GOPS"
break
series_header = f"{series} Series ({gops_capacity}):"
else:
series_header = f"{series} Series:"
self.dongles_list.addItem(series_header)
# Add individual devices
for device in device_list:
port_id = device['port_id']
device_item = f" Port {port_id}"
if 'device_descriptor' in device:
desc = device['device_descriptor']
if hasattr(desc, 'product_id'):
product_id = hex(desc.product_id)
device_item += f" (ID: {product_id})"
self.dongles_list.addItem(device_item)
# Add multi-series information
if multi_series_available and len(series_groups) > 1:
self.dongles_list.addItem("")
self.dongles_list.addItem("Multi-Series Mode Available!")
self.dongles_list.addItem(" Different series can work together for")
self.dongles_list.addItem(" improved performance and load balancing.")
# Calculate total potential GOPS
total_gops = 0
for series, device_list in series_groups.items():
for product_id, spec in DongleSeriesSpec.SERIES_SPECS.items():
if spec["name"] == series:
total_gops += spec["gops"] * len(device_list)
break
if total_gops > 0:
self.dongles_list.addItem(f" Total Combined GOPS: {total_gops}")
# Add configuration options
self.dongles_list.addItem("")
self.dongles_list.addItem("=== Configuration Options ===")
if len(series_groups) > 1 and multi_series_available:
self.dongles_list.addItem("Configure Multi-Series Mapping:")
self.dongles_list.addItem(" Enable multi-series mode in model")
self.dongles_list.addItem(" properties to use mixed dongle types.")
else:
self.dongles_list.addItem("Single-Series Configuration:")
self.dongles_list.addItem(" All detected dongles are same series.")
self.dongles_list.addItem(" Standard mode will be used.")
# Summary
self.dongles_list.addItem("")
self.dongles_list.addItem(f"Summary: {len(devices)} device(s), {len(series_groups)} series type(s)")
# Store enhanced device info
self.detected_devices = devices
self.detected_series_groups = series_groups
# Store multi-series availability for other methods
self.multi_series_available = multi_series_available
else:
self.dongles_list.addItem("No Kneron devices detected")
self.dongles_list.addItem("")
self.dongles_list.addItem("Troubleshooting:")
self.dongles_list.addItem("- Check USB connections")
self.dongles_list.addItem("- Ensure dongles are powered")
self.dongles_list.addItem("- Try different USB ports")
self.dongles_list.addItem("- Check device drivers")
self.detected_devices = []
self.detected_series_groups = {}
self.multi_series_available = multi_series_available
except Exception as e:
# Fallback to simulation if scanning fails
# Enhanced fallback with multi-series simulation
self.dongles_list.addItem("Device scanning failed - using simulation")
self.dongles_list.addItem("Simulated KL520 Dongle - Port 28")
self.dongles_list.addItem("Simulated KL720 Dongle - Port 32")
self.detected_devices = []
self.dongles_list.addItem("")
self.dongles_list.addItem("=== Simulated Devices ===")
self.dongles_list.addItem("KL520 Series (3 GOPS):")
self.dongles_list.addItem(" Port 28 (ID: 0x100)")
self.dongles_list.addItem("KL720 Series (28 GOPS):")
self.dongles_list.addItem(" Port 32 (ID: 0x720)")
self.dongles_list.addItem("")
self.dongles_list.addItem("Multi-Series Mode Available!")
self.dongles_list.addItem(" Total Combined GOPS: 31")
self.dongles_list.addItem("")
self.dongles_list.addItem("Summary: 2 device(s), 2 series type(s)")
# Create simulated device data
self.detected_devices = [
{'port_id': 28, 'series': 'KL520'},
{'port_id': 32, 'series': 'KL720'}
]
self.detected_series_groups = {
'KL520': [{'port_id': 28, 'series': 'KL520'}],
'KL720': [{'port_id': 32, 'series': 'KL720'}]
}
self.multi_series_available = True
# Print error for debugging
print(f"Dongle detection error: {str(e)}")
@ -1846,6 +2044,243 @@ class IntegratedPipelineDashboard(QMainWindow):
"""
return [device['port_id'] for device in self.get_detected_devices()]
def create_port_mapping_widget(self, node):
"""Create port mapping widget for multi-series configuration."""
try:
from PyQt5.QtWidgets import (QWidget, QVBoxLayout, QHBoxLayout,
QLabel, QPushButton, QComboBox, QTableWidget,
QTableWidgetItem, QHeaderView)
# Main container widget
container = QWidget()
container.setStyleSheet("""
QWidget {
background-color: #1e1e2e;
border: 1px solid #45475a;
border-radius: 6px;
margin: 2px;
}
""")
layout = QVBoxLayout(container)
layout.setContentsMargins(8, 8, 8, 8)
# Title
title_label = QLabel("Port ID to Series Mapping")
title_label.setStyleSheet("""
QLabel {
color: #f9e2af;
font-size: 13px;
font-weight: bold;
background: none;
border: none;
margin-bottom: 5px;
}
""")
layout.addWidget(title_label)
# Get detected devices
series_groups = getattr(self, 'detected_series_groups', {})
detected_devices = getattr(self, 'detected_devices', [])
if not detected_devices:
# Show message if no devices detected
no_devices_label = QLabel("No devices detected. Use 'Detect Dongles' button above.")
no_devices_label.setStyleSheet("""
QLabel {
color: #f38ba8;
font-size: 11px;
background: none;
border: none;
padding: 10px;
text-align: center;
}
""")
layout.addWidget(no_devices_label)
return container
# Create mapping table
if len(series_groups) > 1:
# Multiple series detected - show mapping table
table = QTableWidget()
table.setColumnCount(3)
table.setHorizontalHeaderLabels(["Port ID", "Detected Series", "Assign To"])
table.setRowCount(len(detected_devices))
# Style the table
table.setStyleSheet("""
QTableWidget {
background-color: #313244;
gridline-color: #45475a;
color: #cdd6f4;
border: 1px solid #45475a;
font-size: 10px;
}
QTableWidget::item {
padding: 5px;
border-bottom: 1px solid #45475a;
}
QTableWidget::item:selected {
background-color: #89b4fa;
}
QHeaderView::section {
background-color: #45475a;
color: #f9e2af;
padding: 5px;
border: none;
font-weight: bold;
}
""")
# Get current port mapping from node
current_mapping = node.get_property('port_mapping') if hasattr(node, 'get_property') else {}
# Populate table
available_series = list(series_groups.keys())
for i, device in enumerate(detected_devices):
port_id = device['port_id']
detected_series = device['series']
# Port ID column (read-only)
port_item = QTableWidgetItem(str(port_id))
port_item.setFlags(port_item.flags() & ~0x02) # Make read-only
table.setItem(i, 0, port_item)
# Detected Series column (read-only)
series_item = QTableWidgetItem(detected_series)
series_item.setFlags(series_item.flags() & ~0x02) # Make read-only
table.setItem(i, 1, series_item)
# Assignment combo box
combo = QComboBox()
combo.addItems(['Auto'] + available_series)
# Set current mapping
if str(port_id) in current_mapping:
mapped_series = current_mapping[str(port_id)]
if mapped_series in available_series:
combo.setCurrentText(mapped_series)
else:
combo.setCurrentText('Auto')
else:
combo.setCurrentText('Auto')
# Style combo box
combo.setStyleSheet("""
QComboBox {
background-color: #45475a;
color: #cdd6f4;
border: 1px solid #585b70;
padding: 3px;
font-size: 10px;
}
QComboBox:hover {
border-color: #74c7ec;
}
QComboBox::drop-down {
border: none;
}
QComboBox::down-arrow {
width: 10px;
height: 10px;
}
""")
def make_mapping_handler(port, combo_widget):
def on_mapping_change(series_name):
# Update node property
if hasattr(node, 'set_property'):
current_mapping = node.get_property('port_mapping') if hasattr(node, 'get_property') else {}
if series_name == 'Auto':
# Remove explicit mapping, let auto-detection handle it
current_mapping.pop(str(port), None)
else:
current_mapping[str(port)] = series_name
node.set_property('port_mapping', current_mapping)
print(f"Port {port} mapped to {series_name}")
return on_mapping_change
combo.currentTextChanged.connect(make_mapping_handler(port_id, combo))
table.setCellWidget(i, 2, combo)
# Adjust column widths
table.horizontalHeader().setStretchLastSection(True)
table.horizontalHeader().setSectionResizeMode(0, QHeaderView.ResizeToContents)
table.horizontalHeader().setSectionResizeMode(1, QHeaderView.ResizeToContents)
table.setMaximumHeight(150)
layout.addWidget(table)
# Add configuration button
config_button = QPushButton("Advanced Configuration")
config_button.setStyleSheet("""
QPushButton {
background-color: #89b4fa;
color: #1e1e2e;
border: none;
padding: 6px 12px;
border-radius: 4px;
font-size: 11px;
font-weight: bold;
}
QPushButton:hover {
background-color: #74c7ec;
}
QPushButton:pressed {
background-color: #585b70;
}
""")
def open_multi_series_config():
try:
from ui.dialogs.multi_series_config import MultiSeriesConfigDialog
dialog = MultiSeriesConfigDialog()
# Pre-populate with current detected devices
if hasattr(dialog, 'set_detected_devices'):
dialog.set_detected_devices(detected_devices, series_groups)
if dialog.exec_() == dialog.Accepted:
config = dialog.get_configuration()
# Update node properties with configuration
if hasattr(node, 'set_property') and config:
for key, value in config.items():
node.set_property(key, value)
# Refresh properties panel
self.update_node_properties_panel(node)
print("Multi-series configuration updated")
except ImportError as e:
print(f"Multi-series config dialog not available: {e}")
config_button.clicked.connect(open_multi_series_config)
layout.addWidget(config_button)
else:
# Single series detected - show info message
single_series = list(series_groups.keys())[0] if series_groups else "Unknown"
info_label = QLabel(f"All devices are {single_series} series. Multi-series mapping not needed.")
info_label.setStyleSheet("""
QLabel {
color: #94e2d5;
font-size: 11px;
background: none;
border: none;
padding: 10px;
text-align: center;
}
""")
layout.addWidget(info_label)
return container
except Exception as e:
print(f"Error creating port mapping widget: {e}")
# Return simple label as fallback
from PyQt5.QtWidgets import QLabel
fallback_label = QLabel("Port mapping configuration unavailable")
fallback_label.setStyleSheet("color: #f38ba8; padding: 10px;")
return fallback_label
def get_device_by_port(self, port_id):
"""
Get device information by port ID.

4
utils/__init__.py
View File

@ -21,12 +21,8 @@ Usage:
# Import utilities as they are implemented
# from . import file_utils
# from . import ui_utils
from .folder_dialog import select_folder, select_assets_folder, validate_assets_folder_structure
__all__ = [
# "file_utils",
# "ui_utils"
"select_folder",
"select_assets_folder",
"validate_assets_folder_structure"
]

252
utils/folder_dialog.py
View File

@ -1,252 +0,0 @@
"""
Folder selection utilities using PyQt5 as primary, tkinter as fallback
"""
import os
def select_folder(title="Select Folder", initial_dir="", must_exist=True):
"""
Open a folder selection dialog using PyQt5 (preferred) or tkinter (fallback)
Args:
title (str): Dialog window title
initial_dir (str): Initial directory to open
must_exist (bool): Whether the folder must already exist
Returns:
str: Selected folder path, or empty string if cancelled
"""
# Try PyQt5 first (more reliable on macOS)
try:
from PyQt5.QtWidgets import QApplication, QFileDialog
import sys
# Create QApplication if it doesn't exist
app = QApplication.instance()
if app is None:
app = QApplication(sys.argv)
# Set initial directory
if not initial_dir:
initial_dir = os.getcwd()
elif not os.path.exists(initial_dir):
initial_dir = os.getcwd()
# Open folder selection dialog
folder_path = QFileDialog.getExistingDirectory(
None,
title,
initial_dir,
QFileDialog.ShowDirsOnly | QFileDialog.DontResolveSymlinks
)
return folder_path if folder_path else ""
except ImportError:
print("PyQt5 not available, trying tkinter...")
# Fallback to tkinter
try:
import tkinter as tk
from tkinter import filedialog
# Create a root window but keep it hidden
root = tk.Tk()
root.withdraw() # Hide the main window
root.attributes('-topmost', True) # Bring dialog to front
# Set initial directory
if not initial_dir:
initial_dir = os.getcwd()
# Open folder selection dialog
folder_path = filedialog.askdirectory(
title=title,
initialdir=initial_dir,
mustexist=must_exist
)
# Destroy the root window
root.destroy()
return folder_path if folder_path else ""
except ImportError:
print("tkinter also not available")
return ""
except Exception as e:
print(f"Error opening tkinter folder dialog: {e}")
return ""
except Exception as e:
print(f"Error opening PyQt5 folder dialog: {e}")
return ""
def select_assets_folder(initial_dir=""):
"""
Specialized function for selecting Assets folder with validation
Args:
initial_dir (str): Initial directory to open
Returns:
dict: Result with 'path', 'valid', and 'message' keys
"""
folder_path = select_folder(
title="Select Assets Folder (containing Firmware/ and Models/)",
initial_dir=initial_dir
)
if not folder_path:
return {'path': '', 'valid': False, 'message': 'No folder selected'}
# Validate folder structure
validation_result = validate_assets_folder_structure(folder_path)
return {
'path': folder_path,
'valid': validation_result['valid'],
'message': validation_result['message'],
'details': validation_result.get('details', {})
}
def validate_assets_folder_structure(folder_path):
"""
Validate that a folder has the expected Assets structure
Expected structure:
Assets/
├── Firmware/
│ ├── KL520/
│ │ ├── fw_scpu.bin
│ │ └── fw_ncpu.bin
│ └── KL720/
│ ├── fw_scpu.bin
│ └── fw_ncpu.bin
└── Models/
├── KL520/
│ └── model.nef
└── KL720/
└── model.nef
Args:
folder_path (str): Path to validate
Returns:
dict: Validation result with 'valid', 'message', and 'details' keys
"""
if not os.path.exists(folder_path):
return {'valid': False, 'message': 'Folder does not exist'}
if not os.path.isdir(folder_path):
return {'valid': False, 'message': 'Path is not a directory'}
details = {}
issues = []
# Check for Firmware and Models folders
firmware_path = os.path.join(folder_path, 'Firmware')
models_path = os.path.join(folder_path, 'Models')
has_firmware = os.path.exists(firmware_path) and os.path.isdir(firmware_path)
has_models = os.path.exists(models_path) and os.path.isdir(models_path)
details['has_firmware_folder'] = has_firmware
details['has_models_folder'] = has_models
if not has_firmware:
issues.append("Missing 'Firmware' folder")
if not has_models:
issues.append("Missing 'Models' folder")
if not (has_firmware and has_models):
return {
'valid': False,
'message': f"Invalid folder structure: {', '.join(issues)}",
'details': details
}
# Check for series subfolders
expected_series = ['KL520', 'KL720', 'KL630', 'KL730', 'KL540']
firmware_series = []
models_series = []
try:
firmware_dirs = [d for d in os.listdir(firmware_path)
if os.path.isdir(os.path.join(firmware_path, d))]
firmware_series = [d for d in firmware_dirs if d in expected_series]
models_dirs = [d for d in os.listdir(models_path)
if os.path.isdir(os.path.join(models_path, d))]
models_series = [d for d in models_dirs if d in expected_series]
except Exception as e:
return {
'valid': False,
'message': f"Error reading folder contents: {e}",
'details': details
}
details['firmware_series'] = firmware_series
details['models_series'] = models_series
# Find common series (have both firmware and models)
common_series = list(set(firmware_series) & set(models_series))
details['available_series'] = common_series
if not common_series:
return {
'valid': False,
'message': "No series found with both firmware and models folders",
'details': details
}
# Check for actual files in series folders
series_with_files = []
for series in common_series:
has_files = False
# Check firmware files
fw_series_path = os.path.join(firmware_path, series)
if os.path.exists(fw_series_path):
fw_files = [f for f in os.listdir(fw_series_path)
if f.endswith('.bin')]
if fw_files:
has_files = True
# Check model files
model_series_path = os.path.join(models_path, series)
if os.path.exists(model_series_path):
model_files = [f for f in os.listdir(model_series_path)
if f.endswith('.nef')]
if model_files and has_files:
series_with_files.append(series)
details['series_with_files'] = series_with_files
if not series_with_files:
return {
'valid': False,
'message': "No series found with actual firmware and model files",
'details': details
}
return {
'valid': True,
'message': f"Valid Assets folder with {len(series_with_files)} series: {', '.join(series_with_files)}",
'details': details
}
# Example usage
if __name__ == "__main__":
print("Testing folder selection...")
# Test basic folder selection
folder = select_folder("Select any folder")
print(f"Selected: {folder}")
# Test Assets folder selection with validation
result = select_assets_folder()
print(f"Assets folder result: {result}")

447
utils/multi_series_setup.py Normal file
View File

@ -0,0 +1,447 @@
"""
Multi-Series Setup Utility
This utility helps users set up the proper folder structure and configuration
for multi-series dongle inference.
Features:
- Create recommended folder structure
- Validate existing folder structure
- Generate example configuration files
- Provide setup guidance and troubleshooting
Usage:
python utils/multi_series_setup.py create-structure --path "C:/MyAssets"
python utils/multi_series_setup.py validate --path "C:/MyAssets"
python utils/multi_series_setup.py help
"""
import os
import sys
import argparse
from typing import List, Tuple, Dict
import json
class MultiSeriesSetup:
"""Utility class for multi-series setup operations"""
SUPPORTED_SERIES = ['520', '720', '630', '730', '540']
REQUIRED_FW_FILES = ['fw_scpu.bin', 'fw_ncpu.bin']
@staticmethod
def create_folder_structure(base_path: str, series_list: List[str] = None) -> bool:
"""
Create the recommended folder structure for multi-series assets
Args:
base_path: Root path where assets folder should be created
series_list: List of series to create folders for
Returns:
bool: Success status
"""
if series_list is None:
series_list = MultiSeriesSetup.SUPPORTED_SERIES
try:
assets_path = os.path.join(base_path, 'Assets')
firmware_path = os.path.join(assets_path, 'Firmware')
models_path = os.path.join(assets_path, 'Models')
# Create main directories
os.makedirs(firmware_path, exist_ok=True)
os.makedirs(models_path, exist_ok=True)
print(f"✓ Created main directories at: {assets_path}")
# Create series-specific directories
created_series = []
for series in series_list:
series_name = f'KL{series}'
fw_dir = os.path.join(firmware_path, series_name)
model_dir = os.path.join(models_path, series_name)
os.makedirs(fw_dir, exist_ok=True)
os.makedirs(model_dir, exist_ok=True)
created_series.append(series_name)
print(f"✓ Created series directories: {', '.join(created_series)}")
# Create README file explaining the structure
readme_content = MultiSeriesSetup._generate_readme_content()
readme_path = os.path.join(assets_path, 'README.md')
with open(readme_path, 'w') as f:
f.write(readme_content)
print(f"✓ Created README file: {readme_path}")
# Create example configuration
config_example = MultiSeriesSetup._generate_example_config(assets_path, series_list)
config_path = os.path.join(assets_path, 'example_config.json')
with open(config_path, 'w') as f:
json.dump(config_example, f, indent=2)
print(f"✓ Created example configuration: {config_path}")
print(f"\n🎉 Multi-series folder structure created successfully!")
print(f"📁 Assets folder: {assets_path}")
print("\n📋 Next steps:")
print("1. Copy your firmware files to the appropriate Firmware/KLxxx/ folders")
print("2. Copy your model files to the appropriate Models/KLxxx/ folders")
print("3. Configure your model node to use this Assets folder")
print("4. Enable multi-series mode and select desired series")
return True
except Exception as e:
print(f"❌ Error creating folder structure: {e}")
return False
@staticmethod
def validate_folder_structure(assets_path: str) -> Tuple[bool, List[str]]:
"""
Validate an existing folder structure for multi-series configuration
Args:
assets_path: Path to the assets folder
Returns:
Tuple of (is_valid, list_of_issues)
"""
issues = []
# Check if assets folder exists
if not os.path.exists(assets_path):
issues.append(f"Assets folder does not exist: {assets_path}")
return False, issues
# Check for main folders
firmware_path = os.path.join(assets_path, 'Firmware')
models_path = os.path.join(assets_path, 'Models')
if not os.path.exists(firmware_path):
issues.append(f"Firmware folder missing: {firmware_path}")
if not os.path.exists(models_path):
issues.append(f"Models folder missing: {models_path}")
if issues:
return False, issues
# Check series folders and contents
found_series = []
for item in os.listdir(firmware_path):
if item.startswith('KL') and os.path.isdir(os.path.join(firmware_path, item)):
series_name = item
series_fw_path = os.path.join(firmware_path, series_name)
series_model_path = os.path.join(models_path, series_name)
# Check if corresponding model folder exists
if not os.path.exists(series_model_path):
issues.append(f"Models folder missing for {series_name}: {series_model_path}")
continue
# Check firmware files
fw_issues = []
for fw_file in MultiSeriesSetup.REQUIRED_FW_FILES:
fw_file_path = os.path.join(series_fw_path, fw_file)
if not os.path.exists(fw_file_path):
fw_issues.append(f"{fw_file} missing")
if fw_issues:
issues.append(f"{series_name} firmware issues: {', '.join(fw_issues)}")
# Check for model files
model_files = [f for f in os.listdir(series_model_path) if f.endswith('.nef')]
if not model_files:
issues.append(f"{series_name} has no .nef model files in {series_model_path}")
if not fw_issues and model_files:
found_series.append(series_name)
if not found_series:
issues.append("No valid series configurations found")
is_valid = len(issues) == 0
# Print validation results
if is_valid:
print(f"✅ Validation passed!")
print(f"📁 Assets folder: {assets_path}")
print(f"🎯 Valid series found: {', '.join(found_series)}")
else:
print(f"❌ Validation failed with {len(issues)} issues:")
for i, issue in enumerate(issues, 1):
print(f" {i}. {issue}")
return is_valid, issues
@staticmethod
def list_available_series(assets_path: str) -> Dict[str, Dict[str, any]]:
"""
List all available and configured series in the assets folder
Args:
assets_path: Path to the assets folder
Returns:
Dict with series information
"""
series_info = {}
if not os.path.exists(assets_path):
return series_info
firmware_path = os.path.join(assets_path, 'Firmware')
models_path = os.path.join(assets_path, 'Models')
if not os.path.exists(firmware_path) or not os.path.exists(models_path):
return series_info
for item in os.listdir(firmware_path):
if item.startswith('KL') and os.path.isdir(os.path.join(firmware_path, item)):
series_name = item
series_fw_path = os.path.join(firmware_path, series_name)
series_model_path = os.path.join(models_path, series_name)
# Check firmware files
fw_files = {}
for fw_file in MultiSeriesSetup.REQUIRED_FW_FILES:
fw_file_path = os.path.join(series_fw_path, fw_file)
fw_files[fw_file] = os.path.exists(fw_file_path)
# Check model files
model_files = []
if os.path.exists(series_model_path):
model_files = [f for f in os.listdir(series_model_path) if f.endswith('.nef')]
# Determine status
fw_complete = all(fw_files.values())
has_models = len(model_files) > 0
if fw_complete and has_models:
status = "✅ Ready"
elif fw_complete:
status = "⚠️ Missing models"
elif has_models:
status = "⚠️ Missing firmware"
else:
status = "❌ Incomplete"
series_info[series_name] = {
'status': status,
'firmware_files': fw_files,
'model_files': model_files,
'firmware_path': series_fw_path,
'models_path': series_model_path
}
return series_info
@staticmethod
def _generate_readme_content() -> str:
"""Generate README content for the assets folder"""
return '''
# Multi-Series Assets Folder Structure
This folder contains firmware and models organized by dongle series for multi-series inference.
## Structure:
```
Assets/
├── Firmware/
│ ├── KL520/
│ │ ├── fw_scpu.bin
│ │ └── fw_ncpu.bin
│ ├── KL720/
│ │ ├── fw_scpu.bin
│ │ └── fw_ncpu.bin
│ └── [other series...]
└── Models/
├── KL520/
│ └── [model.nef files]
├── KL720/
│ └── [model.nef files]
└── [other series...]
```
## Usage:
1. Place firmware files (fw_scpu.bin, fw_ncpu.bin) in the appropriate series subfolder under Firmware/
2. Place model files (.nef) in the appropriate series subfolder under Models/
3. Configure your model node to use this Assets folder in multi-series mode
4. Select which series to enable in the model node properties
## Supported Series:
- **KL520**: Entry-level performance (3 GOPS)
- **KL720**: Mid-range performance (28 GOPS)
- **KL630**: High performance (400 GOPS)
- **KL730**: Very high performance (1600 GOPS)
- **KL540**: Specialized performance (800 GOPS)
## Performance Benefits:
The multi-series system automatically load balances inference across all enabled series
based on their GOPS capacity for optimal performance. You can expect:
- Higher overall throughput by utilizing multiple dongle types simultaneously
- Automatic load balancing based on dongle capabilities
- Seamless failover if one series becomes unavailable
- Scalable performance as you add more dongles
## Validation:
Run `python utils/multi_series_setup.py validate --path <this_folder>` to validate your configuration.
## Troubleshooting:
- Ensure all firmware files are exactly named `fw_scpu.bin` and `fw_ncpu.bin`
- Model files must have `.nef` extension
- Each series must have both firmware and at least one model file
- Check file permissions and accessibility
'''.strip()
@staticmethod
def _generate_example_config(assets_path: str, series_list: List[str]) -> Dict:
"""Generate example configuration for model node"""
return {
"model_node_properties": {
"multi_series_mode": True,
"assets_folder": assets_path,
"enabled_series": series_list[:2], # Enable first two series by default
"max_queue_size": 100,
"result_buffer_size": 1000,
"batch_size": 1
},
"expected_performance": {
"total_gops": sum([
{"520": 3, "720": 28, "630": 400, "730": 1600, "540": 800}.get(series, 0)
for series in series_list[:2]
]),
"load_balancing": "automatic",
"expected_fps_improvement": "2-5x compared to single series"
},
"notes": [
"This is an example configuration",
"Adjust enabled_series based on your available dongles",
"Higher queue sizes may improve performance but use more memory",
"Monitor system resources when using multiple series"
]
}
def main():
"""Main CLI interface"""
parser = argparse.ArgumentParser(description='Multi-Series Dongle Setup Utility')
subparsers = parser.add_subparsers(dest='command', help='Available commands')
# Create structure command
create_parser = subparsers.add_parser('create-structure', help='Create folder structure')
create_parser.add_argument('--path', required=True, help='Base path for assets folder')
create_parser.add_argument('--series', nargs='*', default=None, help='Series to set up (default: all)')
# Validate command
validate_parser = subparsers.add_parser('validate', help='Validate existing structure')
validate_parser.add_argument('--path', required=True, help='Path to assets folder')
# List command
list_parser = subparsers.add_parser('list', help='List available series')
list_parser.add_argument('--path', required=True, help='Path to assets folder')
# Help command
help_parser = subparsers.add_parser('help', help='Show detailed help')
args = parser.parse_args()
if args.command == 'create-structure':
series_list = args.series if args.series else None
MultiSeriesSetup.create_folder_structure(args.path, series_list)
elif args.command == 'validate':
is_valid, issues = MultiSeriesSetup.validate_folder_structure(args.path)
sys.exit(0 if is_valid else 1)
elif args.command == 'list':
series_info = MultiSeriesSetup.list_available_series(args.path)
if not series_info:
print(f"❌ No series found in {args.path}")
sys.exit(1)
print(f"📁 Series configuration in {args.path}:\n")
for series_name, info in series_info.items():
print(f" {series_name}: {info['status']}")
print(f" 📁 Firmware: {info['firmware_path']}")
print(f" 📁 Models: {info['models_path']}")
if info['model_files']:
print(f" 📄 Model files: {', '.join(info['model_files'])}")
fw_issues = [fw for fw, exists in info['firmware_files'].items() if not exists]
if fw_issues:
print(f" ⚠️ Missing firmware: {', '.join(fw_issues)}")
print()
elif args.command == 'help':
print("""
Multi-Series Dongle Setup Help
=============================
This utility helps you set up and manage multi-series dongle configurations
for improved inference performance.
Commands:
---------
create-structure --path <path> [--series KL520 KL720 ...]
Creates the recommended folder structure for multi-series assets.
Example:
python utils/multi_series_setup.py create-structure --path "C:/MyAssets"
python utils/multi_series_setup.py create-structure --path "C:/MyAssets" --series 520 720
validate --path <path>
Validates an existing assets folder structure.
Example:
python utils/multi_series_setup.py validate --path "C:/MyAssets/Assets"
list --path <path>
Lists all available series and their status in an assets folder.
Example:
python utils/multi_series_setup.py list --path "C:/MyAssets/Assets"
Setup Workflow:
--------------
1. Create folder structure: create-structure --path "C:/MyProject"
2. Copy firmware files to Assets/Firmware/KLxxx/ folders
3. Copy model files to Assets/Models/KLxxx/ folders
4. Validate configuration: validate --path "C:/MyProject/Assets"
5. Configure model node in UI to use Assets folder
6. Enable multi-series mode and select desired series
Performance Benefits:
-------------------
- 2-5x throughput improvement with multiple series
- Automatic load balancing based on dongle GOPS
- Seamless scaling as you add more dongles
- Fault tolerance if some dongles become unavailable
Troubleshooting:
---------------
- Ensure exact firmware file names: fw_scpu.bin, fw_ncpu.bin
- Model files must have .nef extension
- Check file permissions and paths
- Verify dongle connectivity with single-series mode first
- Use validate command to check configuration
For more help, see Assets/README.md after creating the structure.
""")
else:
parser.print_help()
if __name__ == '__main__':
main()

41
verify_properties.py
View File

@ -1,41 +0,0 @@
#!/usr/bin/env python3
"""
Verify that properties are correctly set for multi-series
"""
def verify_properties():
"""Check the expected multi-series properties"""
print("Multi-Series Configuration Checklist:")
print("=" * 50)
print("\n1. In your Dashboard, Model Node properties should have:")
print(" ✓ multi_series_mode = True")
print(" ✓ enabled_series = ['520', '720']")
print(" ✓ kl520_port_ids = '28,32'")
print(" ✓ kl720_port_ids = '4'")
print(" ✓ assets_folder = (optional, for auto model/firmware detection)")
print("\n2. After setting these properties, when you deploy:")
print(" Expected output should show:")
print(" '[stage_1_Model_Node] Using multi-series mode with config: ...'")
print(" NOT: 'Single-series config converted to multi-series format'")
print("\n3. If you still see single-series behavior:")
print(" a) Double-check property names (they should be lowercase)")
print(" b) Make sure multi_series_mode is checked/enabled")
print(" c) Verify port IDs are comma-separated strings")
print(" d) Save the .mflow file and re-deploy")
print("\n4. Property format reference:")
print(" - kl520_port_ids: '28,32' (string, comma-separated)")
print(" - kl720_port_ids: '4' (string)")
print(" - enabled_series: ['520', '720'] (list)")
print(" - multi_series_mode: True (boolean)")
print("\n" + "=" * 50)
print("If properties are set correctly, your deployment should use")
print("true multi-series load balancing across KL520 and KL720 dongles!")
if __name__ == "__main__":
verify_properties()