forked from extern/whisper.cpp
ggml : make more compatible with c99 (#262)
This commit is contained in:
parent
5a5c5ddcca
commit
0f11759406
5
ggml.c
5
ggml.c
@ -14,9 +14,10 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
// if C99 - static_assert is nop
|
// if C99 - static_assert is noop
|
||||||
|
// ref: https://stackoverflow.com/a/53923785/4039976
|
||||||
#ifndef static_assert
|
#ifndef static_assert
|
||||||
#define static_assert(cond, msg)
|
#define static_assert(cond, msg) struct global_scope_noop_trick
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined _MSC_VER || defined(__MINGW32__)
|
#if defined _MSC_VER || defined(__MINGW32__)
|
||||||
|
46
ggml.h
46
ggml.h
@ -681,34 +681,32 @@ struct ggml_opt_params {
|
|||||||
bool print_forward_graph;
|
bool print_forward_graph;
|
||||||
bool print_backward_graph;
|
bool print_backward_graph;
|
||||||
|
|
||||||
union {
|
// ADAM parameters
|
||||||
// ADAM parameters
|
struct {
|
||||||
struct {
|
int n_iter;
|
||||||
int n_iter;
|
|
||||||
|
|
||||||
float alpha; // learning rate
|
float alpha; // learning rate
|
||||||
float beta1;
|
float beta1;
|
||||||
float beta2;
|
float beta2;
|
||||||
float eps; // epsilon for numerical stability
|
float eps; // epsilon for numerical stability
|
||||||
float eps_f; // epsilon for convergence test
|
float eps_f; // epsilon for convergence test
|
||||||
float eps_g; // epsilon for convergence test
|
float eps_g; // epsilon for convergence test
|
||||||
} adam;
|
} adam;
|
||||||
|
|
||||||
// LBFGS parameters
|
// LBFGS parameters
|
||||||
struct {
|
struct {
|
||||||
int m; // number of corrections to approximate the inv. Hessian
|
int m; // number of corrections to approximate the inv. Hessian
|
||||||
int n_iter;
|
int n_iter;
|
||||||
int max_linesearch;
|
int max_linesearch;
|
||||||
|
|
||||||
float eps; // convergence tolerance
|
float eps; // convergence tolerance
|
||||||
float ftol; // line search tolerance
|
float ftol; // line search tolerance
|
||||||
float wolfe;
|
float wolfe;
|
||||||
float min_step;
|
float min_step;
|
||||||
float max_step;
|
float max_step;
|
||||||
|
|
||||||
enum ggml_linesearch linesearch;
|
enum ggml_linesearch linesearch;
|
||||||
} lbfgs;
|
} lbfgs;
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ggml_opt_params ggml_opt_default_params(enum ggml_opt_type type);
|
struct ggml_opt_params ggml_opt_default_params(enum ggml_opt_type type);
|
||||||
|
Loading…
Reference in New Issue
Block a user