From: Akarshan Biswas <redacted>
Date: Mon, 23 Sep 2024 03:28:06 +0000 (+0530)
Subject: Revert "[SYCL] fallback mmvq (#9088)" (llama/9579)
X-Git-Tag: upstream/0.0.1642~348
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=ba85632741e2dc5747c71f2edc435de07c175d80;p=pkg%2Fggml%2Fsources%2Fggml

Revert "[SYCL] fallback mmvq (#9088)" (llama/9579)

This reverts commit 50addec9a532a6518146ab837a85504850627316.
---

diff --git a/src/ggml-sycl.cpp b/src/ggml-sycl.cpp
index 16e6be4a..6978a319 100644
--- a/src/ggml-sycl.cpp
+++ b/src/ggml-sycl.cpp
@@ -3496,8 +3496,7 @@ static void ggml_sycl_mul_mat(ggml_backend_sycl_context & ctx, const ggml_tensor
 
     bool use_mul_mat_vec_q =  ggml_is_quantized(src0->type)
         && src1->type == GGML_TYPE_F32 && dst->type == GGML_TYPE_F32
-        && src1->ne[1] <= MMVQ_MAX_BATCH_SIZE
-        && (ctx.stream()->get_backend() == sycl::backend::ext_oneapi_cuda || src1->ne[1] > MMVQ_MIN_BATCH_SIZE);
+        && src1->ne[1] <= MMVQ_MAX_BATCH_SIZE;
 
     bool use_mul_mat_q =  ggml_sycl_supports_mmq(src0->type)
         && src1->type == GGML_TYPE_F32 && dst->type == GGML_TYPE_F32;
diff --git a/src/ggml-sycl/common.hpp b/src/ggml-sycl/common.hpp
index 05947ccb..bc0faa86 100644
--- a/src/ggml-sycl/common.hpp
+++ b/src/ggml-sycl/common.hpp
@@ -134,7 +134,6 @@ typedef sycl::float2 dfloat2;
 #endif // GGML_SYCL_F16
 
 #define MMVQ_MAX_BATCH_SIZE  8
-#define MMVQ_MIN_BATCH_SIZE  4
 
 static const int8_t kvalues_iq4nl[16]={-127, -104, -83, -65, -49, -35, -22, -10, 1, 13, 25, 38, 53, 69, 89, 113};