ExternalVendorCode/whisper.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/whisper.cpp.git synced 2025-02-07 11:20:12 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

metal : unify mul_mv_id kernels (llama/6556)

Browse Source
This commit is contained in:
slaren 2024-04-12 18:13:20 +02:00 committed by Georgi Gerganov
parent 60f3713026
commit 00a0947c65
3 changed files with 207 additions and 1122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ggml-metal.m
View File

@ -1941,7 +1941,12 @@ static enum ggml_status ggml_metal_graph_compute(
{ {
nth0 = 4; nth0 = 4;
nth1 = 16; nth1 = 16;
#if QK_K == 64
pipeline = ctx->kernels[GGML_METAL_KERNEL_TYPE_MUL_MV_ID_IQ4_NL_F32].pipeline;
#else
pipeline = ctx->kernels[GGML_METAL_KERNEL_TYPE_MUL_MV_ID_IQ4_XS_F32].pipeline; pipeline = ctx->kernels[GGML_METAL_KERNEL_TYPE_MUL_MV_ID_IQ4_XS_F32].pipeline;
#endif
} break; } break;
default: default:
{ {

1323
ggml-metal.metal
View File

File diff suppressed because it is too large Load Diff

1
ggml.c
View File

@ -11074,7 +11074,6 @@ static void ggml_compute_forward_mul_mat_id(
} }
// initialize matrix_row_counts // initialize matrix_row_counts
GGML_ASSERT(wdata == wdata_src1_end);
memset(matrix_row_counts, 0, n_as*sizeof(int64_t)); memset(matrix_row_counts, 0, n_as*sizeof(int64_t));
// group rows by src0 matrix // group rows by src0 matrix