cont : move httplib to /vendor + use json_fwd.hpp

ggml-ci

Author: ggerganov

common/arg.cpp

@@ -5,6 +5,7 @@
 #include "log.h"
 #include "sampling.h"
 #include "chat.h"
+#include "json-schema-to-grammar.h"
 
 // fix problem with std::min and std::max
 #if defined(_WIN32)
@@ -15,6 +16,8 @@
 #include <windows.h>
 #endif
 
+#include <nlohmann/json.hpp>
+
 #include <algorithm>
 #include <climits>
 #include <cstdarg>
@@ -34,8 +37,6 @@
 #include <future>
 #endif
 
-#include "json-schema-to-grammar.h"
-
 using json = nlohmann::ordered_json;
 
 std::initializer_list<enum llama_example> mmproj_examples = {

common/chat-parser.h

@@ -4,7 +4,7 @@
 #include "json-partial.h"
 #include "regex-partial.h"
 
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 
 #include <optional>
 #include <string>

common/json-schema-to-grammar.cpp

@@ -1,6 +1,8 @@
 #include "json-schema-to-grammar.h"
 #include "common.h"
 
+#include <nlohmann/json.hpp>
+
 #include <algorithm>
 #include <fstream>
 #include <map>

common/json-schema-to-grammar.h

@@ -1,9 +1,10 @@
 #pragma once
 
 #include "ggml.h"
+
 // Change JSON_ASSERT from assert() to GGML_ASSERT:
 #define JSON_ASSERT GGML_ASSERT
-#include "nlohmann/json.hpp"
+#include <nlohmann/json_fwd.hpp>
 
 std::string json_schema_to_grammar(const nlohmann::ordered_json & schema,
                                    bool force_gbnf = false);

tests/test-grammar-integration.cpp

@@ -7,6 +7,8 @@
 #include "../src/unicode.h"
 #include "../src/llama-grammar.h"
 
+#include <nlohmann/json.hpp>
+
 #include <cassert>
 #include <string>
 #include <vector>

tests/test-json-schema-to-grammar.cpp

@@ -6,6 +6,8 @@
 
 #include "../src/llama-grammar.h"
 
+#include <nlohmann/json.hpp>
+
 #include <cassert>
 #include <fstream>
 #include <sstream>

tools/run/run.cpp

@@ -1,3 +1,12 @@
+#include "chat.h"
+#include "common.h"
+#include "llama-cpp.h"
+#include "log.h"
+
+#include "linenoise.cpp/linenoise.h"
+
+#include <nlohmann/json.hpp>
+
 #if defined(_WIN32)
 #    include <windows.h>
 #    include <io.h>
@@ -24,14 +33,6 @@
 #include <string>
 #include <vector>
 
-#include "chat.h"
-#include "common.h"
-#include "llama-cpp.h"
-#include "log.h"
-
-#include "nlohmann/json.hpp"
-#include "linenoise.cpp/linenoise.h"
-
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(_WIN32)
 [[noreturn]] static void sigint_handler(int) {
     printf("\n" LOG_COL_DEFAULT);

tools/server/server.cpp

@@ -13,7 +13,7 @@
 
 // Change JSON_ASSERT from assert() to GGML_ASSERT:
 #define JSON_ASSERT GGML_ASSERT
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 // mime type for sending response
 #define MIMETYPE_JSON "application/json; charset=utf-8"
 

tools/server/utils.hpp

@@ -13,11 +13,11 @@
 #define CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH 1048576
 // disable Nagle's algorithm
 #define CPPHTTPLIB_TCP_NODELAY true
-#include "httplib.h"
+#include <cpp-httplib/httplib.h>
 
 // Change JSON_ASSERT from assert() to GGML_ASSERT:
 #define JSON_ASSERT GGML_ASSERT
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 
 #include <random>
 #include <sstream>

tools/tts/tts.cpp

@@ -6,7 +6,7 @@
 #include "log.h"
 #include "llama.h"
 
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 
 #include <algorithm>
 #include <cmath>