@@ -2825,7 +2825,7 @@ static void ggml_sycl_mul_mat_batched_sycl(ggml_backend_sycl_context & ctx, cons
28252825 std::exit (1 );
28262826}
28272827
2828- enum class Mul_Mat_Algo {
2828+ enum class mul_mat_algo {
28292829 DMMV = 0 ,
28302830 MMVQ = 1 ,
28312831 MUL_MAT_SYCL = 2 ,
@@ -2928,7 +2928,7 @@ static bool should_reorder_tensor(ggml_backend_sycl_context& ctx, const ggml_ten
29282928}
29292929
29302930static void opt_for_reorder (ggml_backend_sycl_context * ctx, const ggml_tensor * src0, const ggml_tensor * /* src1 */ ,
2931- ggml_tensor * dst, Mul_Mat_Algo mul_mat_algo) {
2931+ ggml_tensor * dst, mul_mat_algo mm_algorithm ) {
29322932 if (!should_reorder_tensor (*ctx, dst)) {
29332933 return ;
29342934 }
@@ -2938,18 +2938,18 @@ static void opt_for_reorder(ggml_backend_sycl_context * ctx, const ggml_tensor *
29382938 return ; // Skip permutations and already reordered tensors
29392939 }
29402940
2941- switch (mul_mat_algo ) {
2942- case Mul_Mat_Algo ::DMMV:
2941+ switch (mm_algorithm ) {
2942+ case mul_mat_algo ::DMMV:
29432943 if (!ggml_sycl_supports_reorder_dmmv (src0->type )) {
29442944 return ;
29452945 }
29462946 break ;
2947- case Mul_Mat_Algo ::MMVQ:
2947+ case mul_mat_algo ::MMVQ:
29482948 if (!ggml_sycl_supports_reorder_mmvq (src0->type )) {
29492949 return ;
29502950 }
29512951 break ;
2952- case Mul_Mat_Algo ::MUL_MAT_SYCL:
2952+ case mul_mat_algo ::MUL_MAT_SYCL:
29532953 if (!ggml_sycl_supports_reorder_mul_mat_sycl (src0->type )) {
29542954 return ;
29552955 }
@@ -3030,19 +3030,19 @@ static void ggml_sycl_mul_mat(ggml_backend_sycl_context & ctx, const ggml_tensor
30303030 ggml_sycl_mul_mat_batched_sycl (ctx, src0, src1, dst);
30313031 } else if (use_dequantize_mul_mat_vec) {
30323032 constexpr bool convert_src1_to_q8_1 = false ;
3033- opt_for_reorder (&ctx, src0, src1, dst, Mul_Mat_Algo ::DMMV);
3033+ opt_for_reorder (&ctx, src0, src1, dst, mul_mat_algo ::DMMV);
30343034 ggml_sycl_op_mul_mat (ctx, src0, src1, dst, ggml_sycl_op_dequantize_mul_mat_vec, convert_src1_to_q8_1);
30353035 } else if (use_mul_mat_vec_q) {
30363036 constexpr bool convert_src1_to_q8_1 = true ;
3037- opt_for_reorder (&ctx, src0, src1, dst, Mul_Mat_Algo ::MMVQ);
3037+ opt_for_reorder (&ctx, src0, src1, dst, mul_mat_algo ::MMVQ);
30383038 ggml_sycl_op_mul_mat (ctx, src0, src1, dst, ggml_sycl_op_mul_mat_vec_q, convert_src1_to_q8_1);
30393039 } else if (use_mul_mat_q) {
30403040 constexpr bool convert_src1_to_q8_1 = true ;
30413041 ggml_sycl_op_mul_mat (ctx, src0, src1, dst, ggml_sycl_op_mul_mat_q, convert_src1_to_q8_1);
30423042 } else {
30433043 constexpr bool convert_src1_to_q8_1 = false ;
30443044 // MUL_MAT_SYCL supports reorder
3045- opt_for_reorder (&ctx, src0, src1, dst, Mul_Mat_Algo ::MUL_MAT_SYCL);
3045+ opt_for_reorder (&ctx, src0, src1, dst, mul_mat_algo ::MUL_MAT_SYCL);
30463046 ggml_sycl_op_mul_mat (ctx, src0, src1, dst, ggml_sycl_op_mul_mat_sycl, convert_src1_to_q8_1);
30473047 }
30483048 GGML_SYCL_DEBUG (" call %s done\n " , __func__);
0 commit comments