up

Author: metascroy

.github/workflows/mlx.yml

@@ -9,6 +9,7 @@ on:
     paths:
       - .github/workflows/mlx.yml
       - backends/mlx/**
+      - extension/llm/export/**
   workflow_dispatch:
 
 permissions: {}

backends/mlx/ops.py

@@ -219,12 +219,15 @@ def normalize_reduction_dim(
     return dim, keepdim
 
 
+<<<<<<< HEAD
 @REGISTRY.register(target=["NOOP", torch.ops.aten._assert_scalar.default])
 def _noop_handler(P: MLXProgramBuilder, n: Node) -> None:
     """No-op handler for nodes that don't emit any MLX instructions."""
     return None
 
 
+=======
+>>>>>>> e3b488076f (up)
 @REGISTRY.register(target=[torch.ops.aten.addmm.default])
 def _addmm_handler(P: MLXProgramBuilder, n: Node) -> Slot:
     """Handle addmm: self + (mat1 @ mat2).