@@ -668,6 +668,7 @@ struct vk_device_struct {
668668 vk_pipeline pipeline_step[2];
669669 vk_pipeline pipeline_round[2];
670670 vk_pipeline pipeline_ceil[2];
671+ vk_pipeline pipeline_floor[2];
671672
672673 vk_pipeline pipeline_add1_f16_f16;
673674 vk_pipeline pipeline_add1_f16_f32;
@@ -3836,6 +3837,7 @@ static void ggml_vk_load_shaders(vk_device& device) {
38363837 CREATE_UNARY(step)
38373838 CREATE_UNARY(round)
38383839 CREATE_UNARY(ceil)
3840+ CREATE_UNARY(floor)
38393841#undef CREATE_UNARY
38403842
38413843#define CREATE_UNARY_RTE(name) \
@@ -8268,6 +8270,8 @@ static vk_pipeline ggml_vk_op_get_pipeline(ggml_backend_vk_context * ctx, const
82688270 return ctx->device->pipeline_round[dst->type == GGML_TYPE_F16];
82698271 case GGML_UNARY_OP_CEIL:
82708272 return ctx->device->pipeline_ceil[dst->type == GGML_TYPE_F16];
8273+ case GGML_UNARY_OP_FLOOR:
8274+ return ctx->device->pipeline_floor[dst->type == GGML_TYPE_F16];
82718275 default:
82728276 break;
82738277 }
@@ -11293,6 +11297,7 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
1129311297 case GGML_UNARY_OP_STEP:
1129411298 case GGML_UNARY_OP_ROUND:
1129511299 case GGML_UNARY_OP_CEIL:
11300+ case GGML_UNARY_OP_FLOOR:
1129611301 break;
1129711302 default:
1129811303 return false;
@@ -11649,6 +11654,7 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
1164911654 case GGML_UNARY_OP_STEP:
1165011655 case GGML_UNARY_OP_ROUND:
1165111656 case GGML_UNARY_OP_CEIL:
11657+ case GGML_UNARY_OP_FLOOR:
1165211658 ggml_vk_unary(ctx, compute_ctx, src0, node);
1165311659 break;
1165411660 default:
@@ -11929,6 +11935,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context * ctx, ggml_cgraph *
1192911935 case GGML_UNARY_OP_STEP:
1193011936 case GGML_UNARY_OP_ROUND:
1193111937 case GGML_UNARY_OP_CEIL:
11938+ case GGML_UNARY_OP_FLOOR:
1193211939 buf = tensor->buffer;
1193311940 break;
1193411941 default:
@@ -13535,6 +13542,7 @@ static bool ggml_backend_vk_device_supports_op(ggml_backend_dev_t dev, const ggm
1353513542 case GGML_UNARY_OP_STEP:
1353613543 case GGML_UNARY_OP_ROUND:
1353713544 case GGML_UNARY_OP_CEIL:
13545+ case GGML_UNARY_OP_FLOOR:
1353813546 return ggml_is_contiguous(op->src[0]) &&
1353913547 (op->src[0]->type == GGML_TYPE_F32 || op->src[0]->type == GGML_TYPE_F16) &&
1354013548 (op->type == GGML_TYPE_F32 || op->type == GGML_TYPE_F16) &&
@@ -14459,6 +14467,9 @@ static void ggml_vk_check_results_0(ggml_backend_vk_context * ctx, ggml_cgraph *
1445914467 case GGML_UNARY_OP_CEIL:
1446014468 tensor_clone = ggml_ceil(ggml_ctx, src_clone[0]);
1446114469 break;
14470+ case GGML_UNARY_OP_FLOOR:
14471+ tensor_clone = ggml_floor(ggml_ctx, src_clone[0]);
14472+ break;
1446214473 default:
1446314474 std::cerr << "Missing vk_check_results OP: " << ggml_op_name(tensor->op) << std::endl;
1446414475 GGML_ABORT("fatal error");
0 commit comments