Merge branch 'master' into custom-attention-mask

This commit is contained in:
Georgi Gerganov 2023-09-28 15:19:57 +03:00
commit 25856900db
No known key found for this signature in database
GPG key ID: 449E073F9DC10735
36 changed files with 730 additions and 239 deletions

7
ggml.h
View file

@ -445,6 +445,12 @@ extern "C" {
GGML_OBJECT_WORK_BUFFER
};
enum ggml_log_level {
GGML_LOG_LEVEL_ERROR = 2,
GGML_LOG_LEVEL_WARN = 3,
GGML_LOG_LEVEL_INFO = 4
};
// ggml object
struct ggml_object {
size_t offs;
@ -1718,6 +1724,7 @@ extern "C" {
};
typedef void (*ggml_opt_callback)(void * data, float * sched);
typedef void (*ggml_log_callback)(enum ggml_log_level level, const char * text, void * user_data);
// optimization parameters
//