x-transformers 1.30.18__py3-none-any.whl → 1.30.20__py3-none-any.whl

x_transformers/x_transformers.py

@@ -584,7 +584,7 @@ class AdaptiveLayerNorm(Module):
 
         nn.init.zeros_(self.to_gamma.weight)
 
-    def forward(self, x, condition):
+    def forward(self, x, *, condition):
         normed = self.ln(x)
         gamma = self.to_gamma(condition)
         return normed * (gamma + 1.)
@@ -616,7 +616,7 @@ class AdaptiveRMSNorm(Module):
         self.to_gamma = nn.Linear(dim_condition, dim, bias = False)
         nn.init.zeros_(self.to_gamma.weight)
 
-    def forward(self, x, condition):
+    def forward(self, x, *, condition):
         normed = F.normalize(x, dim = -1)
         gamma = self.to_gamma(condition)
         return normed * self.scale * (gamma + 1.)
@@ -1161,6 +1161,8 @@ class AttentionLayers(Module):
         use_adaptive_layernorm = False,
         use_adaptive_rmsnorm = False,
         dim_condition = None,
+        adaptive_condition_mlp = False,
+        adaptive_condition_mlp_expansion = 4,
         alibi_pos_bias = False,
         alibi_num_heads = None,
         rel_pos_bias = False,
@@ -1269,6 +1271,10 @@ class AttentionLayers(Module):
 
         need_condition = False
         dim_condition = default(dim_condition, dim)
+        dim_condition_mult = 1
+
+        if adaptive_condition_mlp:
+            dim_condition_mult = adaptive_condition_mlp_expansion
 
         if use_scalenorm:
             norm_class = ScaleNorm
@@ -1278,15 +1284,23 @@ class AttentionLayers(Module):
             norm_class = SimpleRMSNorm
         elif use_adaptive_layernorm:
             need_condition = True
-            norm_class = partial(AdaptiveLayerNorm, dim_condition = dim_condition)
+            norm_class = partial(AdaptiveLayerNorm, dim_condition = dim_condition * dim_condition_mult)
         elif use_adaptive_rmsnorm:
             need_condition = True
-            norm_class = partial(AdaptiveRMSNorm, dim_condition = dim_condition)
+            norm_class = partial(AdaptiveRMSNorm, dim_condition = dim_condition * dim_condition_mult)
         else:
             norm_class = LayerNorm
 
         norm_fn = partial(norm_class, dim)
 
+        self.adaptive_mlp = nn.Identity()
+
+        if need_condition and adaptive_condition_mlp:
+            self.adaptive_mlp = nn.Sequential(
+                nn.Linear(dim_condition, dim_condition * dim_condition_mult, bias = False),
+                nn.SiLU()
+            )
+
         self.need_condition = need_condition
         self.dim_condition = dim_condition
 
@@ -1446,7 +1460,16 @@ class AttentionLayers(Module):
         norm_kwargs = dict()
 
         if self.need_condition:
-            assert condition.shape[-1] == self.dim_condition
+            assert condition.ndim in {2, 3}
+
+            if condition.ndim == 2:
+                condition = rearrange(condition, 'b d -> b 1 d')
+
+            assert condition.shape[-1] == self.dim_condition, f'expected condition dimension of {self.dim_condition} but received {condition.shape[-1]}'
+
+            # maybe mlp
+
+            condition = self.adaptive_mlp(condition)
 
             norm_kwargs.update(condition = condition)
 

{x_transformers-1.30.18.dist-info → x_transformers-1.30.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: x-transformers
-Version: 1.30.18
+Version: 1.30.20
 Summary: X-Transformers - Pytorch
 Home-page: https://github.com/lucidrains/x-transformers
 Author: Phil Wang

{x_transformers-1.30.18.dist-info → x_transformers-1.30.20.dist-info}/RECORD

@@ -4,11 +4,11 @@ x_transformers/autoregressive_wrapper.py,sha256=uX8Mb0zLsQrZECt_9UGt35g7tC05Rk3n
 x_transformers/continuous.py,sha256=WO52n9lFAXv5-SGadi2cApGF8dkouN8QSTEOuC7erj8,6180
 x_transformers/dpo.py,sha256=LjvWgCkqTl-UuehrzQ8nkX5guLr4whYwsmm7SKSwdls,3450
 x_transformers/nonautoregressive_wrapper.py,sha256=ys_p8obc7lTeeodCqvkRKxOXQ1C9T3j5Jwr-JbVgnXk,10432
-x_transformers/x_transformers.py,sha256=8XuiUXFOD7KAmopmf66mCq-HRs1g5Wd5tHcTTpm9JeM,71460
+x_transformers/x_transformers.py,sha256=kd0H1tsw3SynfQu7xjuzacnuYimVhVMVxLID_I_pM8A,72322
 x_transformers/xl_autoregressive_wrapper.py,sha256=DCx4n0_c1tFai4nOqaWVnqx2p9eutsZsDMiMP1ckxNU,4117
 x_transformers/xval.py,sha256=QE1ltYZTR_eGgIHPP2BrMWVWVLqMW-OpDZh87BSmQEg,8563
-x_transformers-1.30.18.dist-info/LICENSE,sha256=As9u198X-U-vph5noInuUfqsAG2zX_oXPHDmdjwlPPY,1066
-x_transformers-1.30.18.dist-info/METADATA,sha256=6aA6OcLnBMlxZKJeRShv9UMT1BUYZlq-jfrj68nv5yU,662
-x_transformers-1.30.18.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-x_transformers-1.30.18.dist-info/top_level.txt,sha256=hO6KGpFuGucRNEtRfme4A_rGcM53AKwGP7RVlRIxS5Q,15
-x_transformers-1.30.18.dist-info/RECORD,,
+x_transformers-1.30.20.dist-info/LICENSE,sha256=As9u198X-U-vph5noInuUfqsAG2zX_oXPHDmdjwlPPY,1066
+x_transformers-1.30.20.dist-info/METADATA,sha256=OwTLO7xb31tvGd5vHK1XAU70ireyNSlrcDlg2zUJUuY,662
+x_transformers-1.30.20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+x_transformers-1.30.20.dist-info/top_level.txt,sha256=hO6KGpFuGucRNEtRfme4A_rGcM53AKwGP7RVlRIxS5Q,15
+x_transformers-1.30.20.dist-info/RECORD,,