Skip to content

Commit 9e4da7b

Browse files
kherudkherud
committed
Simplify parameter handling
1 parent 5fcccf6 commit 9e4da7b

8 files changed

Lines changed: 501 additions & 560 deletions

File tree

‎src/main/cpp/jllama.cpp‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ static jfieldID f_use_mlock = 0;
9797
static jfieldID f_embedding = 0;
9898
static jfieldID f_lora_adapter = 0;
9999
static jfieldID f_lora_base = 0;
100-
static jfieldID f_hellaswag = 0;
101-
static jfieldID f_hellaswag_tasks = 0;
102100
static jfieldID f_memory_f16 = 0;
103101
static jfieldID f_mem_test = 0;
104102
static jfieldID f_numa = 0;
@@ -221,15 +219,15 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
221219
f_repeat_last_n = env->GetFieldID(c_infer_params, "repeatLastN", "I");
222220
f_frequency_penalty = env->GetFieldID(c_infer_params, "frequencyPenalty", "F");
223221
f_presence_penalty = env->GetFieldID(c_infer_params, "presencePenalty", "F");
224-
f_penalize_nl = env->GetFieldID(c_infer_params, "penalizeNL", "Z");
222+
f_penalize_nl = env->GetFieldID(c_infer_params, "penalizeNl", "Z");
225223
f_ignore_eos = env->GetFieldID(c_infer_params, "ignoreEos", "Z");
226224
f_mirostat = env->GetFieldID(c_infer_params, "mirostat", "I");
227225
f_mirostat_tau = env->GetFieldID(c_infer_params, "mirostatTau", "F");
228226
f_mirostat_eta = env->GetFieldID(c_infer_params, "mirostatEta", "F");
229227
f_beam_search = env->GetFieldID(c_infer_params, "beamSearch", "Z");
230228
f_n_beams = env->GetFieldID(c_infer_params, "nBeams", "I");
231229
f_grammar = env->GetFieldID(c_infer_params, "grammar", "Ljava/lang/String;");
232-
f_antiprompt = env->GetFieldID(c_infer_params, "antiprompt", "[Ljava/lang/String;");
230+
f_antiprompt = env->GetFieldID(c_infer_params, "antiPrompt", "[Ljava/lang/String;");
233231
f_infer_seed = env->GetFieldID(c_infer_params, "seed", "I");
234232

235233
f_n_threads = env->GetFieldID(c_model_params, "nThreads", "I");
@@ -250,8 +248,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
250248
f_embedding = env->GetFieldID(c_model_params, "embedding", "Z");
251249
f_lora_adapter = env->GetFieldID(c_model_params, "loraAdapter", "Ljava/lang/String;");
252250
f_lora_base = env->GetFieldID(c_model_params, "loraBase", "Ljava/lang/String;");
253-
f_hellaswag = env->GetFieldID(c_model_params, "hellaswag", "Z");
254-
f_hellaswag_tasks = env->GetFieldID(c_model_params, "hellaswagTasks", "S");
255251
f_memory_f16 = env->GetFieldID(c_model_params, "memoryF16", "Z");
256252
f_mem_test = env->GetFieldID(c_model_params, "memTest", "Z");
257253
f_numa = env->GetFieldID(c_model_params, "numa", "Z");
@@ -265,7 +261,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
265261
{
266262
goto error;
267263
}
268-
if (!(f_n_threads && f_model_seed && f_n_ctx && f_n_batch && f_n_gpu_layers && f_main_gpu && f_tensor_split && f_rope_freq_base && f_rope_freq_scale && f_mul_mat_q && f_f16_kv && f_logits_all && f_vocab_only && f_use_mmap && f_use_mlock && f_embedding && f_lora_adapter && f_lora_base && f_hellaswag && f_hellaswag_tasks && f_memory_f16 && f_mem_test && f_numa && f_verbose_prompt))
264+
if (!(f_n_threads && f_model_seed && f_n_ctx && f_n_batch && f_n_gpu_layers && f_main_gpu && f_tensor_split && f_rope_freq_base && f_rope_freq_scale && f_mul_mat_q && f_f16_kv && f_logits_all && f_vocab_only && f_use_mmap && f_use_mlock && f_embedding && f_lora_adapter && f_lora_base && f_memory_f16 && f_mem_test && f_numa && f_verbose_prompt))
269265
{
270266
goto error;
271267
}
@@ -956,8 +952,6 @@ static gpt_params parse_model_params(JNIEnv *env, jobject jparams, jstring java_
956952
params.main_gpu = env->GetIntField(jparams, f_main_gpu);
957953
params.rope_freq_base = env->GetFloatField(jparams, f_rope_freq_base);
958954
params.rope_freq_scale = env->GetFloatField(jparams, f_rope_freq_scale);
959-
params.hellaswag = env->GetBooleanField(jparams, f_hellaswag);
960-
params.hellaswag_tasks = env->GetShortField(jparams, f_hellaswag_tasks);
961955
params.mul_mat_q = env->GetBooleanField(jparams, f_mul_mat_q);
962956
params.memory_f16 = env->GetBooleanField(jparams, f_memory_f16);
963957
params.embedding = env->GetBooleanField(jparams, f_embedding);

0 commit comments

Comments
 (0)