mirror of
https://github.com/ggerganov/whisper.cpp.git
synced 2025-08-15 12:52:32 +02:00
opencl: add GELU_ERF (llama/14476)
This commit is contained in:
committed by
Georgi Gerganov
parent
10d0d28f7c
commit
df5af1dc75
@ -398,6 +398,7 @@ struct ggml_backend_opencl_context {
|
|||||||
cl_kernel kernel_scale;
|
cl_kernel kernel_scale;
|
||||||
cl_kernel kernel_silu, kernel_silu_4;
|
cl_kernel kernel_silu, kernel_silu_4;
|
||||||
cl_kernel kernel_gelu, kernel_gelu_4;
|
cl_kernel kernel_gelu, kernel_gelu_4;
|
||||||
|
cl_kernel kernel_gelu_erf, kernel_gelu_erf_4;
|
||||||
cl_kernel kernel_gelu_quick, kernel_gelu_quick_4;
|
cl_kernel kernel_gelu_quick, kernel_gelu_quick_4;
|
||||||
cl_kernel kernel_relu;
|
cl_kernel kernel_relu;
|
||||||
cl_kernel kernel_sigmoid_f32, kernel_sigmoid_f16;
|
cl_kernel kernel_sigmoid_f32, kernel_sigmoid_f16;
|
||||||
@ -736,6 +737,8 @@ static void load_cl_kernels(ggml_backend_opencl_context *backend_ctx, ggml_cl_ve
|
|||||||
|
|
||||||
CL_CHECK((backend_ctx->kernel_gelu = clCreateKernel(backend_ctx->program_gelu, "kernel_gelu", &err), err));
|
CL_CHECK((backend_ctx->kernel_gelu = clCreateKernel(backend_ctx->program_gelu, "kernel_gelu", &err), err));
|
||||||
CL_CHECK((backend_ctx->kernel_gelu_4 = clCreateKernel(backend_ctx->program_gelu, "kernel_gelu_4", &err), err));
|
CL_CHECK((backend_ctx->kernel_gelu_4 = clCreateKernel(backend_ctx->program_gelu, "kernel_gelu_4", &err), err));
|
||||||
|
CL_CHECK((backend_ctx->kernel_gelu_erf = clCreateKernel(backend_ctx->program_gelu, "kernel_gelu_erf", &err), err));
|
||||||
|
CL_CHECK((backend_ctx->kernel_gelu_erf_4 = clCreateKernel(backend_ctx->program_gelu, "kernel_gelu_erf_4", &err), err));
|
||||||
CL_CHECK((backend_ctx->kernel_gelu_quick = clCreateKernel(backend_ctx->program_gelu, "kernel_gelu_quick", &err), err));
|
CL_CHECK((backend_ctx->kernel_gelu_quick = clCreateKernel(backend_ctx->program_gelu, "kernel_gelu_quick", &err), err));
|
||||||
CL_CHECK((backend_ctx->kernel_gelu_quick_4 = clCreateKernel(backend_ctx->program_gelu, "kernel_gelu_quick_4", &err), err));
|
CL_CHECK((backend_ctx->kernel_gelu_quick_4 = clCreateKernel(backend_ctx->program_gelu, "kernel_gelu_quick_4", &err), err));
|
||||||
GGML_LOG_CONT(".");
|
GGML_LOG_CONT(".");
|
||||||
@ -2266,6 +2269,7 @@ static bool ggml_opencl_supports_op(ggml_backend_dev_t dev, const struct ggml_te
|
|||||||
case GGML_UNARY_OP_GELU:
|
case GGML_UNARY_OP_GELU:
|
||||||
case GGML_UNARY_OP_SILU:
|
case GGML_UNARY_OP_SILU:
|
||||||
case GGML_UNARY_OP_RELU:
|
case GGML_UNARY_OP_RELU:
|
||||||
|
case GGML_UNARY_OP_GELU_ERF:
|
||||||
case GGML_UNARY_OP_GELU_QUICK:
|
case GGML_UNARY_OP_GELU_QUICK:
|
||||||
return ggml_is_contiguous(op->src[0]) && op->src[0]->type == GGML_TYPE_F32;
|
return ggml_is_contiguous(op->src[0]) && op->src[0]->type == GGML_TYPE_F32;
|
||||||
case GGML_UNARY_OP_SIGMOID:
|
case GGML_UNARY_OP_SIGMOID:
|
||||||
@ -3870,6 +3874,44 @@ static void ggml_cl_gelu(ggml_backend_t backend, const ggml_tensor * src0, const
|
|||||||
backend_ctx->enqueue_ndrange_kernel(kernel, 3, global_work_size, local_work_size, dst);
|
backend_ctx->enqueue_ndrange_kernel(kernel, 3, global_work_size, local_work_size, dst);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void ggml_cl_gelu_erf(ggml_backend_t backend, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
|
||||||
|
GGML_ASSERT(src0);
|
||||||
|
GGML_ASSERT(src0->extra);
|
||||||
|
GGML_ASSERT(dst);
|
||||||
|
GGML_ASSERT(dst->extra);
|
||||||
|
|
||||||
|
UNUSED(src1);
|
||||||
|
|
||||||
|
ggml_backend_opencl_context *backend_ctx = (ggml_backend_opencl_context *)backend->context;
|
||||||
|
|
||||||
|
ggml_tensor_extra_cl * extra0 = (ggml_tensor_extra_cl *)src0->extra;
|
||||||
|
ggml_tensor_extra_cl * extrad = (ggml_tensor_extra_cl *)dst->extra;
|
||||||
|
|
||||||
|
cl_ulong offset0 = extra0->offset + src0->view_offs;
|
||||||
|
cl_ulong offsetd = extrad->offset + dst->view_offs;
|
||||||
|
|
||||||
|
cl_kernel kernel;
|
||||||
|
|
||||||
|
int n = ggml_nelements(dst);
|
||||||
|
|
||||||
|
if (n % 4 == 0) {
|
||||||
|
kernel = backend_ctx->kernel_gelu_erf_4;
|
||||||
|
n /= 4;
|
||||||
|
} else {
|
||||||
|
kernel = backend_ctx->kernel_gelu_erf;
|
||||||
|
}
|
||||||
|
|
||||||
|
CL_CHECK(clSetKernelArg(kernel, 0, sizeof(cl_mem), &extra0->data_device));
|
||||||
|
CL_CHECK(clSetKernelArg(kernel, 1, sizeof(cl_ulong), &offset0));
|
||||||
|
CL_CHECK(clSetKernelArg(kernel, 2, sizeof(cl_mem), &extrad->data_device));
|
||||||
|
CL_CHECK(clSetKernelArg(kernel, 3, sizeof(cl_ulong), &offsetd));
|
||||||
|
|
||||||
|
size_t global_work_size[] = {(size_t)n, 1, 1};
|
||||||
|
size_t local_work_size[] = {64, 1, 1};
|
||||||
|
|
||||||
|
backend_ctx->enqueue_ndrange_kernel(kernel, 3, global_work_size, local_work_size, dst);
|
||||||
|
}
|
||||||
|
|
||||||
static void ggml_cl_gelu_quick(ggml_backend_t backend, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
|
static void ggml_cl_gelu_quick(ggml_backend_t backend, const ggml_tensor * src0, const ggml_tensor * src1, ggml_tensor * dst) {
|
||||||
GGML_ASSERT(src0);
|
GGML_ASSERT(src0);
|
||||||
GGML_ASSERT(src0->extra);
|
GGML_ASSERT(src0->extra);
|
||||||
@ -6388,6 +6430,12 @@ bool ggml_cl_compute_forward(ggml_backend_t backend, struct ggml_tensor * tensor
|
|||||||
}
|
}
|
||||||
func = ggml_cl_gelu;
|
func = ggml_cl_gelu;
|
||||||
break;
|
break;
|
||||||
|
case GGML_UNARY_OP_GELU_ERF:
|
||||||
|
if (!any_on_device) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
func = ggml_cl_gelu_erf;
|
||||||
|
break;
|
||||||
case GGML_UNARY_OP_GELU_QUICK:
|
case GGML_UNARY_OP_GELU_QUICK:
|
||||||
if (!any_on_device) {
|
if (!any_on_device) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#define GELU_COEF_A 0.044715f
|
#define GELU_COEF_A 0.044715f
|
||||||
#define GELU_QUICK_COEF -1.702f
|
#define GELU_QUICK_COEF -1.702f
|
||||||
#define SQRT_2_OVER_PI 0.79788456080286535587989211986876f
|
#define SQRT_2_OVER_PI 0.79788456080286535587989211986876f
|
||||||
|
#define SQRT_2_INV 0.70710678118654752440084436210484f
|
||||||
|
|
||||||
kernel void kernel_gelu(
|
kernel void kernel_gelu(
|
||||||
global float * src0,
|
global float * src0,
|
||||||
@ -35,6 +36,32 @@ kernel void kernel_gelu_4(
|
|||||||
dst[get_global_id(0)] = 0.5f*x*(1.0f + tanh(SQRT_2_OVER_PI*x*(1.0f + GELU_COEF_A*x*x)));
|
dst[get_global_id(0)] = 0.5f*x*(1.0f + tanh(SQRT_2_OVER_PI*x*(1.0f + GELU_COEF_A*x*x)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
kernel void kernel_gelu_erf(
|
||||||
|
global float * src0,
|
||||||
|
ulong offset0,
|
||||||
|
global float * dst,
|
||||||
|
ulong offsetd
|
||||||
|
) {
|
||||||
|
src0 = (global float*)((global char*)src0 + offset0);
|
||||||
|
dst = (global float*)((global char*)dst + offsetd);
|
||||||
|
|
||||||
|
float x = src0[get_global_id(0)];
|
||||||
|
dst[get_global_id(0)] = 0.5f*x*(1.0f + erf(x*SQRT_2_INV));
|
||||||
|
}
|
||||||
|
|
||||||
|
kernel void kernel_gelu_erf_4(
|
||||||
|
global float4 * src0,
|
||||||
|
ulong offset0,
|
||||||
|
global float4 * dst,
|
||||||
|
ulong offsetd
|
||||||
|
) {
|
||||||
|
src0 = (global float4*)((global char*)src0 + offset0);
|
||||||
|
dst = (global float4*)((global char*)dst + offsetd);
|
||||||
|
|
||||||
|
float4 x = src0[get_global_id(0)];
|
||||||
|
dst[get_global_id(0)] = 0.5f*x*(1.0f + erf(x*SQRT_2_INV));
|
||||||
|
}
|
||||||
|
|
||||||
kernel void kernel_gelu_quick(
|
kernel void kernel_gelu_quick(
|
||||||
global float * src0,
|
global float * src0,
|
||||||
ulong offset0,
|
ulong offset0,
|
||||||
|
Reference in New Issue
Block a user