From 68f22fa87b25b83f9dfc7a2435f1cb5aa0cb20b4 Mon Sep 17 00:00:00 2001 From: silveroxides Date: Mon, 24 Nov 2025 19:16:03 +0100 Subject: [PATCH] fix Extract namespace conflict --- nodes/merger_ops.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nodes/merger_ops.py b/nodes/merger_ops.py index 4809d66..9664f2e 100644 --- a/nodes/merger_ops.py +++ b/nodes/merger_ops.py @@ -94,7 +94,7 @@ class TrainDiff(Operation): dist_bc, dist_ab = torch.abs(diff_bc), torch.abs(b.float() - a.float()) scale = torch.where(dist_bc + dist_ab != 0, dist_ab / (dist_bc + dist_ab), 0.0) return (torch.sign(diff_bc) * torch.abs(scale) * torch.abs(diff_bc)).to(a.dtype) * 1.8 -class Extract(Operation): +class ExtractOp(Operation): def __init__(self, key, alpha, beta, gamma, *args): super().__init__(key, *args) self.alpha, self.beta, self.gamma = alpha, beta, gamma @@ -104,7 +104,7 @@ class Extract(Operation): c = torch.cosine_similarity(a_f.flatten(), b_f.flatten(), 0).clamp(-1, 1) d = ((c + 1) / 2)**self.gamma return (torch.lerp(a_f, b_f, self.alpha) * torch.lerp(d, 1 - d, self.beta)).to(a.dtype) -class Similarities(Extract): +class Similarities(ExtractOp): def oper(self, a: torch.Tensor, b: torch.Tensor) -> torch.Tensor: return super().oper(None, a, b) class PowerUpOp(Operation): def __init__(self, key, alpha, seed, *sources): @@ -198,7 +198,7 @@ class Extract(CalcMode): a = LoadTensor(key, kwargs['model_a'], **loader_args) b = LoadTensor(key, kwargs['model_b'], **loader_args) c = LoadTensor(key, kwargs['model_c'], **loader_args) - extracted = Extract(key, kwargs['alpha'], kwargs['beta'], kwargs['gamma'] * 15, a, b, c) + extracted = ExtractOp(key, kwargs['alpha'], kwargs['beta'], kwargs['gamma'] * 15, a, b, c) multiplied = Multiply(key, kwargs['delta'], extracted) return Add(key, a, multiplied) class AddDisimilarity(CalcMode):