Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0b24be4d94 |
+51
-119
@@ -50,6 +50,31 @@ N_BINS = 8 # default: orientamento mod π (no polarity)
|
||||
N_BINS_POL = 16 # use_polarity=True: orientamento mod 2π (con polarity)
|
||||
|
||||
|
||||
def opencl_available() -> bool:
|
||||
"""Ritorna True se OpenCV ha backend OpenCL disponibile (GPU)."""
|
||||
try:
|
||||
return bool(cv2.ocl.haveOpenCL())
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
|
||||
def set_gpu_enabled(enabled: bool) -> bool:
|
||||
"""Abilita/disabilita backend OpenCL globale di OpenCV.
|
||||
|
||||
Quando attivato, Sobel/dilate/warpAffine usano UMat con dispatch
|
||||
automatico a kernel GPU (Intel UHD, AMD, NVIDIA via OpenCL ICD).
|
||||
Speedup tipico: 1.5-3x su Sobel+dilate per scene 1920x1080,
|
||||
overhead trascurabile per scene < 640px (transfer CPU<->GPU domina).
|
||||
|
||||
Halcon-equivalent: 'find_shape_model' con backend GPU integrato.
|
||||
Ritorna True se l'attivazione e' riuscita.
|
||||
"""
|
||||
if not opencl_available():
|
||||
return False
|
||||
cv2.ocl.setUseOpenCL(bool(enabled))
|
||||
return cv2.ocl.useOpenCL()
|
||||
|
||||
|
||||
def _poly_iou(p1: np.ndarray, p2: np.ndarray) -> float:
|
||||
"""IoU tra due poligoni convessi (4 vertici, float32) via cv2.intersectConvexConvex.
|
||||
|
||||
@@ -145,6 +170,7 @@ class LineShapeMatcher:
|
||||
top_score_factor: float = 0.5,
|
||||
n_threads: int | None = None,
|
||||
use_polarity: bool = False,
|
||||
use_gpu: bool = False,
|
||||
) -> None:
|
||||
self.num_features = num_features
|
||||
self.weak_grad = weak_grad
|
||||
@@ -164,6 +190,11 @@ class LineShapeMatcher:
|
||||
# template e' direzionale.
|
||||
self.use_polarity = use_polarity
|
||||
self._n_bins = N_BINS_POL if use_polarity else N_BINS
|
||||
# GPU offload per Sobel/dilate/warpAffine via cv2.UMat (OpenCL).
|
||||
# Effettivo solo se opencl_available(); altrimenti silent fallback CPU.
|
||||
self.use_gpu = bool(use_gpu and opencl_available())
|
||||
if self.use_gpu:
|
||||
cv2.ocl.setUseOpenCL(True)
|
||||
|
||||
self.variants: list[_Variant] = []
|
||||
self.template_size: tuple[int, int] = (0, 0)
|
||||
@@ -179,10 +210,15 @@ class LineShapeMatcher:
|
||||
return cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
|
||||
return img
|
||||
|
||||
def _gradient(self, gray: np.ndarray) -> tuple[np.ndarray, np.ndarray]:
|
||||
def _gradient(self, gray) -> tuple[np.ndarray, np.ndarray]:
|
||||
# Accetta np.ndarray o cv2.UMat (per path GPU OpenCL).
|
||||
gx = cv2.Sobel(gray, cv2.CV_32F, 1, 0, ksize=3)
|
||||
gy = cv2.Sobel(gray, cv2.CV_32F, 0, 1, ksize=3)
|
||||
mag = cv2.magnitude(gx, gy)
|
||||
# Quantizzazione orientation richiede CPU array (np ops): scarica
|
||||
# da GPU se necessario.
|
||||
if isinstance(gx, cv2.UMat):
|
||||
gx = gx.get(); gy = gy.get(); mag = mag.get()
|
||||
ang = np.arctan2(gy, gx) # [-π, π]
|
||||
if self.use_polarity:
|
||||
# Mod 2π: bin 0..15 codifica direzione + polarity edge.
|
||||
@@ -226,120 +262,6 @@ class LineShapeMatcher:
|
||||
np.array(picked_y, np.int32),
|
||||
np.array(picked_b, np.int8))
|
||||
|
||||
# --- Save / Load (Halcon-style write_shape_model / read_shape_model)
|
||||
|
||||
def save_model(self, path: str) -> None:
|
||||
"""Salva matcher addestrato su disco (formato .npz).
|
||||
|
||||
Persiste: parametri, template_gray, mask, e tutte le varianti
|
||||
pre-computate (con piramide). Halcon-equivalent write_shape_model.
|
||||
Caso d'uso: training offline su workstation, deploy su macchina
|
||||
di linea senza re-train (zero secondi di startup matching).
|
||||
"""
|
||||
if not self.variants:
|
||||
raise RuntimeError("Modello non addestrato: chiamare train() prima.")
|
||||
# Flatten varianti in array piatti (npz non ama dataclass nested)
|
||||
n_vars = len(self.variants)
|
||||
n_levels = len(self.variants[0].levels)
|
||||
var_meta = np.zeros((n_vars, 6), dtype=np.float32) # ang, scale, kh, kw, cxl, cyl
|
||||
all_dx, all_dy, all_bin, all_offsets = [], [], [], []
|
||||
offset = 0
|
||||
all_offsets_per_level = [[] for _ in range(n_levels)]
|
||||
all_dx_per_level = [[] for _ in range(n_levels)]
|
||||
all_dy_per_level = [[] for _ in range(n_levels)]
|
||||
all_bin_per_level = [[] for _ in range(n_levels)]
|
||||
for vi, var in enumerate(self.variants):
|
||||
var_meta[vi] = (
|
||||
var.angle_deg, var.scale, var.kh, var.kw,
|
||||
var.cx_local, var.cy_local,
|
||||
)
|
||||
for li, lvl in enumerate(var.levels):
|
||||
all_offsets_per_level[li].append(len(all_dx_per_level[li]))
|
||||
all_dx_per_level[li].extend(lvl.dx.tolist())
|
||||
all_dy_per_level[li].extend(lvl.dy.tolist())
|
||||
all_bin_per_level[li].extend(lvl.bin.tolist())
|
||||
for li in range(n_levels):
|
||||
all_offsets_per_level[li].append(len(all_dx_per_level[li]))
|
||||
|
||||
out = {
|
||||
"_format_version": np.array([1], dtype=np.int32),
|
||||
"params": np.array([
|
||||
self.num_features, self.weak_grad, self.strong_grad,
|
||||
self.angle_range_deg[0], self.angle_range_deg[1],
|
||||
self.angle_step_deg,
|
||||
self.scale_range[0], self.scale_range[1], self.scale_step,
|
||||
self.spread_radius, self.min_feature_spacing,
|
||||
self.pyramid_levels, self.top_score_factor,
|
||||
int(self.use_polarity),
|
||||
], dtype=np.float64),
|
||||
"template_gray": self.template_gray,
|
||||
"train_mask": self._train_mask,
|
||||
"var_meta": var_meta,
|
||||
"n_levels": np.array([n_levels], dtype=np.int32),
|
||||
}
|
||||
for li in range(n_levels):
|
||||
out[f"dx_l{li}"] = np.asarray(all_dx_per_level[li], dtype=np.int32)
|
||||
out[f"dy_l{li}"] = np.asarray(all_dy_per_level[li], dtype=np.int32)
|
||||
out[f"bin_l{li}"] = np.asarray(all_bin_per_level[li], dtype=np.int8)
|
||||
out[f"offsets_l{li}"] = np.asarray(all_offsets_per_level[li], dtype=np.int32)
|
||||
np.savez_compressed(path, **out)
|
||||
|
||||
@classmethod
|
||||
def load_model(cls, path: str) -> "LineShapeMatcher":
|
||||
"""Carica matcher pre-addestrato da .npz salvato con save_model.
|
||||
|
||||
Halcon-equivalent read_shape_model. Bypassa completamente train():
|
||||
deploy production = istantaneo.
|
||||
"""
|
||||
data = np.load(path, allow_pickle=False)
|
||||
params = data["params"]
|
||||
m = cls(
|
||||
num_features=int(params[0]),
|
||||
weak_grad=float(params[1]),
|
||||
strong_grad=float(params[2]),
|
||||
angle_range_deg=(float(params[3]), float(params[4])),
|
||||
angle_step_deg=float(params[5]),
|
||||
scale_range=(float(params[6]), float(params[7])),
|
||||
scale_step=float(params[8]),
|
||||
spread_radius=int(params[9]),
|
||||
min_feature_spacing=int(params[10]),
|
||||
pyramid_levels=int(params[11]),
|
||||
top_score_factor=float(params[12]),
|
||||
use_polarity=bool(int(params[13])),
|
||||
)
|
||||
tpl = data["template_gray"]
|
||||
if tpl.ndim > 0 and tpl.size > 0:
|
||||
m.template_gray = tpl
|
||||
m.template_size = (tpl.shape[1], tpl.shape[0])
|
||||
mk = data["train_mask"]
|
||||
m._train_mask = mk if mk.size > 0 else None
|
||||
var_meta = data["var_meta"]
|
||||
n_levels = int(data["n_levels"][0])
|
||||
offsets_l = [data[f"offsets_l{li}"] for li in range(n_levels)]
|
||||
dx_l = [data[f"dx_l{li}"] for li in range(n_levels)]
|
||||
dy_l = [data[f"dy_l{li}"] for li in range(n_levels)]
|
||||
bin_l = [data[f"bin_l{li}"] for li in range(n_levels)]
|
||||
m.variants = []
|
||||
n_vars = var_meta.shape[0]
|
||||
for vi in range(n_vars):
|
||||
ang, scale, kh, kw, cxl, cyl = var_meta[vi]
|
||||
levels = []
|
||||
for li in range(n_levels):
|
||||
i0 = int(offsets_l[li][vi])
|
||||
i1 = int(offsets_l[li][vi + 1])
|
||||
levels.append(_LevelFeatures(
|
||||
dx=dx_l[li][i0:i1].copy(),
|
||||
dy=dy_l[li][i0:i1].copy(),
|
||||
bin=bin_l[li][i0:i1].copy(),
|
||||
n=i1 - i0,
|
||||
))
|
||||
m.variants.append(_Variant(
|
||||
angle_deg=float(ang), scale=float(scale),
|
||||
levels=levels, kh=int(kh), kw=int(kw),
|
||||
cx_local=float(cxl), cy_local=float(cyl),
|
||||
))
|
||||
return m
|
||||
|
||||
def set_angle_range_around(
|
||||
self, center_deg: float, tolerance_deg: float,
|
||||
) -> None:
|
||||
@@ -540,19 +462,29 @@ class LineShapeMatcher:
|
||||
"""Spread bitmap: bit b acceso dove bin b è presente nel raggio.
|
||||
|
||||
dtype: uint8 per N_BINS=8, uint16 per N_BINS_POL=16 (use_polarity).
|
||||
Se use_gpu=True: Sobel + dilate via cv2.UMat (OpenCL kernel GPU).
|
||||
"""
|
||||
mag, bins = self._gradient(gray)
|
||||
if self.use_gpu and not isinstance(gray, cv2.UMat):
|
||||
gray_in = cv2.UMat(np.ascontiguousarray(gray))
|
||||
else:
|
||||
gray_in = gray
|
||||
mag, bins = self._gradient(gray_in)
|
||||
valid = mag >= self.weak_grad
|
||||
k = 2 * self.spread_radius + 1
|
||||
kernel = np.ones((k, k), dtype=np.uint8)
|
||||
H, W = gray.shape
|
||||
H, W = (gray.shape if isinstance(gray, np.ndarray)
|
||||
else (gray.get().shape[0], gray.get().shape[1]))
|
||||
nb = self._n_bins
|
||||
dtype = np.uint16 if nb > 8 else np.uint8
|
||||
spread = np.zeros((H, W), dtype=dtype)
|
||||
for b in range(nb):
|
||||
mask_b = ((bins == b) & valid).astype(np.uint8)
|
||||
d = cv2.dilate(mask_b, kernel)
|
||||
spread |= (d.astype(dtype) << b)
|
||||
if self.use_gpu:
|
||||
d = cv2.dilate(cv2.UMat(mask_b), kernel)
|
||||
d_np = d.get()
|
||||
else:
|
||||
d_np = cv2.dilate(mask_b, kernel)
|
||||
spread |= (d_np.astype(dtype) << b)
|
||||
return spread
|
||||
|
||||
@staticmethod
|
||||
|
||||
Reference in New Issue
Block a user