Fix GTA-UAV eval + training pipeline: full gallery, mutex sampler, per-sample mask

Six critical fixes to the caption-test training/eval stack:

1. **IndentationError blocker** (train_gtauav.py:765-766)
   Unparseable file — train-recall LOGGER.info block was orphaned outside
   its `if eval_every` guard. Wrapped in `if train_recall:` so val eval
   and Grad-CAM only run on eval epochs.

2. **Full satellite gallery in `_evaluate`**
   Old code assembled gallery from DataLoader batches (one random sat per
   drone), producing an incomplete gallery of size ≈ N_query instead of
   N_unique_sat. Metrics were inflated because retrieval was against a
   subset that always contained the target.
   New `GTAUAVSatGallery` / `GTAUAVDroneQuery` iterate all unique tiles
   and queries independently; full-gallery multi-match R@K + MRR.

3. **Per-sample caption mask** (`AsymmetricEncoder._fuse_with_mask`)
   Mixed batches (some samples have captions, some don't) previously
   encoded empty strings through DGTRS and mixed the noise output into
   every sample via scalar gate. New `encode_query`/`encode_gallery` use
   `torch.where` to fall back to pure image features for empty-caption
   samples. Training `forward()` routes through the same helper so
   training and eval share code.

4. **Symmetric InfoNCE as primary loss** (multi_infonce.InfoNCELoss)
   Switched gin default from `WeightedInfoNCELoss` (adaptive label
   smoothing — not the Game4Loc soft-IoU target it claimed) to the
   existing symmetric InfoNCE with q2g=0.6/g2q=0.4 weighting. Loss type
   now selectable via `cfg.loss_type ∈ {"symmetric", "weighted"}`.

5. **MutuallyExclusiveSampler** (new file)
   BatchSampler that greedily packs drones whose `sat_candidates` sets
   are pairwise disjoint within a batch. Eliminates false negatives from
   the semi-positive graph without needing soft-label losses.
   At bs=8 keeps 100% of 24,891 train entries; at bs=64 keeps 92.6%.
   `set_epoch()` for reproducibility + different batches per epoch.

6. **Temperature clamp [0.01, 0.1]** (both loss modules)
   Old tau_max=0.5 allowed the logit distribution to collapse into a
   near-uniform softmax. Tightened to the CLIP-standard range.

Also:
- Added `scripts/smoke_eval.py` / `scripts/smoke_train.py` for fast
  regression checks (eval in ~2 min, 2 train steps in ~1 min on RTX 4090).
- CLAUDE.md updated to reflect the new pipeline.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
pikaliov
2026-04-24 15:58:27 +03:00
parent ce7892926f
commit a499fcfd65
10 changed files with 640 additions and 141 deletions

79
scripts/smoke_train.py Normal file
View File

@@ -0,0 +1,79 @@
"""Minimal training smoke test: 2 batches forward+backward.
Verifies end-to-end that MutuallyExclusiveSampler + InfoNCELoss +
per-sample caption masking compose correctly for training.
"""
import torch
from torch.utils.data import DataLoader
from src.datasets.gtauav_dataset import GTAUAVDataset, collate_gtauav_batch
from src.datasets.mutually_exclusive_sampler import MutuallyExclusiveSampler
from src.losses.multi_infonce import InfoNCELoss
from src.models.asymmetric_encoder import AsymmetricEncoder, get_dino_transform
CKPT = "out/gtauav/with_text/ckpt_epoch005.pt"
def main() -> None:
model, _ = AsymmetricEncoder.load_checkpoint(CKPT, device="cuda")
model.train()
tf = get_dino_transform(image_size=256)
ds = GTAUAVDataset(
pair_json="meta/train_80.json",
filter_meta="meta/seg_filter.json",
drone_transform=tf,
sat_transform=tf,
)
sampler = MutuallyExclusiveSampler(
[e["sat_candidates"] for e in ds.entries],
batch_size=8, shuffle=True, seed=42,
)
sampler.set_epoch(0)
loader = DataLoader(
ds, batch_sampler=sampler, num_workers=2,
collate_fn=collate_gtauav_batch, pin_memory=True,
)
loss_fn = InfoNCELoss(
temperature_init=0.07, learnable_temperature=True,
label_smoothing=0.1, weight_q2g=0.6, weight_g2q=0.4,
tau_min=0.01, tau_max=0.1,
).to("cuda")
trainable = [p for p in model.trainable_parameters()] + list(loss_fn.parameters())
opt = torch.optim.AdamW(trainable, lr=1e-4)
it = iter(loader)
for step in range(2):
batch = next(it)
opt.zero_grad()
emb = model(
drone_img=batch["drone_img"].to("cuda", non_blocking=True),
sat_img=batch["sat_img"].to("cuda", non_blocking=True),
caption_l1=batch["caption_l1"], caption_l2=batch["caption_l2"], caption_l3=batch["caption_l3"],
sat_caption_l1=batch["sat_caption_l1"], sat_caption_l2=batch["sat_caption_l2"], sat_caption_l3=batch["sat_caption_l3"],
)
out = loss_fn(emb, epoch=0, total_epochs=10)
out["total"].backward()
opt.step()
# Verify mutual exclusion in batch
batch_sats = [set(ds.entries[i]["sat_candidates"]) for i in batch.get("__indices__", range(8))]
# We can also check via sat_names (one sat per drone sampled)
sat_names = batch["sat_names"]
print(
f" step {step}: loss={out['total'].item():.4f} "
f"tau={out['temperature'].item():.4f} "
f"gate_q={out['gate_q'].item():.3f} gate_g={out['gate_g'].item():.3f} "
f"n_drone_caps={sum(1 for t in batch['caption_l1'] if t)} "
f"n_sat_caps={sum(1 for t in batch['sat_caption_l1'] if t)}"
)
assert torch.isfinite(out["total"]).all(), "Loss not finite!"
print("OK: 2 train steps completed with finite loss")
if __name__ == "__main__":
main()