fix ggml time initialization

Author: slaren

ggml/src/ggml-cpu/ggml-cpu.c

@@ -3460,6 +3460,13 @@ int ggml_cpu_has_sme(void) {
 }
 
 void ggml_cpu_init(void) {
+    // needed to initialize ggml_time
+    {
+        struct ggml_init_params params = { 0, NULL, false };
+        struct ggml_context * ctx = ggml_init(params);
+        ggml_free(ctx);
+    }
+
     ggml_critical_section_start();
 
     static bool is_first_call = true;

ggml/src/ggml-cpu/simd-mappings.h

@@ -18,6 +18,10 @@
 #include <immintrin.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //
 // simd mappings
 //
@@ -139,11 +143,7 @@
 
 // precomputed f32 table for f16 (256 KB)
 // defined in ggml-cpu.c, initialized in ggml_cpu_init()
-#ifdef __cplusplus
-extern "C" float ggml_table_f32_f16[1 << 16];
-#else
 extern float ggml_table_f32_f16[1 << 16];
-#endif
 
 // On ARM NEON, it's quicker to directly convert x -> x instead of calling into ggml_lookup_fp16_to_fp32,
 // so we define GGML_CPU_FP16_TO_FP32 and GGML_CPU_FP32_TO_FP16 elsewhere for NEON.
@@ -1178,3 +1178,8 @@ static inline void __lzs_f16cx4_store(ggml_fp16_t * x, float32x4_t v_y) {
 #define GGML_F32_ARR (GGML_F32_STEP/GGML_F32_EPR)
 #define GGML_F16_ARR (GGML_F16_STEP/GGML_F16_EPR)
 #endif
+
+
+#ifdef __cplusplus
+}
+#endif

ggml/src/ggml.c

@@ -1411,6 +1411,19 @@ static inline bool ggml_can_repeat_rows(const struct ggml_tensor * t0, const str
 ////////////////////////////////////////////////////////////////////////////////
 
 struct ggml_context * ggml_init(struct ggml_init_params params) {
+    static bool is_first_call = true;
+
+    ggml_critical_section_start();
+
+    if (is_first_call) {
+        // initialize time system (required on Windows)
+        ggml_time_init();
+
+        is_first_call = false;
+    }
+
+    ggml_critical_section_end();
+
     struct ggml_context * ctx = GGML_MALLOC(sizeof(struct ggml_context));
 
     // allow to call ggml_init with 0 size