From ef660dd643c66d19bdb1d89adfdeae8e38bc6c19 Mon Sep 17 00:00:00 2001 From: Haoming Date: Sun, 10 Dec 2023 02:53:24 +0800 Subject: [PATCH] minor value refreshes --- normalization.py | 34 ++++++++++------------------------ recenter.py | 4 ++-- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/normalization.py b/normalization.py index b13e394..21b0ffa 100644 --- a/normalization.py +++ b/normalization.py @@ -1,5 +1,11 @@ -DYNAMIC_RANGE = [19.75, 14.275, 14.275, 14.275] -DYNAMIC_RANGE_XL = [27.62, 19.96, 19.96] +DYNAMIC_RANGE = [18, 14, 14, 14] +DYNAMIC_RANGE_XL = [20, 16, 16] + +def normalize_tensor(x, r): + ratio = r / max(abs(float(x.min())), abs(float(x.max()))) + x *= max(ratio, 0.99) + + return x class Normalization: @classmethod @@ -14,17 +20,7 @@ class Normalization: batches = latent['samples'].size(0) for b in range(batches): for c in range(4): - delta = latent['samples'][b][c].mean() - latent['samples'][b][c] -= delta - - xmin = abs(float(latent['samples'][b][c].min())) - xmax = abs(float(latent['samples'][b][c].max())) - - r = DYNAMIC_RANGE[c] / max(xmin, xmax) - ratio = max(0.95, r) - latent['samples'][b][c] *= ratio - - latent['samples'][b][c] += delta + latent['samples'][b][c] = normalize_tensor(latent['samples'][b][c], DYNAMIC_RANGE[c]) return (latent,) @@ -41,16 +37,6 @@ class NormalizationXL: batches = latent['samples'].size(0) for b in range(batches): for c in range(3): - delta = latent['samples'][b][c].mean() - latent['samples'][b][c] -= delta - - xmin = abs(float(latent['samples'][b][c].min())) - xmax = abs(float(latent['samples'][b][c].max())) - - r = DYNAMIC_RANGE_XL[c] / max(xmin, xmax) - ratio = max(0.95, r) - latent['samples'][b][c] *= ratio - - latent['samples'][b][c] += delta + latent['samples'][b][c] = normalize_tensor(latent['samples'][b][c], DYNAMIC_RANGE_XL[c]) return (latent,) diff --git a/recenter.py b/recenter.py index e9bde72..b8fa864 100644 --- a/recenter.py +++ b/recenter.py @@ -50,8 +50,8 @@ class HookCallback: "strength": ("FLOAT", {"default": 0.0, "min": 0.0, "max": 1.0, "step": 0.1, "round": 0.1, "display": "slider"}), "C": ("FLOAT", {"default": 0.01, "min": -1.00, "max": 1.00, "step": 0.01}), - "M": ("FLOAT", {"default": 0.51, "min": -1.00, "max": 1.00, "step": 0.01}), - "Y": ("FLOAT", {"default": -0.12, "min": -1.00, "max": 1.00, "step": 0.01}), + "M": ("FLOAT", {"default": 0.50, "min": -1.00, "max": 1.00, "step": 0.01}), + "Y": ("FLOAT", {"default": -0.13, "min": -1.00, "max": 1.00, "step": 0.01}), "K": ("FLOAT", {"default": 0.00, "min": -1.00, "max": 1.00, "step": 0.01}) } }