sync : resolve conflicts (ggml/0)

ggml-ci
This commit is contained in:
Georgi Gerganov
2025-07-12 19:23:56 +03:00
parent 915fc153a5
commit 85dcc74b88
6 changed files with 195 additions and 113 deletions
+3
View File
@@ -648,6 +648,9 @@ extern "C" {
// misc
GGML_API const char * ggml_version(void);
GGML_API const char * ggml_commit(void);
GGML_API void ggml_time_init(void); // call this once at the beginning of the program
GGML_API int64_t ggml_time_ms(void);
GGML_API int64_t ggml_time_us(void);