@@ -464,6 +464,7 @@ struct vk_device_struct {
464
464
vk_pipeline pipeline_leaky_relu_f32;
465
465
vk_pipeline pipeline_silu_back_f32;
466
466
vk_pipeline pipeline_diag_mask_inf_f32;
467
+ vk_pipeline pipeline_cross_entropy_loss_back_f32;
467
468
vk_pipeline pipeline_soft_max_f32, pipeline_soft_max_f32_f16;
468
469
vk_pipeline pipeline_soft_max_f32_wg512, pipeline_soft_max_f32_f16_wg512;
469
470
vk_pipeline pipeline_soft_max_back_f32;
@@ -2915,6 +2916,8 @@ static void ggml_vk_load_shaders(vk_device& device) {
2915
2916
2916
2917
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);
2917
2918
2919
+ 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);
2920
+
2918
2921
ggml_vk_create_pipeline(device, device->pipeline_soft_max_f32, "soft_max_f32", soft_max_f32_len, soft_max_f32_data, "main", 3, sizeof(vk_op_soft_max_push_constants), {1, 1, 1}, { device->subgroup_size }, 1);
2919
2922
ggml_vk_create_pipeline(device, device->pipeline_soft_max_f32_wg512, "soft_max_f32_wg512", soft_max_f32_len, soft_max_f32_data, "main", 3, sizeof(vk_op_soft_max_push_constants), {1, 1, 1}, { 512 }, 1);
2920
2923
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", 3, sizeof(vk_op_soft_max_push_constants), {1, 1, 1}, { device->subgroup_size }, 1);
@@ -6703,6 +6706,11 @@ static vk_pipeline ggml_vk_op_get_pipeline(ggml_backend_vk_context * ctx, const
6703
6706
return ctx->device->pipeline_diag_mask_inf_f32;
6704
6707
}
6705
6708
return nullptr;
6709
+ case GGML_OP_CROSS_ENTROPY_LOSS_BACK:
6710
+ if (src0->type == GGML_TYPE_F32 && src1->type == GGML_TYPE_F32 && src2->type == GGML_TYPE_F32 && dst->type == GGML_TYPE_F32) {
6711
+ return ctx->device->pipeline_cross_entropy_loss_back_f32;
6712
+ }
6713
+ return nullptr;
6706
6714
case GGML_OP_SOFT_MAX:
6707
6715
GGML_ASSERT(!src1 || src1->type == GGML_TYPE_F32 || src1->type == GGML_TYPE_F16);
6708
6716
@@ -7084,6 +7092,7 @@ static void ggml_vk_op_f32(ggml_backend_vk_context * ctx, vk_context& subctx, co
7084
7092
case GGML_OP_L2_NORM:
7085
7093
case GGML_OP_SOFT_MAX:
7086
7094
case GGML_OP_SOFT_MAX_BACK:
7095
+ case GGML_OP_CROSS_ENTROPY_LOSS_BACK:
7087
7096
case GGML_OP_SUM_ROWS:
7088
7097
case GGML_OP_ARGMAX:
7089
7098
{
@@ -7811,6 +7820,19 @@ static void ggml_vk_diag_mask_inf(ggml_backend_vk_context * ctx, vk_context& sub
7811
7820
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);
7812
7821
}
7813
7822
7823
+ 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) {
7824
+ const int64_t nclasses = src1->ne[0];
7825
+ const int64_t nrows = ggml_nrows(src1);
7826
+
7827
+ ggml_vk_op_f32<vk_op_push_constants>(ctx, subctx, src0, src1, src2, dst, GGML_OP_CROSS_ENTROPY_LOSS_BACK, {
7828
+ (uint32_t)nclasses,
7829
+ (uint32_t)nrows,
7830
+ 0.0f,
7831
+ 0.0f
7832
+ }, dryrun);
7833
+
7834
+ }
7835
+
7814
7836
static void ggml_vk_soft_max(ggml_backend_vk_context * ctx, vk_context& subctx, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst, bool dryrun = false) {
7815
7837
float * op_params = (float *)dst->op_params;
7816
7838
@@ -9086,6 +9108,7 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
9086
9108
case GGML_OP_RMS_NORM_BACK:
9087
9109
case GGML_OP_L2_NORM:
9088
9110
case GGML_OP_DIAG_MASK_INF:
9111
+ case GGML_OP_CROSS_ENTROPY_LOSS_BACK:
9089
9112
case GGML_OP_SOFT_MAX:
9090
9113
case GGML_OP_SOFT_MAX_BACK:
9091
9114
case GGML_OP_ROPE:
@@ -9328,6 +9351,14 @@ static bool ggml_vk_build_graph(ggml_backend_vk_context * ctx, ggml_cgraph * cgr
9328
9351
case GGML_OP_DIAG_MASK_INF:
9329
9352
ggml_vk_diag_mask_inf(ctx, compute_ctx, src0, node, dryrun);
9330
9353
9354
+ break;
9355
+
9356
+ case GGML_OP_CROSS_ENTROPY_LOSS_BACK:
9357
+ // std::cerr << "*** GGML_VK_BUILD_GRAPH: CROSS_ENTROPY_LOSS_BACK case hit, calling ggml_vk_cross_entropy_loss_back" << std::endl;
9358
+ // std::cout << "*** GGML_VK_BUILD_GRAPH: CROSS_ENTROPY_LOSS_BACK case hit, calling ggml_vk_cross_entropy_loss_back" << std::endl;
9359
+ // fflush(stdout); fflush(stderr);
9360
+ ggml_vk_cross_entropy_loss_back(ctx, compute_ctx, src0, src1, src2, node, dryrun);
9361
+
9331
9362
break;
9332
9363
case GGML_OP_SOFT_MAX:
9333
9364
ggml_vk_soft_max(ctx, compute_ctx, src0, src1, node, dryrun);
@@ -9492,6 +9523,7 @@ static bool ggml_vk_compute_forward(ggml_backend_vk_context * ctx, ggml_cgraph *
9492
9523
case GGML_OP_RMS_NORM_BACK:
9493
9524
case GGML_OP_L2_NORM:
9494
9525
case GGML_OP_DIAG_MASK_INF:
9526
+ case GGML_OP_CROSS_ENTROPY_LOSS_BACK:
9495
9527
case GGML_OP_SOFT_MAX:
9496
9528
case GGML_OP_SOFT_MAX_BACK:
9497
9529
case GGML_OP_ROPE:
@@ -10685,6 +10717,8 @@ static bool ggml_backend_vk_device_supports_op(ggml_backend_dev_t dev, const ggm
10685
10717
return true;
10686
10718
case GGML_OP_CONV_TRANSPOSE_1D:
10687
10719
return op->src[0]->type == GGML_TYPE_F32 && op->src[1]->type == GGML_TYPE_F32;
10720
+ case GGML_OP_CROSS_ENTROPY_LOSS_BACK:
10721
+ 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;
10688
10722
default:
10689
10723
return false;
10690
10724
}
0 commit comments