From 02473d8a45b697c58159f00ceca5a0f823538902 Mon Sep 17 00:00:00 2001
From: Iwan Kawrakow <iwan.kawrakow@gmail.com>
Date: Mon, 11 Sep 2023 11:36:27 +0200
Subject: [PATCH] Fix rebase on master

---
 ggml-metal.metal | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/ggml-metal.metal b/ggml-metal.metal
index d5f72dba0..064b61e28 100644
--- a/ggml-metal.metal
+++ b/ggml-metal.metal
@@ -216,41 +216,6 @@ kernel void kernel_diag_mask_inf_8(
     const int64_t i02 = i4/(ne00*ne01); i4 -= i02*ne00*ne01;
     const int64_t i01 = i4/(ne00);      i4 -= i01*ne00;
     const int64_t i00 = i4;
-    dst[i+0] = src0[i+0];
-    dst[i+1] = src0[i+1];
-    int64_t i4 = 4*i;
-    const int64_t i02 = i4/n00x01;
-    i4 -= i02*n00x01;
-    const int64_t i01 = i4/ne00;
-    const int64_t i00 = i4 - i01*ne00;
-    for (int k = 3; k >= 0; --k) {
-        if (i00 + 4 + k <= n_past + i01) {
-            break;
-        }
-        dst[i+1][k] = -INFINITY;
-        if (i00 + k > n_past + i01) {
-            dst[i][k] = -INFINITY;
-        }
-    }
-}
-
-kernel void kernel_diag_mask_inf_8(
-        device const float4 * src0,
-        device       float4 * dst,
-        constant    int64_t & ne00,
-        constant    int64_t & ne01,
-        constant        int & n_past,
-        uint3 tpig[[thread_position_in_grid]]) {
-
-    const int64_t i = 2*tpig[0];
-
-    dst[i+0] = src0[i+0];
-    dst[i+1] = src0[i+1];
-    int64_t i4 = 4*i;
-    const int64_t i02 = i4/(ne00*ne01);
-    i4 -= i02*ne00*ne01;
-    const int64_t i01 = i4/ne00;
-    const int64_t i00 = i4 - i01*ne00;
     for (int k = 3; k >= 0; --k) {
         if (i00 + 4 + k <= n_past + i01) {
             break;