cont : header clean-up

ggml-ci

Author: ggerganov

common/arg.cpp

@@ -1,11 +1,11 @@
-#include "gguf.h" // for reading GGUF splits
 #include "arg.h"
 
+#include "chat.h"
 #include "common.h"
+#include "gguf.h" // for reading GGUF splits
+#include "json-schema-to-grammar.h"
 #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)
@@ -16,6 +16,7 @@
 #include <windows.h>
 #endif
 
+#define JSON_ASSERT GGML_ASSERT
 #include <nlohmann/json.hpp>
 
 #include <algorithm>

common/chat.cpp

@@ -1,13 +1,14 @@
 #include "chat.h"
 #include "chat-parser.h"
 #include "common.h"
+#include "json-partial.h"
 #include "json-schema-to-grammar.h"
 #include "log.h"
-#include "json-partial.h"
-#include "minja/chat-template.hpp"
-#include "minja/minja.hpp"
 #include "regex-partial.h"
 
+#include <minja/chat-template.hpp>
+#include <minja/minja.hpp>
+
 #include <cstdio>
 #include <exception>
 #include <iostream>
@@ -16,7 +17,6 @@
 #include <string>
 #include <vector>
 
-
 static std::string format_time(const std::chrono::system_clock::time_point & now, const std::string & format) {
     auto time = std::chrono::system_clock::to_time_t(now);
     auto local_time = *std::localtime(&time);

common/json-partial.cpp

@@ -1,10 +1,11 @@
-#include <json-partial.h>
-#include "ggml.h"
+#include "json-partial.h"
+
 #include "log.h"
-#include <string>
 
 #include <nlohmann/json.hpp>
 
+#include <string>
+
 using json = nlohmann::ordered_json;
 
 enum common_json_stack_element_type {

common/json-partial.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <nlohmann/json.hpp>
 
 // Healing marker (empty if the JSON was fully parsed / wasn't healed).

common/json-schema-to-grammar.cpp

@@ -4,7 +4,6 @@
 #include <nlohmann/json.hpp>
 
 #include <algorithm>
-#include <fstream>
 #include <map>
 #include <regex>
 #include <sstream>

common/json-schema-to-grammar.h

@@ -1,9 +1,5 @@
 #pragma once
 
-#include "ggml.h"
-
-// Change JSON_ASSERT from assert() to GGML_ASSERT:
-#define JSON_ASSERT GGML_ASSERT
 #include <nlohmann/json_fwd.hpp>
 
 #include <functional>

tests/test-chat.cpp

@@ -5,17 +5,17 @@
 //
 //    cmake -B build && cmake --build build --parallel && ./build/bin/test-chat ../minja/build/tests/*.jinja 2>/dev/null
 //
-#include <fstream>
-#include <iostream>
-#include <string>
-
-#include <nlohmann/json.hpp>
-
 #include "chat.h"
 
 #include "../src/unicode.h"
 #include "../src/llama-grammar.h"
 
+#include <nlohmann/json.hpp>
+
+#include <fstream>
+#include <iostream>
+#include <string>
+
 using json = nlohmann::ordered_json;
 
 static std::ostream & operator<<(std::ostream & os, const common_chat_msg_diff & diff) {

tools/run/run.cpp

@@ -5,6 +5,7 @@
 
 #include "linenoise.cpp/linenoise.h"
 
+#define JSON_ASSERT GGML_ASSERT
 #include <nlohmann/json.hpp>
 
 #if defined(_WIN32)

tools/server/server.cpp

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

tools/server/utils.hpp

@@ -15,7 +15,6 @@
 #define CPPHTTPLIB_TCP_NODELAY true
 #include <cpp-httplib/httplib.h>
 
-// Change JSON_ASSERT from assert() to GGML_ASSERT:
 #define JSON_ASSERT GGML_ASSERT
 #include <nlohmann/json.hpp>