0001-Expose-callable-API-for-server.patch 16 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455
  1. From b5e195803e2a989e57eef0010adce778df1e2d01 Mon Sep 17 00:00:00 2001
  2. From: Daniel Hiltgen <daniel@ollama.com>
  3. Date: Mon, 13 Nov 2023 12:25:58 -0800
  4. Subject: [PATCH] Expose callable API for server
  5. This adds an extern "C" interface within the example server
  6. ---
  7. examples/server/CMakeLists.txt | 24 +++
  8. examples/server/server.cpp | 274 +++++++++++++++++++++++++++++++++
  9. examples/server/server.h | 89 +++++++++++
  10. ggml-cuda.cu | 1 +
  11. 4 files changed, 388 insertions(+)
  12. create mode 100644 examples/server/server.h
  13. diff --git a/examples/server/CMakeLists.txt b/examples/server/CMakeLists.txt
  14. index 859cd12..4ea47a7 100644
  15. --- a/examples/server/CMakeLists.txt
  16. +++ b/examples/server/CMakeLists.txt
  17. @@ -11,3 +11,27 @@ if (WIN32)
  18. TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ws2_32)
  19. endif()
  20. target_compile_features(${TARGET} PRIVATE cxx_std_11)
  21. +
  22. +set(TARGET ext_server)
  23. +option(LLAMA_SERVER_VERBOSE "Build verbose logging option for Server" ON)
  24. +add_library(${TARGET} STATIC server.cpp)
  25. +target_include_directories(${TARGET} PRIVATE ../../common)
  26. +target_include_directories(${TARGET} PRIVATE ../..)
  27. +target_compile_features(${TARGET} PRIVATE cxx_std_11)
  28. +target_compile_definitions(${TARGET} PUBLIC LLAMA_SERVER_LIBRARY=1)
  29. +target_link_libraries(${TARGET} PRIVATE common llama llava ${CMAKE_THREAD_LIBS_INIT})
  30. +
  31. +if (BUILD_SHARED_LIBS)
  32. + set_target_properties(ext_server PROPERTIES POSITION_INDEPENDENT_CODE ON)
  33. + target_compile_definitions(ext_server PRIVATE LLAMA_SHARED LLAMA_BUILD)
  34. + add_library(ext_server_shared SHARED $<TARGET_OBJECTS:ext_server>)
  35. + target_link_libraries(ext_server_shared PRIVATE ggml llama llava common ${CMAKE_THREAD_LIBS_INIT})
  36. + install(TARGETS ext_server_shared LIBRARY)
  37. +endif()
  38. +
  39. +if (CUDAToolkit_FOUND)
  40. + target_include_directories(${TARGET} PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
  41. + if (WIN32)
  42. + target_link_libraries(ext_server_shared PRIVATE nvml)
  43. + endif()
  44. +endif()
  45. \ No newline at end of file
  46. diff --git a/examples/server/server.cpp b/examples/server/server.cpp
  47. index 0403853..2084fd8 100644
  48. --- a/examples/server/server.cpp
  49. +++ b/examples/server/server.cpp
  50. @@ -5,6 +5,9 @@
  51. #include "../llava/clip.h"
  52. #include "stb_image.h"
  53. +#if defined(LLAMA_SERVER_LIBRARY)
  54. +#include "server.h"
  55. +#endif
  56. #ifndef NDEBUG
  57. // crash the server in debug mode, otherwise send an http 500 error
  58. @@ -2643,6 +2646,7 @@ static void append_to_generated_text_from_generated_token_probs(llama_server_con
  59. }
  60. }
  61. +#ifndef LLAMA_SERVER_LIBRARY
  62. int main(int argc, char **argv)
  63. {
  64. #if SERVER_VERBOSE != 1
  65. @@ -3123,3 +3127,273 @@ int main(int argc, char **argv)
  66. llama_backend_free();
  67. return 0;
  68. }
  69. +
  70. +#else // LLAMA_SERVER_LIBRARY
  71. +// Expose the llama server as a callable extern "C" API
  72. +llama_server_context *llama = NULL;
  73. +std::atomic<bool> ext_server_running(false);
  74. +std::thread ext_server_thread;
  75. +
  76. +void llama_server_init(ext_server_params *sparams, ext_server_resp_t *err)
  77. +{
  78. + assert(err != NULL && sparams != NULL);
  79. + err->id = 0;
  80. + err->msg[0] = '\0';
  81. + try {
  82. + llama = new llama_server_context;
  83. + log_set_target(stdout);
  84. + gpt_params params;
  85. + params.n_ctx = sparams->n_ctx;
  86. + params.n_batch = sparams->n_batch;
  87. + params.n_threads = sparams->n_threads;
  88. + params.n_parallel = sparams->n_parallel;
  89. + params.rope_freq_base = sparams->rope_freq_base;
  90. + params.rope_freq_scale = sparams->rope_freq_scale;
  91. +
  92. + if (sparams->memory_f16) {
  93. + params.cache_type_k = "f16";
  94. + params.cache_type_v = "f16";
  95. + } else {
  96. + params.cache_type_k = "f32";
  97. + params.cache_type_v = "f32";
  98. + }
  99. +
  100. + params.n_gpu_layers = sparams->n_gpu_layers;
  101. + params.main_gpu = sparams->main_gpu;
  102. + params.use_mlock = sparams->use_mlock;
  103. + params.use_mmap = sparams->use_mmap;
  104. + params.numa = sparams->numa;
  105. + params.embedding = sparams->embedding;
  106. + if (sparams->model != NULL) {
  107. + params.model = sparams->model;
  108. + }
  109. +
  110. + for (ext_server_lora_adapter *la = sparams->lora_adapters; la != NULL; la = la->next) {
  111. + params.lora_adapter.push_back(std::make_tuple(la->adapter, la->scale));
  112. + }
  113. +
  114. + if (sparams->mmproj != NULL) {
  115. + params.mmproj = std::string(sparams->mmproj);
  116. + }
  117. +
  118. + llama_backend_init(params.numa);
  119. +
  120. + // load the model
  121. + if (!llama->load_model(params))
  122. + {
  123. + // TODO - consider modifying the logging logic or patching load_model so we can capture more detailed error messages
  124. + // and pass them back to the caller for better UX
  125. + err->id = -1;
  126. + snprintf(err->msg, err->msg_len, "error loading model %s", params.model.c_str());
  127. + return;
  128. + }
  129. +
  130. + llama->initialize();
  131. + } catch (std::exception &e) {
  132. + err->id = -1;
  133. + snprintf(err->msg, err->msg_len, "exception %s", e.what());
  134. + } catch (...) {
  135. + err->id = -1;
  136. + snprintf(err->msg, err->msg_len, "Unknown exception initializing llama server");
  137. + }
  138. +}
  139. +
  140. +void llama_server_start()
  141. +{
  142. + assert(llama != NULL);
  143. + // TODO mutex to protect thread creation
  144. + ext_server_thread = std::thread([&]()
  145. + {
  146. + ext_server_running = true;
  147. + try {
  148. + LOG_TEE("llama server main loop starting\n");
  149. + ggml_time_init();
  150. + while (ext_server_running.load())
  151. + {
  152. + if (!llama->update_slots()) {
  153. + LOG_TEE("unexpected error in llama server update_slots - exiting main loop\n");
  154. + break;
  155. + }
  156. + }
  157. + } catch (std::exception &e) {
  158. + LOG_TEE("caught exception in llama server main loop: %s\n", e.what());
  159. + } catch (...) {
  160. + LOG_TEE("caught unknown exception in llama server main loop\n");
  161. + }
  162. + LOG_TEE("\nllama server shutting down\n");
  163. + llama_backend_free();
  164. + });
  165. +}
  166. +
  167. +void llama_server_stop() {
  168. + assert(llama != NULL);
  169. + // TODO - too verbose, remove once things are solid
  170. + LOG_TEE("requesting llama server shutdown\n");
  171. + ext_server_running = false;
  172. + ext_server_thread.join();
  173. + delete llama;
  174. + llama = NULL;
  175. + LOG_TEE("llama server shutdown complete\n");
  176. +}
  177. +
  178. +void llama_server_completion(const char *json_req, ext_server_resp_t *resp) {
  179. + assert(llama != NULL && json_req != NULL && resp != NULL);
  180. + resp->id = -1;
  181. + resp->msg[0] = '\0';
  182. + try {
  183. + json data = json::parse(json_req);
  184. + resp->id = llama->request_completion(data, false, false, -1);
  185. + } catch (std::exception &e) {
  186. + snprintf(resp->msg, resp->msg_len, "exception %s", e.what());
  187. + } catch (...) {
  188. + snprintf(resp->msg, resp->msg_len, "Unknown exception during completion");
  189. + }
  190. +}
  191. +
  192. +void llama_server_completion_next_result(const int task_id, ext_server_task_result_t *resp) {
  193. + assert(llama != NULL && resp != NULL);
  194. + std::string msg;
  195. + resp->id = -1;
  196. + resp->stop = false;
  197. + resp->error = false;
  198. + resp->json_resp = NULL;
  199. + std::string result_json;
  200. + try {
  201. + task_result result = llama->next_result(task_id);
  202. + result_json = result.result_json.dump(-1, ' ', false, json::error_handler_t::replace);
  203. + resp->id = result.id;
  204. + resp->stop = result.stop;
  205. + resp->error = result.error;
  206. + if (result.error) {
  207. + llama->request_cancel(task_id);
  208. + } else if (result.stop) {
  209. + llama->request_cancel(task_id);
  210. + }
  211. + } catch (std::exception &e) {
  212. + resp->error = true;
  213. + resp->id = -1;
  214. + result_json = "{\"error\":\"exception " + std::string(e.what()) + "\"}";
  215. + } catch (...) {
  216. + resp->error = true;
  217. + resp->id = -1;
  218. + result_json = "{\"error\":\"Unknown exception during completion\"}";
  219. + }
  220. + const std::string::size_type size = result_json.size() + 1;
  221. + resp->json_resp = new char[size];
  222. + snprintf(resp->json_resp, size, "%s", result_json.c_str());
  223. +}
  224. +
  225. +void llama_server_release_task_result(ext_server_task_result_t *result) {
  226. + if (result == NULL || result->json_resp == NULL) {
  227. + return;
  228. + }
  229. + delete[] result->json_resp;
  230. +}
  231. +
  232. +void llama_server_completion_cancel(const int task_id, ext_server_resp_t *err) {
  233. + assert(llama != NULL && err != NULL);
  234. + err->id = 0;
  235. + err->msg[0] = '\0';
  236. + try {
  237. + llama->request_cancel(task_id);
  238. + } catch (std::exception &e) {
  239. + err->id = -1;
  240. + snprintf(err->msg, err->msg_len, "exception %s", e.what());
  241. + } catch (...) {
  242. + err->id = -1;
  243. + snprintf(err->msg, err->msg_len, "Unknown exception completion cancel in llama server");
  244. + }
  245. +}
  246. +
  247. +void llama_server_tokenize(const char *json_req, char **json_resp, ext_server_resp_t *err) {
  248. + assert(llama != NULL && json_req != NULL && json_resp != NULL && err != NULL);
  249. + *json_resp = NULL;
  250. + err->id = 0;
  251. + err->msg[0] = '\0';
  252. + try {
  253. + const json body = json::parse(json_req);
  254. + std::vector<llama_token> tokens;
  255. + if (body.count("content") != 0)
  256. + {
  257. + tokens = llama->tokenize(body["content"], false);
  258. + }
  259. + const json data = format_tokenizer_response(tokens);
  260. + std::string result_json = data.dump();
  261. + const std::string::size_type size = result_json.size() + 1;
  262. + *json_resp = new char[size];
  263. + snprintf(*json_resp, size, "%s", result_json.c_str());
  264. + } catch (std::exception &e) {
  265. + err->id = -1;
  266. + snprintf(err->msg, err->msg_len, "exception %s", e.what());
  267. + } catch (...) {
  268. + err->id = -1;
  269. + snprintf(err->msg, err->msg_len, "Unknown exception during tokenize");
  270. + }
  271. +}
  272. +
  273. +void llama_server_release_json_resp(char **json_resp) {
  274. + if (json_resp == NULL || *json_resp == NULL) {
  275. + return;
  276. + }
  277. + delete[] *json_resp;
  278. +}
  279. +
  280. +void llama_server_detokenize(const char *json_req, char **json_resp, ext_server_resp_t *err) {
  281. + assert(llama != NULL && json_req != NULL && json_resp != NULL && err != NULL);
  282. + *json_resp = NULL;
  283. + err->id = 0;
  284. + err->msg[0] = '\0';
  285. + try {
  286. + const json body = json::parse(json_req);
  287. + std::string content;
  288. + if (body.count("tokens") != 0)
  289. + {
  290. + const std::vector<llama_token> tokens = body["tokens"];
  291. + content = tokens_to_str(llama->ctx, tokens.cbegin(), tokens.cend());
  292. + }
  293. + const json data = format_detokenized_response(content);
  294. + std::string result_json = data.dump();
  295. + const std::string::size_type size = result_json.size() + 1;
  296. + *json_resp = new char[size];
  297. + snprintf(*json_resp, size, "%s", result_json.c_str());
  298. + } catch (std::exception &e) {
  299. + err->id = -1;
  300. + snprintf(err->msg, err->msg_len, "exception %s", e.what());
  301. + } catch (...) {
  302. + err->id = -1;
  303. + snprintf(err->msg, err->msg_len, "Unknown exception during detokenize");
  304. + }
  305. +}
  306. +
  307. +void llama_server_embedding(const char *json_req, char** json_resp, ext_server_resp_t *err) {
  308. + assert(llama != NULL && json_req != NULL && json_resp != NULL && err != NULL);
  309. + *json_resp = NULL;
  310. + err->id = 0;
  311. + err->msg[0] = '\0';
  312. + try {
  313. + const json body = json::parse(json_req);
  314. + json prompt;
  315. + if (body.count("content") != 0)
  316. + {
  317. + prompt = body["content"];
  318. + }
  319. + else
  320. + {
  321. + prompt = "";
  322. + }
  323. + const int task_id = llama->request_completion({ {"prompt", prompt}, { "n_predict", 0} }, false, true, -1);
  324. + task_result result = llama->next_result(task_id);
  325. + std::string result_json = result.result_json.dump();
  326. + const std::string::size_type size = result_json.size() + 1;
  327. + *json_resp = new char[size];
  328. + snprintf(*json_resp, size, "%s", result_json.c_str());
  329. + } catch (std::exception &e) {
  330. + err->id = -1;
  331. + snprintf(err->msg, err->msg_len, "exception %s", e.what());
  332. + } catch (...) {
  333. + err->id = -1;
  334. + snprintf(err->msg, err->msg_len, "Unknown exception during embedding");
  335. + }
  336. +}
  337. +
  338. +#endif // LLAMA_SERVER_LIBRARY
  339. \ No newline at end of file
  340. diff --git a/examples/server/server.h b/examples/server/server.h
  341. new file mode 100644
  342. index 0000000..d22f1b6
  343. --- /dev/null
  344. +++ b/examples/server/server.h
  345. @@ -0,0 +1,89 @@
  346. +#if defined(LLAMA_SERVER_LIBRARY)
  347. +#ifndef LLAMA_SERVER_H
  348. +#define LLAMA_SERVER_H
  349. +#include <stddef.h>
  350. +#include <stdint.h>
  351. +#include <stdio.h>
  352. +#include <stdbool.h>
  353. +
  354. +// This exposes extern C entrypoints into the llama_server
  355. +// To enable the server compile with LLAMA_SERVER_LIBRARY
  356. +
  357. +#ifdef __cplusplus
  358. +extern "C"
  359. +{
  360. +#endif
  361. + typedef struct ext_server_resp {
  362. + int id; // < 0 on error
  363. + size_t msg_len; // caller must allocate msg and set msg_len
  364. + char *msg;
  365. + } ext_server_resp_t;
  366. +
  367. + // Allocated and freed by caller
  368. + typedef struct ext_server_lora_adapter {
  369. + char *adapter;
  370. + float scale;
  371. + struct ext_server_lora_adapter *next;
  372. + } ext_server_lora_adapter_t;
  373. +
  374. + // Allocated and freed by caller
  375. + typedef struct ext_server_params
  376. + {
  377. + char *model;
  378. + uint32_t n_ctx; // text context, 0 = from model
  379. + uint32_t n_batch; // prompt processing maximum batch size
  380. + uint32_t n_threads; // number of threads to use for generation
  381. + int32_t n_parallel; // number of parallel sequences to decodewra
  382. + float rope_freq_base; // RoPE base frequency, 0 = from model
  383. + float rope_freq_scale; // RoPE frequency scaling factor, 0 = from model
  384. + bool memory_f16; // use f16 instead of f32 for memory kv
  385. + int32_t n_gpu_layers; // number of layers to store in VRAM (-1 - use default)
  386. + int32_t main_gpu; // the GPU that is used for scratch and small tensors
  387. + bool use_mlock; // force system to keep model in RAM
  388. + bool use_mmap; // use mmap if possible
  389. + bool numa; // attempt optimizations that help on some NUMA systems
  390. + bool embedding; // get only sentence embedding
  391. + ext_server_lora_adapter_t* lora_adapters;
  392. + char *mmproj;
  393. + } ext_server_params_t;
  394. +
  395. + typedef struct ext_server_task_result
  396. + {
  397. + int id;
  398. + bool stop;
  399. + bool error;
  400. + char* json_resp; // null terminated, memory managed by ext_server
  401. + } ext_server_task_result_t;
  402. +
  403. + // Initialize the server once per process
  404. + // err->id = 0 for success and err->msg[0] = NULL
  405. + // err->id != 0 for failure, and err->msg contains error message
  406. + void llama_server_init(ext_server_params_t *sparams, ext_server_resp_t *err);
  407. +
  408. + // Run the main loop, called once per init
  409. + void llama_server_start();
  410. + // Stop the main loop and free up resources allocated in init and start. Init must be called again to reuse
  411. + void llama_server_stop();
  412. +
  413. + // json_req null terminated string, memory managed by caller
  414. + // resp->id >= 0 on success (task ID)
  415. + // resp->id < 0 on error, and resp->msg contains error message
  416. + void llama_server_completion(const char *json_req, ext_server_resp_t *resp);
  417. +
  418. + // Caller must call llama_server_release_task_result to free resp->json_resp
  419. + void llama_server_completion_next_result(const int task_id, ext_server_task_result_t *result);
  420. + void llama_server_completion_cancel(const int task_id, ext_server_resp_t *err);
  421. + void llama_server_release_task_result(ext_server_task_result_t *result);
  422. +
  423. + // Caller must call llama_server_releaes_json_resp to free json_resp if err.id < 0
  424. + void llama_server_tokenize(const char *json_req, char **json_resp, ext_server_resp_t *err);
  425. + void llama_server_detokenize(const char *json_req, char **json_resp, ext_server_resp_t *err);
  426. + void llama_server_embedding(const char *json_req, char** json_resp, ext_server_resp_t *err);
  427. + void llama_server_release_json_resp(char **json_resp);
  428. +
  429. +#ifdef __cplusplus
  430. +}
  431. +#endif
  432. +
  433. +#endif
  434. +#endif // LLAMA_SERVER_LIBRARY
  435. \ No newline at end of file
  436. diff --git a/ggml-cuda.cu b/ggml-cuda.cu
  437. index f20846f..9640cf3 100644
  438. --- a/ggml-cuda.cu
  439. +++ b/ggml-cuda.cu
  440. @@ -6757,6 +6757,7 @@ static cudaError_t ggml_cuda_cpy_tensor_2d(
  441. CUDA_CHECK(cudaGetDevice(&id));
  442. src_ptr = (char *) extra->data_device[id];
  443. } else {
  444. + fprintf(stderr, "ggml_cuda_cpy_tensor_2d assert: backend: %d\n", src->backend);
  445. GGML_ASSERT(false);
  446. }
  447. char * dst_ptr = (char *) dst;
  448. --
  449. 2.39.3 (Apple Git-145)