Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 40 additions & 16 deletions particlegan/_unified_v11/critic.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,17 +145,31 @@ def observe_margin_and_scale(
else:
self.ema_margin = 0.90 * self.ema_margin + 0.10 * margin
if x_real is not None and x_real.numel() > 0:
xr = x_real.detach().reshape(x_real.shape[0], -1).float()
sc = float(xr.square().sum(dim=-1).mean().sqrt().clamp_min(0.05).item())
if math.isfinite(sc):
self.ema_data_scale = sc if self.observed_steps == 0 else (0.95 * self.ema_data_scale + 0.05 * sc)
if x_fake is not None and x_fake.shape == x_real.shape:
xf = x_fake.detach().reshape(x_fake.shape[0], -1).float()
mean_gap = float((xf.mean(dim=0) - xr.mean(dim=0)).norm().item())
std_gap = abs(float(xf.std().item()) - float(xr.std().item()))
rel_gap = min(10.0, (mean_gap + 0.5 * std_gap) / max(0.05, self.ema_data_scale))
if math.isfinite(rel_gap):
self.ema_push_res = rel_gap if self.observed_steps == 0 else (0.92 * self.ema_push_res + 0.08 * rel_gap)
self.observe_scale(x_real, x_fake)

@torch.no_grad()
def observe_scale(
self,
x_real: torch.Tensor,
x_fake: Optional[torch.Tensor] = None,
) -> None:
"""Update checkpointed data scale and pushforward residual EMAs."""
if getattr(self, "_in_penalty", False) or getattr(self, "_in_probe", False) or getattr(self, "_in_protected_probe", False):
return
if x_real is None or x_real.numel() == 0:
return
step_tag = int(getattr(self, "observed_steps", 0))
xr = x_real.detach().reshape(x_real.shape[0], -1).float()
sc = float(xr.square().sum(dim=-1).mean().sqrt().clamp_min(0.05).item())
if math.isfinite(sc):
self.ema_data_scale = sc if step_tag == 0 else (0.95 * self.ema_data_scale + 0.05 * sc)
if x_fake is not None and x_fake.shape == x_real.shape:
xf = x_fake.detach().reshape(x_fake.shape[0], -1).float()
mean_gap = float((xf.mean(dim=0) - xr.mean(dim=0)).norm().item())
std_gap = abs(float(xf.std().item()) - float(xr.std().item()))
rel_gap = min(10.0, (mean_gap + 0.5 * std_gap) / max(0.05, self.ema_data_scale))
if math.isfinite(rel_gap):
self.ema_push_res = rel_gap if step_tag == 0 else (0.92 * self.ema_push_res + 0.08 * rel_gap)

def clear_transient_captures(self) -> None:
if hasattr(self, "_live_captures") and self._live_captures:
Expand Down Expand Up @@ -425,7 +439,7 @@ def _unified_v11_generator_forward_hook(
kwargs: Dict[str, Any],
output: Any,
) -> None:
"""Capture a detached ``B_probe <= 16`` generator slice for function-space secant trust-band regulation."""
"""Capture a dimension-agnostic element-budgeted generator slice for function-space secant trust-band regulation."""
rec = getattr(module, "_unified_v11_record", None)
if (
rec is None
Expand All @@ -443,19 +457,26 @@ def _unified_v11_generator_forward_hook(
if (
not isinstance(raw_out, torch.Tensor)
or not raw_out.requires_grad
or raw_out.ndim != 2
or raw_out.ndim < 2
or raw_out.shape[0] < 1
or raw_out.shape[1] > 32
):
return
import torch.autograd.forward_ad as fwAD
if fwAD.unpack_dual(raw_out).tangent is not None:
return
b_full = int(raw_out.shape[0])
b_p = min(_PROBE_SLICE, b_full)
out_dim = max(1, int(raw_out[0].numel()))
b_p = min(b_full, max(2, min(_PROBE_SLICE, 8192 // out_dim)))
p_args = tuple(_slice_probe_arg(a, b_full, b_p) for a in args)
p_kwargs = {k: _slice_probe_arg(v, b_full, b_p) for k, v in kwargs.items()}
rec._g_probe_cache = (module, p_args, p_kwargs, raw_out.detach()[:b_p].to(dtype=torch.float32))
if getattr(module, "_unified_v11_gen_has_bn", False):
from .._unified_v4.optimizer import _eval_probe_forward
y_pre = _eval_probe_forward(module, p_args, p_kwargs, rec)
if y_pre is None:
return
else:
y_pre = raw_out.detach()[:b_p].to(dtype=torch.float32)
rec._g_probe_cache = (module, p_args, p_kwargs, y_pre)


def _attach_unified_v11_critic_hook(critic: nn.Module | None, record: CriticStepRecord) -> None:
Expand Down Expand Up @@ -491,6 +512,9 @@ def _attach_unified_v11_generator_hook(generator: nn.Module | None, record: Crit
if not isinstance(generator, nn.Module):
return
generator._unified_v11_record = record
generator._unified_v11_gen_has_bn = any(
isinstance(m, torch.nn.modules.batchnorm._BatchNorm) for m in generator.modules()
)
if getattr(generator, "_unified_v11_gen_hook_registered", False):
return
generator.register_forward_hook(_unified_v11_generator_forward_hook, with_kwargs=True)
Expand Down
40 changes: 36 additions & 4 deletions particlegan/_unified_v11/loss.py
Original file line number Diff line number Diff line change
Expand Up @@ -615,16 +615,38 @@ def _resolve_pair_parts(
parts_r = None
return x_f, x_r, cond_f, cond_r, rec, has_cont_cond, parts_f, parts_r, captured

@staticmethod
def _scalar_pair_relativistic(
pos_logits: torch.Tensor,
neg_logits: torch.Tensor,
*,
detach_neg: bool = False,
) -> Optional[torch.Tensor]:
b_p, b_n = int(pos_logits.shape[0]), int(neg_logits.shape[0])
if b_p != b_n or b_p < 1:
return None
p_flat = pos_logits.reshape(b_p, -1).mean(dim=1) if pos_logits.ndim > 1 else pos_logits.reshape(b_p)
n_src = neg_logits.detach() if detach_neg else neg_logits
n_flat = n_src.reshape(b_n, -1).mean(dim=1) if n_src.ndim > 1 else n_src.reshape(b_n)
return F.softplus(n_flat - p_flat).mean()

def d_loss(self, real_logits: torch.Tensor, fake_logits: torch.Tensor) -> torch.Tensor:
base = super().d_loss(real_logits, fake_logits)
x_f, x_r, cond_f, cond_r, rec, has_cont_cond, _, _, captured = self._resolve_pair_parts(
fake_logits, real_logits
)
if captured and rec is not None and hasattr(rec, "observe_margin_and_scale") and not has_cont_cond:
rec.observe_margin_and_scale(real_logits, fake_logits, x_r, x_f)
if rec is not None and hasattr(rec, "observe_margin_and_scale") and not has_cont_cond:
if captured:
rec.observe_margin_and_scale(real_logits, fake_logits, x_r, x_f)
else:
rec.observe_margin_and_scale(real_logits, fake_logits)
if self.critic_weight == 0.0 and self.fibre_rel_blend == 0.0:
return base
if not captured:
if self.loss == "non_saturating" and self.t1c.weight > 0.0 and self.fibre_rel_blend > 0.0:
pair_d = self._scalar_pair_relativistic(real_logits, fake_logits)
if pair_d is not None:
return (1.0 - self.fibre_rel_blend) * base + self.fibre_rel_blend * pair_d
return base
if self.conditional_fibre == "slack" and has_cont_cond:
if self.fibre_rel_blend > 0.0:
Expand Down Expand Up @@ -672,7 +694,12 @@ def g_loss(self, fake_logits: torch.Tensor, real_logits: torch.Tensor | None = N
fake_logits, real_logits
)
if not captured:
return self.t1c.weight * super().g_loss(fake_logits, real_logits)
base_g = super().g_loss(fake_logits, real_logits)
if self.loss == "non_saturating" and self.fibre_rel_blend > 0.0:
pair_g = self._scalar_pair_relativistic(fake_logits, real_logits, detach_neg=True)
if pair_g is not None:
return self.t1c.weight * ((1.0 - self.fibre_rel_blend) * base_g + self.fibre_rel_blend * pair_g)
return self.t1c.weight * base_g

b_f = fake_logits.shape[0]
b_r = real_logits.shape[0]
Expand Down Expand Up @@ -733,7 +760,12 @@ def g_loss(self, fake_logits: torch.Tensor, real_logits: torch.Tensor | None = N
rec._t1c_disc_gate = 0.0
if rec is not None and hasattr(rec, "_simplicial_step"):
rec._simplicial_step = False
return super().g_loss(fake_logits, real_logits)
base_g = super().g_loss(fake_logits, real_logits)
if self.loss == "non_saturating" and self.fibre_rel_blend > 0.0:
pair_g = self._scalar_pair_relativistic(fake_logits, real_logits, detach_neg=True)
if pair_g is not None:
return self.t1c.weight * ((1.0 - self.fibre_rel_blend) * base_g + self.fibre_rel_blend * pair_g)
return base_g

# 3. H_0-connectedness-gated chart coupling + zero-eigh orphan macro-transport:
allow_ell = torch.is_grad_enabled() and not getattr(rec, "_in_protected_probe", False)
Expand Down
Loading
Loading