Add object detection, tracking, mobile notifications, and search to any security camera.
newer tg
Rory Clearcd3ef2b9ae13
diff --git a/requirements.txt b/requirements.txtindex bfb6da5..8673580 100644--- a/requirements.txt+++ b/requirements.txt@@ -1,3 +1,3 @@-git+https://github.com/tinygrad/tinygrad.git@fe39cf148a72e8d0b4025f123a00c61b7d9340b2+git+https://github.com/tinygrad/tinygrad.git@a35964493e3126928880d1f26ccd7351b1572534numpy==2.0.0opencv-python-headless==4.10.0.84\ No newline at end of filediff --git a/utils/model.py b/utils/model.pyindex a639df1..cd74317 100644--- a/utils/model.py+++ b/utils/model.py@@ -9,7 +9,7 @@ from tinygrad.uop.ops import resolvedef precompute_freqs_cis(dim: int, end: int, theta: float = 10000.0, device:str|None=None) -> Tensor:freqs = 1.0 / (theta ** (Tensor.arange(0, dim, 2)[:(dim // 2)] / dim))freqs = Tensor.arange(end).unsqueeze(dim=1) * freqs.unsqueeze(dim=0)- return freqs.cos().cat(freqs.sin(), dim=-1).contiguous()+ return freqs.cos().cat(freqs.sin(), dim=-1).clone(device)class ExpertWeights:"""Like nn.Linear but with num_experts dimension. Weight shape: (num_experts, out_features, in_features)."""@@ -27,9 +27,9 @@ def apply_rope(x:Tensor, freqs_cis:Tensor) -> Tensor:def pairwise_topk(x: Tensor, k: int) -> tuple[Tensor, Tensor]:n = x.shape[-1]- vals = Tensor.arange(n, device=x.device).reshape(1,1,n).cast(x.dtype).expand(x.shape)+ vals = Tensor.arange(n).reshape(1,1,n).cast(x.dtype).expand(x.shape)cmp = (x.unsqueeze(-1) > x.unsqueeze(-2)) | ((x.unsqueeze(-1) == x.unsqueeze(-2)) & \- (Tensor.arange(n, device=x.device).reshape(1,1,n,1) < Tensor.arange(n, device=x.device).reshape(1,1,1,n)))+ (Tensor.arange(n).reshape(1,1,n,1) < Tensor.arange(n).reshape(1,1,1,n)))sel = x.const_like(0).scatter(-1, cmp.sum(axis=-1).cast('int32'), vals)[:,:,n-k:].cast('int32')return x.gather(-1, sel), sel@@ -177,7 +177,7 @@ class TransformerBlock(FFNBlock):# NOTE: this mask is causal_lower_right, not the causal_upper_left generated by is_casual = True# TODO: this if statement should be removed and it shouldn't generate extra kernels- mask = Tensor.full((1, 1, T, start_pos+T), float("-inf"), dtype=x.dtype, device=x.device).triu(start_pos+1) \+ mask = Tensor.full((1, 1, T, start_pos+T), float("-inf"), dtype=x.dtype, buffer=False).triu(start_pos+1) \if resolve(T != 1) else Noneattn = q.scaled_dot_product_attention(k, v, attn_mask=mask, enable_gqa=True) # (B,H,T,Hd)attn = attn.transpose(1, 2).reshape(B, T, -1) # back to (B,T,D)@@ -205,7 +205,6 @@ class MLATransformerBlock(FFNBlock):self.attn_v_b = {"weight": Tensor.zeros(config.n_heads, config.v_head_dim, config.kv_lora_rank)}self.attn_output = nn.Linear(config.n_heads * config.v_head_dim, config.dim, bias=False)- # todo, catch up to master when reqs updateddef _attention(self, x:Tensor, start_pos:int|UOp) -> Tensor:B, T, _ = x.shapeq_nope_head_dim = self.config.head_dim - self.config.rope_dim@@ -224,7 +223,7 @@ class MLATransformerBlock(FFNBlock):k = Tensor(self.cache_k.uop.after(self.cache_k[:, :, start_pos:start_pos+T, :].uop.store(k_store.uop)))[:, :, 0:start_pos+T, :]v = k[..., :self.config.kv_lora_rank]- mask = Tensor.full((1, 1, T, start_pos+T), float("-inf"), dtype=x.dtype, device=x.device).triu(start_pos+1) \+ mask = Tensor.full((1, 1, T, start_pos+T), float("-inf"), dtype=x.dtype, buffer=False).triu(start_pos+1) \if resolve(T != 1) else Noneattn = q @ k.transpose(-1, -2) * (1.0 / self.config.head_dim ** 0.5)if mask is not None: attn = attn + mask@@ -399,7 +398,7 @@ class Transformer:v_start_pos = UOp.variable("start_pos", 0, self.max_context-1)v_toks = UOp.variable("toks", 1, chunk_size)# TODO: use UOp.variable for temperature once float variables are supported- temp = Tensor(temperature).contiguous()+ temp = Tensor([temperature])# assign all input tokens once, then slice from start_pos for the model callt = Tensor(tokens + [0] * (self.max_context - len(tokens)), dtype="int32").reshape(1, self.max_context)# recompute start_pos from what's currently valid in the caches@@ -414,4 +413,4 @@ class Transformer:if start_pos < len(tokens): continuetokens.append(int(out.item()))self._cached_tokens = tokens[:-1]- yield tokens[-1]+ yield tokens[-1]\ No newline at end of file