cleanup

Author: Nexesenex

ggml/src/ggml-cpu/ggml-cpu-quants.c

@@ -13812,7 +13812,6 @@ void ggml_vec_dot_iq2_bn_q8_K64(int n, float * s, size_t bs, const void * vx, si
     }
 #endif */
 
-
 /* void ggml_vec_dot_iq2_k_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, size_t bx, const void * GGML_RESTRICT vy, size_t by, int nrc) {
     assert(n % QK_K == 0);
     assert(nrc == 1);
@@ -13829,60 +13828,6 @@ void ggml_vec_dot_iq2_bn_q8_K64(int n, float * s, size_t bs, const void * vx, si
 
 }
 
-void ggml_vec_dot_iq2_ks_q8_K(int n, float * s, size_t bs, const void * vx, size_t bx, const void * vy, size_t by, int nrc) {
-    assert(n % QK_K == 0);
-    assert(nrc == 1);
-    UNUSED(nrc);
-    UNUSED(bx);
-    UNUSED(by);
-    UNUSED(bs);
-
-#if GGML_USE_IQK_MULMAT
-    if (iqk_mul_mat(1, 1, n, GGML_TYPE_IQ2_KS, vx, 0, GGML_TYPE_Q8_K, vy, 0, s, 0, 0, 1)) {
-        return;
-    }
-#endif
-
-    const ggml_half * dptr = (const ggml_half *)vx;
-    const float d = GGML_FP16_TO_FP32(*dptr);
-    const block_iq2_ks * x = (const block_iq2_ks *)(dptr + 1);
-    const block_q8_K   * y = (const block_q8_K *)vy;
-
-    const int nb = n / QK_K;
-    float sumf = 0;
-    for (int i = 0; i < nb; i++) {
-        const uint8_t * qs = x[i].qs;
-        const  int8_t * q8 = y[i].qs;
-        uint16_t extra = x[i].extra;
-        int sumi = 0;
-        for (int ib128 = 0; ib128 < QK_K/128; ++ib128) {
-            int d1 = (((x[i].scales[2*ib128+0] & 0xf) | ((extra >> 4) & 0x10)) - 16);
-            int d2 = (((x[i].scales[2*ib128+0] >>  4) | ((extra >> 5) & 0x10)) - 16);
-            int d3 = (((x[i].scales[2*ib128+1] & 0xf) | ((extra >> 6) & 0x10)) - 16);
-            int d4 = (((x[i].scales[2*ib128+1] >>  4) | ((extra >> 7) & 0x10)) - 16);
-            const int8_t * values1 = extra & 1 ? iq2nl_values + 4 : iq2nl_values;
-            const int8_t * values2 = extra & 2 ? iq2nl_values + 4 : iq2nl_values;
-            const int8_t * values3 = extra & 4 ? iq2nl_values + 4 : iq2nl_values;
-            const int8_t * values4 = extra & 8 ? iq2nl_values + 4 : iq2nl_values;
-            extra >>= 4;
-            int sumi1 = 0, sumi2 = 0, sumi3 = 0, sumi4 = 0;
-            for (int j = 0; j < 32; ++j) {
-                sumi1 += q8[j+ 0] * values1[(qs[j] >> 0) & 3];
-                sumi2 += q8[j+32] * values2[(qs[j] >> 2) & 3];
-                sumi3 += q8[j+64] * values3[(qs[j] >> 4) & 3];
-                sumi4 += q8[j+96] * values4[(qs[j] >> 6) & 3];
-            }
-            sumi += d1*sumi1 + d2*sumi2 + d3*sumi3 + d4*sumi4;
-            q8 += 128;
-            qs +=  32;
-        }
-        sumf += y[i].d * sumi;
-    }
-
-    *s = d * sumf;
-
-}
-
 void ggml_vec_dot_iq3_k_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, size_t bx, const void * GGML_RESTRICT vy, size_t by, int nrc) {
     assert(n % QK_K == 0);
     assert(nrc == 1);
@@ -14080,113 +14025,3 @@ void ggml_vec_dot_iq6_k_q8_K(int n, float * s, size_t bs, const void * vx, size_
     *s = sumf;
 
 } */
-
-/* void ggml_vec_dot_iq4_ks_q8_K(int n, float * s, size_t bs, const void * vx, size_t bx, const void * vy, size_t by, int nrc) {
-    constexpr int kBlockSize = 32;
-#if GGML_USE_IQK_MULMAT
-    if (iqk_mul_mat(1, 1, n, GGML_TYPE_IQ4_KS, vx, 0, GGML_TYPE_Q8_K, vy, 0, s, 0, 0, 1)) {
-        return;
-    }
-#endif
-    assert(n%QK_K == 0);
-    assert(nrc == 1);
-    UNUSED(bs);
-    UNUSED(bx);
-    UNUSED(by);
-    const float * dptr = (const float *)vx;
-    const float d = *dptr;
-    //printf("%s: n = %d, d = %g\n", __func__, n, d);
-    const block_iq4_ks * x = (const block_iq4_ks *)(dptr + 1);
-    const block_q8_K    * y = (const block_q8_K    *)vy;
-    int nblock = n/QK_K;
-    float sumf = 0;
-    for (int ibl = 0; ibl < nblock; ++ibl) {
-        //int sumi = 0;
-        auto qy = y[ibl].qs;
-        auto qx = x[ibl].qs;
-        float db = d * y[ibl].d;
-        for (int ib = 0; ib < QK_K/kBlockSize; ++ib) {
-            float dl = db * ((x[ibl].scales[ib] & 254) - 127);
-            //int ls = (x[ibl].scales[ib] & 254) - 127;
-            const int8_t * values = iq4k_values + ((x[ibl].scales[ib] & 1) << 4);
-            int suml = 0;
-            for (int j = 0; j < kBlockSize/2; ++j) {
-                suml += qy[j               ] * values[qx[j] & 0xf]
-                      + qy[j + kBlockSize/2] * values[qx[j] >>  4];
-            }
-            sumf += dl * suml;
-            //sumi += ls * suml;
-            qy += kBlockSize;
-            qx += kBlockSize/2;
-        }
-        //sumf += d * y[ibl].d * sumi;
-    }
-    *s = sumf;
-} */
-
-/* void ggml_vec_dot_iq4_kss_q8_K(int n, float * s, size_t bs, const void * vx, size_t bx, const void * vy, size_t by, int nrc) {
-#if GGML_USE_IQK_MULMAT
-    if (iqk_mul_mat(1, 1, n, GGML_TYPE_IQ4_KSS, vx, 0, GGML_TYPE_Q8_K, vy, 0, s, 0, 0, 1)) {
-        return;
-    }
-#endif
-    assert(n%QK_K == 0);
-    assert(nrc == 1);
-    UNUSED(bs);
-    UNUSED(bx);
-    UNUSED(by);
-} */
-
-// ======================================= iq2_kt
-
-/* void ggml_vec_dot_iq2_kt_q8_K(int n, float * s, size_t bs, const void * vx, size_t bx, const void * vy, size_t by, int nrc) {
-    assert(n % QK_K == 0);
-    assert(nrc == 1);
-    UNUSED(nrc);
-    UNUSED(bx);
-    UNUSED(by);
-    UNUSED(bs);
-
-#if GGML_USE_IQK_MULMAT
-    if (iqk_mul_mat(1, 1, n, GGML_TYPE_IQ2_KT, vx, 0, GGML_TYPE_Q8_K, vy, 0, s, 0, 0, 1)) {
-        return;
-    }
-#endif
-
-}
-
-// ======================================== iq3_kt
-
-void ggml_vec_dot_iq3_kt_q8_K(int n, float * s, size_t bs, const void * vx, size_t bx, const void * vy, size_t by, int nrc) {
-    assert(n % QK_K == 0);
-    assert(nrc == 1);
-    UNUSED(nrc);
-    UNUSED(bx);
-    UNUSED(by);
-    UNUSED(bs);
-
-#if GGML_USE_IQK_MULMAT
-    if (iqk_mul_mat(1, 1, n, GGML_TYPE_IQ3_KT, vx, 0, GGML_TYPE_Q8_K, vy, 0, s, 0, 0, 1)) {
-        return;
-    }
-#endif
-
-}
-
-// ======================================== iq4_kt
-
-void ggml_vec_dot_iq4_kt_q8_K(int n, float * s, size_t bs, const void * vx, size_t bx, const void * vy, size_t by, int nrc) {
-    assert(n % QK_K == 0);
-    assert(nrc == 1);
-    UNUSED(nrc);
-    UNUSED(bx);
-    UNUSED(by);
-    UNUSED(bs);
-
-#if GGML_USE_IQK_MULMAT
-    if (iqk_mul_mat(1, 1, n, GGML_TYPE_IQ4_KT, vx, 0, GGML_TYPE_Q8_K, vy, 0, s, 0, 0, 1)) {
-        return;
-    }
-#endif
-
-} */