vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

httplib.h json.hpp -> common lib

Browse source
This commit is contained in:
FSSRepo 2023-10-06 09:40:08 -04:00
parent bb093eb295
commit c12e18f2f1
6 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/CMakeLists.txt
View file

@ -11,6 +11,8 @@ add_library(${TARGET} OBJECT
grammar-parser.cpp grammar-parser.cpp
train.h train.h
train.cpp train.cpp
json.hpp
httplib.h
) )
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)

0
examples/server/httplib.h → common/httplib.h
View file

0
examples/server/json.hpp → common/json.hpp
View file

2
examples/server-parallel/CMakeLists.txt
View file

@ -1,6 +1,6 @@
set(TARGET server-parallel) set(TARGET server-parallel)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
add_executable(${TARGET} server.cpp ../server/json.hpp ../server/httplib.h) add_executable(${TARGET} server.cpp)
install(TARGETS ${TARGET} RUNTIME) install(TARGETS ${TARGET} RUNTIME)
target_compile_definitions(${TARGET} PRIVATE target_compile_definitions(${TARGET} PRIVATE
SERVER_VERBOSE=$<BOOL:${LLAMA_SERVER_VERBOSE}> SERVER_VERBOSE=$<BOOL:${LLAMA_SERVER_VERBOSE}>

4
examples/server-parallel/server.cpp
View file

@ -2,8 +2,8 @@
#include "common.h" #include "common.h"
#include "llama.h" #include "llama.h"
#include "../server/httplib.h" #include "httplib.h"
#include "../server/json.hpp" #include "json.hpp"
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>

2
examples/server/CMakeLists.txt
View file

@ -1,7 +1,7 @@
set(TARGET server) set(TARGET server)
option(LLAMA_SERVER_VERBOSE "Build verbose logging option for Server" ON) option(LLAMA_SERVER_VERBOSE "Build verbose logging option for Server" ON)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
add_executable(${TARGET} server.cpp json.hpp httplib.h) add_executable(${TARGET} server.cpp)
install(TARGETS ${TARGET} RUNTIME) install(TARGETS ${TARGET} RUNTIME)
target_compile_definitions(${TARGET} PRIVATE target_compile_definitions(${TARGET} PRIVATE
SERVER_VERBOSE=$<BOOL:${LLAMA_SERVER_VERBOSE}> SERVER_VERBOSE=$<BOOL:${LLAMA_SERVER_VERBOSE}>