From 7628bd8c7679e888b7bcde924a844ee6e6a8e7ef Mon Sep 17 00:00:00 2001
From: Olivier Chafik <ochafik@google.com>
Date: Wed, 20 Mar 2024 14:35:10 +0000
Subject: [PATCH] json: move json.hpp & json-schema-to-grammar.{cpp,h} to
 common

---
 Makefile                                               | 4 ++--
 common/CMakeLists.txt                                  | 3 +++
 {examples/server => common}/json-schema-to-grammar.cpp | 0
 {examples/server => common}/json-schema-to-grammar.h   | 0
 {examples/server => common}/json.hpp                   | 0
 examples/server/CMakeLists.txt                         | 2 --
 examples/server/json-schema-to-grammar.hpp             | 0
 7 files changed, 5 insertions(+), 4 deletions(-)
 rename {examples/server => common}/json-schema-to-grammar.cpp (100%)
 rename {examples/server => common}/json-schema-to-grammar.h (100%)
 rename {examples/server => common}/json.hpp (100%)
 delete mode 100644 examples/server/json-schema-to-grammar.hpp

diff --git a/Makefile b/Makefile
index 9478fbe91..951b84807 100644
--- a/Makefile
+++ b/Makefile
@@ -667,7 +667,7 @@ console.o: common/console.cpp common/console.h
 grammar-parser.o: common/grammar-parser.cpp common/grammar-parser.h
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-json-schema-to-grammar.o: examples/server/json-schema-to-grammar.cpp examples/server/json-schema-to-grammar.h
+json-schema-to-grammar.o: common/json-schema-to-grammar.cpp common/json-schema-to-grammar.h
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 train.o: common/train.cpp common/train.h
@@ -749,7 +749,7 @@ save-load-state: examples/save-load-state/save-load-state.cpp ggml.o llama.o $(C
 	$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
 	$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)
 
-server: examples/server/server.cpp examples/server/utils.hpp examples/server/httplib.h examples/server/json.hpp examples/server/index.html.hpp examples/server/index.js.hpp examples/server/completion.js.hpp json-schema-to-grammar.o common/stb_image.h ggml.o llama.o $(COMMON_DEPS) grammar-parser.o $(OBJS)
+server: examples/server/server.cpp examples/server/utils.hpp examples/server/httplib.h common/json.hpp examples/server/index.html.hpp examples/server/index.js.hpp examples/server/completion.js.hpp json-schema-to-grammar.o common/stb_image.h ggml.o llama.o $(COMMON_DEPS) grammar-parser.o $(OBJS)
 	$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
 	$(CXX) $(CXXFLAGS) $(filter-out %.h %.hpp $<,$^) -Iexamples/server $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS) $(LWINSOCK2)
 
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index af2629a46..10951693a 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -47,6 +47,8 @@ if (BUILD_SHARED_LIBS)
     set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 endif()
 
+set(TARGET json-schema-to-grammar)
+add_library(${TARGET} OBJECT json-schema-to-grammar.cpp json-schema-to-grammar.h)
 
 set(TARGET common)
 
@@ -60,6 +62,7 @@ add_library(${TARGET} STATIC
     console.cpp
     grammar-parser.h
     grammar-parser.cpp
+    json.hpp
     train.h
     train.cpp
     )
diff --git a/examples/server/json-schema-to-grammar.cpp b/common/json-schema-to-grammar.cpp
similarity index 100%
rename from examples/server/json-schema-to-grammar.cpp
rename to common/json-schema-to-grammar.cpp
diff --git a/examples/server/json-schema-to-grammar.h b/common/json-schema-to-grammar.h
similarity index 100%
rename from examples/server/json-schema-to-grammar.h
rename to common/json-schema-to-grammar.h
diff --git a/examples/server/json.hpp b/common/json.hpp
similarity index 100%
rename from examples/server/json.hpp
rename to common/json.hpp
diff --git a/examples/server/CMakeLists.txt b/examples/server/CMakeLists.txt
index 3d027fae1..d2ee47d01 100644
--- a/examples/server/CMakeLists.txt
+++ b/examples/server/CMakeLists.txt
@@ -2,11 +2,9 @@ set(TARGET server)
 option(LLAMA_SERVER_VERBOSE "Build verbose logging option for Server" ON)
 option(LLAMA_SERVER_SSL "Build SSL support for the server" OFF)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-add_library(json-schema-to-grammar OBJECT json-schema-to-grammar.cpp json-schema-to-grammar.h)
 add_executable(${TARGET}
     server.cpp
     utils.hpp
-    json.hpp
     httplib.h
 )
 install(TARGETS ${TARGET} RUNTIME)
diff --git a/examples/server/json-schema-to-grammar.hpp b/examples/server/json-schema-to-grammar.hpp
deleted file mode 100644
index e69de29bb..000000000