format c++ code

Author: kherud

src/main/cpp/jllama.cpp

@@ -13,7 +13,7 @@
 
 namespace
 {
-JavaVM* g_vm = nullptr;
+JavaVM *g_vm = nullptr;
 
 // classes
 jclass c_llama_model = nullptr;
@@ -117,7 +117,8 @@ jobject log_level_to_jobject(ggml_log_level level)
         return o_log_level_error;
     case GGML_LOG_LEVEL_WARN:
         return o_log_level_warn;
-    default: case GGML_LOG_LEVEL_INFO:
+    default:
+    case GGML_LOG_LEVEL_INFO:
         return o_log_level_info;
     case GGML_LOG_LEVEL_DEBUG:
         return o_log_level_debug;
@@ -127,9 +128,11 @@ jobject log_level_to_jobject(ggml_log_level level)
 /**
  * Returns the JNIEnv of the current thread.
  */
-JNIEnv* get_jni_env() {
-    JNIEnv* env = nullptr;
-    if (g_vm == nullptr || g_vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
+JNIEnv *get_jni_env()
+{
+    JNIEnv *env = nullptr;
+    if (g_vm == nullptr || g_vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK)
+    {
         throw std::runtime_error("Thread is not attached to the JVM");
     }
     return env;
@@ -436,10 +439,12 @@ JNIEXPORT void JNICALL Java_de_kherud_llama_LlamaModel_loadModel(JNIEnv *env, jo
 
     std::thread t([ctx_server]() {
         JNIEnv *env;
-        jint res = g_vm->GetEnv((void**)&env, JNI_VERSION_1_6);
-        if (res == JNI_EDETACHED) {
-            res = g_vm->AttachCurrentThread((void**)&env, nullptr);
-            if (res != JNI_OK) {
+        jint res = g_vm->GetEnv((void **)&env, JNI_VERSION_1_6);
+        if (res == JNI_EDETACHED)
+        {
+            res = g_vm->AttachCurrentThread((void **)&env, nullptr);
+            if (res != JNI_OK)
+            {
                 throw std::runtime_error("Failed to attach thread to JVM");
             }
         }
@@ -459,7 +464,8 @@ JNIEXPORT jint JNICALL Java_de_kherud_llama_LlamaModel_requestCompletion(JNIEnv
     json json_params = json::parse(c_params);
     const bool infill = json_params.contains("input_prefix") || json_params.contains("input_suffix");
 
-    if (json_params.value("use_chat_template", false)) {
+    if (json_params.value("use_chat_template", false))
+    {
         json chat;
         chat.push_back({{"role", "system"}, {"content", ctx_server->system_prompt}});
         chat.push_back({{"role", "user"}, {"content", json_params["prompt"]}});
@@ -631,7 +637,7 @@ JNIEXPORT void JNICALL Java_de_kherud_llama_LlamaModel_setLogger(JNIEnv *env, jc
     {
         o_log_callback = env->NewGlobalRef(jcallback);
         log_callback = [](enum ggml_log_level level, const char *text, void *user_data) {
-            JNIEnv* env = get_jni_env();
+            JNIEnv *env = get_jni_env();
             jstring message = env->NewStringUTF(text);
             jobject log_level = log_level_to_jobject(level);
             env->CallVoidMethod(o_log_callback, m_biconsumer_accept, log_level, message);

src/main/cpp/server.hpp

@@ -2139,7 +2139,8 @@ struct server_context
                                 slot.command = SLOT_COMMAND_NONE;
                                 slot.release();
                                 slot.print_timings();
-                                send_error(slot, "input is too large to process. increase the physical batch size", ERROR_TYPE_SERVER);
+                                send_error(slot, "input is too large to process. increase the physical batch size",
+                                           ERROR_TYPE_SERVER);
                                 continue;
                             }
                         }

src/main/cpp/utils.hpp

@@ -70,20 +70,24 @@ template <typename T> static T json_value(const json &body, const std::string &k
     }
 }
 
-static const char * log_level_to_string(ggml_log_level level) {
-    switch (level) {
-        case GGML_LOG_LEVEL_ERROR:
-            return "ERROR";
-        case GGML_LOG_LEVEL_WARN:
-            return "WARN";
-        default: case GGML_LOG_LEVEL_INFO:
-            return "INFO";
-        case GGML_LOG_LEVEL_DEBUG:
-            return "DEBUG";
+static const char *log_level_to_string(ggml_log_level level)
+{
+    switch (level)
+    {
+    case GGML_LOG_LEVEL_ERROR:
+        return "ERROR";
+    case GGML_LOG_LEVEL_WARN:
+        return "WARN";
+    default:
+    case GGML_LOG_LEVEL_INFO:
+        return "INFO";
+    case GGML_LOG_LEVEL_DEBUG:
+        return "DEBUG";
     }
 }
 
-static inline void server_log(ggml_log_level level, const char *function, int line, const char *message, const json &extra)
+static inline void server_log(ggml_log_level level, const char *function, int line, const char *message,
+                              const json &extra)
 {
     std::stringstream ss_tid;
     ss_tid << std::this_thread::get_id();
@@ -110,7 +114,9 @@ static inline void server_log(ggml_log_level level, const char *function, int li
         if (log_callback == nullptr)
         {
             printf("%s\n", dump.c_str());
-        } else {
+        }
+        else
+        {
             log_callback(level, dump.c_str(), nullptr);
         }
     }
@@ -135,9 +141,12 @@ static inline void server_log(ggml_log_level level, const char *function, int li
 #endif
 
         const std::string str = ss.str();
-        if (log_callback == nullptr) {
+        if (log_callback == nullptr)
+        {
             printf("[%4s] %.*s\n", log_level_to_string(level), (int)str.size(), str.data());
-        } else {
+        }
+        else
+        {
             log_callback(level, str.c_str(), nullptr);
         }
     }