sync : vendor (#13901)

* sync : vendor ggml-ci * cont : fix httplib version ggml-ci * cont : fix lint * cont : fix lint * vendor : move to common folder /vendor ggml-ci * cont : fix lint * cont : move httplib to /vendor + use json_fwd.hpp ggml-ci * cont : fix server build ggml-ci * cont : add missing headers ggml-ci * cont : header clean-up ggml-ci
2025-05-30 16:25:45 +03:00 · 2025-05-30 16:25:45 +03:00 · 53f925074d
commit 53f925074d
parent db38704f01
27 changed files with 2084 additions and 1096 deletions
--- a/tools/tts/tts.cpp
+++ b/tools/tts/tts.cpp
@ -5,7 +5,9 @@
 #include "sampling.h"
 #include "log.h"
 #include "llama.h"
-#include "json.hpp"
+
+#define JSON_ASSERT GGML_ASSERT
+#include <nlohmann/json.hpp>

 #include <algorithm>
 #include <cmath>