Merge branch 'master' into concedo_experimental

# Conflicts:
#	.github/workflows/build.yml
This commit is contained in:
Concedo 2023-07-04 18:51:42 +08:00
commit 69add28324
5 changed files with 127 additions and 38 deletions

View file

@ -1384,7 +1384,7 @@ static void ggml_cl_mul_f32(const ggml_tensor * src0, const ggml_tensor * src1,
const int64_t ne00 = src0->ne[0];
const int64_t ne01 = src0->ne[1];
const int64_t ne02 = src0->ne[2];
const int64_t ne03 = src0->ne[2];
const int64_t ne03 = src0->ne[3];
const int64_t ne0 = ne00 * ne01 * ne02 * ne03;
const int64_t ne10 = src1->ne[0];
const int64_t ne11 = src1->ne[1];