ikawrakow/ik_llama.cpp
1
0
Fork 0
mirror of https://github.com/ikawrakow/ik_llama.cpp.git synced 2026-02-24 23:24:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor

Browse Source
This commit is contained in:
Iwan Kawrakow
2025-03-25 09:04:45 +02:00
parent be46f3ef14
commit daa3b00ccd
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ggml/src/ggml.c
View File

@@ -15021,7 +15021,10 @@ static void ggml_compute_forward_mul_mat_id_up_gate(
if (ids->ne[1] == 1 && dst->type == GGML_TYPE_F32) {
int gcd = simple_gcd(n_ids, nth);
if (gcd > 1) {
ggml_barrier(params->shared);
if (src1->type != vec_dot_type) {
// make sure quantization has finished
ggml_barrier(params->shared);
}
const void * wdata = (src1->type == vec_dot_type) ? src1->data : params->wdata;
const size_t row_size = ggml_row_size(vec_dot_type, ne10);
int counter = 0;

4
ggml/src/iqk/iqk_mul_mat.cpp
View File

@@ -532,7 +532,9 @@ bool iqk_moe_fused_up_gate(long Nx, long Ny, long ne00, int ne11, int unary_op,
float * C, long nb1, long nb2, const void * vrow_mapping, int ith, int nth) {
const mmid_row_mapping * row_mapping = (const mmid_row_mapping *)vrow_mapping;
assert(row_mapping != nullptr);
// Removing this assert to accomodate usage without row id mapping (e.g., for Ny = 1,
// or if B has been prepared to be contiguous.
//assert(row_mapping != nullptr);
MulMat mm;
if (!MulMat::prepare(typeA, typeB, ne00, mm, Ny)) {