Upload HfMoondream

config.json

@@ -1,15 +1,13 @@
 {
   "architectures": [
-    "Moondream"
+    "HfMoondream"
   ],
   "auto_map": {
-    "AutoConfig": "configuration_moondream.MoondreamConfig",
-    "AutoModelForCausalLM": "moondream.Moondream"
+    "AutoConfig": "hf_moondream.HfConfig",
+    "AutoModelForCausalLM": "hf_moondream.HfMoondream"
   },
+  "config": {},
   "model_type": "moondream1",
-  "text_config": {
-    "model_type": "phi"
-  },
   "torch_dtype": "float16",
   "transformers_version": "4.44.0"
 }

config.py

@@ -0,0 +1,83 @@
+from dataclasses import dataclass, field
+from typing import Dict, List, Optional
+
+
+@dataclass(frozen=True)
+class TextConfig:
+    dim: int = 2048
+    n_layers: int = 24
+    vocab_size: int = 51200
+    max_context: int = 2048
+    n_heads: int = 32
+    prefix_attn: int = 730
+
+
+@dataclass(frozen=True)
+class VisionConfig:
+    enc_dim: int = 1152
+    enc_patch_size: int = 14
+    enc_n_layers: int = 27
+    enc_ff_dim: int = 4304
+    enc_n_heads: int = 16
+    proj_out_dim: int = 2048
+    crop_size: int = 378
+    in_channels: int = 3
+    max_crops: int = 12
+    overlap_margin: int = 4
+    proj_inner_dim: int = 8192
+
+
+@dataclass(frozen=True)
+class RegionConfig:
+    dim: int = 2048
+    coord_feat_dim: int = 256
+    coord_out_dim: int = 1024
+    size_feat_dim: int = 512
+    size_out_dim: int = 2048
+    inner_dim: int = 8192
+
+
+@dataclass(frozen=True)
+class TokenizerConfig:
+    bos_id: int = 50256
+    eos_id: int = 50256
+    templates: Dict[str, Optional[Dict[str, List[int]]]] = field(
+        default_factory=lambda: {
+            "caption": {
+                "short": [198, 198, 16438, 8305, 25],
+                "normal": [198, 198, 24334, 1159, 25],
+            },
+            "query": {"prefix": [198, 198, 24361, 25], "suffix": [198, 198, 33706, 25]},
+            "detect": {"prefix": [198, 198, 47504, 25], "suffix": [628]},
+            "point": {"prefix": [198, 198, 12727, 25], "suffix": [628]},
+        }
+    )
+
+
+@dataclass(frozen=True)
+class MoondreamConfig:
+    text: TextConfig = TextConfig()
+    vision: VisionConfig = VisionConfig()
+    region: RegionConfig = RegionConfig()
+    tokenizer: TokenizerConfig = TokenizerConfig()
+
+    @classmethod
+    def from_dict(cls, config_dict: dict):
+        text_config = TextConfig(**config_dict.get("text", {}))
+        vision_config = VisionConfig(**config_dict.get("vision", {}))
+        region_config = RegionConfig(**config_dict.get("region", {}))
+        tokenizer_config = TokenizerConfig(**config_dict.get("tokenizer", {}))
+        return cls(
+            text=text_config,
+            vision=vision_config,
+            region=region_config,
+            tokenizer=tokenizer_config,
+        )
+
+    def to_dict(self):
+        return {
+            "text": self.text.__dict__,
+            "vision": self.vision.__dict__,
+            "region": self.region.__dict__,
+            "tokenizer": self.tokenizer.__dict__,
+        }

generation_config.json

@@ -1,6 +1,4 @@
 {
   "_from_model_config": true,
-  "bos_token_id": 1,
-  "eos_token_id": 2,
   "transformers_version": "4.44.0"
 }

hf_moondream.py

@@ -0,0 +1,123 @@
+from transformers import PreTrainedModel, PretrainedConfig
+
+from .config import MoondreamConfig
+from .moondream import MoondreamModel
+
+# Files sometimes don't get loaded without these...
+from .image_crops import *
+from .vision import *
+from .text import *
+from .region import *
+from .utils import *
+
+
+def extract_question(text):
+    prefix = "<image>\n\nQuestion: "
+    suffix = "\n\nAnswer:"
+    
+    if text.startswith(prefix) and text.endswith(suffix):
+        return text[len(prefix) : -len(suffix)]
+    else:
+        return None
+
+
+class HfConfig(PretrainedConfig):
+    _auto_class = "AutoConfig"
+    model_type = "moondream1"
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.config = {}
+
+
+class HfMoondream(PreTrainedModel):
+    _auto_class = "AutoModelForCausalLM"
+    config_class = HfConfig
+
+    def __init__(self, config):
+        super().__init__(config)
+        self.model = MoondreamModel(MoondreamConfig.from_dict(config.config))
+
+    @property
+    def encode_image(self):
+        return self.model.encode_image
+
+    @property
+    def query(self):
+        return self.model.query
+
+    @property
+    def caption(self):
+        return self.model.caption
+
+    @property
+    def detect(self):
+        return self.model.detect
+
+    @property
+    def point(self):
+        return self.model.point
+
+    @property
+    def detect_gaze(self):
+        return self.model.detect_gaze
+
+    def answer_question(
+        self,
+        image_embeds,
+        question,
+        tokenizer=None,
+        chat_history="",
+        result_queue=None,
+        max_new_tokens=256,
+        **kwargs
+    ):
+        answer = self.query(image_embeds, question)["answer"].strip()
+
+        if result_queue is not None:
+            result_queue.put(answer)
+        return answer
+
+    def batch_answer(self, images, prompts, tokenizer=None, **kwargs):
+        answers = []
+        for image, prompt in zip(images, prompts):
+            answers.append(self.query(image, prompt)["answer"].strip())
+        return answers
+
+    def _unsupported_exception(self):
+        raise NotImplementedError(
+            "This method is not supported in the latest version of moondream. "
+            "Consider upgrading to the updated API spec, or alternately pin "
+            "to 'revision=2024-08-26'."
+        )
+
+    def generate(self, image_embeds, prompt, tokenizer, max_new_tokens=128, **kwargs):
+        """
+        Function definition remains unchanged for backwards compatibility.
+        Be aware that tokenizer, max_new_takens, and kwargs are ignored.
+        """
+        prompt_extracted = extract_question(prompt)
+        if prompt_extracted is not None:
+            answer = self.model.query(image=image_embeds, question=prompt_extracted, stream=False)[
+                "answer"
+            ]
+        else:
+            image_embeds = self.encode_image(image_embeds)
+            prompt_tokens = torch.tensor(
+                [self.model.tokenizer.encode(prompt).ids],
+                device=self.device,
+            )
+            def generator():
+                for token in self.model._generate_text(
+                    prompt_tokens, image_embeds.kv_cache, image_embeds.pos, max_new_tokens
+                ):
+                    yield token
+            answer = "".join(list(generator()))
+            
+        return [answer]
+
+    def get_input_embeddings(self):
+        return super().get_input_embeddings()
+
+    def input_embeds(self, *args, **kwargs):
+        self._unsupported_exception()

image_crops.py

@@ -0,0 +1,208 @@
+import math
+import numpy as np
+import torch
+import pyvips
+
+from typing import TypedDict
+
+
+def select_tiling(
+    height: int, width: int, crop_size: int, max_crops: int
+) -> tuple[int, int]:
+    """
+    Determine the optimal number of tiles to cover an image with overlapping crops.
+    """
+    if height <= crop_size or width <= crop_size:
+        return (1, 1)
+
+    # Minimum required tiles in each dimension
+    min_h = math.ceil(height / crop_size)
+    min_w = math.ceil(width / crop_size)
+
+    # If minimum required tiles exceed max_crops, return proportional distribution
+    if min_h * min_w > max_crops:
+        ratio = math.sqrt(max_crops / (min_h * min_w))
+        return (max(1, math.floor(min_h * ratio)), max(1, math.floor(min_w * ratio)))
+
+    # Perfect aspect-ratio tiles that satisfy max_crops
+    h_tiles = math.floor(math.sqrt(max_crops * height / width))
+    w_tiles = math.floor(math.sqrt(max_crops * width / height))
+
+    # Ensure we meet minimum tile requirements
+    h_tiles = max(h_tiles, min_h)
+    w_tiles = max(w_tiles, min_w)
+
+    # If we exceeded max_crops, scale down the larger dimension
+    if h_tiles * w_tiles > max_crops:
+        if w_tiles > h_tiles:
+            w_tiles = math.floor(max_crops / h_tiles)
+        else:
+            h_tiles = math.floor(max_crops / w_tiles)
+
+    return (max(1, h_tiles), max(1, w_tiles))
+
+
+class OverlapCropOutput(TypedDict):
+    crops: np.ndarray
+    tiling: tuple[int, int]
+
+
+def overlap_crop_image(
+    image: np.ndarray,
+    overlap_margin: int,
+    max_crops: int,
+    base_size: tuple[int, int] = (378, 378),
+    patch_size: int = 14,
+) -> OverlapCropOutput:
+    """
+    Process an image using an overlap-and-resize cropping strategy with margin handling.
+
+    This function takes an input image and creates multiple overlapping crops with
+    consistent margins. It produces:
+    1. A single global crop resized to base_size
+    2. Multiple overlapping local crops that maintain high resolution details
+    3. A patch ordering matrix that tracks correspondence between crops
+
+    The overlap strategy ensures:
+    - Smooth transitions between adjacent crops
+    - No loss of information at crop boundaries
+    - Proper handling of features that cross crop boundaries
+    - Consistent patch indexing across the full image
+
+    Args:
+        image (np.ndarray): Input image as numpy array with shape (H,W,C)
+        base_size (tuple[int,int]): Target size for crops, default (378,378)
+        patch_size (int): Size of patches in pixels, default 14
+        overlap_margin (int): Margin size in patch units, default 4
+        max_crops (int): Maximum number of crops allowed, default 12
+
+    Returns:
+        OverlapCropOutput: Dictionary containing:
+            - crops: A numpy array containing the global crop of the full image (index 0)
+                followed by the overlapping cropped regions (indices 1+)
+            - tiling: Tuple of (height,width) tile counts
+    """
+    original_h, original_w = image.shape[:2]
+
+    # Convert margin from patch units to pixels
+    margin_pixels = patch_size * overlap_margin
+    total_margin_pixels = margin_pixels * 2  # Both sides
+
+    # Calculate crop parameters
+    crop_patches = base_size[0] // patch_size  # patches per crop dimension
+    crop_window_patches = crop_patches - (2 * overlap_margin)  # usable patches
+    crop_window_size = crop_window_patches * patch_size  # usable size in pixels
+
+    # Determine tiling
+    tiling = select_tiling(
+        original_h - total_margin_pixels,
+        original_w - total_margin_pixels,
+        crop_window_size,
+        max_crops,
+    )
+
+    # Pre-allocate crops.
+    n_crops = tiling[0] * tiling[1] + 1  # 1 = global crop
+    crops = np.zeros(
+        (n_crops, base_size[0], base_size[1], image.shape[2]), dtype=np.uint8
+    )
+
+    # Resize image to fit tiling
+    target_size = (
+        tiling[0] * crop_window_size + total_margin_pixels,
+        tiling[1] * crop_window_size + total_margin_pixels,
+    )
+
+    # Convert to vips for resizing
+    vips_image = pyvips.Image.new_from_array(image)
+    scale_x = target_size[1] / image.shape[1]
+    scale_y = target_size[0] / image.shape[0]
+    resized = vips_image.resize(scale_x, vscale=scale_y)
+    image = resized.numpy()
+
+    # Create global crop
+    scale_x = base_size[1] / vips_image.width
+    scale_y = base_size[0] / vips_image.height
+    global_vips = vips_image.resize(scale_x, vscale=scale_y)
+    crops[0] = global_vips.numpy()
+
+    for i in range(tiling[0]):
+        for j in range(tiling[1]):
+            # Calculate crop coordinates
+            y0 = i * crop_window_size
+            x0 = j * crop_window_size
+
+            # Extract crop with padding if needed
+            y_end = min(y0 + base_size[0], image.shape[0])
+            x_end = min(x0 + base_size[1], image.shape[1])
+
+            crop_region = image[y0:y_end, x0:x_end]
+            crops[
+                1 + i * tiling[1] + j, : crop_region.shape[0], : crop_region.shape[1]
+            ] = crop_region
+
+    return {"crops": crops, "tiling": tiling}
+
+
+def reconstruct_from_crops(
+    crops: torch.Tensor,
+    tiling: tuple[int, int],
+    overlap_margin: int,
+    patch_size: int = 14,
+) -> torch.Tensor:
+    """
+    Reconstruct the original image from overlapping crops into a single seamless image.
+
+    Takes a list of overlapping image crops along with their positional metadata and
+    reconstructs them into a single coherent image by carefully stitching together
+    non-overlapping regions. Handles both numpy arrays and PyTorch tensors.
+
+    Args:
+        crops: List of image crops as numpy arrays or PyTorch tensors with shape
+            (H,W,C)
+        tiling: Tuple of (height,width) indicating crop grid layout
+        patch_size: Size in pixels of each patch, default 14
+        overlap_margin: Number of overlapping patches on each edge, default 4
+
+    Returns:
+        Reconstructed image as numpy array or PyTorch tensor matching input type,
+        with shape (H,W,C) where H,W are the original image dimensions
+    """
+    tiling_h, tiling_w = tiling
+    crop_height, crop_width = crops[0].shape[:2]
+    margin_pixels = overlap_margin * patch_size
+
+    # Calculate output size (only adding margins once)
+    output_h = (crop_height - 2 * margin_pixels) * tiling_h + 2 * margin_pixels
+    output_w = (crop_width - 2 * margin_pixels) * tiling_w + 2 * margin_pixels
+
+    reconstructed = torch.zeros(
+        (output_h, output_w, crops[0].shape[2]),
+        device=crops[0].device,
+        dtype=crops[0].dtype,
+    )
+
+    for i, crop in enumerate(crops):
+        tile_y = i // tiling_w
+        tile_x = i % tiling_w
+
+        # For each tile, determine which part to keep
+        # Keep left margin only for first column
+        x_start = 0 if tile_x == 0 else margin_pixels
+        # Keep right margin only for last column
+        x_end = crop_width if tile_x == tiling_w - 1 else crop_width - margin_pixels
+        # Keep top margin only for first row
+        y_start = 0 if tile_y == 0 else margin_pixels
+        # Keep bottom margin only for last row
+        y_end = crop_height if tile_y == tiling_h - 1 else crop_height - margin_pixels
+
+        # Calculate where this piece belongs in the output
+        out_x = tile_x * (crop_width - 2 * margin_pixels)
+        out_y = tile_y * (crop_height - 2 * margin_pixels)
+
+        # Place the piece
+        reconstructed[
+            out_y + y_start : out_y + y_end, out_x + x_start : out_x + x_end
+        ] = crop[y_start:y_end, x_start:x_end]
+
+    return reconstructed

layers.py

@@ -0,0 +1,63 @@
+from dataclasses import dataclass
+from typing import Literal
+
+import torch
+from torch.nn import functional as F
+
+
+def gelu_approx(x):
+    return F.gelu(x, approximate="tanh")
+
+
+@dataclass
+class LinearWeights:
+    weight: torch.Tensor
+    bias: torch.Tensor
+
+
+def linear(x: torch.Tensor, w: LinearWeights) -> torch.Tensor:
+    return F.linear(x, w.weight, w.bias)
+
+
+@dataclass
+class LayerNormWeights:
+    weight: torch.Tensor
+    bias: torch.Tensor
+
+
+def layer_norm(x: torch.Tensor, w: LayerNormWeights) -> torch.Tensor:
+    return F.layer_norm(x, w.bias.shape, w.weight, w.bias)
+
+
+@dataclass
+class MLPWeights:
+    fc1: LinearWeights
+    fc2: LinearWeights
+    act: Literal["gelu_approx"] = "gelu_approx"
+
+
+def mlp(x: torch.Tensor, w: MLPWeights) -> torch.Tensor:
+    x = linear(x, w.fc1)
+    x = gelu_approx(x)
+    x = linear(x, w.fc2)
+    return x
+
+
+@dataclass
+class AttentionWeights:
+    qkv: LinearWeights
+    proj: LinearWeights
+
+
+def attn(x: torch.Tensor, w: AttentionWeights, n_heads: int) -> torch.Tensor:
+    bsz, q_len, d_model = x.shape
+    head_dim = d_model // n_heads
+
+    q, k, v = [
+        t.view(bsz, q_len, n_heads, head_dim).transpose(1, 2)
+        for t in linear(x, w.qkv).chunk(3, dim=-1)
+    ]
+    out = F.scaled_dot_product_attention(q, k, v)
+    out = out.transpose(1, 2).reshape(bsz, q_len, d_model)
+    out = linear(out, w.proj)
+    return out

model.safetensors

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bf7aed8ba4325d23fa7cd348d795a27f3b272682536f08aca4cdd62cde79293
-size 3736040266
+oid sha256:23e2e6498a058d12832e119dc97a1d2f14936b4ccf77b8492bc0fefba49ea8bb
+size 3854538376

moondream.py

@@ -1,230 +1,586 @@
 import torch
+import torch.nn as nn
+import random
 
-from typing import List, Union, Literal, Optional
-from transformers import PreTrainedModel
+from typing import Literal, Tuple, TypedDict, Union, Dict, Any, Optional
 from PIL import Image
+from dataclasses import dataclass
+from tokenizers import Tokenizer
 
-from .configuration_moondream import PhiConfig
-from .configuration_moondream import MoondreamConfig
-from .vision_encoder import VisionEncoder
-from .region_model import RegionModel
-from .modeling_phi import PhiForCausalLM
+from .config import MoondreamConfig
+from .image_crops import reconstruct_from_crops
+from .vision import vision_encoder, vision_projection, prepare_crops, build_vision_model
+from .text import build_text_model, prefill, text_encoder, lm_head, decode_one_token
+from .region import decode_coordinate, encode_coordinate, decode_size, encode_size
+from .utils import remove_outlier_points
 
-class Moondream(PreTrainedModel):
-    config_class = MoondreamConfig
-    _supports_flash_attn_2 = True
 
-    def __init__(self, config):
-        super().__init__(config)
-        self.vision_encoder = VisionEncoder(
-            use_flash_attn=config._attn_implementation == "flash_attention_2"
+SamplingSettings = TypedDict(
+    "SamplingSettings",
+    {"max_tokens": int},
+    total=False,
+)
+
+DEFAULT_MAX_TOKENS = 512
+
+
+@dataclass(frozen=True)
+class EncodedImage:
+    pos: int
+    kv_cache: torch.Tensor
+
+
+def _min_p_sampler(
+    logits: torch.Tensor,
+    min_p: float = 0.1,
+    filter_value: float = 0,
+    min_tokens_to_keep: int = 1,
+    temp=0.5,
+) -> torch.Tensor:
+    """
+    Min-p sampler adapted from https://github.com/oobabooga/text-generation-webui/blob/3146124ec01f02c8fb1650a6517cf1b60b537aaf/modules/sampler_hijack.py#L16C17-L16C17
+    https://arxiv.org/pdf/2407.01082
+    """
+    logits = logits / temp
+    probs = torch.softmax(logits, dim=-1)
+    top_probs, _ = probs.max(dim=-1, keepdim=True)
+    scaled_min_p = min_p * top_probs
+    tokens_to_remove = probs < scaled_min_p
+    sorted_indices = torch.argsort(logits, descending=True, dim=-1)
+    sorted_indices_to_remove = torch.gather(
+        tokens_to_remove, dim=-1, index=sorted_indices
+    )
+    if min_tokens_to_keep > 1:
+        sorted_indices_to_remove[..., :min_tokens_to_keep] = False
+
+    indices_to_remove = sorted_indices_to_remove.scatter(
+        1, sorted_indices, sorted_indices_to_remove
+    )
+    logits = logits.masked_fill(indices_to_remove, filter_value)
+    token = torch.multinomial(logits, num_samples=1)
+    return token.squeeze(0)
+
+
+class MoondreamModel(nn.Module):
+    def __init__(self, config: MoondreamConfig, dtype=torch.float16):
+        super().__init__()
+        self.config = config
+
+        self.tokenizer = Tokenizer.from_pretrained(
+            "vikhyatk/moondream2", revision="2024-08-26"
         )
-        self.region_model = RegionModel()
+        self.vision = build_vision_model(config.vision, dtype)
+        self.text = build_text_model(config.text, dtype)
 
-        if type(config.text_config) == dict:
-            phi_config = PhiConfig(
-                **config.text_config, attn_implementation=config._attn_implementation
-            )
-        else:
-            phi_config = config.text_config
-        self.text_model = PhiForCausalLM(phi_config)
+        # Region Model
+        self.region = nn.ModuleDict(
+            {
+                "coord_encoder": nn.Linear(
+                    config.region.coord_feat_dim, config.region.dim, dtype=dtype
+                ),
+                "coord_decoder": nn.ModuleDict(
+                    {
+                        "fc1": nn.Linear(
+                            config.region.dim, config.region.inner_dim, dtype=dtype
+                        ),
+                        "fc2": nn.Linear(
+                            config.region.inner_dim,
+                            config.region.coord_out_dim,
+                            dtype=dtype,
+                        ),
+                    }
+                ),
+                "size_encoder": nn.Linear(
+                    config.region.size_feat_dim, config.region.dim, dtype=dtype
+                ),
+                "size_decoder": nn.ModuleDict(
+                    {
+                        "fc1": nn.Linear(
+                            config.region.dim, config.region.inner_dim, dtype=dtype
+                        ),
+                        "fc2": nn.Linear(
+                            config.region.inner_dim,
+                            config.region.size_out_dim,
+                            dtype=dtype,
+                        ),
+                    }
+                ),
+            }
+        )
+        self.region.coord_features = nn.Parameter(
+            torch.empty(config.region.coord_feat_dim // 2, 1, dtype=dtype).T
+        )
+        self.region.size_features = nn.Parameter(
+            torch.empty(config.region.size_feat_dim // 2, 2, dtype=dtype).T
+        )
+
+        self.ops = {
+            "vision_encoder": vision_encoder,
+            "vision_projection": vision_projection,
+            "prefill": prefill,
+            "decode_one_token": decode_one_token,
+        }
 
     @property
     def device(self):
-        return self.text_model.device
+        return self.vision.pos_emb.device
 
-    def encode_image(self, image):
-        with torch.no_grad():
-            return self.vision_encoder(image)
+    def compile(self):
+        self.ops["vision_encoder"] = torch.compile(
+            self.ops["vision_encoder"], fullgraph=True
+        )
+        # Need to figure out how to mark the 'reconstructed' input shape as dynamic
+        # self.ops["vision_projection"] = torch.compile(
+        #     self.ops["vision_projection"], fullgraph=True
+        # )
+        self.ops["prefill"] = torch.compile(self.ops["prefill"], fullgraph=True)
+        self.ops["decode_one_token"] = torch.compile(
+            self.ops["decode_one_token"], fullgraph=True
+        )
 
-    def input_embeds(self, prompt, image_embeds, tokenizer):
-        def _tokenize(txt):
-            return tokenizer(
-                txt, return_tensors="pt", add_special_tokens=False
-            ).input_ids.to(self.device)
+    def _run_vision_encoder(self, image: Image.Image) -> torch.Tensor:
+        all_crops, tiling = prepare_crops(image, self.config.vision, device=self.device)
+        torch._dynamo.mark_dynamic(all_crops, 0)
 
-        text_emb = self.text_model.get_input_embeddings()
+        outputs = self.ops["vision_encoder"](all_crops, self.vision, self.config.vision)
 
-        # Add BOS token
-        embeds = []
-        embeds.append(
-            text_emb((torch.tensor([[tokenizer.bos_token_id]], device=self.device)))
+        global_features = outputs[0]
+        local_features = outputs[1:].view(
+            -1,
+            self.config.vision.enc_n_layers,
+            self.config.vision.enc_n_layers,
+            self.config.vision.enc_dim,
         )
 
-        if "<image>" not in prompt:
-            embeds.append(text_emb(_tokenize(prompt)))
-        else:
-            assert prompt.count("<image>") == 1
-            before, after = prompt.split("<image>")
-            if len(before) > 0:
-                embeds.append(text_emb(_tokenize(before)))
-            embeds.append(image_embeds.to(self.device))
-            if len(after) > 0:
-                embeds.append(text_emb(_tokenize(after)))
+        reconstructed = reconstruct_from_crops(
+            local_features,
+            tiling,
+            patch_size=1,
+            overlap_margin=self.config.vision.overlap_margin,
+        )
 
-        return torch.cat(embeds, dim=1)
+        return self.ops["vision_projection"](
+            global_features, reconstructed, self.vision, self.config.vision
+        )
 
-    def get_input_embeddings(self):
-        return self.text_model.get_input_embeddings()
+    def encode_image(self, image: Union[Image.Image, EncodedImage]) -> EncodedImage:
+        if isinstance(image, EncodedImage):
+            return image
+        elif not isinstance(image, Image.Image):
+            raise ValueError("image must be a PIL Image or EncodedImage")
 
-    def generate(
-        self,
-        image_embeds,
-        prompt,
-        tokenizer,
-        max_new_tokens=128,
-        **kwargs,
-    ):
-        generate_config = {
-            "eos_token_id": tokenizer.eos_token_id,
-            "bos_token_id": tokenizer.bos_token_id,
-            "pad_token_id": tokenizer.bos_token_id,
-            "max_new_tokens": max_new_tokens,
-            **kwargs,
-        }
+        # Run through text model in addition to the vision encoder, to minimize
+        # re-computation if multiple queries are performed on this image.
+        kv_cache = torch.zeros(
+            self.config.text.n_layers,
+            2,  # k, v
+            1,  # batch size
+            self.config.text.n_heads,
+            self.config.text.max_context,  # static cache
+            self.config.text.dim // self.config.text.n_heads,  # head dim
+            device=self.device,
+            dtype=torch.float16,
+        )
+        with torch.no_grad():
+            img_emb = self._run_vision_encoder(image)
+            bos_emb = text_encoder(
+                torch.tensor([[self.config.tokenizer.bos_id]], device=self.device),
+                self.text,
+            )
+            inputs_embeds = torch.cat([bos_emb, img_emb[None]], dim=1)
+            self.ops["prefill"](inputs_embeds, kv_cache, 0, self.text, self.config.text)
+        return EncodedImage(pos=inputs_embeds.size(1), kv_cache=kv_cache)
 
+    def _prefill_prompt(
+        self, kv_cache: torch.Tensor, prompt_tokens: torch.Tensor, pos: int
+    ):
         with torch.no_grad():
-            inputs_embeds = self.input_embeds(prompt, image_embeds, tokenizer)
-            attention_mask = torch.ones((inputs_embeds.shape[0], inputs_embeds.shape[1]), device=self.device)
-            output_ids = self.text_model.generate(
-                inputs_embeds=inputs_embeds,
-                attention_mask=attention_mask,
-                **generate_config,
+            prompt_emb = text_encoder(prompt_tokens, self.text)
+            hidden = self.ops["prefill"](
+                prompt_emb, kv_cache, pos, self.text, self.config.text
             )
+            logits = lm_head(hidden, self.text)
+            next_token = torch.argmax(logits, dim=-1)
+        pos = pos + prompt_emb.size(1)
+        return logits, hidden, next_token, pos
 
-        return tokenizer.batch_decode(output_ids, skip_special_tokens=True)
+    def _generate_text(
+        self,
+        prompt_tokens: torch.Tensor,
+        kv_cache: torch.Tensor,
+        pos: int,
+        max_tokens: int,
+    ):
+        kv_cache = kv_cache.clone()
+        _, _, next_token, pos = self._prefill_prompt(kv_cache, prompt_tokens, pos)
 
-    # Note: Not ready for use yet, intended for September release.
-    def caption(
+        def generator(next_token, pos):
+            generated_tokens = 0
+
+            while (
+                next_token_id := next_token.item()
+            ) != self.config.tokenizer.eos_id and generated_tokens < max_tokens:
+                yield self.tokenizer.decode([next_token_id])
+
+                with torch.no_grad():
+                    next_emb = text_encoder(next_token, self.text)
+                    logits, _, kv_cache_update = self.ops["decode_one_token"](
+                        next_emb, kv_cache, pos, self.text, self.config.text
+                    )
+                    kv_cache[:, :, :, :, pos : pos + kv_cache_update.size(-2), :] = (
+                        kv_cache_update
+                    )
+                    pos += 1
+                    next_token = torch.argmax(logits, dim=-1)
+                    generated_tokens += 1
+
+        return generator(next_token, pos)
+
+    def query(
         self,
-        images: List[Image.Image],
-        tokenizer,
-        length: Optional[Literal["short"]] = None,
-        **kwargs,
+        image: Union[Image.Image, EncodedImage],
+        question: str,
+        stream: bool = False,
+        settings: Optional[SamplingSettings] = None,
     ):
-        image_embeds = self.encode_image(images)
-
-        templated_prompts = [
-            f"<image>\n\n{'Short caption' if length == 'short' else 'Caption'}:" for _ in images
-        ]
-        inputs_embeds = torch.stack([
-            self.input_embeds(prompt, image_embed.unsqueeze(0), tokenizer)[0]
-            for prompt, image_embed in zip(templated_prompts, image_embeds)
-        ])
-        attention_mask = torch.ones((inputs_embeds.shape[0], inputs_embeds.shape[1]), device=self.device)
-
-        generate_config = {
-            "eos_token_id": tokenizer.eos_token_id,
-            "bos_token_id": tokenizer.bos_token_id,
-            "pad_token_id": tokenizer.bos_token_id,
-            "repetition_penalty": 1.2,
-            "max_new_tokens": 512,
-            **kwargs,
-        }
+        if self.config.tokenizer.templates["query"] is None:
+            raise NotImplementedError("Model does not support querying.")
 
-        with torch.no_grad():
-            output_ids = self.text_model.generate(
-                inputs_embeds=inputs_embeds,
-                attention_mask=attention_mask,
-                **generate_config,
-            )
+        image = self.encode_image(image)
+        prompt_tokens = torch.tensor(
+            [
+                self.config.tokenizer.templates["query"]["prefix"]
+                + self.tokenizer.encode(question).ids
+                + self.config.tokenizer.templates["query"]["suffix"]
+            ],
+            device=self.device,
+        )
 
-        return [
-            x.strip()
-            for x in tokenizer.batch_decode(output_ids, skip_special_tokens=True)
-        ]
+        max_tokens = DEFAULT_MAX_TOKENS
+        if settings:
+            max_tokens = settings.get("max_tokens", DEFAULT_MAX_TOKENS)
 
-    def answer_question(
+        def generator():
+            for token in self._generate_text(
+                prompt_tokens, image.kv_cache, image.pos, max_tokens
+            ):
+                yield token
+
+        if stream:
+            return {"answer": generator()}
+        else:
+            return {"answer": "".join(list(generator()))}
+
+    def caption(
         self,
-        image_embeds,
-        question,
-        tokenizer,
-        chat_history="",
-        result_queue=None,
-        max_new_tokens=256,
-        **kwargs,
+        image: Union[Image.Image, EncodedImage],
+        length: Literal["normal", "short"] = "normal",
+        stream: bool = False,
+        settings: Optional[SamplingSettings] = None,
     ):
-        prompt = f"<image>\n\n{chat_history}Question: {question}\n\nAnswer:"
-        answer = self.generate(
-            image_embeds,
-            prompt,
-            tokenizer=tokenizer,
-            max_new_tokens=max_new_tokens,
-            **kwargs,
-        )[0]
-        cleaned_answer = answer.strip()
-
-        # Use the result_queue to pass the result if it is provided
-        if result_queue:
-            result_queue.put(cleaned_answer)
+        if self.config.tokenizer.templates["caption"] is None:
+            raise NotImplementedError("Model does not support captioning.")
+        if length not in self.config.tokenizer.templates["caption"]:
+            raise ValueError(f"Model does not support caption length '{length}'.")
+
+        image = self.encode_image(image)
+        prompt_tokens = torch.tensor(
+            [self.config.tokenizer.templates["caption"][length]], device=self.device
+        )
+
+        max_tokens = DEFAULT_MAX_TOKENS
+        if settings:
+            max_tokens = settings.get("max_tokens", DEFAULT_MAX_TOKENS)
+
+        def generator():
+            for token in self._generate_text(
+                prompt_tokens, image.kv_cache, image.pos, max_tokens
+            ):
+                yield token
+
+        if stream:
+            return {"caption": generator()}
         else:
-            return cleaned_answer
+            return {"caption": "".join(list(generator()))}
 
-    def batch_answer(
+    def _generate_points(
         self,
-        images,
-        prompts,
-        tokenizer,
-        **kwargs,
+        hidden: torch.Tensor,
+        kv_cache: torch.Tensor,
+        next_token: torch.Tensor,
+        pos: int,
+        include_size: bool = True,
+        max_points: int = 50,
     ):
-        image_embeds = self.encode_image(images)
+        out = []
 
-        templated_prompts = [
-            f"<image>\n\nQuestion: {prompt}\n\nAnswer:" for prompt in prompts
-        ]
-        prompt_embs = [
-            self.input_embeds(prompt, image_embed.unsqueeze(0), tokenizer)[0]
-            for prompt, image_embed in zip(templated_prompts, image_embeds)
-        ]
+        with torch.no_grad():
+            while (
+                next_token.item() != self.config.tokenizer.eos_id
+                and len(out) < max_points
+            ):
+                x_logits = decode_coordinate(hidden, self.region)
+                x_center = torch.argmax(x_logits, dim=-1) / x_logits.size(-1)
+                next_emb = encode_coordinate(
+                    x_center.to(dtype=x_logits.dtype), self.region
+                )
 
-        bos_emb = prompt_embs[0][0]
-        max_len = max([p.shape[0] for p in prompt_embs])
+                # Decode y-coordinate
+                _, hidden, kv_cache_update = self.ops["decode_one_token"](
+                    next_emb, kv_cache, pos, self.text, self.config.text
+                )
+                kv_cache[:, :, :, :, pos : pos + kv_cache_update.size(-2), :] = (
+                    kv_cache_update
+                )
+                pos += 1
+                y_logits = decode_coordinate(hidden, self.region)
+                y_center = torch.argmax(y_logits, dim=-1) / y_logits.size(-1)
+                next_emb = encode_coordinate(
+                    y_center.to(dtype=y_logits.dtype), self.region
+                )
+
+                # Decode size
+                if include_size:
+                    logits, hidden, kv_cache_update = self.ops["decode_one_token"](
+                        next_emb, kv_cache, pos, self.text, self.config.text
+                    )
+                    kv_cache[:, :, :, :, pos : pos + kv_cache_update.size(-2), :] = (
+                        kv_cache_update
+                    )
+                    pos += 1
+                    size_logits = decode_size(hidden, self.region)
+                    w = torch.argmax(size_logits[0], dim=-1) / size_logits.size(-1)
+                    h = torch.argmax(size_logits[1], dim=-1) / size_logits.size(-1)
+                    next_emb = encode_size(
+                        torch.tensor(
+                            [w, h], device=self.device, dtype=size_logits.dtype
+                        ),
+                        self.region,
+                    )[None]
+
+                    # Add object
+                    out.append(
+                        {
+                            "x_min": x_center.item() - w.item() / 2,
+                            "y_min": y_center.item() - h.item() / 2,
+                            "x_max": x_center.item() + w.item() / 2,
+                            "y_max": y_center.item() + h.item() / 2,
+                        }
+                    )
+                else:
+                    out.append({"x": x_center.item(), "y": y_center.item()})
+
+                # Decode next token (x-coordinate, or eos)
+                logits, hidden, kv_cache_update = self.ops["decode_one_token"](
+                    next_emb, kv_cache, pos, self.text, self.config.text
+                )
+                kv_cache[:, :, :, :, pos : pos + kv_cache_update.size(-2), :] = (
+                    kv_cache_update
+                )
+                pos += 1
+                next_token = torch.argmax(logits, dim=-1)
 
-        inputs_embeds = torch.cat(
+        return out
+
+    def detect(
+        self,
+        image: Union[Image.Image, EncodedImage],
+        object: str,
+        settings: Optional[SamplingSettings] = None,
+    ):
+        if self.config.tokenizer.templates["detect"] is None:
+            raise NotImplementedError("Model does not support object detection.")
+
+        image = self.encode_image(image)
+        prompt_tokens = torch.tensor(
             [
-                torch.cat([bos_emb.repeat(max_len - p.shape[0], 1), p]).unsqueeze(0)
-                for p in prompt_embs
+                self.config.tokenizer.templates["detect"]["prefix"]
+                + self.tokenizer.encode(object).ids
+                + self.config.tokenizer.templates["detect"]["suffix"]
             ],
-            dim=0,
+            device=self.device,
         )
-        attention_mask = torch.cat(
+
+        kv_cache = image.kv_cache.clone()
+        _, hidden, next_token, pos = self._prefill_prompt(
+            kv_cache, prompt_tokens, image.pos
+        )
+        hidden = hidden[:, -1:, :]
+
+        objects = self._generate_points(
+            hidden, kv_cache, next_token, pos, include_size=True, max_points=50
+        )
+
+        return {"objects": objects}
+
+    def point(
+        self,
+        image: Union[Image.Image, EncodedImage],
+        object: str,
+        settings: Optional[SamplingSettings] = None,
+    ):
+        if self.config.tokenizer.templates["point"] is None:
+            raise NotImplementedError("Model does not support pointing.")
+
+        image = self.encode_image(image)
+        prompt_tokens = torch.tensor(
             [
-                torch.cat(
-                    [
-                        torch.zeros(
-                            1,
-                            max_len - p.shape[0],
-                            device=self.device,
-                            dtype=torch.long,
-                        ),
-                        torch.ones(1, p.shape[0], device=self.device, dtype=torch.long),
-                    ],
-                    dim=1,
-                )
-                for p in prompt_embs
+                self.config.tokenizer.templates["point"]["prefix"]
+                + self.tokenizer.encode(object).ids
+                + self.config.tokenizer.templates["point"]["suffix"]
             ],
-            dim=0,
+            device=self.device,
         )
 
-        generate_config = {
-            "eos_token_id": tokenizer.eos_token_id,
-            "bos_token_id": tokenizer.bos_token_id,
-            "pad_token_id": tokenizer.bos_token_id,
-            "max_new_tokens": 512,
-            **kwargs,
-        }
+        kv_cache = image.kv_cache.clone()
+        _, hidden, next_token, pos = self._prefill_prompt(
+            kv_cache, prompt_tokens, image.pos
+        )
+        hidden = hidden[:, -1:, :]
 
+        objects = self._generate_points(
+            hidden, kv_cache, next_token, pos, include_size=False, max_points=50
+        )
+
+        return {"points": objects}
+
+    def _detect_gaze(
+        self,
+        image: EncodedImage,
+        source: Tuple[float, float],
+        force_detect: bool = False,
+    ):
         with torch.no_grad():
-            output_ids = self.text_model.generate(
-                inputs_embeds=inputs_embeds,
-                attention_mask=attention_mask,
-                **generate_config,
+            before_emb = text_encoder(
+                torch.tensor(
+                    [self.tokenizer.encode("\n\nPoint:").ids], device=self.device
+                ),
+                self.text,
+            )
+            after_emb = text_encoder(
+                torch.tensor(
+                    [self.tokenizer.encode(" gaze\n\n").ids], device=self.device
+                ),
+                self.text,
+            )
+            x_emb = encode_coordinate(
+                torch.tensor([[[source[0]]]], device=self.device, dtype=torch.float16),
+                self.region,
+            )
+            y_emb = encode_coordinate(
+                torch.tensor([[[source[1]]]], device=self.device, dtype=torch.float16),
+                self.region,
+            )
+
+            prompt_emb = torch.cat([before_emb, x_emb, y_emb, after_emb], dim=1)
+
+            kv_cache = image.kv_cache.clone()
+            hidden = self.ops["prefill"](
+                prompt_emb, kv_cache, image.pos, self.text, self.config.text
+            )
+            logits = lm_head(hidden, self.text)
+            next_token = torch.argmax(logits, dim=-1)
+            pos = image.pos + prompt_emb.size(1)
+            hidden = hidden[:, -1:, :]
+
+            if force_detect:
+                next_token = torch.tensor([[0]], device=self.device)
+
+            if next_token.item() == self.config.tokenizer.eos_id:
+                return None
+
+            gaze = self._generate_points(
+                hidden, kv_cache, next_token, pos, include_size=False, max_points=1
+            )
+            return gaze[0]
+
+    def detect_gaze(
+        self,
+        image: Union[Image.Image, EncodedImage],
+        eye: Optional[Tuple[float, float]] = None,
+        face: Optional[Dict[str, float]] = None,
+        unstable_settings: Dict[str, Any] = {},
+    ):
+        if "force_detect" in unstable_settings:
+            force_detect = unstable_settings["force_detect"]
+        else:
+            force_detect = False
+
+        if "prioritize_accuracy" in unstable_settings:
+            prioritize_accuracy = unstable_settings["prioritize_accuracy"]
+        else:
+            prioritize_accuracy = False
+
+        if not prioritize_accuracy:
+            if eye is None:
+                raise ValueError("eye must be provided when prioritize_accuracy=False")
+            image = self.encode_image(image)
+            return {"gaze": self._detect_gaze(image, eye, force_detect=force_detect)}
+        else:
+            if (
+                not isinstance(image, Image.Image)
+                and "flip_enc_img" not in unstable_settings
+            ):
+                raise ValueError(
+                    "image must be a PIL Image when prioritize_accuracy=True, "
+                    "or flip_enc_img must be provided"
+                )
+            if face is None:
+                raise ValueError("face must be provided when prioritize_accuracy=True")
+
+            encoded_image = self.encode_image(image)
+            if (
+                isinstance(image, Image.Image)
+                and "flip_enc_img" not in unstable_settings
+            ):
+                flipped_pil = image.copy()
+                flipped_pil = flipped_pil.transpose(method=Image.FLIP_LEFT_RIGHT)
+                encoded_flipped_image = self.encode_image(flipped_pil)
+            else:
+                encoded_flipped_image = unstable_settings["flip_enc_img"]
+
+            N = 10
+
+            detections = [
+                self._detect_gaze(
+                    encoded_image,
+                    (
+                        random.uniform(face["x_min"], face["x_max"]),
+                        random.uniform(face["y_min"], face["y_max"]),
+                    ),
+                    force_detect=force_detect,
+                )
+                for _ in range(N)
+            ]
+            detections = [
+                (gaze["x"], gaze["y"]) for gaze in detections if gaze is not None
+            ]
+            flipped_detections = [
+                self._detect_gaze(
+                    encoded_flipped_image,
+                    (
+                        1 - random.uniform(face["x_min"], face["x_max"]),
+                        random.uniform(face["y_min"], face["y_max"]),
+                    ),
+                    force_detect=force_detect,
+                )
+                for _ in range(N)
+            ]
+            detections.extend(
+                [
+                    (1 - gaze["x"], gaze["y"])
+                    for gaze in flipped_detections
+                    if gaze is not None
+                ]
             )
 
-        return [
-            x.strip()
-            for x in tokenizer.batch_decode(output_ids, skip_special_tokens=True)
-        ]
+            if len(detections) < N:
+                return {"gaze": None}
+
+            detections = remove_outlier_points(detections)
+            mean_gaze = (
+                sum(gaze[0] for gaze in detections) / len(detections),
+                sum(gaze[1] for gaze in detections) / len(detections),
+            )
 
-    def detect(self, image: Image.Image, query: str, tokenizer):
-        pass
+            return {"gaze": {"x": mean_gaze[0], "y": mean_gaze[1]}}

region.py

@@ -0,0 +1,82 @@
+import torch
+import math
+
+from .weights import RegionModel
+from .layers import linear, mlp
+
+
+def fourier_features(x: torch.Tensor, w: torch.Tensor) -> torch.Tensor:
+    """
+    Applies Fourier feature mapping to input tensor x using frequency matrix w. This
+    projects inputs through sinusoidal functions to create higher dimensional features
+    that help mitigate spectral bias - the tendency of neural networks to learn
+    low-frequency functions more easily than high-frequency ones. By explicitly
+    mapping inputs to higher frequencies through sin/cos transformations, we enable
+    better learning of fine details and higher frequency patterns.
+
+    Args:
+        x: Input tensor to transform
+        w: Matrix of frequencies for the Fourier features transformation
+
+    Returns:
+        Concatenated cosine and sine transformed features as a tensor
+    """
+    f = 2 * math.pi * x @ w
+    return torch.cat([f.cos(), f.sin()], dim=-1)
+
+
+def encode_coordinate(coord: torch.Tensor, w: RegionModel) -> torch.Tensor:
+    """
+    Takes as input a tensor containing a single float coordinate value (x or y)
+    and encodes it into hidden states for input to the text model.
+
+    Args:
+        coord: Tensor with single float coordinate value
+
+    Returns:
+        Encoded hidden states tensor for input to text model
+    """
+    return linear(fourier_features(coord, w.coord_features), w.coord_encoder)
+
+
+def decode_coordinate(hidden_state: torch.Tensor, w: RegionModel) -> torch.Tensor:
+    """
+    Takes as input the last hidden state from the text model and outputs a single logit
+    representing either an x or y coordinate prediction.
+
+    Args:
+        hidden_state: The final hidden state tensor from the text model.
+
+    Returns:
+        A single logit representing the predicted coordinate value (x or y)
+    """
+    return mlp(hidden_state, w.coord_decoder)
+
+
+def encode_size(size: torch.Tensor, w: RegionModel) -> torch.Tensor:
+    """
+    Takes a tensor containing normalized width and height values in range [0,1]
+    and encodes them into hidden states for input to the text model.
+
+    Args:
+        size: Tensor with two floats for width and height in range [0,1]
+
+    Returns:
+        Encoded hidden states tensor for input to text model
+    """
+    return linear(fourier_features(size, w.size_features), w.size_encoder)
+
+
+def decode_size(hidden_state: torch.Tensor, w: RegionModel) -> torch.Tensor:
+    """
+    Takes as input the last hidden state from the text model and outputs two logits
+    for width and height respectively.
+
+    Args:
+        hidden_state: The final hidden state tensor from the text model.
+
+    Returns:
+        A tensor containing two logits - one for predicted width and one for
+        predicted height.
+    """
+    return mlp(hidden_state, w.size_decoder).view(2, -1)

rope.py

@@ -0,0 +1,48 @@
+# Ethically sourced from https://github.com/xjdr-alt/entropix
+
+import torch
+
+
+def precompute_freqs_cis(
+    dim: int,
+    end: int,
+    theta: float = 10000.0,
+    use_scaled: bool = False,
+    dtype: torch.dtype = torch.float32,
+) -> torch.Tensor:
+    freqs = 1.0 / (theta ** (torch.arange(0, dim, 2, dtype=dtype)[: (dim // 2)] / dim))
+    t = torch.arange(end, dtype=dtype).unsqueeze(1)
+    freqs = t * freqs.unsqueeze(0)
+    freqs = torch.exp(1j * freqs)
+    return torch.stack([freqs.real, freqs.imag], dim=-1)
+
+
+def apply_rotary_emb(
+    x: torch.Tensor,
+    freqs_cis: torch.Tensor,
+    position_ids: torch.Tensor,
+    num_heads: int,
+    rot_dim: int = 32,
+    interleave: bool = False,
+) -> torch.Tensor:
+    assert rot_dim == freqs_cis.shape[-2] * 2
+    assert num_heads == x.shape[1]
+
+    x_rot, x_pass = x[..., :rot_dim], x[..., rot_dim:]
+
+    if interleave:
+        xq_r = x_rot.float().reshape(*x_rot.shape[:-1], -1, 2)[..., 0]
+        xq_i = x_rot.float().reshape(*x_rot.shape[:-1], -1, 2)[..., 1]
+    else:
+        d_q = x_rot.shape[-1] // 2
+        xq_r, xq_i = x_rot[..., :d_q], x_rot[..., d_q:]
+
+    freqs_cos = freqs_cis[..., 0][position_ids, :].unsqueeze(0).unsqueeze(0)
+    freqs_sin = freqs_cis[..., 1][position_ids, :].unsqueeze(0).unsqueeze(0)
+
+    # Complex multiplication: (a + bi) * (c + di) = (ac - bd) + (ad + bc)i
+    xq_out_r = xq_r * freqs_cos - xq_i * freqs_sin
+    xq_out_i = xq_r * freqs_sin + xq_i * freqs_cos
+    xq_out = torch.stack((xq_out_r, xq_out_i), dim=-1).flatten(-2)
+
+    return torch.cat([xq_out.to(x.dtype), x_pass], dim=-1)

text.py

@@ -0,0 +1,167 @@
+import torch
+import torch.nn as nn
+from torch.nn import functional as F
+
+from .layers import layer_norm, linear, mlp
+from .rope import apply_rotary_emb, precompute_freqs_cis
+from .weights import AttentionWeights
+from .config import TextConfig
+
+
+def text_encoder(input_ids: torch.Tensor, w: nn.Module):
+    return F.embedding(input_ids, w.wte)
+
+
+def attn(
+    x: torch.Tensor,
+    w: AttentionWeights,
+    freqs_cis: torch.Tensor,
+    layer_kv_cache: torch.Tensor,
+    attn_mask: torch.Tensor,
+    n_heads: int,
+    pos: int,
+):
+    bsz, q_len, d_model = x.shape
+    head_dim = d_model // n_heads
+
+    q, k, v = [
+        t.view(bsz, q_len, n_heads, head_dim).transpose(1, 2)
+        for t in linear(x, w.qkv).chunk(3, dim=-1)
+    ]
+
+    position_ids = torch.arange(pos, pos + q_len, dtype=torch.long)
+    q = apply_rotary_emb(q, freqs_cis, position_ids, n_heads)
+    k = apply_rotary_emb(k, freqs_cis, position_ids, n_heads)
+
+    k_, v_ = k, v
+    if layer_kv_cache is not None:
+        k = torch.cat([layer_kv_cache[0, :, :, :pos, :], k], dim=2)
+        v = torch.cat([layer_kv_cache[1, :, :, :pos, :], v], dim=2)
+
+    out = F.scaled_dot_product_attention(q, k, v, attn_mask=attn_mask).to(
+        # This type conversion isn't needed when running in PyTorch directly, but the
+        # ONNX export runs attention in float32 because the attention mask is cast to
+        # float32.
+        x.dtype
+    )
+    out = out.transpose(1, 2).reshape(bsz, q_len, d_model)
+    out = linear(out, w.proj)
+    return out, torch.stack([k_, v_])
+
+
+def text_decoder(
+    inputs_embeds: torch.Tensor,
+    w: nn.Module,
+    kv_cache: torch.Tensor,
+    pos: int,
+    config: TextConfig,
+):
+    hidden_BTC = inputs_embeds
+    new_kv_cache = [torch.empty(0)] * len(w.blocks)
+
+    attn_mask = w.attn_mask[
+        :, :, pos : pos + hidden_BTC.size(1), : pos + hidden_BTC.size(1)
+    ]
+
+    for i, block in enumerate(w.blocks):
+        l_in = layer_norm(hidden_BTC, block.ln)
+        l_attn, new_kv_cache[i] = attn(
+            l_in,
+            block.attn,
+            freqs_cis=w.freqs_cis,
+            layer_kv_cache=kv_cache[i],
+            attn_mask=attn_mask,
+            n_heads=config.n_heads,
+            pos=pos,
+        )
+        l_mlp = mlp(l_in, block.mlp)
+        hidden_BTC = hidden_BTC + l_attn + l_mlp
+
+    return hidden_BTC, torch.stack(new_kv_cache)
+
+
+def lm_head(hidden_BTC: torch.Tensor, w: nn.Module):
+    hidden_BC = hidden_BTC[:, -1, :]
+    hidden_BC = layer_norm(hidden_BC, w.post_ln)
+    logits = linear(hidden_BC, w.lm_head)
+    return logits
+
+
+def prefill(
+    inputs_embeds: torch.Tensor,
+    kv_cache: torch.Tensor,
+    pos: int,
+    w: nn.Module,
+    config: TextConfig,
+):
+    # Updates kv_cache in-place
+    hidden, kv_cache[:, :, :, :, pos : pos + inputs_embeds.size(1), :] = text_decoder(
+        inputs_embeds, w, kv_cache, pos, config
+    )
+    return hidden
+
+
+def decode_one_token(
+    token_emb: torch.Tensor,
+    kv_cache: torch.Tensor,
+    pos: int,
+    w: nn.Module,
+    config: TextConfig,
+):
+    hidden, kv_cache_update = text_decoder(token_emb[None], w, kv_cache, pos, config)
+    logits = lm_head(hidden, w)
+    return logits, hidden, kv_cache_update
+
+
+def build_text_model(config: TextConfig, dtype: torch.dtype) -> nn.Module:
+    text = nn.ModuleDict(
+        {
+            "blocks": nn.ModuleList(
+                [
+                    nn.ModuleDict(
+                        {
+                            "ln": nn.LayerNorm(config.dim, dtype=dtype),
+                            "attn": nn.ModuleDict(
+                                {
+                                    "qkv": nn.Linear(
+                                        config.dim, 3 * config.dim, dtype=dtype
+                                    ),
+                                    "proj": nn.Linear(
+                                        config.dim, config.dim, dtype=dtype
+                                    ),
+                                }
+                            ),
+                            "mlp": nn.ModuleDict(
+                                {
+                                    "fc1": nn.Linear(
+                                        config.dim, 4 * config.dim, dtype=dtype
+                                    ),
+                                    "fc2": nn.Linear(
+                                        4 * config.dim, config.dim, dtype=dtype
+                                    ),
+                                }
+                            ),
+                        }
+                    )
+                    for _ in range(config.n_layers)
+                ]
+            ),
+            "post_ln": nn.LayerNorm(config.dim, dtype=dtype),
+            "lm_head": nn.Linear(config.dim, config.vocab_size, dtype=dtype),
+        }
+    )
+    text.wte = nn.Parameter(torch.empty(config.vocab_size, config.dim, dtype=dtype))
+    text.register_buffer(
+        "freqs_cis",
+        precompute_freqs_cis(config.dim // (2 * config.n_heads), config.max_context),
+        persistent=False,
+    )
+
+    attn_mask = torch.tril(
+        torch.ones(1, 1, config.max_context, config.max_context, dtype=torch.bool)
+    )
+    if config.prefix_attn != 0:
+        attn_mask[..., : config.prefix_attn, : config.prefix_attn] = 1
+    text.register_buffer("attn_mask", attn_mask, persistent=False)
+
+    return text

utils.py

@@ -0,0 +1,41 @@
+import numpy as np
+
+
+def remove_outlier_points(points_tuples, k_nearest=2, threshold=2.0):
+    """
+    Robust outlier detection for list of (x,y) tuples.
+    Only requires numpy.
+
+    Args:
+        points_tuples: list of (x,y) tuples
+        k_nearest: number of neighbors to consider
+        threshold: multiplier for median distance
+
+    Returns:
+        list: filtered list of (x,y) tuples with outliers removed
+        list: list of booleans indicating which points were kept (True = kept)
+    """
+    points = np.array(points_tuples)
+    n_points = len(points)
+
+    # Calculate pairwise distances manually
+    dist_matrix = np.zeros((n_points, n_points))
+    for i in range(n_points):
+        for j in range(i + 1, n_points):
+            # Euclidean distance between points i and j
+            dist = np.sqrt(np.sum((points[i] - points[j]) ** 2))
+            dist_matrix[i, j] = dist
+            dist_matrix[j, i] = dist
+
+    # Get k nearest neighbors' distances
+    k = min(k_nearest, n_points - 1)
+    neighbor_distances = np.partition(dist_matrix, k, axis=1)[:, :k]
+    avg_neighbor_dist = np.mean(neighbor_distances, axis=1)
+
+    # Calculate mask using median distance
+    median_dist = np.median(avg_neighbor_dist)
+    mask = avg_neighbor_dist <= threshold * median_dist
+
+    # Return filtered tuples and mask
+    filtered_tuples = [t for t, m in zip(points_tuples, mask) if m]
+    return filtered_tuples

vision.py

@@ -0,0 +1,133 @@
+import torch
+import torch.nn as nn
+import torch.nn.functional as F
+import numpy as np
+
+from typing import Union, Tuple
+from einops import rearrange
+from PIL import Image
+
+from .layers import attn, layer_norm, linear, mlp
+from .image_crops import overlap_crop_image
+from .config import VisionConfig
+
+if torch.backends.mps.is_available():
+    # Non-divisible input sizes are not implemented on MPS device yet.
+    # https://github.com/pytorch/pytorch/issues/96056
+    def adaptive_avg_pool2d(input, output_size):
+        return F.adaptive_avg_pool2d(input.to("cpu"), output_size).to("mps")
+
+else:
+    adaptive_avg_pool2d = F.adaptive_avg_pool2d
+
+DeviceLike = Union[str, torch.device, int]
+
+
+def prepare_crops(
+    image: Image.Image, config: VisionConfig, device: DeviceLike
+) -> Tuple[torch.Tensor, Tuple[int, int]]:
+    np_image = np.array(image.convert("RGB"))
+    overlap_crops = overlap_crop_image(
+        np_image, max_crops=config.max_crops, overlap_margin=config.overlap_margin
+    )
+    all_crops = overlap_crops["crops"]
+    all_crops = np.transpose(all_crops, (0, 3, 1, 2))
+    all_crops = (
+        torch.from_numpy(all_crops)
+        .to(device=device, dtype=torch.float16)
+        .div_(255.0)
+        .sub_(0.5)
+        .div_(0.5)
+    )
+    return all_crops, overlap_crops["tiling"]
+
+
+def vision_encoder(input_BCHW: torch.Tensor, w: nn.Module, config: VisionConfig):
+    x = rearrange(
+        input_BCHW,
+        "b c (h p1) (w p2) -> b (h w) (c p1 p2)",
+        p1=config.enc_patch_size,
+        p2=config.enc_patch_size,
+    )  # B3HW -> B(HxW)(3xP1xP2), aka BTC
+
+    x = linear(x, w.patch_emb)
+    x = x + w.pos_emb
+    for block in w.blocks:
+        x = x + attn(layer_norm(x, block.ln1), block.attn, n_heads=config.enc_n_heads)
+        x = x + mlp(layer_norm(x, block.ln2), block.mlp)
+    x = layer_norm(x, w.post_ln)
+
+    return x
+
+
+def vision_projection(
+    global_features: torch.Tensor,
+    reconstructed: torch.Tensor,
+    w: nn.Module,
+    config: VisionConfig,
+):
+    reconstructed = reconstructed.permute(2, 0, 1)
+    reconstructed = adaptive_avg_pool2d(
+        reconstructed, output_size=(config.enc_n_layers, config.enc_n_layers)
+    )
+    reconstructed = reconstructed.permute(1, 2, 0).view(729, config.enc_dim)
+    final_features = torch.cat([global_features, reconstructed], dim=-1)
+    return mlp(final_features, w.proj_mlp)
+
+
+def build_vision_model(config: VisionConfig, dtype: torch.dtype):
+    patch_dim = config.enc_patch_size * config.enc_patch_size * config.in_channels
+    grid_size = config.crop_size // config.enc_patch_size
+    num_patches = grid_size * grid_size
+
+    vision = nn.ModuleDict(
+        {
+            "patch_emb": nn.Linear(patch_dim, config.enc_dim, dtype=dtype),
+            "blocks": nn.ModuleList(
+                [
+                    nn.ModuleDict(
+                        {
+                            "ln1": nn.LayerNorm(config.enc_dim, dtype=dtype),
+                            "attn": nn.ModuleDict(
+                                {
+                                    "qkv": nn.Linear(
+                                        config.enc_dim, 3 * config.enc_dim, dtype=dtype
+                                    ),
+                                    "proj": nn.Linear(
+                                        config.enc_dim, config.enc_dim, dtype=dtype
+                                    ),
+                                }
+                            ),
+                            "ln2": nn.LayerNorm(config.enc_dim, dtype=dtype),
+                            "mlp": nn.ModuleDict(
+                                {
+                                    "fc1": nn.Linear(
+                                        config.enc_dim, config.enc_ff_dim, dtype=dtype
+                                    ),
+                                    "fc2": nn.Linear(
+                                        config.enc_ff_dim, config.enc_dim, dtype=dtype
+                                    ),
+                                }
+                            ),
+                        }
+                    )
+                    for _ in range(config.enc_n_layers)
+                ]
+            ),
+            "post_ln": nn.LayerNorm(config.enc_dim, dtype=dtype),
+            "proj_mlp": nn.ModuleDict(
+                {
+                    "fc1": nn.Linear(
+                        config.enc_dim * 2, config.proj_inner_dim, dtype=dtype
+                    ),
+                    "fc2": nn.Linear(
+                        config.proj_inner_dim, config.proj_out_dim, dtype=dtype
+                    ),
+                }
+            ),
+        }
+    )
+    vision.pos_emb = nn.Parameter(
+        torch.zeros(1, num_patches, config.enc_dim, dtype=dtype)
+    )
+    return vision

weights.py

@@ -0,0 +1,292 @@
+import safetensors
+import torch
+import torch.nn as nn
+
+from contextlib import contextmanager
+from dataclasses import dataclass
+from typing import Callable, List
+
+from .layers import AttentionWeights, LayerNormWeights, LinearWeights, MLPWeights
+
+
+@dataclass
+class VisionBlock:
+    ln1: LayerNormWeights
+    attn: AttentionWeights
+    ln2: LayerNormWeights
+    mlp: MLPWeights
+
+
+@dataclass
+class VisionModel:
+    patch_emb: LinearWeights
+    pos_emb: torch.Tensor
+    blocks: List[VisionBlock]
+    post_ln: LayerNormWeights
+    proj_mlp: MLPWeights
+
+
+@dataclass
+class TextBlock:
+    ln: LayerNormWeights
+    attn: AttentionWeights
+    mlp: MLPWeights
+
+
+@dataclass
+class TextModel:
+    wte: torch.Tensor
+    blocks: List[TextBlock]
+    post_ln: LayerNormWeights
+    lm_head: LinearWeights
+
+
+@dataclass
+class RegionModel:
+    coord_features: torch.Tensor
+    coord_encoder: LinearWeights
+    coord_decoder: MLPWeights
+    size_features: torch.Tensor
+    size_encoder: LinearWeights
+    size_decoder: MLPWeights
+
+
+@dataclass
+class MoondreamModel:
+    vision: VisionModel
+    text: TextModel
+    region: RegionModel
+
+
+@contextmanager
+def safetensors_open(safetensors_file: str):
+    """
+    Simplify interfacing with safetensors files. Eliminates the need to ignore
+    type errors when using the `safe_open` function.
+    """
+    with safetensors.safe_open(
+        safetensors_file, framework="pt"
+    ) as st:  # pyright: ignore
+
+        def get_tensor(name: str) -> torch.Tensor:
+            return st.get_tensor(name)
+
+        def get_keys() -> List[str]:
+            return st.keys()
+
+        get_tensor.keys = get_keys
+
+        yield get_tensor
+
+
+def _load_weights(get_tensor: Callable[[str], torch.Tensor], model: nn.Module) -> None:
+    """Internal function to load weights using a tensor getter function."""
+    model = model.to(dtype=torch.float16)
+
+    # Vision Model
+    model.vision["patch_emb"].weight.data.copy_(
+        get_tensor("vision_encoder.encoder.model.visual.patch_embed.linear.weight")
+    )
+    model.vision["patch_emb"].bias.data.copy_(
+        get_tensor("vision_encoder.encoder.model.visual.patch_embed.linear.bias")
+    )
+    model.vision.pos_emb.data.copy_(
+        get_tensor("vision_encoder.encoder.model.visual.pos_embed")
+    )
+
+    for i in range(len(model.vision["blocks"])):
+        prefix = f"vision_encoder.encoder.model.visual.blocks.{i}"
+
+        # Layer norms
+        model.vision["blocks"][i]["ln1"].weight.data.copy_(
+            get_tensor(f"{prefix}.norm1.weight")
+        )
+        model.vision["blocks"][i]["ln1"].bias.data.copy_(
+            get_tensor(f"{prefix}.norm1.bias")
+        )
+        model.vision["blocks"][i]["ln2"].weight.data.copy_(
+            get_tensor(f"{prefix}.norm2.weight")
+        )
+        model.vision["blocks"][i]["ln2"].bias.data.copy_(
+            get_tensor(f"{prefix}.norm2.bias")
+        )
+
+        # Attention
+        model.vision["blocks"][i]["attn"]["qkv"].weight.data.copy_(
+            get_tensor(f"{prefix}.attn.qkv.weight")
+        )
+        model.vision["blocks"][i]["attn"]["qkv"].bias.data.copy_(
+            get_tensor(f"{prefix}.attn.qkv.bias")
+        )
+        model.vision["blocks"][i]["attn"]["proj"].weight.data.copy_(
+            get_tensor(f"{prefix}.attn.proj.weight")
+        )
+        model.vision["blocks"][i]["attn"]["proj"].bias.data.copy_(
+            get_tensor(f"{prefix}.attn.proj.bias")
+        )
+
+        # MLP
+        model.vision["blocks"][i]["mlp"]["fc1"].weight.data.copy_(
+            get_tensor(f"{prefix}.mlp.fc1.weight")
+        )
+        model.vision["blocks"][i]["mlp"]["fc1"].bias.data.copy_(
+            get_tensor(f"{prefix}.mlp.fc1.bias")
+        )
+        model.vision["blocks"][i]["mlp"]["fc2"].weight.data.copy_(
+            get_tensor(f"{prefix}.mlp.fc2.weight")
+        )
+        model.vision["blocks"][i]["mlp"]["fc2"].bias.data.copy_(
+            get_tensor(f"{prefix}.mlp.fc2.bias")
+        )
+
+    model.vision["post_ln"].weight.data.copy_(
+        get_tensor("vision_encoder.encoder.model.visual.norm.weight")
+    )
+    model.vision["post_ln"].bias.data.copy_(
+        get_tensor("vision_encoder.encoder.model.visual.norm.bias")
+    )
+
+    model.vision["proj_mlp"]["fc1"].weight.data.copy_(
+        get_tensor("vision_encoder.projection.mlp.fc1.weight")
+    )
+    model.vision["proj_mlp"]["fc1"].bias.data.copy_(
+        get_tensor("vision_encoder.projection.mlp.fc1.bias")
+    )
+    model.vision["proj_mlp"]["fc2"].weight.data.copy_(
+        get_tensor("vision_encoder.projection.mlp.fc2.weight")
+    )
+    model.vision["proj_mlp"]["fc2"].bias.data.copy_(
+        get_tensor("vision_encoder.projection.mlp.fc2.bias")
+    )
+
+    # Text Model
+    model.text.wte.data.copy_(get_tensor("text_model.transformer.embd.wte.weight"))
+
+    for i in range(len(model.text["blocks"])):
+        prefix = f"text_model.transformer.h.{i}"
+
+        # Layer norm
+        model.text["blocks"][i]["ln"].weight.data.copy_(
+            get_tensor(f"{prefix}.ln.weight")
+        )
+        model.text["blocks"][i]["ln"].bias.data.copy_(get_tensor(f"{prefix}.ln.bias"))
+
+        # Attention
+        model.text["blocks"][i]["attn"]["qkv"].weight.data.copy_(
+            get_tensor(f"{prefix}.mixer.Wqkv.weight")
+        )
+        model.text["blocks"][i]["attn"]["qkv"].bias.data.copy_(
+            get_tensor(f"{prefix}.mixer.Wqkv.bias")
+        )
+        model.text["blocks"][i]["attn"]["proj"].weight.data.copy_(
+            get_tensor(f"{prefix}.mixer.out_proj.weight")
+        )
+        model.text["blocks"][i]["attn"]["proj"].bias.data.copy_(
+            get_tensor(f"{prefix}.mixer.out_proj.bias")
+        )
+
+        # MLP
+        model.text["blocks"][i]["mlp"]["fc1"].weight.data.copy_(
+            get_tensor(f"{prefix}.mlp.fc1.weight")
+        )
+        model.text["blocks"][i]["mlp"]["fc1"].bias.data.copy_(
+            get_tensor(f"{prefix}.mlp.fc1.bias")
+        )
+        model.text["blocks"][i]["mlp"]["fc2"].weight.data.copy_(
+            get_tensor(f"{prefix}.mlp.fc2.weight")
+        )
+        model.text["blocks"][i]["mlp"]["fc2"].bias.data.copy_(
+            get_tensor(f"{prefix}.mlp.fc2.bias")
+        )
+
+    model.text["post_ln"].weight.data.copy_(get_tensor("text_model.lm_head.ln.weight"))
+    model.text["post_ln"].bias.data.copy_(get_tensor("text_model.lm_head.ln.bias"))
+
+    model.text["lm_head"].weight.data.copy_(
+        get_tensor("text_model.lm_head.linear.weight")
+    )
+    model.text["lm_head"].bias.data.copy_(get_tensor("text_model.lm_head.linear.bias"))
+
+    # Region Model
+    model.region.coord_features.data.copy_(
+        get_tensor("region_model.coordinate_features.weight").T
+    )
+    model.region["coord_encoder"].weight.data.copy_(
+        get_tensor("region_model.coordinate_encoder.weight")
+    )
+    model.region["coord_encoder"].bias.data.copy_(
+        get_tensor("region_model.coordinate_encoder.bias")
+    )
+
+    model.region["coord_decoder"]["fc1"].weight.data.copy_(
+        get_tensor("region_model.coordinate_decoder.fc1.weight")
+    )
+    model.region["coord_decoder"]["fc1"].bias.data.copy_(
+        get_tensor("region_model.coordinate_decoder.fc1.bias")
+    )
+    model.region["coord_decoder"]["fc2"].weight.data.copy_(
+        get_tensor("region_model.coordinate_decoder.fc2.weight")
+    )
+    model.region["coord_decoder"]["fc2"].bias.data.copy_(
+        get_tensor("region_model.coordinate_decoder.fc2.bias")
+    )
+
+    model.region.size_features.data.copy_(
+        get_tensor("region_model.size_features.weight").T
+    )
+    model.region["size_encoder"].weight.data.copy_(
+        get_tensor("region_model.size_encoder.weight")
+    )
+    model.region["size_encoder"].bias.data.copy_(
+        get_tensor("region_model.size_encoder.bias")
+    )
+
+    model.region["size_decoder"]["fc1"].weight.data.copy_(
+        get_tensor("region_model.size_decoder.fc1.weight")
+    )
+    model.region["size_decoder"]["fc1"].bias.data.copy_(
+        get_tensor("region_model.size_decoder.fc1.bias")
+    )
+    model.region["size_decoder"]["fc2"].weight.data.copy_(
+        get_tensor("region_model.size_decoder.fc2.weight")
+    )
+    model.region["size_decoder"]["fc2"].bias.data.copy_(
+        get_tensor("region_model.size_decoder.fc2.bias")
+    )
+
+
+def load_weights_from_safetensors(weights_file: str, model: nn.Module) -> None:
+    """Load weights from a safetensors file into a MoondreamModel instance."""
+    with safetensors_open(weights_file) as get_tensor:
+        # Wrap the get_tensor function to handle key normalization
+        name_map = {k.replace("._orig_mod", ""): k for k in get_tensor.keys()}
+        _load_weights(lambda x: get_tensor(name_map[x]).to(dtype=torch.float16), model)
+
+
+def load_weights_from_pt(weights_file: str, model: nn.Module) -> None:
+    """Load weights from a PyTorch file into a MoondreamModel instance."""
+    device = str(torch.empty(0).device)
+    tensors = torch.load(weights_file, map_location=device, weights_only=True)
+    tensors = {
+        k.replace("._orig_mod", ""): v.to(dtype=torch.float16)
+        for k, v in tensors.items()
+    }
+    _load_weights(lambda x: tensors[x], model)
+
+
+def load_weights_into_model(weights_file: str, model: nn.Module) -> None:
+    """
+    Load weights from either a safetensors or PyTorch file directly into a MoondreamModel instance.
+
+    Args:
+        weights_file: Path to weights file (either .safetensors or .pt)
+        model: MoondreamModel instance to load weights into
+    """
+    if weights_file.endswith(".safetensors"):
+        load_weights_from_safetensors(weights_file, model)
+    else:
+        load_weights_from_pt(weights_file, model)
+
+    # Make all parameters contiguous
+    for param in model.parameters():
+        param.data = param.data.contiguous()