feat(detect): 固定 160x160 输入，只用裁剪与镜像填充，禁止缩放
产线要求送进模型的图固定为 N×N 且不许 resize——缺陷的绝对尺度是判别依据， 拉伸会把"5 像素的黑点"变成别的东西。 - engine/tiling.py：切片几何。边长 < N 镜像填充（reflect，真镜像，原图居中）； 边长 >= N 按步长裁剪、末片贴边保证全覆盖。框跟着平移裁剪，露出面积低于 min_visibility 的丢弃；to_source 反向映射供推理时拼回原图。 - scripts/tile_dataset.py：整套数据集转换。有框图切出的空片会爆量 （524x959 能切 24 片），用 --max-empty-ratio 限量；原本无框的真负样本不受限。 - 训练配置 imgsz 改 160，并显式关掉 scale 与 translate——ultralytics 的默认值是 0.5 / 0.1 而不是 0，不写出来等于一直在做仿射缩放，违反约束。 尺寸正好等于 imgsz 时 letterbox 退化为空操作（r=1、dw=dh=0），核对过源码。 合成数据上验证：所有片正好 160x160、框区域与原图逐像素一致、填充是真镜像。 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Shaun Zhou
co-authored by
Claude Opus 5
Claude Opus 5
parent
1684fddd7f
commit
2a92275317
@@ -0,0 +1,183 @@
|
||||
"""把数据集切成固定边长的方片。"""
|
||||
|
||||
import csv
|
||||
import json
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
pytest.importorskip("PIL")
|
||||
|
||||
import numpy as np # noqa: E402
|
||||
import yaml # noqa: E402
|
||||
from PIL import Image # noqa: E402
|
||||
|
||||
sys.path.insert(0, "scripts")
|
||||
import tile_dataset as td # noqa: E402
|
||||
|
||||
from engine.detection import parse_label # noqa: E402
|
||||
from engine.tiling import Tile, to_source # noqa: E402
|
||||
|
||||
SIZE = 160
|
||||
CLASSES = ["blackdot", "grease"]
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def dataset(tmp_path):
|
||||
"""含小图（要填充）、大图（要切片）与真负样本的最小数据集。"""
|
||||
root = tmp_path / "src"
|
||||
rng = np.random.default_rng(0)
|
||||
for split in ("train", "val"):
|
||||
(root / "images" / split).mkdir(parents=True)
|
||||
(root / "labels" / split).mkdir(parents=True)
|
||||
|
||||
def put(split, name, width, height, lines):
|
||||
Image.fromarray(rng.integers(0, 255, (height, width, 3), dtype=np.uint8)).save(
|
||||
root / "images" / split / f"{name}.png"
|
||||
)
|
||||
(root / "labels" / split / f"{name}.txt").write_text("".join(lines), encoding="utf-8")
|
||||
|
||||
put("train", "blackdot_0001", 128, 128, ["0 0.5 0.5 0.1 0.1\n"]) # 小图
|
||||
put("train", "grease_0001", 400, 300, ["1 0.25 0.3 0.1 0.1\n"]) # 大图
|
||||
put("train", "normal_0001", 116, 83, []) # 真负样本
|
||||
put("val", "blackdot_0002", 320, 160, ["0 0.25 0.5 0.1 0.2\n"])
|
||||
|
||||
(root / "data.yaml").write_text(
|
||||
yaml.safe_dump({"path": str(root), "train": "images/train", "val": "images/val",
|
||||
"nc": 2, "names": dict(enumerate(CLASSES))}),
|
||||
encoding="utf-8",
|
||||
)
|
||||
return root
|
||||
|
||||
|
||||
def run(dataset, out, *extra):
|
||||
argv = ["tile_dataset.py", "--data", str(dataset / "data.yaml"), "--out", str(out),
|
||||
"--size", str(SIZE), *extra]
|
||||
original, sys.argv = sys.argv, argv
|
||||
try:
|
||||
return td.main()
|
||||
finally:
|
||||
sys.argv = original
|
||||
|
||||
|
||||
def tiles_of(out):
|
||||
with (out / "tiles.csv").open(encoding="utf-8-sig", newline="") as handle:
|
||||
return list(csv.DictReader(handle))
|
||||
|
||||
|
||||
def test_every_tile_is_exactly_the_target_size(dataset, tmp_path):
|
||||
"""这是整件事的目的：模型输入固定 160x160。"""
|
||||
out = tmp_path / "out"
|
||||
assert run(dataset, out) == 0
|
||||
images = list((out / "images").rglob("*.png"))
|
||||
assert images
|
||||
for path in images:
|
||||
with Image.open(path) as image:
|
||||
assert image.size == (SIZE, SIZE)
|
||||
|
||||
|
||||
def test_pixels_are_never_resampled(dataset, tmp_path):
|
||||
"""片上框住的像素必须与原图逐像素相同——有任何缩放都会露馅。"""
|
||||
out = tmp_path / "out"
|
||||
assert run(dataset, out) == 0
|
||||
|
||||
checked = 0
|
||||
for row in tiles_of(out):
|
||||
if int(row["boxes"]) == 0:
|
||||
continue
|
||||
tile = Tile(int(row["x"]), int(row["y"]), int(row["crop_width"]),
|
||||
int(row["crop_height"]), int(row["pad_left"]), int(row["pad_top"]))
|
||||
patch = np.asarray(Image.open(out / "images" / row["split"] / row["tile"]).convert("RGB"))
|
||||
source = np.asarray(
|
||||
Image.open(dataset / "images" / row["split"] / row["source"]).convert("RGB")
|
||||
)
|
||||
label = out / "labels" / row["split"] / f"{Path(row['tile']).stem}.txt"
|
||||
for box in parse_label(label.read_text(encoding="utf-8")):
|
||||
back = to_source(box, tile, SIZE)
|
||||
region = patch[
|
||||
round(box.y1 * SIZE):round(box.y2 * SIZE),
|
||||
round(box.x1 * SIZE):round(box.x2 * SIZE),
|
||||
]
|
||||
original = source[round(back.y1):round(back.y2), round(back.x1):round(back.x2)]
|
||||
assert np.array_equal(region, original)
|
||||
checked += 1
|
||||
assert checked >= 3
|
||||
|
||||
|
||||
def test_small_image_is_mirror_padded_not_stretched(dataset, tmp_path):
|
||||
out = tmp_path / "out"
|
||||
assert run(dataset, out) == 0
|
||||
row = next(r for r in tiles_of(out) if r["source"] == "blackdot_0001.png")
|
||||
tile = Tile(int(row["x"]), int(row["y"]), int(row["crop_width"]), int(row["crop_height"]),
|
||||
int(row["pad_left"]), int(row["pad_top"]))
|
||||
|
||||
patch = np.asarray(Image.open(out / "images" / row["split"] / row["tile"]).convert("RGB"))
|
||||
source = np.asarray(Image.open(dataset / "images/train/blackdot_0001.png").convert("RGB"))
|
||||
inner = patch[tile.pad_top:tile.pad_top + 128, tile.pad_left:tile.pad_left + 128]
|
||||
assert np.array_equal(inner, source) # 原图原样居中
|
||||
# 填充是镜像而不是复制边缘：左侧第一个填充列等于原图第 1 列（不是第 0 列）
|
||||
assert np.array_equal(patch[tile.pad_top, tile.pad_left - 1], source[0, 1])
|
||||
|
||||
|
||||
def test_large_image_is_cut_into_covering_tiles(dataset, tmp_path):
|
||||
out = tmp_path / "out"
|
||||
assert run(dataset, out, "--max-empty-ratio", "-1") == 0
|
||||
rows = [r for r in tiles_of(out) if r["source"] == "grease_0001.png"]
|
||||
# 400x300 -> x 起点 [0,160,240]，y 起点 [0,140]
|
||||
assert len(rows) == 6
|
||||
assert {int(r["x"]) for r in rows} == {0, 160, 240}
|
||||
assert {int(r["y"]) for r in rows} == {0, 140}
|
||||
assert all(int(r["pad_left"]) == 0 and int(r["pad_top"]) == 0 for r in rows)
|
||||
|
||||
|
||||
def test_true_negative_images_keep_all_their_tiles(dataset, tmp_path):
|
||||
"""原本就没框的图是真负样本，不受空片配额限制。"""
|
||||
out = tmp_path / "out"
|
||||
assert run(dataset, out, "--max-empty-ratio", "0") == 0
|
||||
assert [r for r in tiles_of(out) if r["source"] == "normal_0001.png"]
|
||||
|
||||
|
||||
def test_empty_tile_quota_limits_background_from_positive_images(dataset, tmp_path):
|
||||
"""有框图切出的空片会爆量，要能限量。"""
|
||||
strict = tmp_path / "strict"
|
||||
assert run(dataset, strict, "--max-empty-ratio", "0") == 0
|
||||
loose = tmp_path / "loose"
|
||||
assert run(dataset, loose, "--max-empty-ratio", "-1") == 0
|
||||
|
||||
def empties(out):
|
||||
return [r for r in tiles_of(out) if r["source"] == "grease_0001.png" and r["boxes"] == "0"]
|
||||
|
||||
assert empties(strict) == []
|
||||
assert len(empties(loose)) == 5 # 6 片里 1 片有框
|
||||
|
||||
|
||||
def test_box_split_by_a_cut_line_is_dropped_when_barely_visible(dataset, tmp_path):
|
||||
"""min_visibility > 0.5 时，一个框最多只会出现在一片里。"""
|
||||
out = tmp_path / "out"
|
||||
assert run(dataset, out, "--min-visibility", "0.6") == 0
|
||||
# val 里的 320x160：框中心在 x=80，完整落在第一片内
|
||||
rows = [r for r in tiles_of(out) if r["source"] == "blackdot_0002.png"]
|
||||
assert sum(int(r["boxes"]) for r in rows) == 1
|
||||
|
||||
|
||||
def test_outputs_are_a_valid_yolo_dataset(dataset, tmp_path):
|
||||
out = tmp_path / "out"
|
||||
assert run(dataset, out) == 0
|
||||
|
||||
meta = yaml.safe_load((out / "data.yaml").read_text(encoding="utf-8"))
|
||||
assert [meta["names"][i] for i in range(meta["nc"])] == CLASSES
|
||||
assert (out / "classes.txt").read_text(encoding="utf-8").split() == CLASSES
|
||||
for row in tiles_of(out):
|
||||
assert (out / "images" / row["split"] / row["tile"]).exists()
|
||||
assert (out / "labels" / row["split"] / f"{Path(row['tile']).stem}.txt").exists()
|
||||
|
||||
summary = json.loads((out / "summary.json").read_text(encoding="utf-8"))
|
||||
assert summary["size"] == SIZE
|
||||
assert summary["counts"]["源图"] == 4
|
||||
|
||||
|
||||
def test_dry_run_writes_nothing(dataset, tmp_path):
|
||||
out = tmp_path / "out"
|
||||
assert run(dataset, out, "--dry-run") == 0
|
||||
assert not out.exists()
|
||||
@@ -0,0 +1,186 @@
|
||||
"""固定边长切片：只裁剪与镜像填充，不缩放。"""
|
||||
|
||||
import pytest
|
||||
|
||||
np = pytest.importorskip("numpy")
|
||||
|
||||
from engine.detection import Box, from_yolo # noqa: E402
|
||||
from engine.tiling import axis_starts, cut, plan_tiles, remap_boxes, to_source # noqa: E402
|
||||
|
||||
SIZE = 160
|
||||
|
||||
|
||||
# ---------------- 切片网格 ----------------
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"length,overlap,expected",
|
||||
[
|
||||
(160, 0, [0]), # 正好一片
|
||||
(128, 0, [0]), # 不足，填充
|
||||
(320, 0, [0, 160]), # 整两片
|
||||
(200, 0, [0, 40]), # 最后一片贴边，与前片重叠 120
|
||||
(480, 32, [0, 128, 256, 320]), # 步长 128，末片贴边
|
||||
],
|
||||
)
|
||||
def test_axis_starts(length, overlap, expected):
|
||||
assert axis_starts(length, SIZE, overlap) == expected
|
||||
|
||||
|
||||
def test_last_tile_always_reaches_the_edge():
|
||||
"""末尾那条不足一步的区域不能被漏掉。"""
|
||||
for length in range(161, 700):
|
||||
starts = axis_starts(length, SIZE, 16)
|
||||
assert starts[-1] + SIZE == length
|
||||
|
||||
|
||||
def test_plan_tiles_covers_a_large_image():
|
||||
tiles = plan_tiles(524, 959, SIZE, overlap=0)
|
||||
assert len(tiles) == len(axis_starts(524, SIZE, 0)) * len(axis_starts(959, SIZE, 0))
|
||||
assert all(t.pad_left == 0 and t.pad_top == 0 for t in tiles) # 大图纯裁剪
|
||||
|
||||
|
||||
def test_small_image_is_centred_and_padded():
|
||||
tile, = plan_tiles(116, 83, SIZE)
|
||||
assert (tile.crop_width, tile.crop_height) == (116, 83)
|
||||
assert tile.pad_left == (160 - 116) // 2 == 22
|
||||
assert tile.pad_top == (160 - 83) // 2 == 38
|
||||
|
||||
|
||||
@pytest.mark.parametrize("bad", [0, -1])
|
||||
def test_rejects_invalid_size(bad):
|
||||
with pytest.raises(ValueError, match="size"):
|
||||
plan_tiles(100, 100, bad)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("bad", [-1, 160, 200])
|
||||
def test_rejects_invalid_overlap(bad):
|
||||
with pytest.raises(ValueError, match="overlap"):
|
||||
plan_tiles(300, 300, SIZE, bad)
|
||||
|
||||
|
||||
# ---------------- 取片 ----------------
|
||||
|
||||
|
||||
def test_cut_crops_without_resizing():
|
||||
"""大图取片必须是原像素的子块，一个插值都不能有。"""
|
||||
image = np.arange(300 * 400, dtype=np.uint8).reshape(300, 400) % 251
|
||||
tile = plan_tiles(400, 300, SIZE, overlap=0)[1] # 第二片，x 有偏移
|
||||
patch = cut(image, tile, SIZE)
|
||||
|
||||
assert patch.shape == (SIZE, SIZE)
|
||||
expected = image[tile.y:tile.y + SIZE, tile.x:tile.x + SIZE]
|
||||
assert np.array_equal(patch, expected)
|
||||
|
||||
|
||||
def test_cut_mirrors_small_images():
|
||||
image = np.arange(1, 5, dtype=np.uint8).reshape(1, 4) # 1x4
|
||||
tile, = plan_tiles(4, 1, 4)
|
||||
patch = cut(image, tile, 4)
|
||||
assert patch.shape == (4, 4)
|
||||
# 竖直方向镜像：原始那一行在中间，上下是它的倒影（reflect 不重复边缘行）
|
||||
assert np.array_equal(patch[tile.pad_top], image[0])
|
||||
assert patch.dtype == image.dtype
|
||||
|
||||
|
||||
def test_cut_keeps_channels():
|
||||
image = np.zeros((50, 60, 3), dtype=np.uint8)
|
||||
tile, = plan_tiles(60, 50, SIZE)
|
||||
assert cut(image, tile, SIZE).shape == (SIZE, SIZE, 3)
|
||||
|
||||
|
||||
def test_cut_of_an_exact_size_image_is_the_image_itself():
|
||||
image = np.random.default_rng(0).integers(0, 255, (SIZE, SIZE), dtype=np.uint8)
|
||||
tile, = plan_tiles(SIZE, SIZE, SIZE)
|
||||
assert np.array_equal(cut(image, tile, SIZE), image)
|
||||
|
||||
|
||||
# ---------------- 框的重映射 ----------------
|
||||
|
||||
|
||||
def test_box_shifts_with_padding():
|
||||
"""小图居中填充后，框只是整体平移。"""
|
||||
width, height = 80, 80
|
||||
box = from_yolo(3, 0.5, 0.5, 0.25, 0.25) # 原图中心 20x20 的框
|
||||
tile, = plan_tiles(width, height, SIZE)
|
||||
mapped, = remap_boxes([box], tile, width, height, SIZE)
|
||||
|
||||
assert mapped.class_id == 3
|
||||
# 原图中心落在片中心
|
||||
assert (mapped.x1 + mapped.x2) / 2 == pytest.approx(0.5)
|
||||
# 尺寸不变：原来 20 像素，片上还是 20 像素（占 160 的 1/8）
|
||||
assert (mapped.x2 - mapped.x1) * SIZE == pytest.approx(20)
|
||||
|
||||
|
||||
def test_box_outside_the_tile_is_dropped():
|
||||
width = height = 400
|
||||
box = from_yolo(0, 0.9, 0.9, 0.05, 0.05) # 右下角
|
||||
first = plan_tiles(width, height, SIZE, overlap=0)[0] # 左上片
|
||||
assert remap_boxes([box], first, width, height, SIZE) == []
|
||||
|
||||
|
||||
def test_partially_visible_box_is_clipped_or_dropped():
|
||||
"""跨片的框：露得多就裁剪保留，露得少就丢弃。"""
|
||||
width = height = 320
|
||||
# 框中心正好在 x=160 的切割线上，左右各露一半
|
||||
box = from_yolo(1, 160 / width, 0.25, 40 / width, 40 / height)
|
||||
left, right = plan_tiles(width, height, SIZE, overlap=0)[:2]
|
||||
|
||||
kept_left, = remap_boxes([box], left, width, height, SIZE, min_visibility=0.4)
|
||||
assert kept_left.x2 == pytest.approx(1.0) # 裁到片的右边缘
|
||||
assert (kept_left.x2 - kept_left.x1) * SIZE == pytest.approx(20)
|
||||
|
||||
# 阈值提到 0.6 时，只露一半就不够了
|
||||
assert remap_boxes([box], left, width, height, SIZE, min_visibility=0.6) == []
|
||||
assert remap_boxes([box], right, width, height, SIZE, min_visibility=0.6) == []
|
||||
|
||||
|
||||
def test_mirrored_region_gets_no_box():
|
||||
"""镜像出来的是复制品，不能再给它标框——否则等于告诉模型那里真有缺陷。"""
|
||||
width = height = 80
|
||||
box = from_yolo(0, 0.5, 0.5, 0.5, 0.5)
|
||||
tile, = plan_tiles(width, height, SIZE)
|
||||
mapped = remap_boxes([box], tile, width, height, SIZE)
|
||||
|
||||
assert len(mapped) == 1 # 只有一个，不是四个倒影
|
||||
# 框整体落在原图内容的范围内
|
||||
assert mapped[0].x1 * SIZE >= tile.pad_left - 1e-6
|
||||
assert mapped[0].x2 * SIZE <= tile.pad_left + tile.crop_width + 1e-6
|
||||
|
||||
|
||||
def test_zero_area_box_is_ignored():
|
||||
tile, = plan_tiles(100, 100, SIZE)
|
||||
degenerate = Box(0, 0.5, 0.5, 0.5, 0.5)
|
||||
assert remap_boxes([degenerate], tile, 100, 100, SIZE) == []
|
||||
|
||||
|
||||
# ---------------- 反向映射 ----------------
|
||||
|
||||
|
||||
@pytest.mark.parametrize("size_wh", [(80, 60), (400, 300), (160, 160), (524, 959)])
|
||||
def test_round_trip_back_to_source(size_wh):
|
||||
"""片上的框映射回原图，必须落回原来的像素位置。
|
||||
|
||||
框放在某一片裁剪区域的正中，确保它完整落在该片内——无重叠切片时，
|
||||
原图正中的框反而可能横跨切割线，不适合用来做往返校验。
|
||||
"""
|
||||
width, height = size_wh
|
||||
for tile in plan_tiles(width, height, SIZE, overlap=0):
|
||||
cx = tile.x + tile.crop_width / 2
|
||||
cy = tile.y + tile.crop_height / 2
|
||||
half_w = min(tile.crop_width, 20) / 4
|
||||
half_h = min(tile.crop_height, 20) / 4
|
||||
px = [cx - half_w, cy - half_h, cx + half_w, cy + half_h]
|
||||
box = Box(2, px[0] / width, px[1] / height, px[2] / width, px[3] / height)
|
||||
|
||||
mapped, = remap_boxes([box], tile, width, height, SIZE, min_visibility=0.99)
|
||||
back = to_source(mapped, tile, SIZE)
|
||||
assert [back.x1, back.y1, back.x2, back.y2] == pytest.approx(px, abs=1e-6)
|
||||
|
||||
|
||||
def test_score_survives_both_directions():
|
||||
tile, = plan_tiles(100, 100, SIZE)
|
||||
box = Box(1, 0.4, 0.4, 0.6, 0.6, 0.83)
|
||||
mapped, = remap_boxes([box], tile, 100, 100, SIZE)
|
||||
assert mapped.score == 0.83
|
||||
assert to_source(mapped, tile, SIZE).score == 0.83
|
||||
Reference in New Issue
Block a user