vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge a6fe84abac into 9b75f03cd2

Browse source
This commit is contained in:
FirstTimeEZ 2024-11-18 10:10:16 +00:00 • committed by GitHub
commit 62cc60d3e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ggml/src/ggml-vulkan/ggml-vulkan.cpp
View file

@ -3929,13 +3929,13 @@ static vk_pipeline ggml_vk_op_get_pipeline(ggml_backend_vk_context * ctx, const
}
return nullptr;
case GGML_OP_SOFT_MAX:
GGML_ASSERT(!src1 || src1->type == GGML_TYPE_F32 || src1->type == GGML_TYPE_F16);
if (src0->type == GGML_TYPE_F32 && (src1 == nullptr || src1->type == GGML_TYPE_F32) && dst->type == GGML_TYPE_F32) {
return ctx->device->pipeline_soft_max_f32;
}
if (src0->type == GGML_TYPE_F32 && src1->type == GGML_TYPE_F16 && dst->type == GGML_TYPE_F32) {
return ctx->device->pipeline_soft_max_f32_f16;
if (src0->type == GGML_TYPE_F32 && dst->type == GGML_TYPE_F32) {
if (src1 == nullptr || src1->type == GGML_TYPE_F32) {
return ctx->device->pipeline_soft_max_f32;
}
else if (src1->type == GGML_TYPE_F16) {
return ctx->device->pipeline_soft_max_f32_f16;
}
}
return nullptr;
case GGML_OP_ROPE: