@@ -542,6 +542,7 @@ struct vk_device_struct {
542542 vk_pipeline pipeline_leaky_relu_f32;
543543 vk_pipeline pipeline_silu_back_f32;
544544 vk_pipeline pipeline_diag_mask_inf_f32;
545+ vk_pipeline pipeline_cross_entropy_loss_back_f32;
545546 vk_pipeline pipeline_soft_max_f32, pipeline_soft_max_f32_f16;
546547 vk_pipeline pipeline_soft_max_f32_wg512, pipeline_soft_max_f32_f16_wg512;
547548 vk_pipeline pipeline_soft_max_back_f32;
@@ -3394,6 +3395,10 @@ static void ggml_vk_load_shaders(vk_device& device) {
33943395
33953396 ggml_vk_create_pipeline(device, device->pipeline_diag_mask_inf_f32, "diag_mask_inf_f32", diag_mask_inf_f32_len, diag_mask_inf_f32_data, "main", 2, sizeof(vk_op_diag_mask_push_constants), {1, 512, 1}, {}, 1, true);
33963397
3398+ ggml_vk_create_pipeline(device, device->pipeline_cross_entropy_loss_back_f32, "cross_entropy_loss_back_f32", cross_entropy_loss_back_f32_len, cross_entropy_loss_back_f32_data, "main", 4, sizeof(vk_op_push_constants), {256, 1, 1}, { device->subgroup_size }, 1);
3399+
3400+ ggml_vk_create_pipeline(device, device->pipeline_cross_entropy_loss_back_f32, "cross_entropy_loss_back_f32", cross_entropy_loss_back_f32_len, cross_entropy_loss_back_f32_data, "main", 4, sizeof(vk_op_push_constants), {256, 1, 1}, { device->subgroup_size }, 1);
3401+
33973402 ggml_vk_create_pipeline(device, device->pipeline_soft_max_f32, "soft_max_f32", soft_max_f32_len, soft_max_f32_data, "main", 4, sizeof(vk_op_soft_max_push_constants), {1, 1, 1}, { device->subgroup_size }, 1);
33983403 ggml_vk_create_pipeline(device, device->pipeline_soft_max_f32_wg512, "soft_max_f32_wg512", soft_max_f32_len, soft_max_f32_data, "main", 4, sizeof(vk_op_soft_max_push_constants), {1, 1, 1}, { 512 }, 1);
33993404 ggml_vk_create_pipeline(device, device->pipeline_soft_max_f32_f16, "soft_max_f32_f16", soft_max_f32_f16_len, soft_max_f32_f16_data, "main", 4, sizeof(vk_op_soft_max_push_constants), {1, 1, 1}, { device->subgroup_size }, 1);
@@ -7719,6 +7724,11 @@ static vk_pipeline ggml_vk_op_get_pipeline(ggml_backend_vk_context * ctx, const
77197724 return ctx->device->pipeline_diag_mask_inf_f32;
77207725 }
77217726 return nullptr;
7727+ case GGML_OP_CROSS_ENTROPY_LOSS_BACK:
7728+ if (src0->type == GGML_TYPE_F32 && src1->type == GGML_TYPE_F32 && src2->type == GGML_TYPE_F32 && dst->type == GGML_TYPE_F32) {
7729+ return ctx->device->pipeline_cross_entropy_loss_back_f32;
7730+ }
7731+ return nullptr;
77227732 case GGML_OP_SOFT_MAX:
77237733 GGML_ASSERT(!src1 || src1->type == GGML_TYPE_F32 || src1->type == GGML_TYPE_F16);
77247734 GGML_ASSERT(!src2 || src2->type == GGML_TYPE_F32);
@@ -8188,6 +8198,7 @@ static void ggml_vk_op_f32(ggml_backend_vk_context * ctx, vk_context& subctx, co
81888198 case GGML_OP_L2_NORM:
81898199 case GGML_OP_SOFT_MAX:
81908200 case GGML_OP_SOFT_MAX_BACK:
8201+ case GGML_OP_CROSS_ENTROPY_LOSS_BACK:
81918202 case GGML_OP_SUM_ROWS:
81928203 case GGML_OP_MEAN:
81938204 case GGML_OP_ARGMAX:
@@ -9144,6 +9155,19 @@ static void ggml_vk_diag_mask_inf(ggml_backend_vk_context * ctx, vk_context& sub
91449155 ggml_vk_op_f32<vk_op_diag_mask_push_constants>(ctx, subctx, src0, nullptr, nullptr, dst, GGML_OP_DIAG_MASK_INF, { (uint32_t)src0->ne[0], (uint32_t)src0->ne[1], op_params[0] }, dryrun);
91459156}
91469157
9158+ static void ggml_vk_cross_entropy_loss_back(ggml_backend_vk_context * ctx, vk_context& subctx, const ggml_tensor * src0, const ggml_tensor * src1, const ggml_tensor * src2, ggml_tensor * dst, bool dryrun = false) {
9159+ const int64_t nclasses = src1->ne[0];
9160+ const int64_t nrows = ggml_nrows(src1);
9161+
9162+ ggml_vk_op_f32<vk_op_push_constants>(ctx, subctx, src0, src1, src2, dst, GGML_OP_CROSS_ENTROPY_LOSS_BACK, {
9163+ (uint32_t)nclasses,
9164+ (uint32_t)nrows,
9165+ 0.0f,
9166+ 0.0f
9167+ }, dryrun);
9168+
9169+ }
9170+
91479171static void ggml_vk_soft_max(ggml_backend_vk_context * ctx, vk_context& subctx, const ggml_tensor * src0, const ggml_tensor * src1, const ggml_tensor * src2, ggml_tensor * dst, bool dryrun = false) {
91489172 float * op_params = (float *)dst->op_params;
91499173
@@ -10556,6 +10580,7 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
1055610580 case GGML_OP_RMS_NORM_BACK:
1055710581 case GGML_OP_L2_NORM:
1055810582 case GGML_OP_DIAG_MASK_INF:
10583+ case GGML_OP_CROSS_ENTROPY_LOSS_BACK:
1055910584 case GGML_OP_SOFT_MAX:
1056010585 case GGML_OP_SOFT_MAX_BACK:
1056110586 case GGML_OP_ROPE:
@@ -10898,6 +10923,14 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
1089810923 case GGML_OP_DIAG_MASK_INF:
1089910924 ggml_vk_diag_mask_inf(ctx, compute_ctx, src0, node, dryrun);
1090010925
10926+ break;
10927+
10928+ case GGML_OP_CROSS_ENTROPY_LOSS_BACK:
10929+ // std::cerr << "*** GGML_VK_BUILD_GRAPH: CROSS_ENTROPY_LOSS_BACK case hit, calling ggml_vk_cross_entropy_loss_back" << std::endl;
10930+ // std::cout << "*** GGML_VK_BUILD_GRAPH: CROSS_ENTROPY_LOSS_BACK case hit, calling ggml_vk_cross_entropy_loss_back" << std::endl;
10931+ // fflush(stdout); fflush(stderr);
10932+ ggml_vk_cross_entropy_loss_back(ctx, compute_ctx, src0, src1, src2, node, dryrun);
10933+
1090110934 break;
1090210935 case GGML_OP_SOFT_MAX:
1090310936 ggml_vk_soft_max(ctx, compute_ctx, src0, src1, src2, node, dryrun);
@@ -11081,6 +11114,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context * ctx, ggml_cgraph *
1108111114 case GGML_OP_RMS_NORM_BACK:
1108211115 case GGML_OP_L2_NORM:
1108311116 case GGML_OP_DIAG_MASK_INF:
11117+ case GGML_OP_CROSS_ENTROPY_LOSS_BACK:
1108411118 case GGML_OP_SOFT_MAX:
1108511119 case GGML_OP_SOFT_MAX_BACK:
1108611120 case GGML_OP_ROPE:
@@ -12540,6 +12574,8 @@ static bool ggml_backend_vk_device_supports_op(ggml_backend_dev_t dev, const ggm
1254012574 return true;
1254112575 case GGML_OP_CONV_TRANSPOSE_1D:
1254212576 return op->src[0]->type == GGML_TYPE_F32 && op->src[1]->type == GGML_TYPE_F32;
12577+ case GGML_OP_CROSS_ENTROPY_LOSS_BACK:
12578+ return op->src[0]->type == GGML_TYPE_F32 && op->src[1]->type == GGML_TYPE_F32 && op->src[2]->type == GGML_TYPE_F32 && op->type == GGML_TYPE_F32;
1254312579 case GGML_OP_CONV_2D:
1254412580 {
1254512581 // Op is disabled for Apple because it segfaults at pipeline create time on MoltenVK
0 commit comments