Skip to content

Commit 82b6fb1

Browse files
committed
Format c++ code
1 parent fe3fbf5 commit 82b6fb1

3 files changed

Lines changed: 722 additions & 604 deletions

File tree

src/main/cpp/jllama.cpp

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,13 @@ JNIEXPORT void JNICALL Java_de_kherud_llama_LlamaModel_loadModel(JNIEnv *env, jo
252252
json json_params = json::parse(c_params);
253253
server_params_parse(json_params, sparams, params);
254254

255-
if (json_value(json_params, "disable_log", false)) {
256-
log_disable();
257-
} else {
258-
log_enable();
255+
if (json_value(json_params, "disable_log", false))
256+
{
257+
log_disable();
258+
}
259+
else
260+
{
261+
log_enable();
259262
}
260263

261264
if (!sparams.system_prompt.empty())
@@ -411,12 +414,14 @@ JNIEXPORT jfloatArray JNICALL Java_de_kherud_llama_LlamaModel_embed(JNIEnv *env,
411414
jlong server_handle = env->GetLongField(obj, f_model_pointer);
412415
server_context *ctx_server = reinterpret_cast<server_context *>(server_handle);
413416

414-
if (!ctx_server->params.embedding) {
415-
env->ThrowNew(c_llama_error, "model was not loaded with embedding support (see ModelParameters#setEmbedding(boolean))");
416-
return nullptr;
417+
if (!ctx_server->params.embedding)
418+
{
419+
env->ThrowNew(c_llama_error,
420+
"model was not loaded with embedding support (see ModelParameters#setEmbedding(boolean))");
421+
return nullptr;
417422
}
418423

419-
const std::string prompt = parse_jstring(env, jprompt);
424+
const std::string prompt = parse_jstring(env, jprompt);
420425

421426
const int id_task = ctx_server->queue_tasks.get_new_id();
422427
ctx_server->queue_results.add_waiting_task_id(id_task);
@@ -432,7 +437,7 @@ JNIEXPORT jfloatArray JNICALL Java_de_kherud_llama_LlamaModel_embed(JNIEnv *env,
432437
}
433438
else
434439
{
435-
std::cout << result.data << std::endl;
440+
std::cout << result.data << std::endl;
436441
std::vector<float> embedding = result.data["embedding"].get<std::vector<float>>();
437442

438443
jfloatArray j_embedding = env->NewFloatArray(embedding.size());

0 commit comments

Comments
 (0)