From bb9949b3f6d46cc487f4e2da18d83c9625743adc Mon Sep 17 00:00:00 2001 From: Junhee Yoo Date: Wed, 23 Oct 2024 14:59:30 +0900 Subject: [PATCH] apply review: change kernel name of pool_2d Signed-off-by: Junhee Yoo --- ggml/src/ggml-metal.m | 4 ++-- ggml/src/ggml-metal.metal | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ggml/src/ggml-metal.m b/ggml/src/ggml-metal.m index 584d626ca..ed4d8326c 100644 --- a/ggml/src/ggml-metal.m +++ b/ggml/src/ggml-metal.m @@ -722,8 +722,8 @@ static struct ggml_backend_metal_context * ggml_metal_init(ggml_backend_dev_t de GGML_METAL_ADD_KERNEL(GGML_METAL_KERNEL_TYPE_SIN, sin, true); GGML_METAL_ADD_KERNEL(GGML_METAL_KERNEL_TYPE_COS, cos, true); GGML_METAL_ADD_KERNEL(GGML_METAL_KERNEL_TYPE_SUM_ROWS, sum_rows, true); - GGML_METAL_ADD_KERNEL(GGML_METAL_KERNEL_TYPE_POOL_2D_AVG_F32, avg_pool_2d_f32, true); - GGML_METAL_ADD_KERNEL(GGML_METAL_KERNEL_TYPE_POOL_2D_MAX_F32, max_pool_2d_f32, true); + GGML_METAL_ADD_KERNEL(GGML_METAL_KERNEL_TYPE_POOL_2D_AVG_F32, pool_2d_avg_f32, true); + GGML_METAL_ADD_KERNEL(GGML_METAL_KERNEL_TYPE_POOL_2D_MAX_F32, pool_2d_max_f32, true); } [metal_library release]; diff --git a/ggml/src/ggml-metal.metal b/ggml/src/ggml-metal.metal index 8b6eba9ba..1fb05ccea 100644 --- a/ggml/src/ggml-metal.metal +++ b/ggml/src/ggml-metal.metal @@ -6452,7 +6452,7 @@ template [[host_name("kernel_mul_mv_id_iq2_s_f32")]] kernel kernel_mul_mv_id_t template [[host_name("kernel_mul_mv_id_iq4_nl_f32")]] kernel kernel_mul_mv_id_t kernel_mul_mv_id>; template [[host_name("kernel_mul_mv_id_iq4_xs_f32")]] kernel kernel_mul_mv_id_t kernel_mul_mv_id>; -kernel void kernel_max_pool_2d_f32( +kernel void kernel_pool_2d_max_f32( device const float * src0, device float * dst, constant int32_t & k0, @@ -6498,7 +6498,7 @@ kernel void kernel_max_pool_2d_f32( o_ptr[cur_oh * OW + cur_ow] = res; } -kernel void kernel_avg_pool_2d_f32( +kernel void kernel_pool_2d_avg_f32( device const float* src0, device float* dst, constant int32_t& k0,