titans-pytorch 0.0.35__py3-none-any.whl → 0.0.37__py3-none-any.whl

titans_pytorch/mac_transformer.py

@@ -7,7 +7,7 @@ from torch import nn, cat
 import torch.nn.functional as F
 from torch.nn import Module, ModuleList, Linear
 
-from einops import repeat, rearrange
+from einops import repeat, rearrange, pack, unpack
 from einops.layers.torch import Rearrange
 
 from hyper_connections import get_init_and_expand_reduce_stream_functions
@@ -185,7 +185,9 @@ class MemoryAsContextTransformer(Module):
         # long term mem tokens
 
         self.segment_len = segment_len
+
         self.num_longterm_mem_tokens = num_longterm_mem_tokens
+        has_longterm_mems = num_longterm_mem_tokens > 0
 
         self.longterm_mems = nn.Parameter(torch.randn(num_longterm_mem_tokens, dim) * 0.02)
 
@@ -197,7 +199,11 @@ class MemoryAsContextTransformer(Module):
         self.neural_mem_layers = ModuleList([])
 
         layers = tuple(range(1, depth + 1))
-        neural_memory_layers = set(default(neural_memory_layers, layers))
+
+        if not exists(neural_memory_layers):
+            neural_memory_layers = layers if has_longterm_mems else ()
+
+        assert not (num_longterm_mem_tokens > 0 and len(neural_memory_layers) == 0), 'empty `neural_memory_layers` when longterm memory tokens are present'
 
         for layer in layers:
 
@@ -205,8 +211,15 @@ class MemoryAsContextTransformer(Module):
 
             mem = None
 
-            if num_longterm_mem_tokens > 0 and layer in neural_memory_layers:
-                mem = NeuralMemory(dim = dim, chunk_size = num_longterm_mem_tokens)
+            if layer in neural_memory_layers:
+                assert has_longterm_mems, '`num_longterm_mem_tokens` must be greater than 0'
+
+                mem = NeuralMemory(
+                    dim = dim,
+                    chunk_size = num_longterm_mem_tokens + segment_len,
+                    **neural_memory_kwargs
+                )
+
                 mem = init_hyper_conn(dim = dim, branch = mem)
 
             self.neural_mem_layers.append(mem)
@@ -258,7 +271,7 @@ class MemoryAsContextTransformer(Module):
         x, inverse_segment = pad_and_segment_with_inverse(x, segment_len)
 
         mems = repeat(self.longterm_mems, 'n d -> b n d', b = x.shape[0])
-        x = cat((mems, x), dim = -2)
+        x, mem_ps = pack((x, mems), 'b * d')
 
         x = inverse_segment(x)
 
@@ -275,21 +288,7 @@ class MemoryAsContextTransformer(Module):
         for (attn, ff), maybe_neural_mem in zip(self.layers, self.neural_mem_layers):
 
             if exists(maybe_neural_mem):
-                batch_streams = x.shape[0]
-
-                x, inverse_segment = pad_and_segment_with_inverse(x, total_segment_len)
-
-                longterm_mems, x = x[:, :num_longterm_mem_tokens], x[:, num_longterm_mem_tokens:]
-
-                longterm_mems = rearrange(longterm_mems, '(b w) n d -> b (w n) d', b = batch_streams)
-
-                longterm_mems = maybe_neural_mem(longterm_mems)
-
-                longterm_mems = rearrange(longterm_mems, 'b (w n) d -> (b w) n d', n = num_longterm_mem_tokens)
-
-                x = cat((longterm_mems, x), dim = -2)
-
-                x = inverse_segment(x)
+                mems = maybe_neural_mem(mems)
 
             x = attn(x)
 
@@ -301,7 +300,7 @@ class MemoryAsContextTransformer(Module):
 
         x, inverse_segment = pad_and_segment_with_inverse(x, total_segment_len)
 
-        x = x[:, num_longterm_mem_tokens:]
+        x, mem = unpack(x, mem_ps, 'b * d')
 
         x = inverse_segment(x)
 

titans_pytorch/titans.py

@@ -132,7 +132,7 @@ class NeuralMemory(Module):
         max_grad_norm: float | None = None,
         use_accelerated_scan = False,
         default_mlp_kwargs: dict = dict(
-            depth = 4
+            depth = 2
         )
     ):
         super().__init__()

{titans_pytorch-0.0.35.dist-info → titans_pytorch-0.0.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: titans-pytorch
-Version: 0.0.35
+Version: 0.0.37
 Summary: Titans
 Project-URL: Homepage, https://pypi.org/project/titans-pytorch/
 Project-URL: Repository, https://github.com/lucidrains/titans-pytorch

titans_pytorch-0.0.37.dist-info/RECORD

@@ -0,0 +1,9 @@
+titans_pytorch/__init__.py,sha256=F6pV8BamKCsbJFVo5x2hw69vzfJNLy54SwIKIueMdp4,142
+titans_pytorch/associative_scan.py,sha256=Y-iYqmFuG-NoCKu6kgql1mhowXTeJfyawi3eUIXamp0,2650
+titans_pytorch/mac_transformer.py,sha256=JjKGEMBit_SvyAsxq5v08614YBcLVx3OkM6pf0rADsA,8400
+titans_pytorch/titans.py,sha256=ALICGfc6p2bD2QkaibyIceVLvBIRKXmDm-w7RjnVOe4,14304
+titans_pytorch/titans_attn_memory.py,sha256=Rwx_-riGeISBefZg5Kjic8jzmmRRys-u93D2Kgb7Mos,12691
+titans_pytorch-0.0.37.dist-info/METADATA,sha256=RNokG8101_tlR0BiF-AxqYLZpXqafMSiN1Rg_pZe2-o,3938
+titans_pytorch-0.0.37.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+titans_pytorch-0.0.37.dist-info/licenses/LICENSE,sha256=1yCiA9b5nhslTavxPjsQAO-wpOnwJR9-l8LTVi7GJuk,1066
+titans_pytorch-0.0.37.dist-info/RECORD,,

titans_pytorch-0.0.35.dist-info/RECORD

@@ -1,9 +0,0 @@
-titans_pytorch/__init__.py,sha256=F6pV8BamKCsbJFVo5x2hw69vzfJNLy54SwIKIueMdp4,142
-titans_pytorch/associative_scan.py,sha256=Y-iYqmFuG-NoCKu6kgql1mhowXTeJfyawi3eUIXamp0,2650
-titans_pytorch/mac_transformer.py,sha256=FGShQHD-dQQdQKKzvNS_jTC_FcikdqO_s3ZKOKfr_9E,8502
-titans_pytorch/titans.py,sha256=Kx_tl_QkeDccvkMwPZ0xQ_saYjZfbKzDNPTTSHNWYcA,14304
-titans_pytorch/titans_attn_memory.py,sha256=Rwx_-riGeISBefZg5Kjic8jzmmRRys-u93D2Kgb7Mos,12691
-titans_pytorch-0.0.35.dist-info/METADATA,sha256=jrhx-Bp1LqlOAV3jl4M70WTqq29ciz5lYWJvo2aoPE4,3938
-titans_pytorch-0.0.35.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-titans_pytorch-0.0.35.dist-info/licenses/LICENSE,sha256=1yCiA9b5nhslTavxPjsQAO-wpOnwJR9-l8LTVi7GJuk,1066
-titans_pytorch-0.0.35.dist-info/RECORD,,