mirror of
https://github.com/ggerganov/whisper.cpp.git
synced 2024-12-24 06:46:37 +00:00
ggml : restore sigmoid decl order (ggml/0)
This commit is contained in:
parent
accada542a
commit
91c646c61d
30
ggml.c
30
ggml.c
@ -1951,8 +1951,8 @@ inline static void ggml_vec_step_f32 (const int n, float * y, const float * x) {
|
|||||||
inline static void ggml_vec_tanh_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = tanhf(x[i]); }
|
inline static void ggml_vec_tanh_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = tanhf(x[i]); }
|
||||||
inline static void ggml_vec_elu_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = (x[i] > 0.f) ? x[i] : expf(x[i])-1; }
|
inline static void ggml_vec_elu_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = (x[i] > 0.f) ? x[i] : expf(x[i])-1; }
|
||||||
inline static void ggml_vec_relu_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = (x[i] > 0.f) ? x[i] : 0.f; }
|
inline static void ggml_vec_relu_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = (x[i] > 0.f) ? x[i] : 0.f; }
|
||||||
inline static void ggml_vec_sigmoid_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = 1.f / (1.f + expf(-x[i])); }
|
|
||||||
inline static void ggml_vec_leaky_relu_f32 (const int n, float * y, const float * x, const float ns) { for (int i = 0; i < n; ++i) y[i] = ((x[i] > 0.f) ? x[i] : 0.f) + ns * ((x[i] < 0.0f) ? x[i] : 0.f); }
|
inline static void ggml_vec_leaky_relu_f32 (const int n, float * y, const float * x, const float ns) { for (int i = 0; i < n; ++i) y[i] = ((x[i] > 0.f) ? x[i] : 0.f) + ns * ((x[i] < 0.0f) ? x[i] : 0.f); }
|
||||||
|
inline static void ggml_vec_sigmoid_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = 1.f / (1.f + expf(-x[i])); }
|
||||||
// TODO: optimize performance
|
// TODO: optimize performance
|
||||||
inline static void ggml_vec_hardswish_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = x[i] * fminf(1.0f, fmaxf(0.0f, (x[i] + 3.0f) / 6.0f)); }
|
inline static void ggml_vec_hardswish_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = x[i] * fminf(1.0f, fmaxf(0.0f, (x[i] + 3.0f) / 6.0f)); }
|
||||||
inline static void ggml_vec_hardsigmoid_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = fminf(1.0f, fmaxf(0.0f, (x[i] + 3.0f) / 6.0f)); }
|
inline static void ggml_vec_hardsigmoid_f32 (const int n, float * y, const float * x) { for (int i = 0; i < n; ++i) y[i] = fminf(1.0f, fmaxf(0.0f, (x[i] + 3.0f) / 6.0f)); }
|
||||||
@ -4545,20 +4545,6 @@ struct ggml_tensor * ggml_relu_inplace(
|
|||||||
return ggml_unary_inplace(ctx, a, GGML_UNARY_OP_RELU);
|
return ggml_unary_inplace(ctx, a, GGML_UNARY_OP_RELU);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ggml_sigmoid
|
|
||||||
|
|
||||||
struct ggml_tensor * ggml_sigmoid(
|
|
||||||
struct ggml_context * ctx,
|
|
||||||
struct ggml_tensor * a) {
|
|
||||||
return ggml_unary(ctx, a, GGML_UNARY_OP_SIGMOID);
|
|
||||||
}
|
|
||||||
|
|
||||||
struct ggml_tensor * ggml_sigmoid_inplace(
|
|
||||||
struct ggml_context * ctx,
|
|
||||||
struct ggml_tensor * a) {
|
|
||||||
return ggml_unary_inplace(ctx, a, GGML_UNARY_OP_SIGMOID);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ggml_leaky_relu
|
// ggml_leaky_relu
|
||||||
|
|
||||||
struct ggml_tensor * ggml_leaky_relu(
|
struct ggml_tensor * ggml_leaky_relu(
|
||||||
@ -4580,6 +4566,20 @@ struct ggml_tensor * ggml_leaky_relu(
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ggml_sigmoid
|
||||||
|
|
||||||
|
struct ggml_tensor * ggml_sigmoid(
|
||||||
|
struct ggml_context * ctx,
|
||||||
|
struct ggml_tensor * a) {
|
||||||
|
return ggml_unary(ctx, a, GGML_UNARY_OP_SIGMOID);
|
||||||
|
}
|
||||||
|
|
||||||
|
struct ggml_tensor * ggml_sigmoid_inplace(
|
||||||
|
struct ggml_context * ctx,
|
||||||
|
struct ggml_tensor * a) {
|
||||||
|
return ggml_unary_inplace(ctx, a, GGML_UNARY_OP_SIGMOID);
|
||||||
|
}
|
||||||
|
|
||||||
// ggml_gelu
|
// ggml_gelu
|
||||||
|
|
||||||
struct ggml_tensor * ggml_gelu(
|
struct ggml_tensor * ggml_gelu(
|
||||||
|
8
ggml.h
8
ggml.h
@ -1066,10 +1066,6 @@ extern "C" {
|
|||||||
struct ggml_context * ctx,
|
struct ggml_context * ctx,
|
||||||
struct ggml_tensor * a);
|
struct ggml_tensor * a);
|
||||||
|
|
||||||
GGML_API struct ggml_tensor * ggml_sigmoid(
|
|
||||||
struct ggml_context * ctx,
|
|
||||||
struct ggml_tensor * a);
|
|
||||||
|
|
||||||
GGML_API struct ggml_tensor * ggml_leaky_relu(
|
GGML_API struct ggml_tensor * ggml_leaky_relu(
|
||||||
struct ggml_context * ctx,
|
struct ggml_context * ctx,
|
||||||
struct ggml_tensor * a, float negative_slope, bool inplace);
|
struct ggml_tensor * a, float negative_slope, bool inplace);
|
||||||
@ -1078,6 +1074,10 @@ extern "C" {
|
|||||||
struct ggml_context * ctx,
|
struct ggml_context * ctx,
|
||||||
struct ggml_tensor * a);
|
struct ggml_tensor * a);
|
||||||
|
|
||||||
|
GGML_API struct ggml_tensor * ggml_sigmoid(
|
||||||
|
struct ggml_context * ctx,
|
||||||
|
struct ggml_tensor * a);
|
||||||
|
|
||||||
GGML_API struct ggml_tensor * ggml_sigmoid_inplace(
|
GGML_API struct ggml_tensor * ggml_sigmoid_inplace(
|
||||||
struct ggml_context * ctx,
|
struct ggml_context * ctx,
|
||||||
struct ggml_tensor * a);
|
struct ggml_tensor * a);
|
||||||
|
Loading…
Reference in New Issue
Block a user