seqrep: Rebase, deal with logging changes.

Author: KerfuffleV2

common/common.cpp

@@ -108,12 +108,9 @@ void seqrep_sampler_params_init(llama_sampler_seqrep_params * params) {
     params->tolerance_half_step_cost = 1.0f;
 }
 
-void seqrep_sampler_params_dump(FILE * fp, llama_sampler_seqrep_params * params) {
-    if (fp == NULL) {
-        return;
-    }
+void seqrep_sampler_params_dump(const llama_sampler_seqrep_params * params) {
     assert(params != NULL);
-    fprintf(fp, "seqrep(last_n = %d, min_length = %zd, start_offset = %zd, presence_penalty = %.4f, length_penalty = %.4f, tolerance = %.4f, mid_word_scale = %.4f, tolerance_match_credit = %.4f, tolerance_half_step_cost = %.4f, flags = %d)",
+    LOG_TEE("seqrep(last_n = %d, min_length = %zd, start_offset = %zd, presence_penalty = %.4f, length_penalty = %.4f, tolerance = %.4f, mid_word_scale = %.4f, tolerance_match_credit = %.4f, tolerance_half_step_cost = %.4f, flags = %d)",
         params->last_n, params->min_length, params->start_offset, params->presence_penalty,
         params->length_penalty, params->tolerance, params->mid_word_scale, params->tolerance_match_credit,
         params->tolerance_half_step_cost, params->flags);

common/common.h

@@ -168,5 +168,5 @@ void dump_non_result_info_yaml(
     const std::string & timestamp, const std::vector<int> & prompt_tokens, const char * model_desc);
 
 void seqrep_sampler_params_init(llama_sampler_seqrep_params * params);
-void seqrep_sampler_params_dump(FILE * fp, llama_sampler_seqrep_params * params);
+void seqrep_sampler_params_dump(const llama_sampler_seqrep_params * params);
 bool seqrep_sampler_params_parse(char * s, llama_sampler_seqrep_params * params);

examples/main/main.cpp

@@ -424,7 +424,7 @@ int main(int argc, char ** argv) {
             params.repeat_last_n, params.repeat_penalty, params.presence_penalty, params.frequency_penalty, params.top_k, params.tfs_z, params.top_p, params.typical_p, params.temp, params.mirostat, params.mirostat_eta, params.mirostat_tau);
     LOG_TEE("generate: n_ctx = %d, n_batch = %d, n_predict = %d, n_keep = %d\n", n_ctx, params.n_batch, params.n_predict, params.n_keep);
     for (auto & sr_params : params.seqrep_params) {
-        seqrep_sampler_params_dump(stderr, &sr_params);
+        seqrep_sampler_params_dump(&sr_params);
     }
     LOG_TEE("\n\n");