x-transformers 2.2.6__py3-none-any.whl → 2.2.8__py3-none-any.whl

x_transformers/entropy_based_tokenizer.py

@@ -6,12 +6,6 @@ import torch.nn.functional as F
 from torch.nn import Module
 from torch.nn.utils.rnn import pad_sequence
 
-from x_transformers.x_transformers import (
-    Decoder,
-    TransformerWrapper,
-    calc_entropy
-)
-
 import einx
 from einops import repeat, rearrange, pack, unpack
 
@@ -23,6 +17,13 @@ def exists(v):
 def default(v, d):
     return v if exists(v) else d
 
+def log(t, eps = 1e-20):
+    return t.clamp(min = eps).log()
+
+def calc_entropy_from_logits(logits):
+    prob = logits.softmax(dim = -1)
+    return -(prob * log(prob)).sum(dim = -1)
+
 # entropy based tokenizer applied in byte-latent transformer paper
 # they use a simple entropy threshold for segmenting a string into variable sized tokens
 
@@ -60,7 +61,7 @@ class EntropyBasedTokenizer(Module):
 
         logits = self.decoder(seq, **decoder_forward_kwargs)
 
-        entropies = calc_entropy(logits)
+        entropies = calc_entropy_from_logits(logits)
 
         # get length mask for boundaries
 

x_transformers/x_transformers.py

@@ -1196,6 +1196,7 @@ class FeedForward(Module):
         glu_mult_bias = False,
         swish = False,
         relu_squared = False,
+        custom_activation = None,
         post_act_ln = False,
         dropout = 0.,
         no_bias = False,
@@ -1205,7 +1206,9 @@ class FeedForward(Module):
         inner_dim = int(dim * mult)
         dim_out = default(dim_out, dim)
 
-        if relu_squared:
+        if exists(custom_activation):
+            activation = deepcopy(custom_activation)
+        elif relu_squared:
             activation = ReluSquared()
         elif swish:
             activation = nn.SiLU()

{x_transformers-2.2.6.dist-info → x_transformers-2.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: x-transformers
-Version: 2.2.6
+Version: 2.2.8
 Summary: X-Transformers
 Project-URL: Homepage, https://pypi.org/project/x-transformers/
 Project-URL: Repository, https://github.com/lucidrains/x-transformers

{x_transformers-2.2.6.dist-info → x_transformers-2.2.8.dist-info}/RECORD

@@ -4,14 +4,14 @@ x_transformers/autoregressive_wrapper.py,sha256=reLCno9Z9pchVU79tBF8OMo21LwSZ67K
 x_transformers/belief_state_wrapper.py,sha256=YLUMk6t2MhFBEw5lHDDHJHcoCxTIkHvxTNY__GGZEKU,13374
 x_transformers/continuous.py,sha256=p0sCAiH1na236ygwgL1Yyhu36eZBf9cZvoW1JyP_fFE,7073
 x_transformers/dpo.py,sha256=xt4OuOWhU8pN3OKN2LZAaC2NC8iiEnchqqcrPWVqf0o,3521
-x_transformers/entropy_based_tokenizer.py,sha256=F6NNbT5H-eVrb9jxVG1n1g8mptDbfm2D7itJCP9RaYA,3845
+x_transformers/entropy_based_tokenizer.py,sha256=c9dcERmoK454mD3JKlxeU3cNwYVPi8I8bI91xrvVvOA,3938
 x_transformers/multi_input.py,sha256=tCh-fTJDj2ib4SMGtsa-AM8MxKzJAQSwqAXOu3HU2mg,9252
 x_transformers/neo_mlp.py,sha256=XCNnnop9WLarcxap1kGuYc1x8GHvwkZiDRnXOxSl3Po,3452
 x_transformers/nonautoregressive_wrapper.py,sha256=2NU58hYMgn-4Jzg3mie-mXb0XH_dCN7fjlzd3K1rLUY,10510
-x_transformers/x_transformers.py,sha256=Fl2CuAKTxJDOQvqwQo2FK8eO2s1iNLO-P1PP2Yw64rQ,111826
+x_transformers/x_transformers.py,sha256=m2xiiTafFZiII-QZLCpPerdWbY8O41I6BAYCaaPdXig,111953
 x_transformers/xl_autoregressive_wrapper.py,sha256=CvZMJ6A6PA-Y_bQAhnORwjJBSl6Vjq2IdW5KTdk8NI8,4195
 x_transformers/xval.py,sha256=7S00kCuab4tWQa-vf-z-XfzADjVj48MoFIr7VSIvttg,8575
-x_transformers-2.2.6.dist-info/METADATA,sha256=1NbgGNWjqzPTJz7u0vm3dqTFyszQgAtjxg7LGVu4BnQ,88686
-x_transformers-2.2.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-x_transformers-2.2.6.dist-info/licenses/LICENSE,sha256=As9u198X-U-vph5noInuUfqsAG2zX_oXPHDmdjwlPPY,1066
-x_transformers-2.2.6.dist-info/RECORD,,
+x_transformers-2.2.8.dist-info/METADATA,sha256=U54PnKoqbbDeOAU2moEtVMOAejOvXnF6BDpakJTHud8,88686
+x_transformers-2.2.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+x_transformers-2.2.8.dist-info/licenses/LICENSE,sha256=As9u198X-U-vph5noInuUfqsAG2zX_oXPHDmdjwlPPY,1066
+x_transformers-2.2.8.dist-info/RECORD,,