2023-03-25 18:26:40 +00:00
|
|
|
#include "common.h"
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2023-08-04 15:20:12 +00:00
|
|
|
#include "console.h"
|
2023-03-22 05:32:36 +00:00
|
|
|
#include "llama.h"
|
2023-03-10 18:40:58 +00:00
|
|
|
|
|
|
|
#include <cassert>
|
2023-03-20 10:17:23 +00:00
|
|
|
#include <cinttypes>
|
2023-03-10 18:40:58 +00:00
|
|
|
#include <cmath>
|
|
|
|
#include <cstdio>
|
|
|
|
#include <cstring>
|
2023-04-16 10:13:00 +00:00
|
|
|
#include <ctime>
|
2023-03-10 18:40:58 +00:00
|
|
|
#include <fstream>
|
2023-03-19 19:44:30 +00:00
|
|
|
#include <iostream>
|
2023-08-28 15:59:39 +00:00
|
|
|
#include <sstream>
|
2023-03-10 18:40:58 +00:00
|
|
|
#include <string>
|
|
|
|
#include <vector>
|
|
|
|
|
2023-03-13 03:08:01 +00:00
|
|
|
#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
|
2023-03-12 21:13:28 +00:00
|
|
|
#include <signal.h>
|
|
|
|
#include <unistd.h>
|
2023-03-15 19:56:24 +00:00
|
|
|
#elif defined (_WIN32)
|
2023-05-03 01:01:57 +00:00
|
|
|
#define WIN32_LEAN_AND_MEAN
|
2023-06-16 18:25:01 +00:00
|
|
|
#ifndef NOMINMAX
|
2023-05-03 01:01:57 +00:00
|
|
|
#define NOMINMAX
|
2023-06-16 18:25:01 +00:00
|
|
|
#endif
|
2023-05-03 01:01:57 +00:00
|
|
|
#include <windows.h>
|
2023-03-15 19:56:24 +00:00
|
|
|
#include <signal.h>
|
2023-03-13 03:08:01 +00:00
|
|
|
#endif
|
2023-03-12 21:13:28 +00:00
|
|
|
|
2023-06-16 18:23:53 +00:00
|
|
|
#if defined(_MSC_VER)
|
|
|
|
#pragma warning(disable: 4244 4267) // possible loss of data
|
|
|
|
#endif
|
|
|
|
|
2023-08-28 15:59:39 +00:00
|
|
|
static llama_context ** g_ctx;
|
|
|
|
static llama_model ** g_model;
|
|
|
|
static gpt_params * g_params;
|
|
|
|
static std::vector<llama_token> * g_input_tokens;
|
|
|
|
static std::ostringstream * g_output_ss;
|
|
|
|
static std::vector<llama_token> * g_output_tokens;
|
2024-07-04 18:55:03 +00:00
|
|
|
static bool is_interacting = false;
|
|
|
|
static bool need_insert_eot = false;
|
2023-03-12 21:13:28 +00:00
|
|
|
|
2024-06-25 11:56:49 +00:00
|
|
|
static bool file_exists(const std::string & path) {
|
2024-01-30 09:18:02 +00:00
|
|
|
std::ifstream f(path.c_str());
|
|
|
|
return f.good();
|
|
|
|
}
|
|
|
|
|
2024-06-25 11:56:49 +00:00
|
|
|
static bool file_is_empty(const std::string & path) {
|
2024-01-30 09:18:02 +00:00
|
|
|
std::ifstream f;
|
|
|
|
f.exceptions(std::ifstream::failbit | std::ifstream::badbit);
|
|
|
|
f.open(path.c_str(), std::ios::in | std::ios::binary | std::ios::ate);
|
|
|
|
return f.tellg() == 0;
|
|
|
|
}
|
2023-09-15 19:38:27 +00:00
|
|
|
|
|
|
|
static void write_logfile(
|
2023-08-28 15:59:39 +00:00
|
|
|
const llama_context * ctx, const gpt_params & params, const llama_model * model,
|
2023-09-07 17:22:29 +00:00
|
|
|
const std::vector<llama_token> & input_tokens, const std::string & output,
|
|
|
|
const std::vector<llama_token> & output_tokens
|
|
|
|
) {
|
2023-08-28 15:59:39 +00:00
|
|
|
if (params.logdir.empty()) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2024-05-22 17:04:20 +00:00
|
|
|
const std::string timestamp = string_get_sortable_timestamp();
|
2023-08-28 15:59:39 +00:00
|
|
|
|
2024-05-22 17:04:20 +00:00
|
|
|
const bool success = fs_create_directory_with_parents(params.logdir);
|
2023-08-28 15:59:39 +00:00
|
|
|
if (!success) {
|
|
|
|
fprintf(stderr, "%s: warning: failed to create logdir %s, cannot write logfile\n",
|
|
|
|
__func__, params.logdir.c_str());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
const std::string logfile_path = params.logdir + timestamp + ".yml";
|
|
|
|
FILE * logfile = fopen(logfile_path.c_str(), "w");
|
|
|
|
|
|
|
|
if (logfile == NULL) {
|
|
|
|
fprintf(stderr, "%s: failed to open logfile %s\n", __func__, logfile_path.c_str());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(logfile, "binary: main\n");
|
|
|
|
char model_desc[128];
|
|
|
|
llama_model_desc(model, model_desc, sizeof(model_desc));
|
2024-05-22 17:04:20 +00:00
|
|
|
yaml_dump_non_result_info(logfile, params, ctx, timestamp, input_tokens, model_desc);
|
2023-08-28 15:59:39 +00:00
|
|
|
|
|
|
|
fprintf(logfile, "\n");
|
|
|
|
fprintf(logfile, "######################\n");
|
|
|
|
fprintf(logfile, "# Generation Results #\n");
|
|
|
|
fprintf(logfile, "######################\n");
|
|
|
|
fprintf(logfile, "\n");
|
|
|
|
|
2024-05-22 17:04:20 +00:00
|
|
|
yaml_dump_string_multiline(logfile, "output", output.c_str());
|
|
|
|
yaml_dump_vector_int(logfile, "output_tokens", output_tokens);
|
2023-08-28 15:59:39 +00:00
|
|
|
|
|
|
|
llama_dump_timing_info_yaml(logfile, ctx);
|
|
|
|
fclose(logfile);
|
|
|
|
}
|
|
|
|
|
2023-03-15 19:56:24 +00:00
|
|
|
#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) || defined (_WIN32)
|
2023-09-15 19:38:27 +00:00
|
|
|
static void sigint_handler(int signo) {
|
2023-03-12 21:13:28 +00:00
|
|
|
if (signo == SIGINT) {
|
2024-02-11 13:35:50 +00:00
|
|
|
if (!is_interacting && g_params->interactive) {
|
2024-07-04 18:55:03 +00:00
|
|
|
is_interacting = true;
|
|
|
|
need_insert_eot = true;
|
2023-03-12 21:13:28 +00:00
|
|
|
} else {
|
2023-08-04 15:20:12 +00:00
|
|
|
console::cleanup();
|
2023-05-09 02:45:48 +00:00
|
|
|
printf("\n");
|
2023-04-22 08:56:35 +00:00
|
|
|
llama_print_timings(*g_ctx);
|
2023-08-28 15:59:39 +00:00
|
|
|
write_logfile(*g_ctx, *g_params, *g_model, *g_input_tokens, g_output_ss->str(), *g_output_tokens);
|
2023-03-12 21:13:28 +00:00
|
|
|
_exit(130);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2023-03-13 03:08:01 +00:00
|
|
|
#endif
|
2023-03-12 21:13:28 +00:00
|
|
|
|
2023-11-30 21:56:19 +00:00
|
|
|
static void llama_log_callback_logTee(ggml_log_level level, const char * text, void * user_data) {
|
|
|
|
(void) level;
|
|
|
|
(void) user_data;
|
|
|
|
LOG_TEE("%s", text);
|
|
|
|
}
|
|
|
|
|
2024-06-25 11:56:49 +00:00
|
|
|
static std::string chat_add_and_format(struct llama_model * model, std::vector<llama_chat_msg> & chat_msgs, std::string role, std::string content) {
|
|
|
|
llama_chat_msg new_msg{role, content};
|
|
|
|
auto formatted = llama_chat_format_single(
|
|
|
|
model, g_params->chat_template, chat_msgs, new_msg, role == "user");
|
|
|
|
chat_msgs.push_back({role, content});
|
2024-07-24 11:48:46 +00:00
|
|
|
LOG("formatted: %s\n", formatted.c_str());
|
2024-06-25 11:56:49 +00:00
|
|
|
return formatted;
|
|
|
|
}
|
|
|
|
|
2023-03-10 18:40:58 +00:00
|
|
|
int main(int argc, char ** argv) {
|
|
|
|
gpt_params params;
|
2023-08-28 15:59:39 +00:00
|
|
|
g_params = ¶ms;
|
2023-03-10 18:40:58 +00:00
|
|
|
|
2023-09-07 17:22:29 +00:00
|
|
|
if (!gpt_params_parse(argc, argv, params)) {
|
2024-06-04 18:23:39 +00:00
|
|
|
gpt_params_print_usage(argc, argv, params);
|
2023-03-10 18:40:58 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2024-06-04 18:23:39 +00:00
|
|
|
|
2023-10-20 18:07:23 +00:00
|
|
|
llama_sampling_params & sparams = params.sparams;
|
2023-03-19 16:37:02 +00:00
|
|
|
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
#ifndef LOG_DISABLE_LOGS
|
|
|
|
log_set_target(log_filename_generator("main", "log"));
|
|
|
|
LOG_TEE("Log start\n");
|
2023-09-03 12:12:08 +00:00
|
|
|
log_dump_cmdline(argc, argv);
|
2023-11-30 21:56:19 +00:00
|
|
|
llama_log_set(llama_log_callback_logTee, nullptr);
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
#endif // LOG_DISABLE_LOGS
|
|
|
|
|
|
|
|
// TODO: Dump params ?
|
|
|
|
//LOG("Params perplexity: %s\n", LOG_TOSTR(params.perplexity));
|
|
|
|
|
2023-03-25 20:29:22 +00:00
|
|
|
// save choice to use color for later
|
|
|
|
// (note for later: this is a slightly awkward choice)
|
2023-08-04 15:20:12 +00:00
|
|
|
console::init(params.simple_io, params.use_color);
|
|
|
|
atexit([]() { console::cleanup(); });
|
2023-03-25 20:29:22 +00:00
|
|
|
|
2023-09-28 16:04:36 +00:00
|
|
|
if (params.logits_all) {
|
2023-03-25 18:26:40 +00:00
|
|
|
printf("\n************\n");
|
|
|
|
printf("%s: please use the 'perplexity' tool for perplexity calculations\n", __func__);
|
|
|
|
printf("************\n\n");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2023-03-25 19:36:22 +00:00
|
|
|
if (params.embedding) {
|
|
|
|
printf("\n************\n");
|
|
|
|
printf("%s: please use the 'embedding' tool for embedding calculations\n", __func__);
|
|
|
|
printf("************\n\n");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2023-09-28 19:42:38 +00:00
|
|
|
if (params.n_ctx != 0 && params.n_ctx < 8) {
|
|
|
|
LOG_TEE("%s: warning: minimum context size is 8, using minimum size.\n", __func__);
|
|
|
|
params.n_ctx = 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (params.rope_freq_base != 0.0) {
|
|
|
|
LOG_TEE("%s: warning: changing RoPE frequency base to %g.\n", __func__, params.rope_freq_base);
|
llama : add custom RoPE (#2054)
* Implement customizable RoPE
The original RoPE has pre-defined parameters
theta_i = 10000^(−2(i−1)/d), for i in [1, 2, ..., d/2]
Our customizable RoPE, ggml_rope_custom_inplace, uses
theta_i = scale * base^(−2(i−1)/d), for i in [1, 2, ..., d/2]
with the default matches the original
scale = 1.0
base = 10000
The new command line arguments
--rope-freq-base
--rope-freq-scale
set the two new RoPE parameter.
Recent researches show changing these two parameters extends the context limit with minimal loss.
1. Extending Context to 8K
kaiokendev
https://kaiokendev.github.io/til#extending-context-to-8k
2. Extending Context Window of Large Language Models via Positional Interpolation
Shouyuan Chen, Sherman Wong, Liangjian Chen, Yuandong Tian
https://arxiv.org/abs/2306.15595
3. NTK-Aware Scaled RoPE allows LLaMA models to have extended (8k+) context size without any fine-tuning and minimal perplexity degradation.
https://www.reddit.com/user/bloc97
https://www.reddit.com/r/LocalLLaMA/comments/14lz7j5/ntkaware_scaled_rope_allows_llama_models_to_have/
For the bold, try adding the following command line parameters to your favorite model:
-c 16384 --rope-freq-base 80000 --rope-freq-scale 0.5
* ggml-metal: fix custom rope
* common: fix argument names in help
* llama: increase MEM_REQ_EVAL for MODEL_3B
It avoids crashing for quantized weights on CPU.
Better ways to calculate the required buffer size would be better.
* llama: make MEM_REQ_EVAL depend on n_ctx
* server: use proper Content-Type in curl examples
Without the header Content-Type: application/json, curl will POST with
Content-Type: application/x-www-form-urlencoded
Though our simple server doesn't care, the httplib.h used has a limit
with CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH 8192
With Content-Type: application/json, we can send large json data.
* style : minor fixes, mostly indentations
* ggml : fix asserts
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-07-15 10:34:16 +00:00
|
|
|
}
|
|
|
|
|
2023-09-28 19:42:38 +00:00
|
|
|
if (params.rope_freq_scale != 0.0) {
|
|
|
|
LOG_TEE("%s: warning: scaling RoPE frequency by %g.\n", __func__, params.rope_freq_scale);
|
llama : add custom RoPE (#2054)
* Implement customizable RoPE
The original RoPE has pre-defined parameters
theta_i = 10000^(−2(i−1)/d), for i in [1, 2, ..., d/2]
Our customizable RoPE, ggml_rope_custom_inplace, uses
theta_i = scale * base^(−2(i−1)/d), for i in [1, 2, ..., d/2]
with the default matches the original
scale = 1.0
base = 10000
The new command line arguments
--rope-freq-base
--rope-freq-scale
set the two new RoPE parameter.
Recent researches show changing these two parameters extends the context limit with minimal loss.
1. Extending Context to 8K
kaiokendev
https://kaiokendev.github.io/til#extending-context-to-8k
2. Extending Context Window of Large Language Models via Positional Interpolation
Shouyuan Chen, Sherman Wong, Liangjian Chen, Yuandong Tian
https://arxiv.org/abs/2306.15595
3. NTK-Aware Scaled RoPE allows LLaMA models to have extended (8k+) context size without any fine-tuning and minimal perplexity degradation.
https://www.reddit.com/user/bloc97
https://www.reddit.com/r/LocalLLaMA/comments/14lz7j5/ntkaware_scaled_rope_allows_llama_models_to_have/
For the bold, try adding the following command line parameters to your favorite model:
-c 16384 --rope-freq-base 80000 --rope-freq-scale 0.5
* ggml-metal: fix custom rope
* common: fix argument names in help
* llama: increase MEM_REQ_EVAL for MODEL_3B
It avoids crashing for quantized weights on CPU.
Better ways to calculate the required buffer size would be better.
* llama: make MEM_REQ_EVAL depend on n_ctx
* server: use proper Content-Type in curl examples
Without the header Content-Type: application/json, curl will POST with
Content-Type: application/x-www-form-urlencoded
Though our simple server doesn't care, the httplib.h used has a limit
with CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH 8192
With Content-Type: application/json, we can send large json data.
* style : minor fixes, mostly indentations
* ggml : fix asserts
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-07-15 10:34:16 +00:00
|
|
|
}
|
|
|
|
|
2023-11-02 06:50:16 +00:00
|
|
|
LOG_TEE("%s: build = %d (%s)\n", __func__, LLAMA_BUILD_NUMBER, LLAMA_COMMIT);
|
|
|
|
LOG_TEE("%s: built with %s for %s\n", __func__, LLAMA_COMPILER, LLAMA_BUILD_TARGET);
|
2023-05-01 16:23:47 +00:00
|
|
|
|
2023-06-29 13:15:15 +00:00
|
|
|
if (params.seed == LLAMA_DEFAULT_SEED) {
|
2023-03-10 18:40:58 +00:00
|
|
|
params.seed = time(NULL);
|
|
|
|
}
|
|
|
|
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s: seed = %u\n", __func__, params.seed);
|
2023-03-10 18:40:58 +00:00
|
|
|
|
|
|
|
std::mt19937 rng(params.seed);
|
|
|
|
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG("%s: llama backend init\n", __func__);
|
2024-02-16 09:31:07 +00:00
|
|
|
llama_backend_init();
|
|
|
|
llama_numa_init(params.numa);
|
2023-04-22 10:54:13 +00:00
|
|
|
|
2023-06-24 08:47:58 +00:00
|
|
|
llama_model * model;
|
2023-03-22 05:32:36 +00:00
|
|
|
llama_context * ctx;
|
2023-07-11 16:18:43 +00:00
|
|
|
llama_context * ctx_guidance = NULL;
|
2024-06-25 11:56:49 +00:00
|
|
|
std::vector<llama_chat_msg> chat_msgs;
|
2023-08-28 15:59:39 +00:00
|
|
|
g_model = &model;
|
2023-04-22 08:56:35 +00:00
|
|
|
g_ctx = &ctx;
|
2023-03-10 18:40:58 +00:00
|
|
|
|
2023-05-02 20:39:51 +00:00
|
|
|
// load the model and apply lora adapter, if any
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG("%s: load the model and apply lora adapter, if any\n", __func__);
|
2024-08-05 16:14:10 +00:00
|
|
|
llama_init_result llama_init = llama_init_from_gpt_params(params);
|
|
|
|
|
|
|
|
model = llama_init.model;
|
|
|
|
ctx = llama_init.context;
|
2023-10-11 19:35:46 +00:00
|
|
|
if (sparams.cfg_scale > 1.f) {
|
2023-07-11 16:18:43 +00:00
|
|
|
struct llama_context_params lparams = llama_context_params_from_gpt_params(params);
|
|
|
|
ctx_guidance = llama_new_context_with_model(model, lparams);
|
|
|
|
}
|
|
|
|
|
2023-06-24 08:47:58 +00:00
|
|
|
if (model == NULL) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s: error: unable to load model\n", __func__);
|
2023-05-02 20:39:51 +00:00
|
|
|
return 1;
|
2023-04-17 15:28:55 +00:00
|
|
|
}
|
|
|
|
|
Threadpool: take 2 (#8672)
* Introduce ggml_compute_threadpool
- OpenMP functional: check
- Vanilla ggml functional: Check
- ggml w/threadpool functional: Check
- OpenMP no regression: No glaring problems
- Vanilla ggml no regression: No glaring problems
- ggml w/threadpool no regression: No glaring problems
* Minor fixes
* fixed use after release bug
* fixed a harmless race condition
* Fix Android bulid issue
* fix more race conditions
* fix deadlock for cases where cgraph.n_nodes == 1
and fix --poll case
* threadpool: use cpu_get_num_math to set the default number of threadpool threads
This way we avoid using E-Cores and Hyperthreaded siblings.
* bench: create fresh threadpool for each test
For benchmarking it's better to start a fresh pool for each test with the exact number of threads
needed for that test. Having larger pools is suboptimal (causes more load, etc).
* atomics: always use stdatomics with clang and use relaxed memory order when polling in ggml_barrier
This also removes sched_yield() calls from ggml_barrier() to match OpenMP behavior.
* threadpool: make polling the default to match openmp behavior
All command line args now allow for setting poll to 0 (false).
* threadpool: do not wakeup threads in already paused threadpool
* fix potential race condition in check_for_work
* threadpool: do not create two threadpools if their params are identical
* threadpool: reduce pause/resume/wakeup overhead in common cases
We now start threadpool in paused state only if we have two.
The resume is now implicit (ie new work) which allows for reduced locking and context-switch overhead.
* threadpool: add support for hybrid polling
poll params (--poll, ...) now specify "polling level", i.e. how aggresively we poll before waiting on cond.var.
poll=0 means no polling, 1 means poll for 128K rounds then wait, 2 for 256K rounds, ...
The default value of 50 (ie 50x128K rounds) seems like a decent default across modern platforms.
We can tune this further as things evolve.
* threadpool: reduce the number of barrier required
New work is now indicated with an atomic counter that is incremented for
each new graph that needs to be computed.
This removes the need for extra barrier for clearing the "new_work" and
removes the special case for trivial graphs.
* threadpool: remove special-casing for disposable threadpools
With the efficient hybrid polling there is no need to make disposable pools any different.
This simplifies the overall logic and reduces branching.
Include n_threads in debug print for disposable threadpool.
Declare pause and stop flags as atomic_bool
This doesn't actually generate any memory barriers and simply informs
the thread sanitizer that these flags can be written & read by different
threads without locking.
* threadpool: do not clear barrier counters between graphs computes (fixes race with small graphs)
This fixes the race condition with very small graphs where the main thread happens to
start a new graph while the workers are just about to exit from barriers.
* threadpool: use relaxed order for chunk sync
Full memory barrier is an overkill for this since each thread works on different chunk
* threadpool: remove abort_callback from threadpool state
* threadpool: better naming for thread/cpumask releated functions
* threadpool: consistent use of int type for n_threads params
* threadpool: add support for ggml_threadpool_params_default/init
Also removes the need for explicit mask_specified param.
all-zero cpumask means use default (usually inherited) cpu affinity mask.
* threadpool: move typedef into ggml.h
* threadpool: fix apply_priority() function name
* threadpool: fix swift wrapper errors due to n_threads int type cleanup
* threadpool: enable --cpu-mask and other threadpool related options only if threadpool is enabled
* threadpool: replace checks for compute_thread ret code with proper status check
* threadpool: simplify threadpool init logic and fix main thread affinity application
Most of the init code is now exactly the same between threadpool and openmp.
* threadpool: update threadpool resume/pause function names
* threadpool: enable openmp by default for now
* threadpool: don't forget to free workers state when omp is enabled
* threadpool: avoid updating process priority on the platforms that do not require it
On Windows we need to change overall process priority class in order to set thread priorities,
but on Linux, Mac, etc we do not need to touch the overall process settings.
* threadpool: update calling thread prio and affinity only at start/resume
This avoids extra syscalls for each graph_compute()
* llama-bench: turn threadpool params into vectors, add output headers, etc
* llama-bench: add support for cool off between tests --delay
This helps for long running tests on platforms that are thermally limited (phones, laptops, etc).
--delay (disabled by default) introduces the sleep for N seconds before starting each test.
* threadpool: move process priority setting into the apps (bench and cli)
This avoids changing the overall process priority on Windows for the apps
that use ggml/llama.cpp directy.
* threadpool: move all pause/resume logic into ggml
* threadpool: futher api cleanup and prep for future refactoring
All threadpool related functions and structs use ggml_threadpool prefix.
* threadpool: minor indent fixes
* threadpool: improve setprioty error message
* Update examples/llama-bench/llama-bench.cpp
Co-authored-by: slaren <slarengh@gmail.com>
* threadpool: fix indent in set_threadpool call
* use int32_t for n_thread type in public llama.cpp API
* threadpool: use _new and _free instead of _create and _release
* fix two more public APIs to use int32_t for n_threads
* build: set _GNU_SOURCE for Adroid
---------
Co-authored-by: Max Krasnyansky <quic_maxk@quicinc.com>
Co-authored-by: fmz <quic_fzaghlou@quic.com>
Co-authored-by: Max Krasnyansky <max.krasnyansky@gmail.com>
Co-authored-by: slaren <slarengh@gmail.com>
2024-08-29 23:20:53 +00:00
|
|
|
LOG("%s: llama threadpool init = n_threads = %d\n",
|
|
|
|
__func__,
|
|
|
|
(int) params.cpuparams.n_threads
|
|
|
|
);
|
|
|
|
struct ggml_threadpool_params tpp_batch =
|
|
|
|
ggml_threadpool_params_from_cpu_params(params.cpuparams_batch);
|
|
|
|
struct ggml_threadpool_params tpp =
|
|
|
|
ggml_threadpool_params_from_cpu_params(params.cpuparams);
|
|
|
|
|
|
|
|
set_process_priority(params.cpuparams.priority);
|
|
|
|
|
|
|
|
struct ggml_threadpool * threadpool_batch = NULL;
|
|
|
|
if (!ggml_threadpool_params_match(&tpp, &tpp_batch)) {
|
|
|
|
threadpool_batch = ggml_threadpool_new(&tpp_batch);
|
|
|
|
if (!threadpool_batch) {
|
|
|
|
LOG_TEE("%s: batch threadpool create failed : n_threads %d\n", __func__, tpp_batch.n_threads);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Start the non-batch threadpool in the paused state
|
|
|
|
tpp.paused = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct ggml_threadpool * threadpool = ggml_threadpool_new(&tpp);
|
|
|
|
if (!threadpool) {
|
|
|
|
LOG_TEE("%s: threadpool create failed : n_threads %d\n", __func__, tpp.n_threads);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
llama_attach_threadpool(ctx, threadpool, threadpool_batch);
|
|
|
|
if (ctx_guidance) {
|
|
|
|
llama_attach_threadpool(ctx_guidance, threadpool, threadpool_batch);
|
|
|
|
}
|
|
|
|
|
2023-09-28 19:42:38 +00:00
|
|
|
const int n_ctx_train = llama_n_ctx_train(model);
|
|
|
|
const int n_ctx = llama_n_ctx(ctx);
|
|
|
|
LOG("n_ctx: %d\n", n_ctx);
|
|
|
|
|
|
|
|
if (n_ctx > n_ctx_train) {
|
2023-09-08 15:43:35 +00:00
|
|
|
LOG_TEE("%s: warning: model was trained on only %d context tokens (%d specified)\n",
|
2023-09-28 19:42:38 +00:00
|
|
|
__func__, n_ctx_train, n_ctx);
|
2023-09-04 19:26:24 +00:00
|
|
|
}
|
|
|
|
|
2024-07-04 18:55:03 +00:00
|
|
|
// print chat template example in conversation mode
|
|
|
|
if (params.conversation) {
|
|
|
|
if (params.enable_chat_template) {
|
|
|
|
LOG_TEE("%s: chat template example: %s\n", __func__, llama_chat_format_example(model, params.chat_template).c_str());
|
|
|
|
} else {
|
|
|
|
LOG_TEE("%s: in-suffix/prefix is specified, chat template will be disabled\n", __func__);
|
|
|
|
}
|
|
|
|
}
|
2024-06-25 11:56:49 +00:00
|
|
|
|
2023-03-13 17:15:08 +00:00
|
|
|
// print system information
|
|
|
|
{
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("\n");
|
2024-05-22 17:04:20 +00:00
|
|
|
LOG_TEE("%s\n", gpt_params_get_system_info(params).c_str());
|
2023-03-13 17:15:08 +00:00
|
|
|
}
|
|
|
|
|
2023-05-10 15:37:14 +00:00
|
|
|
std::string path_session = params.path_prompt_cache;
|
2023-04-28 15:59:37 +00:00
|
|
|
std::vector<llama_token> session_tokens;
|
|
|
|
|
|
|
|
if (!path_session.empty()) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s: attempting to load saved session from '%s'\n", __func__, path_session.c_str());
|
2024-01-30 09:18:02 +00:00
|
|
|
if (!file_exists(path_session)) {
|
|
|
|
LOG_TEE("%s: session file does not exist, will create.\n", __func__);
|
|
|
|
} else if (file_is_empty(path_session)) {
|
|
|
|
LOG_TEE("%s: The session file is empty. A new session will be initialized.\n", __func__);
|
|
|
|
} else {
|
|
|
|
// The file exists and is not empty
|
2023-09-28 19:42:38 +00:00
|
|
|
session_tokens.resize(n_ctx);
|
2023-04-28 15:59:37 +00:00
|
|
|
size_t n_token_count_out = 0;
|
2024-04-08 12:43:30 +00:00
|
|
|
if (!llama_state_load_file(ctx, path_session.c_str(), session_tokens.data(), session_tokens.capacity(), &n_token_count_out)) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s: error: failed to load session file '%s'\n", __func__, path_session.c_str());
|
2023-05-01 11:54:59 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2023-04-28 15:59:37 +00:00
|
|
|
session_tokens.resize(n_token_count_out);
|
2024-01-30 09:18:02 +00:00
|
|
|
LOG_TEE("%s: loaded a session with prompt size of %d tokens\n", __func__, (int)session_tokens.size());
|
2023-04-28 15:59:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-08-15 07:23:23 +00:00
|
|
|
const bool add_bos = llama_add_bos_token(model);
|
2024-07-04 13:46:11 +00:00
|
|
|
if (!llama_model_has_encoder(model)) {
|
2024-08-15 07:23:23 +00:00
|
|
|
GGML_ASSERT(!llama_add_eos_token(model));
|
2024-07-04 13:46:11 +00:00
|
|
|
}
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG("add_bos: %d\n", add_bos);
|
2023-08-23 20:08:04 +00:00
|
|
|
|
2023-05-26 02:18:01 +00:00
|
|
|
std::vector<llama_token> embd_inp;
|
2023-08-26 11:45:53 +00:00
|
|
|
|
2024-06-25 11:56:49 +00:00
|
|
|
{
|
2024-07-04 18:55:03 +00:00
|
|
|
auto prompt = (params.conversation && params.enable_chat_template && !params.prompt.empty())
|
2024-06-25 11:56:49 +00:00
|
|
|
? chat_add_and_format(model, chat_msgs, "system", params.prompt) // format the system prompt in conversation mode
|
|
|
|
: params.prompt;
|
|
|
|
if (params.interactive_first || !params.prompt.empty() || session_tokens.empty()) {
|
|
|
|
LOG("tokenize the prompt\n");
|
|
|
|
embd_inp = ::llama_tokenize(ctx, prompt, true, true);
|
|
|
|
} else {
|
|
|
|
LOG("use session tokens\n");
|
|
|
|
embd_inp = session_tokens;
|
|
|
|
}
|
2023-03-10 18:40:58 +00:00
|
|
|
|
2024-06-25 11:56:49 +00:00
|
|
|
LOG("prompt: \"%s\"\n", log_tostr(prompt));
|
|
|
|
LOG("tokens: %s\n", LOG_TOKENS_TOSTR_PRETTY(ctx, embd_inp).c_str());
|
|
|
|
}
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2023-08-23 14:46:03 +00:00
|
|
|
// Should not run without any tokens
|
|
|
|
if (embd_inp.empty()) {
|
2024-07-12 11:48:04 +00:00
|
|
|
if (add_bos) {
|
|
|
|
embd_inp.push_back(llama_token_bos(model));
|
|
|
|
LOG("embd_inp was considered empty and bos was added: %s\n", LOG_TOKENS_TOSTR_PRETTY(ctx, embd_inp).c_str());
|
|
|
|
} else {
|
|
|
|
LOG_TEE("error: input is empty\n");
|
|
|
|
return -1;
|
|
|
|
}
|
2023-08-23 14:46:03 +00:00
|
|
|
}
|
|
|
|
|
2023-07-11 16:18:43 +00:00
|
|
|
// Tokenize negative prompt
|
|
|
|
std::vector<llama_token> guidance_inp;
|
|
|
|
int guidance_offset = 0;
|
|
|
|
int original_prompt_len = 0;
|
|
|
|
if (ctx_guidance) {
|
2023-10-11 19:35:46 +00:00
|
|
|
LOG("cfg_negative_prompt: \"%s\"\n", log_tostr(sparams.cfg_negative_prompt));
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2024-04-09 17:44:08 +00:00
|
|
|
guidance_inp = ::llama_tokenize(ctx_guidance, sparams.cfg_negative_prompt, true, true);
|
2023-10-18 13:21:57 +00:00
|
|
|
LOG("guidance_inp tokenized: %s\n", LOG_TOKENS_TOSTR_PRETTY(ctx_guidance, guidance_inp).c_str());
|
2023-07-11 16:18:43 +00:00
|
|
|
|
2024-04-09 17:44:08 +00:00
|
|
|
std::vector<llama_token> original_inp = ::llama_tokenize(ctx, params.prompt, true, true);
|
2023-10-18 13:21:57 +00:00
|
|
|
LOG("original_inp tokenized: %s\n", LOG_TOKENS_TOSTR_PRETTY(ctx, original_inp).c_str());
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2023-07-11 16:18:43 +00:00
|
|
|
original_prompt_len = original_inp.size();
|
|
|
|
guidance_offset = (int)guidance_inp.size() - original_prompt_len;
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG("original_prompt_len: %s", log_tostr(original_prompt_len));
|
|
|
|
LOG("guidance_offset: %s", log_tostr(guidance_offset));
|
2023-07-11 16:18:43 +00:00
|
|
|
}
|
|
|
|
|
2023-03-25 19:36:22 +00:00
|
|
|
if ((int) embd_inp.size() > n_ctx - 4) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s: error: prompt is too long (%d tokens, max %d)\n", __func__, (int) embd_inp.size(), n_ctx - 4);
|
2023-03-25 19:36:22 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2023-04-28 15:59:37 +00:00
|
|
|
// debug message about similarity of saved session, if applicable
|
|
|
|
size_t n_matching_session_tokens = 0;
|
2023-09-07 17:22:29 +00:00
|
|
|
if (!session_tokens.empty()) {
|
2023-04-28 15:59:37 +00:00
|
|
|
for (llama_token id : session_tokens) {
|
|
|
|
if (n_matching_session_tokens >= embd_inp.size() || id != embd_inp[n_matching_session_tokens]) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
n_matching_session_tokens++;
|
|
|
|
}
|
2023-05-26 02:18:01 +00:00
|
|
|
if (params.prompt.empty() && n_matching_session_tokens == embd_inp.size()) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s: using full prompt from session file\n", __func__);
|
2023-05-26 02:18:01 +00:00
|
|
|
} else if (n_matching_session_tokens >= embd_inp.size()) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s: session file has exact match for prompt!\n", __func__);
|
2023-04-28 15:59:37 +00:00
|
|
|
} else if (n_matching_session_tokens < (embd_inp.size() / 2)) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s: warning: session file has low similarity to prompt (%zu / %zu tokens); will mostly be reevaluated\n",
|
2023-04-28 15:59:37 +00:00
|
|
|
__func__, n_matching_session_tokens, embd_inp.size());
|
|
|
|
} else {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s: session file matches %zu / %zu tokens of prompt\n",
|
2023-04-28 15:59:37 +00:00
|
|
|
__func__, n_matching_session_tokens, embd_inp.size());
|
|
|
|
}
|
2023-10-11 20:55:08 +00:00
|
|
|
|
|
|
|
// remove any "future" tokens that we might have inherited from the previous session
|
2023-10-29 17:31:40 +00:00
|
|
|
llama_kv_cache_seq_rm(ctx, -1, n_matching_session_tokens, -1);
|
2023-04-28 15:59:37 +00:00
|
|
|
}
|
|
|
|
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOGLN(
|
2024-09-02 12:36:43 +00:00
|
|
|
"recalculate the cached logits (check): embd_inp.empty() %s, n_matching_session_tokens %zu, embd_inp.size() %zu, session_tokens.size() %zu",
|
|
|
|
log_tostr(embd_inp.empty()), n_matching_session_tokens, embd_inp.size(), session_tokens.size());
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2023-06-03 11:28:45 +00:00
|
|
|
// if we will use the cache for the full prompt without reaching the end of the cache, force
|
2024-04-29 17:56:59 +00:00
|
|
|
// reevaluation of the last token to recalculate the cached logits
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
if (!embd_inp.empty() && n_matching_session_tokens == embd_inp.size() && session_tokens.size() > embd_inp.size()) {
|
|
|
|
LOGLN("recalculate the cached logits (do): session_tokens.resize( %zu )", embd_inp.size() - 1);
|
|
|
|
|
2023-06-03 11:28:45 +00:00
|
|
|
session_tokens.resize(embd_inp.size() - 1);
|
|
|
|
}
|
|
|
|
|
2023-03-28 14:09:55 +00:00
|
|
|
// number of tokens to keep when resetting context
|
2024-06-04 18:23:39 +00:00
|
|
|
if (params.n_keep < 0 || params.n_keep > (int) embd_inp.size()) {
|
2023-03-28 14:09:55 +00:00
|
|
|
params.n_keep = (int)embd_inp.size();
|
2024-02-21 15:33:54 +00:00
|
|
|
} else {
|
|
|
|
params.n_keep += add_bos; // always keep the BOS token
|
2023-03-28 14:09:55 +00:00
|
|
|
}
|
2023-03-10 18:40:58 +00:00
|
|
|
|
2024-06-04 18:23:39 +00:00
|
|
|
if (params.conversation) {
|
2024-05-08 14:32:32 +00:00
|
|
|
params.interactive_first = true;
|
|
|
|
}
|
2023-03-19 16:37:02 +00:00
|
|
|
|
2023-05-19 17:24:59 +00:00
|
|
|
// enable interactive mode if interactive start is specified
|
|
|
|
if (params.interactive_first) {
|
2023-03-22 17:16:35 +00:00
|
|
|
params.interactive = true;
|
|
|
|
}
|
|
|
|
|
2023-03-25 15:16:50 +00:00
|
|
|
if (params.verbose_prompt) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("\n");
|
|
|
|
LOG_TEE("%s: prompt: '%s'\n", __func__, params.prompt.c_str());
|
|
|
|
LOG_TEE("%s: number of tokens in prompt = %zu\n", __func__, embd_inp.size());
|
2023-03-25 15:16:50 +00:00
|
|
|
for (int i = 0; i < (int) embd_inp.size(); i++) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%6d -> '%s'\n", embd_inp[i], llama_token_to_piece(ctx, embd_inp[i]).c_str());
|
2023-03-25 15:16:50 +00:00
|
|
|
}
|
2023-07-11 16:18:43 +00:00
|
|
|
|
|
|
|
if (ctx_guidance) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("\n");
|
2023-10-11 19:35:46 +00:00
|
|
|
LOG_TEE("%s: negative prompt: '%s'\n", __func__, sparams.cfg_negative_prompt.c_str());
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s: number of tokens in negative prompt = %zu\n", __func__, guidance_inp.size());
|
2023-07-11 16:18:43 +00:00
|
|
|
for (int i = 0; i < (int) guidance_inp.size(); i++) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%6d -> '%s'\n", guidance_inp[i], llama_token_to_piece(ctx, guidance_inp[i]).c_str());
|
2023-07-11 16:18:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-02-21 15:33:54 +00:00
|
|
|
if (params.n_keep > add_bos) {
|
|
|
|
LOG_TEE("%s: static prompt based on n_keep: '", __func__);
|
2023-03-25 19:36:22 +00:00
|
|
|
for (int i = 0; i < params.n_keep; i++) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s", llama_token_to_piece(ctx, embd_inp[i]).c_str());
|
2023-03-25 19:36:22 +00:00
|
|
|
}
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("'\n");
|
2023-03-25 19:36:22 +00:00
|
|
|
}
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("\n");
|
2023-03-10 18:40:58 +00:00
|
|
|
}
|
2023-03-25 15:16:50 +00:00
|
|
|
|
2024-02-11 13:35:50 +00:00
|
|
|
// ctrl+C handling
|
|
|
|
{
|
2023-03-13 03:08:01 +00:00
|
|
|
#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
|
2023-03-12 21:13:28 +00:00
|
|
|
struct sigaction sigint_action;
|
|
|
|
sigint_action.sa_handler = sigint_handler;
|
|
|
|
sigemptyset (&sigint_action.sa_mask);
|
2023-03-13 17:15:08 +00:00
|
|
|
sigint_action.sa_flags = 0;
|
2023-03-12 21:13:28 +00:00
|
|
|
sigaction(SIGINT, &sigint_action, NULL);
|
2023-03-15 19:56:24 +00:00
|
|
|
#elif defined (_WIN32)
|
2023-05-18 17:30:40 +00:00
|
|
|
auto console_ctrl_handler = +[](DWORD ctrl_type) -> BOOL {
|
2023-05-03 01:01:57 +00:00
|
|
|
return (ctrl_type == CTRL_C_EVENT) ? (sigint_handler(SIGINT), true) : false;
|
|
|
|
};
|
2023-08-21 20:07:43 +00:00
|
|
|
SetConsoleCtrlHandler(reinterpret_cast<PHANDLER_ROUTINE>(console_ctrl_handler), true);
|
2023-03-13 03:08:01 +00:00
|
|
|
#endif
|
2024-02-11 13:35:50 +00:00
|
|
|
}
|
2023-03-12 21:13:28 +00:00
|
|
|
|
2024-02-11 13:35:50 +00:00
|
|
|
if (params.interactive) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s: interactive mode on.\n", __func__);
|
2023-03-12 21:13:28 +00:00
|
|
|
|
2023-09-07 17:22:29 +00:00
|
|
|
if (!params.antiprompt.empty()) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
for (const auto & antiprompt : params.antiprompt) {
|
|
|
|
LOG_TEE("Reverse prompt: '%s'\n", antiprompt.c_str());
|
2023-10-17 15:11:01 +00:00
|
|
|
if (params.verbose_prompt) {
|
|
|
|
auto tmp = ::llama_tokenize(ctx, antiprompt, false, true);
|
|
|
|
for (int i = 0; i < (int) tmp.size(); i++) {
|
|
|
|
LOG_TEE("%6d -> '%s'\n", tmp[i], llama_token_to_piece(ctx, tmp[i]).c_str());
|
|
|
|
}
|
|
|
|
}
|
2023-03-12 21:13:28 +00:00
|
|
|
}
|
|
|
|
}
|
2023-03-25 12:03:19 +00:00
|
|
|
|
2023-07-25 12:19:11 +00:00
|
|
|
if (params.input_prefix_bos) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("Input prefix with BOS\n");
|
2023-07-25 12:19:11 +00:00
|
|
|
}
|
|
|
|
|
2023-03-25 12:03:19 +00:00
|
|
|
if (!params.input_prefix.empty()) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("Input prefix: '%s'\n", params.input_prefix.c_str());
|
2023-10-17 15:11:01 +00:00
|
|
|
if (params.verbose_prompt) {
|
|
|
|
auto tmp = ::llama_tokenize(ctx, params.input_prefix, true, true);
|
|
|
|
for (int i = 0; i < (int) tmp.size(); i++) {
|
|
|
|
LOG_TEE("%6d -> '%s'\n", tmp[i], llama_token_to_piece(ctx, tmp[i]).c_str());
|
|
|
|
}
|
|
|
|
}
|
2023-03-25 12:03:19 +00:00
|
|
|
}
|
2023-05-04 15:41:12 +00:00
|
|
|
|
|
|
|
if (!params.input_suffix.empty()) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("Input suffix: '%s'\n", params.input_suffix.c_str());
|
2023-10-17 15:11:01 +00:00
|
|
|
if (params.verbose_prompt) {
|
|
|
|
auto tmp = ::llama_tokenize(ctx, params.input_suffix, false, true);
|
|
|
|
for (int i = 0; i < (int) tmp.size(); i++) {
|
|
|
|
LOG_TEE("%6d -> '%s'\n", tmp[i], llama_token_to_piece(ctx, tmp[i]).c_str());
|
|
|
|
}
|
|
|
|
}
|
2023-05-04 15:41:12 +00:00
|
|
|
}
|
2023-03-12 21:13:28 +00:00
|
|
|
}
|
2023-10-20 18:07:23 +00:00
|
|
|
LOG_TEE("sampling: \n%s\n", llama_sampling_print(sparams).c_str());
|
2023-12-05 10:05:51 +00:00
|
|
|
LOG_TEE("sampling order: \n%s\n", llama_sampling_order_print(sparams).c_str());
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
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);
|
2024-01-08 09:18:32 +00:00
|
|
|
|
|
|
|
// group-attention state
|
|
|
|
// number of grouped KV tokens so far (used only if params.grp_attn_n > 1)
|
|
|
|
int ga_i = 0;
|
|
|
|
|
|
|
|
const int ga_n = params.grp_attn_n;
|
|
|
|
const int ga_w = params.grp_attn_w;
|
|
|
|
|
|
|
|
if (ga_n != 1) {
|
|
|
|
GGML_ASSERT(ga_n > 0 && "grp_attn_n must be positive"); // NOLINT
|
|
|
|
GGML_ASSERT(ga_w % ga_n == 0 && "grp_attn_w must be a multiple of grp_attn_n"); // NOLINT
|
|
|
|
//GGML_ASSERT(n_ctx_train % ga_w == 0 && "n_ctx_train must be a multiple of grp_attn_w"); // NOLINT
|
|
|
|
//GGML_ASSERT(n_ctx >= n_ctx_train * ga_n && "n_ctx must be at least n_ctx_train * grp_attn_n"); // NOLINT
|
|
|
|
LOG_TEE("self-extend: n_ctx_train = %d, grp_attn_n = %d, grp_attn_w = %d\n", n_ctx_train, ga_n, ga_w);
|
|
|
|
}
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("\n\n");
|
2023-03-10 18:40:58 +00:00
|
|
|
|
2023-03-12 21:13:28 +00:00
|
|
|
if (params.interactive) {
|
2024-05-23 06:43:24 +00:00
|
|
|
const char * control_message;
|
2023-08-04 15:20:12 +00:00
|
|
|
if (params.multiline_input) {
|
2024-05-23 06:43:24 +00:00
|
|
|
control_message = " - To return control to the AI, end your input with '\\'.\n"
|
2023-05-09 02:45:48 +00:00
|
|
|
" - To return control without starting a new line, end your input with '/'.\n";
|
|
|
|
} else {
|
2024-05-23 06:43:24 +00:00
|
|
|
control_message = " - Press Return to return control to the AI.\n"
|
2023-05-09 02:45:48 +00:00
|
|
|
" - To return control without starting a new line, end your input with '/'.\n"
|
|
|
|
" - If you want to submit another line, end your input with '\\'.\n";
|
|
|
|
}
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("== Running in interactive mode. ==\n");
|
2023-03-15 19:56:24 +00:00
|
|
|
#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) || defined (_WIN32)
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE( " - Press Ctrl+C to interject at any time.\n");
|
2023-03-13 03:08:01 +00:00
|
|
|
#endif
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE( "%s\n", control_message);
|
2023-05-09 02:45:48 +00:00
|
|
|
|
2023-04-24 15:45:32 +00:00
|
|
|
is_interacting = params.interactive_first;
|
2023-03-12 21:13:28 +00:00
|
|
|
}
|
|
|
|
|
2023-05-10 15:37:14 +00:00
|
|
|
bool is_antiprompt = false;
|
|
|
|
bool input_echo = true;
|
2024-01-13 16:09:08 +00:00
|
|
|
bool display = true;
|
2023-05-10 15:37:14 +00:00
|
|
|
bool need_to_save_session = !path_session.empty() && n_matching_session_tokens < embd_inp.size();
|
2023-04-28 15:59:37 +00:00
|
|
|
|
2023-05-02 17:53:52 +00:00
|
|
|
int n_past = 0;
|
|
|
|
int n_remain = params.n_predict;
|
|
|
|
int n_consumed = 0;
|
2023-04-28 15:59:37 +00:00
|
|
|
int n_session_consumed = 0;
|
2023-07-11 16:18:43 +00:00
|
|
|
int n_past_guidance = 0;
|
2023-03-12 21:13:28 +00:00
|
|
|
|
2023-08-28 15:59:39 +00:00
|
|
|
std::vector<int> input_tokens; g_input_tokens = &input_tokens;
|
|
|
|
std::vector<int> output_tokens; g_output_tokens = &output_tokens;
|
|
|
|
std::ostringstream output_ss; g_output_ss = &output_ss;
|
2024-06-25 11:56:49 +00:00
|
|
|
std::ostringstream assistant_ss; // for storing current assistant message, used in conversation mode
|
2023-08-28 15:59:39 +00:00
|
|
|
|
2023-03-21 17:11:01 +00:00
|
|
|
// the first thing we will do is to output the prompt, so set color accordingly
|
2023-08-04 15:20:12 +00:00
|
|
|
console::set_display(console::prompt);
|
2024-01-13 16:09:08 +00:00
|
|
|
display = params.display_prompt;
|
2023-03-12 21:13:28 +00:00
|
|
|
|
2023-03-25 19:36:22 +00:00
|
|
|
std::vector<llama_token> embd;
|
2023-07-11 16:18:43 +00:00
|
|
|
std::vector<llama_token> embd_guidance;
|
2023-03-25 19:36:22 +00:00
|
|
|
|
2024-03-04 07:57:20 +00:00
|
|
|
// tokenized antiprompts
|
|
|
|
std::vector<std::vector<llama_token>> antiprompt_ids;
|
|
|
|
|
|
|
|
antiprompt_ids.reserve(params.antiprompt.size());
|
|
|
|
for (const std::string & antiprompt : params.antiprompt) {
|
|
|
|
antiprompt_ids.emplace_back(::llama_tokenize(ctx, antiprompt, false, true));
|
|
|
|
}
|
|
|
|
|
2023-10-20 18:07:23 +00:00
|
|
|
struct llama_sampling_context * ctx_sampling = llama_sampling_init(sparams);
|
2024-05-10 11:01:08 +00:00
|
|
|
if (!ctx_sampling) {
|
|
|
|
fprintf(stderr, "%s: failed to initialize sampling subsystem\n", __func__);
|
|
|
|
exit(1);
|
|
|
|
}
|
2023-09-03 12:12:08 +00:00
|
|
|
|
2024-07-04 13:46:11 +00:00
|
|
|
if (llama_model_has_encoder(model)) {
|
|
|
|
int enc_input_size = embd_inp.size();
|
|
|
|
llama_token * enc_input_buf = embd_inp.data();
|
|
|
|
|
|
|
|
if (llama_encode(ctx, llama_batch_get_one(enc_input_buf, enc_input_size, 0, 0))) {
|
|
|
|
LOG_TEE("%s : failed to eval\n", __func__);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
llama_token decoder_start_token_id = llama_model_decoder_start_token(model);
|
|
|
|
if (decoder_start_token_id == -1) {
|
|
|
|
decoder_start_token_id = llama_token_bos(model);
|
|
|
|
}
|
|
|
|
|
|
|
|
embd_inp.clear();
|
|
|
|
embd_inp.push_back(decoder_start_token_id);
|
|
|
|
}
|
|
|
|
|
2023-05-19 17:24:59 +00:00
|
|
|
while ((n_remain != 0 && !is_antiprompt) || params.interactive) {
|
2023-03-10 18:40:58 +00:00
|
|
|
// predict
|
2023-09-07 17:22:29 +00:00
|
|
|
if (!embd.empty()) {
|
2024-01-11 16:14:52 +00:00
|
|
|
// Note: (n_ctx - 4) here is to match the logic for commandline prompt handling via
|
2023-06-11 14:19:17 +00:00
|
|
|
// --prompt or --file which uses the same value.
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
int max_embd_size = n_ctx - 4;
|
|
|
|
|
2023-06-11 14:19:17 +00:00
|
|
|
// Ensure the input doesn't exceed the context size by truncating embd if necessary.
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
if ((int) embd.size() > max_embd_size) {
|
|
|
|
const int skipped_tokens = (int) embd.size() - max_embd_size;
|
|
|
|
embd.resize(max_embd_size);
|
|
|
|
|
2023-08-04 15:20:12 +00:00
|
|
|
console::set_display(console::error);
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
printf("<<input too long: skipped %d token%s>>", skipped_tokens, skipped_tokens != 1 ? "s" : "");
|
2023-08-04 15:20:12 +00:00
|
|
|
console::set_display(console::reset);
|
2023-06-11 14:19:17 +00:00
|
|
|
fflush(stdout);
|
|
|
|
}
|
|
|
|
|
2024-01-08 09:18:32 +00:00
|
|
|
if (ga_n == 1) {
|
|
|
|
// infinite text generation via context shifting
|
|
|
|
// if we run out of context:
|
|
|
|
// - take the n_keep first tokens from the original prompt (via n_past)
|
|
|
|
// - take half of the last (n_ctx - n_keep) tokens and recompute the logits in batches
|
2024-05-01 19:27:41 +00:00
|
|
|
if (n_past + (int) embd.size() + std::max<int>(0, guidance_offset) >= n_ctx) {
|
2024-01-08 09:18:32 +00:00
|
|
|
if (params.n_predict == -2) {
|
|
|
|
LOG_TEE("\n\n%s: context full and n_predict == -%d => stopping\n", __func__, params.n_predict);
|
|
|
|
break;
|
|
|
|
}
|
2023-03-25 19:36:22 +00:00
|
|
|
|
2024-02-21 15:33:54 +00:00
|
|
|
const int n_left = n_past - params.n_keep;
|
2024-01-08 09:18:32 +00:00
|
|
|
const int n_discard = n_left/2;
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2024-01-08 09:18:32 +00:00
|
|
|
LOG("context full, swapping: n_past = %d, n_left = %d, n_ctx = %d, n_keep = %d, n_discard = %d\n",
|
|
|
|
n_past, n_left, n_ctx, params.n_keep, n_discard);
|
2023-03-25 19:36:22 +00:00
|
|
|
|
2024-02-25 20:12:24 +00:00
|
|
|
llama_kv_cache_seq_rm (ctx, 0, params.n_keep , params.n_keep + n_discard);
|
|
|
|
llama_kv_cache_seq_add(ctx, 0, params.n_keep + n_discard, n_past, -n_discard);
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2024-01-08 09:18:32 +00:00
|
|
|
n_past -= n_discard;
|
2023-09-28 16:04:36 +00:00
|
|
|
|
2024-01-08 09:18:32 +00:00
|
|
|
if (ctx_guidance) {
|
|
|
|
n_past_guidance -= n_discard;
|
|
|
|
}
|
|
|
|
|
|
|
|
LOG("after swap: n_past = %d, n_past_guidance = %d\n", n_past, n_past_guidance);
|
|
|
|
|
|
|
|
LOG("embd: %s\n", LOG_TOKENS_TOSTR_PRETTY(ctx, embd).c_str());
|
|
|
|
|
|
|
|
LOG("clear session path\n");
|
|
|
|
path_session.clear();
|
2023-09-28 16:04:36 +00:00
|
|
|
}
|
2024-01-08 09:18:32 +00:00
|
|
|
} else {
|
|
|
|
// context extension via Self-Extend
|
|
|
|
while (n_past >= ga_i + ga_w) {
|
|
|
|
const int ib = (ga_n*ga_i)/ga_w;
|
|
|
|
const int bd = (ga_w/ga_n)*(ga_n - 1);
|
|
|
|
const int dd = (ga_w/ga_n) - ib*bd - ga_w;
|
2023-09-28 16:04:36 +00:00
|
|
|
|
2024-01-08 09:18:32 +00:00
|
|
|
LOG("\n");
|
|
|
|
LOG("shift: [%6d, %6d] + %6d -> [%6d, %6d]\n", ga_i, n_past, ib*bd, ga_i + ib*bd, n_past + ib*bd);
|
|
|
|
LOG("div: [%6d, %6d] / %6d -> [%6d, %6d]\n", ga_i + ib*bd, ga_i + ib*bd + ga_w, ga_n, (ga_i + ib*bd)/ga_n, (ga_i + ib*bd + ga_w)/ga_n);
|
|
|
|
LOG("shift: [%6d, %6d] + %6d -> [%6d, %6d]\n", ga_i + ib*bd + ga_w, n_past + ib*bd, dd, ga_i + ib*bd + ga_w + dd, n_past + ib*bd + dd);
|
2023-03-25 19:36:22 +00:00
|
|
|
|
2024-02-25 20:12:24 +00:00
|
|
|
llama_kv_cache_seq_add(ctx, 0, ga_i, n_past, ib*bd);
|
|
|
|
llama_kv_cache_seq_div(ctx, 0, ga_i + ib*bd, ga_i + ib*bd + ga_w, ga_n);
|
|
|
|
llama_kv_cache_seq_add(ctx, 0, ga_i + ib*bd + ga_w, n_past + ib*bd, dd);
|
2023-04-28 15:59:37 +00:00
|
|
|
|
2024-01-08 09:18:32 +00:00
|
|
|
n_past -= bd;
|
|
|
|
|
|
|
|
ga_i += ga_w/ga_n;
|
|
|
|
|
|
|
|
LOG("\nn_past_old = %d, n_past = %d, ga_i = %d\n\n", n_past + bd, n_past, ga_i);
|
|
|
|
}
|
2023-03-25 19:36:22 +00:00
|
|
|
}
|
|
|
|
|
2023-04-28 15:59:37 +00:00
|
|
|
// try to reuse a matching prefix from the loaded session instead of re-eval (via n_past)
|
|
|
|
if (n_session_consumed < (int) session_tokens.size()) {
|
|
|
|
size_t i = 0;
|
|
|
|
for ( ; i < embd.size(); i++) {
|
|
|
|
if (embd[i] != session_tokens[n_session_consumed]) {
|
|
|
|
session_tokens.resize(n_session_consumed);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
n_past++;
|
|
|
|
n_session_consumed++;
|
|
|
|
|
|
|
|
if (n_session_consumed >= (int) session_tokens.size()) {
|
2023-05-01 11:54:59 +00:00
|
|
|
++i;
|
2023-04-28 15:59:37 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (i > 0) {
|
|
|
|
embd.erase(embd.begin(), embd.begin() + i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-04-21 18:18:09 +00:00
|
|
|
// evaluate tokens in batches
|
|
|
|
// embd is typically prepared beforehand to fit within a batch, but not always
|
2023-07-11 16:18:43 +00:00
|
|
|
if (ctx_guidance) {
|
|
|
|
int input_size = 0;
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
llama_token * input_buf = NULL;
|
2023-07-11 16:18:43 +00:00
|
|
|
|
|
|
|
if (n_past_guidance < (int) guidance_inp.size()) {
|
|
|
|
// Guidance context should have the same data with these modifications:
|
|
|
|
//
|
|
|
|
// * Replace the initial prompt
|
|
|
|
// * Shift everything by guidance_offset
|
|
|
|
embd_guidance = guidance_inp;
|
|
|
|
if (embd.begin() + original_prompt_len < embd.end()) {
|
|
|
|
embd_guidance.insert(
|
|
|
|
embd_guidance.end(),
|
|
|
|
embd.begin() + original_prompt_len,
|
|
|
|
embd.end()
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
input_buf = embd_guidance.data();
|
2023-07-11 16:18:43 +00:00
|
|
|
input_size = embd_guidance.size();
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2023-10-18 13:21:57 +00:00
|
|
|
LOG("guidance context: %s\n", LOG_TOKENS_TOSTR_PRETTY(ctx, embd_guidance).c_str());
|
2023-07-11 16:18:43 +00:00
|
|
|
} else {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
input_buf = embd.data();
|
2023-07-11 16:18:43 +00:00
|
|
|
input_size = embd.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < input_size; i += params.n_batch) {
|
|
|
|
int n_eval = std::min(input_size - i, params.n_batch);
|
2023-09-28 19:42:38 +00:00
|
|
|
if (llama_decode(ctx_guidance, llama_batch_get_one(input_buf + i, n_eval, n_past_guidance, 0))) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s : failed to eval\n", __func__);
|
2023-07-11 16:18:43 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
n_past_guidance += n_eval;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-04-21 18:18:09 +00:00
|
|
|
for (int i = 0; i < (int) embd.size(); i += params.n_batch) {
|
|
|
|
int n_eval = (int) embd.size() - i;
|
|
|
|
if (n_eval > params.n_batch) {
|
|
|
|
n_eval = params.n_batch;
|
|
|
|
}
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2023-10-18 13:21:57 +00:00
|
|
|
LOG("eval: %s\n", LOG_TOKENS_TOSTR_PRETTY(ctx, embd).c_str());
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2023-09-28 19:42:38 +00:00
|
|
|
if (llama_decode(ctx, llama_batch_get_one(&embd[i], n_eval, n_past, 0))) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("%s : failed to eval\n", __func__);
|
2023-04-21 18:18:09 +00:00
|
|
|
return 1;
|
|
|
|
}
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2023-04-21 18:18:09 +00:00
|
|
|
n_past += n_eval;
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
|
|
|
LOG("n_past = %d\n", n_past);
|
2024-01-11 16:14:52 +00:00
|
|
|
// Display total tokens alongside total time
|
2024-01-11 20:46:26 +00:00
|
|
|
if (params.n_print > 0 && n_past % params.n_print == 0) {
|
2024-01-11 20:43:05 +00:00
|
|
|
LOG_TEE("\n\033[31mTokens consumed so far = %d / %d \033[0m\n", n_past, n_ctx);
|
2024-01-11 16:14:52 +00:00
|
|
|
}
|
2023-03-10 18:40:58 +00:00
|
|
|
}
|
2023-04-28 15:59:37 +00:00
|
|
|
|
2023-09-07 17:22:29 +00:00
|
|
|
if (!embd.empty() && !path_session.empty()) {
|
2023-04-28 15:59:37 +00:00
|
|
|
session_tokens.insert(session_tokens.end(), embd.begin(), embd.end());
|
|
|
|
n_session_consumed = session_tokens.size();
|
|
|
|
}
|
2023-03-10 18:40:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
embd.clear();
|
2023-07-11 16:18:43 +00:00
|
|
|
embd_guidance.clear();
|
2023-03-10 18:40:58 +00:00
|
|
|
|
2023-03-25 19:36:22 +00:00
|
|
|
if ((int) embd_inp.size() <= n_consumed && !is_interacting) {
|
2023-04-28 15:59:37 +00:00
|
|
|
// optionally save the session on first sample (for faster prompt loading next time)
|
2023-06-07 02:10:17 +00:00
|
|
|
if (!path_session.empty() && need_to_save_session && !params.prompt_cache_ro) {
|
2023-04-28 15:59:37 +00:00
|
|
|
need_to_save_session = false;
|
2024-04-08 12:43:30 +00:00
|
|
|
llama_state_save_file(ctx, path_session.c_str(), session_tokens.data(), session_tokens.size());
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
|
|
|
LOG("saved session to %s\n", path_session.c_str());
|
2023-04-28 15:59:37 +00:00
|
|
|
}
|
|
|
|
|
2023-10-18 13:21:57 +00:00
|
|
|
const llama_token id = llama_sampling_sample(ctx_sampling, ctx, ctx_guidance);
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2024-05-21 19:40:00 +00:00
|
|
|
llama_sampling_accept(ctx_sampling, ctx, id, /* apply_grammar= */ true);
|
2023-03-12 09:27:42 +00:00
|
|
|
|
2023-10-18 13:21:57 +00:00
|
|
|
LOG("last: %s\n", LOG_TOKENS_TOSTR_PRETTY(ctx, ctx_sampling->prev).c_str());
|
2023-03-10 18:40:58 +00:00
|
|
|
|
|
|
|
embd.push_back(id);
|
2023-03-12 21:13:28 +00:00
|
|
|
|
|
|
|
// echo this to console
|
2023-05-02 16:13:26 +00:00
|
|
|
input_echo = true;
|
2023-03-12 21:13:28 +00:00
|
|
|
|
|
|
|
// decrement remaining sampling budget
|
2023-03-25 19:36:22 +00:00
|
|
|
--n_remain;
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
|
|
|
LOG("n_remain: %d\n", n_remain);
|
2023-03-10 18:40:58 +00:00
|
|
|
} else {
|
2023-03-12 22:07:34 +00:00
|
|
|
// some user input remains from prompt or interaction, forward it to processing
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG("embd_inp.size(): %d, n_consumed: %d\n", (int) embd_inp.size(), n_consumed);
|
2023-03-25 19:36:22 +00:00
|
|
|
while ((int) embd_inp.size() > n_consumed) {
|
|
|
|
embd.push_back(embd_inp[n_consumed]);
|
2023-10-18 13:21:57 +00:00
|
|
|
|
2023-10-20 18:07:23 +00:00
|
|
|
// push the prompt in the sampling context in order to apply repetition penalties later
|
|
|
|
// for the prompt, we don't apply grammar rules
|
2024-05-21 19:40:00 +00:00
|
|
|
llama_sampling_accept(ctx_sampling, ctx, embd_inp[n_consumed], /* apply_grammar= */ false);
|
2023-10-18 13:21:57 +00:00
|
|
|
|
2023-03-25 19:36:22 +00:00
|
|
|
++n_consumed;
|
2023-03-19 17:46:32 +00:00
|
|
|
if ((int) embd.size() >= params.n_batch) {
|
2023-03-10 18:40:58 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// display text
|
2024-01-13 16:09:08 +00:00
|
|
|
if (input_echo && display) {
|
2023-03-12 21:13:28 +00:00
|
|
|
for (auto id : embd) {
|
2024-05-26 14:10:17 +00:00
|
|
|
const std::string token_str = llama_token_to_piece(ctx, id, params.special);
|
2024-05-25 09:04:03 +00:00
|
|
|
|
|
|
|
// Console/Stream Output
|
2024-05-26 14:10:17 +00:00
|
|
|
fprintf(stdout, "%s", token_str.c_str());
|
2023-08-28 15:59:39 +00:00
|
|
|
|
2024-05-25 09:04:03 +00:00
|
|
|
// Record Displayed Tokens To Log
|
|
|
|
// Note: Generated tokens are created one by one hence this check
|
2023-08-28 15:59:39 +00:00
|
|
|
if (embd.size() > 1) {
|
2024-05-25 09:04:03 +00:00
|
|
|
// Incoming Requested Tokens
|
2023-08-28 15:59:39 +00:00
|
|
|
input_tokens.push_back(id);
|
|
|
|
} else {
|
2024-05-25 09:04:03 +00:00
|
|
|
// Outgoing Generated Tokens
|
2023-08-28 15:59:39 +00:00
|
|
|
output_tokens.push_back(id);
|
|
|
|
output_ss << token_str;
|
|
|
|
}
|
2024-05-25 09:04:03 +00:00
|
|
|
|
|
|
|
fflush(stdout);
|
2023-03-12 21:13:28 +00:00
|
|
|
}
|
|
|
|
}
|
2024-05-25 09:04:03 +00:00
|
|
|
|
2023-10-03 18:16:15 +00:00
|
|
|
// reset color to default if there is no pending user input
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
if (input_echo && (int) embd_inp.size() == n_consumed) {
|
2023-08-04 15:20:12 +00:00
|
|
|
console::set_display(console::reset);
|
2024-01-13 16:09:08 +00:00
|
|
|
display = true;
|
2023-03-19 19:44:30 +00:00
|
|
|
}
|
2023-03-12 21:13:28 +00:00
|
|
|
|
2023-05-19 17:24:59 +00:00
|
|
|
// if not currently processing queued inputs;
|
|
|
|
if ((int) embd_inp.size() <= n_consumed) {
|
2023-10-20 18:07:23 +00:00
|
|
|
// check for reverse prompt in the last n_prev tokens
|
2023-09-07 17:22:29 +00:00
|
|
|
if (!params.antiprompt.empty()) {
|
2023-10-20 18:07:23 +00:00
|
|
|
const int n_prev = 32;
|
|
|
|
const std::string last_output = llama_sampling_prev_str(ctx_sampling, ctx, n_prev);
|
2023-03-21 16:04:43 +00:00
|
|
|
|
2023-04-14 19:58:43 +00:00
|
|
|
is_antiprompt = false;
|
2023-03-28 14:09:55 +00:00
|
|
|
// Check if each of the reverse prompts appears at the end of the output.
|
2023-05-19 17:24:59 +00:00
|
|
|
// If we're not running interactively, the reverse prompt might be tokenized with some following characters
|
|
|
|
// so we'll compensate for that by widening the search window a bit.
|
2023-04-14 19:58:43 +00:00
|
|
|
for (std::string & antiprompt : params.antiprompt) {
|
2023-05-19 17:24:59 +00:00
|
|
|
size_t extra_padding = params.interactive ? 0 : 2;
|
|
|
|
size_t search_start_pos = last_output.length() > static_cast<size_t>(antiprompt.length() + extra_padding)
|
|
|
|
? last_output.length() - static_cast<size_t>(antiprompt.length() + extra_padding)
|
|
|
|
: 0;
|
|
|
|
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
if (last_output.find(antiprompt, search_start_pos) != std::string::npos) {
|
2023-05-19 17:24:59 +00:00
|
|
|
if (params.interactive) {
|
|
|
|
is_interacting = true;
|
|
|
|
}
|
2023-04-14 19:58:43 +00:00
|
|
|
is_antiprompt = true;
|
2023-03-28 14:09:55 +00:00
|
|
|
break;
|
|
|
|
}
|
2023-03-19 19:33:06 +00:00
|
|
|
}
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2024-03-04 07:57:20 +00:00
|
|
|
// check for reverse prompt using special tokens
|
|
|
|
llama_token last_token = llama_sampling_last(ctx_sampling);
|
|
|
|
for (std::vector<llama_token> ids : antiprompt_ids) {
|
|
|
|
if (ids.size() == 1 && last_token == ids[0]) {
|
|
|
|
if (params.interactive) {
|
|
|
|
is_interacting = true;
|
|
|
|
}
|
|
|
|
is_antiprompt = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
if (is_antiprompt) {
|
|
|
|
LOG("found antiprompt: %s\n", last_output.c_str());
|
|
|
|
}
|
2023-03-12 21:13:28 +00:00
|
|
|
}
|
2023-03-24 21:17:58 +00:00
|
|
|
|
2024-04-21 11:50:41 +00:00
|
|
|
// deal with end of generation tokens in interactive mode
|
|
|
|
if (llama_token_is_eog(model, llama_sampling_last(ctx_sampling))) {
|
2024-05-07 17:51:31 +00:00
|
|
|
LOG("found an EOG token\n");
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2023-07-25 12:19:11 +00:00
|
|
|
if (params.interactive) {
|
2023-09-07 17:22:29 +00:00
|
|
|
if (!params.antiprompt.empty()) {
|
2023-07-25 12:19:11 +00:00
|
|
|
// tokenize and inject first reverse prompt
|
2023-10-17 15:11:01 +00:00
|
|
|
const auto first_antiprompt = ::llama_tokenize(ctx, params.antiprompt.front(), false, true);
|
2023-07-25 12:19:11 +00:00
|
|
|
embd_inp.insert(embd_inp.end(), first_antiprompt.begin(), first_antiprompt.end());
|
|
|
|
is_antiprompt = true;
|
|
|
|
}
|
|
|
|
|
2024-06-30 18:27:13 +00:00
|
|
|
if (params.enable_chat_template) {
|
|
|
|
chat_add_and_format(model, chat_msgs, "assistant", assistant_ss.str());
|
|
|
|
}
|
2023-07-25 12:19:11 +00:00
|
|
|
is_interacting = true;
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-06-25 11:56:49 +00:00
|
|
|
// if current token is not EOG, we add it to current assistant message
|
|
|
|
if (params.conversation) {
|
|
|
|
auto id = llama_sampling_last(ctx_sampling);
|
|
|
|
assistant_ss << llama_token_to_piece(ctx, id, false);
|
|
|
|
}
|
|
|
|
|
2023-04-14 19:58:43 +00:00
|
|
|
if (n_past > 0 && is_interacting) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG("waiting for user input\n");
|
|
|
|
|
2024-06-04 18:23:39 +00:00
|
|
|
if (params.conversation) {
|
2023-03-19 16:37:02 +00:00
|
|
|
printf("\n> ");
|
|
|
|
}
|
|
|
|
|
2023-07-25 12:19:11 +00:00
|
|
|
if (params.input_prefix_bos) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG("adding input prefix BOS token\n");
|
2023-10-23 19:40:03 +00:00
|
|
|
embd_inp.push_back(llama_token_bos(model));
|
2023-07-25 12:19:11 +00:00
|
|
|
}
|
|
|
|
|
2023-04-14 19:58:43 +00:00
|
|
|
std::string buffer;
|
2024-05-08 14:32:32 +00:00
|
|
|
if (!params.input_prefix.empty() && !params.conversation) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG("appending input prefix: '%s'\n", params.input_prefix.c_str());
|
2023-10-17 15:11:01 +00:00
|
|
|
printf("%s", params.input_prefix.c_str());
|
2023-03-25 12:03:19 +00:00
|
|
|
}
|
|
|
|
|
2023-10-03 18:16:15 +00:00
|
|
|
// color user input only
|
|
|
|
console::set_display(console::user_input);
|
2024-01-13 16:09:08 +00:00
|
|
|
display = params.display_prompt;
|
2023-10-03 18:16:15 +00:00
|
|
|
|
2023-04-14 19:58:43 +00:00
|
|
|
std::string line;
|
|
|
|
bool another_line = true;
|
|
|
|
do {
|
2023-08-04 15:20:12 +00:00
|
|
|
another_line = console::readline(line, params.multiline_input);
|
2023-05-09 02:45:48 +00:00
|
|
|
buffer += line;
|
2023-04-14 19:58:43 +00:00
|
|
|
} while (another_line);
|
2023-03-21 17:11:01 +00:00
|
|
|
|
|
|
|
// done taking input, reset color
|
2023-08-04 15:20:12 +00:00
|
|
|
console::set_display(console::reset);
|
2024-01-13 16:09:08 +00:00
|
|
|
display = true;
|
2023-03-19 16:37:02 +00:00
|
|
|
|
2023-03-28 14:09:55 +00:00
|
|
|
// Add tokens to embd only if the input buffer is non-empty
|
|
|
|
// Entering a empty line lets the user pass control back
|
|
|
|
if (buffer.length() > 1) {
|
2023-05-04 15:41:12 +00:00
|
|
|
// append input suffix if any
|
2024-05-08 14:32:32 +00:00
|
|
|
if (!params.input_suffix.empty() && !params.conversation) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG("appending input suffix: '%s'\n", params.input_suffix.c_str());
|
2023-05-04 15:41:12 +00:00
|
|
|
printf("%s", params.input_suffix.c_str());
|
|
|
|
}
|
2023-03-12 23:35:51 +00:00
|
|
|
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG("buffer: '%s'\n", buffer.c_str());
|
|
|
|
|
2023-08-28 15:59:39 +00:00
|
|
|
const size_t original_size = embd_inp.size();
|
|
|
|
|
2023-10-22 18:09:51 +00:00
|
|
|
if (params.escape) {
|
2024-05-22 17:04:20 +00:00
|
|
|
string_process_escapes(buffer);
|
2023-10-22 18:09:51 +00:00
|
|
|
}
|
2023-03-12 21:13:28 +00:00
|
|
|
|
2024-06-30 18:27:13 +00:00
|
|
|
bool format_chat = params.conversation && params.enable_chat_template;
|
|
|
|
std::string user_inp = format_chat
|
2024-06-25 11:56:49 +00:00
|
|
|
? chat_add_and_format(model, chat_msgs, "user", std::move(buffer))
|
|
|
|
: std::move(buffer);
|
|
|
|
// TODO: one inconvenient of current chat template implementation is that we can't distinguish between user input and special tokens (prefix/postfix)
|
2023-10-17 15:11:01 +00:00
|
|
|
const auto line_pfx = ::llama_tokenize(ctx, params.input_prefix, false, true);
|
2024-06-30 18:27:13 +00:00
|
|
|
const auto line_inp = ::llama_tokenize(ctx, user_inp, false, format_chat);
|
2023-10-17 15:11:01 +00:00
|
|
|
const auto line_sfx = ::llama_tokenize(ctx, params.input_suffix, false, true);
|
2024-03-11 15:49:47 +00:00
|
|
|
|
2023-10-18 13:21:57 +00:00
|
|
|
LOG("input tokens: %s\n", LOG_TOKENS_TOSTR_PRETTY(ctx, line_inp).c_str());
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
|
2024-07-04 18:55:03 +00:00
|
|
|
// if user stop generation mid-way, we must add EOT to finish model's last response
|
|
|
|
if (need_insert_eot && format_chat) {
|
|
|
|
llama_token eot = llama_token_eot(model);
|
|
|
|
embd_inp.push_back(eot == -1 ? llama_token_eos(model) : eot);
|
|
|
|
need_insert_eot = false;
|
|
|
|
}
|
|
|
|
|
2023-10-17 15:11:01 +00:00
|
|
|
embd_inp.insert(embd_inp.end(), line_pfx.begin(), line_pfx.end());
|
2023-03-28 14:09:55 +00:00
|
|
|
embd_inp.insert(embd_inp.end(), line_inp.begin(), line_inp.end());
|
2023-10-17 15:11:01 +00:00
|
|
|
embd_inp.insert(embd_inp.end(), line_sfx.begin(), line_sfx.end());
|
2023-03-28 14:09:55 +00:00
|
|
|
|
2023-08-28 15:59:39 +00:00
|
|
|
for (size_t i = original_size; i < embd_inp.size(); ++i) {
|
|
|
|
const llama_token token = embd_inp[i];
|
|
|
|
output_tokens.push_back(token);
|
|
|
|
output_ss << llama_token_to_piece(ctx, token);
|
|
|
|
}
|
|
|
|
|
2024-06-25 11:56:49 +00:00
|
|
|
// reset assistant message
|
|
|
|
assistant_ss.str("");
|
|
|
|
|
2023-03-28 14:09:55 +00:00
|
|
|
n_remain -= line_inp.size();
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG("n_remain: %d\n", n_remain);
|
|
|
|
} else {
|
|
|
|
LOG("empty line, passing control back\n");
|
2023-03-28 14:09:55 +00:00
|
|
|
}
|
2023-03-19 19:44:30 +00:00
|
|
|
|
2023-05-02 16:13:26 +00:00
|
|
|
input_echo = false; // do not echo this again
|
2023-03-12 21:13:28 +00:00
|
|
|
}
|
2023-03-24 21:17:58 +00:00
|
|
|
|
|
|
|
if (n_past > 0) {
|
2023-07-24 03:58:10 +00:00
|
|
|
if (is_interacting) {
|
2023-10-18 13:21:57 +00:00
|
|
|
llama_sampling_reset(ctx_sampling);
|
2023-07-24 03:58:10 +00:00
|
|
|
}
|
2023-03-24 21:17:58 +00:00
|
|
|
is_interacting = false;
|
|
|
|
}
|
2023-03-10 18:40:58 +00:00
|
|
|
}
|
|
|
|
|
2024-04-21 11:50:41 +00:00
|
|
|
// end of generation
|
2024-06-04 18:23:39 +00:00
|
|
|
if (!embd.empty() && llama_token_is_eog(model, embd.back()) && !(params.interactive)) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE(" [end of text]\n");
|
2023-07-25 12:19:11 +00:00
|
|
|
break;
|
2023-03-10 18:40:58 +00:00
|
|
|
}
|
2023-03-19 18:31:17 +00:00
|
|
|
|
|
|
|
// In interactive mode, respect the maximum number of tokens and drop back to user input when reached.
|
2023-08-24 16:11:13 +00:00
|
|
|
// We skip this logic when n_predict == -1 (infinite) or -2 (stop at context size).
|
|
|
|
if (params.interactive && n_remain <= 0 && params.n_predict >= 0) {
|
2023-03-25 19:36:22 +00:00
|
|
|
n_remain = params.n_predict;
|
2023-03-19 18:31:17 +00:00
|
|
|
is_interacting = true;
|
|
|
|
}
|
2023-03-10 18:40:58 +00:00
|
|
|
}
|
|
|
|
|
2023-06-07 02:10:17 +00:00
|
|
|
if (!path_session.empty() && params.prompt_cache_all && !params.prompt_cache_ro) {
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
LOG_TEE("\n%s: saving final output to session file '%s'\n", __func__, path_session.c_str());
|
2024-04-08 12:43:30 +00:00
|
|
|
llama_state_save_file(ctx, path_session.c_str(), session_tokens.data(), session_tokens.size());
|
2023-05-10 15:37:14 +00:00
|
|
|
}
|
|
|
|
|
2023-03-22 05:32:36 +00:00
|
|
|
llama_print_timings(ctx);
|
2023-08-28 15:59:39 +00:00
|
|
|
write_logfile(ctx, params, model, input_tokens, output_ss.str(), output_tokens);
|
|
|
|
|
2023-07-11 16:18:43 +00:00
|
|
|
if (ctx_guidance) { llama_free(ctx_guidance); }
|
2023-03-22 05:32:36 +00:00
|
|
|
llama_free(ctx);
|
2023-06-24 08:47:58 +00:00
|
|
|
llama_free_model(model);
|
2023-03-10 18:40:58 +00:00
|
|
|
|
2023-10-18 13:21:57 +00:00
|
|
|
llama_sampling_free(ctx_sampling);
|
2023-07-10 15:49:56 +00:00
|
|
|
llama_backend_free();
|
|
|
|
|
Threadpool: take 2 (#8672)
* Introduce ggml_compute_threadpool
- OpenMP functional: check
- Vanilla ggml functional: Check
- ggml w/threadpool functional: Check
- OpenMP no regression: No glaring problems
- Vanilla ggml no regression: No glaring problems
- ggml w/threadpool no regression: No glaring problems
* Minor fixes
* fixed use after release bug
* fixed a harmless race condition
* Fix Android bulid issue
* fix more race conditions
* fix deadlock for cases where cgraph.n_nodes == 1
and fix --poll case
* threadpool: use cpu_get_num_math to set the default number of threadpool threads
This way we avoid using E-Cores and Hyperthreaded siblings.
* bench: create fresh threadpool for each test
For benchmarking it's better to start a fresh pool for each test with the exact number of threads
needed for that test. Having larger pools is suboptimal (causes more load, etc).
* atomics: always use stdatomics with clang and use relaxed memory order when polling in ggml_barrier
This also removes sched_yield() calls from ggml_barrier() to match OpenMP behavior.
* threadpool: make polling the default to match openmp behavior
All command line args now allow for setting poll to 0 (false).
* threadpool: do not wakeup threads in already paused threadpool
* fix potential race condition in check_for_work
* threadpool: do not create two threadpools if their params are identical
* threadpool: reduce pause/resume/wakeup overhead in common cases
We now start threadpool in paused state only if we have two.
The resume is now implicit (ie new work) which allows for reduced locking and context-switch overhead.
* threadpool: add support for hybrid polling
poll params (--poll, ...) now specify "polling level", i.e. how aggresively we poll before waiting on cond.var.
poll=0 means no polling, 1 means poll for 128K rounds then wait, 2 for 256K rounds, ...
The default value of 50 (ie 50x128K rounds) seems like a decent default across modern platforms.
We can tune this further as things evolve.
* threadpool: reduce the number of barrier required
New work is now indicated with an atomic counter that is incremented for
each new graph that needs to be computed.
This removes the need for extra barrier for clearing the "new_work" and
removes the special case for trivial graphs.
* threadpool: remove special-casing for disposable threadpools
With the efficient hybrid polling there is no need to make disposable pools any different.
This simplifies the overall logic and reduces branching.
Include n_threads in debug print for disposable threadpool.
Declare pause and stop flags as atomic_bool
This doesn't actually generate any memory barriers and simply informs
the thread sanitizer that these flags can be written & read by different
threads without locking.
* threadpool: do not clear barrier counters between graphs computes (fixes race with small graphs)
This fixes the race condition with very small graphs where the main thread happens to
start a new graph while the workers are just about to exit from barriers.
* threadpool: use relaxed order for chunk sync
Full memory barrier is an overkill for this since each thread works on different chunk
* threadpool: remove abort_callback from threadpool state
* threadpool: better naming for thread/cpumask releated functions
* threadpool: consistent use of int type for n_threads params
* threadpool: add support for ggml_threadpool_params_default/init
Also removes the need for explicit mask_specified param.
all-zero cpumask means use default (usually inherited) cpu affinity mask.
* threadpool: move typedef into ggml.h
* threadpool: fix apply_priority() function name
* threadpool: fix swift wrapper errors due to n_threads int type cleanup
* threadpool: enable --cpu-mask and other threadpool related options only if threadpool is enabled
* threadpool: replace checks for compute_thread ret code with proper status check
* threadpool: simplify threadpool init logic and fix main thread affinity application
Most of the init code is now exactly the same between threadpool and openmp.
* threadpool: update threadpool resume/pause function names
* threadpool: enable openmp by default for now
* threadpool: don't forget to free workers state when omp is enabled
* threadpool: avoid updating process priority on the platforms that do not require it
On Windows we need to change overall process priority class in order to set thread priorities,
but on Linux, Mac, etc we do not need to touch the overall process settings.
* threadpool: update calling thread prio and affinity only at start/resume
This avoids extra syscalls for each graph_compute()
* llama-bench: turn threadpool params into vectors, add output headers, etc
* llama-bench: add support for cool off between tests --delay
This helps for long running tests on platforms that are thermally limited (phones, laptops, etc).
--delay (disabled by default) introduces the sleep for N seconds before starting each test.
* threadpool: move process priority setting into the apps (bench and cli)
This avoids changing the overall process priority on Windows for the apps
that use ggml/llama.cpp directy.
* threadpool: move all pause/resume logic into ggml
* threadpool: futher api cleanup and prep for future refactoring
All threadpool related functions and structs use ggml_threadpool prefix.
* threadpool: minor indent fixes
* threadpool: improve setprioty error message
* Update examples/llama-bench/llama-bench.cpp
Co-authored-by: slaren <slarengh@gmail.com>
* threadpool: fix indent in set_threadpool call
* use int32_t for n_thread type in public llama.cpp API
* threadpool: use _new and _free instead of _create and _release
* fix two more public APIs to use int32_t for n_threads
* build: set _GNU_SOURCE for Adroid
---------
Co-authored-by: Max Krasnyansky <quic_maxk@quicinc.com>
Co-authored-by: fmz <quic_fzaghlou@quic.com>
Co-authored-by: Max Krasnyansky <max.krasnyansky@gmail.com>
Co-authored-by: slaren <slarengh@gmail.com>
2024-08-29 23:20:53 +00:00
|
|
|
ggml_threadpool_free(threadpool);
|
|
|
|
ggml_threadpool_free(threadpool_batch);
|
|
|
|
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
#ifndef LOG_DISABLE_LOGS
|
2023-09-28 21:41:44 +00:00
|
|
|
LOG_TEE("Log end\n");
|
main : log file (#2748)
* initial, base LOG macro
* add *.log to .gitignore
* added basic log file handler
* reverted log auto endline to better mimic printf
* remove atomics and add dynamic log target
* log_enable/disable, LOG_TEE, basic usage doc
* update .gitignore
* mv include to common, params, help msg
* log tostring helpers, token vectors pretty prints
* main: replaced fprintf/LOG_TEE, some trace logging
* LOG_DISABLE_LOGS compile flag, wrapped f in macros
* fix LOG_TEELN and configchecker
* stub LOG_DUMP_CMDLINE for WIN32 for now
* fix msvc
* cleanup main.cpp:273
* fix stray whitespace after master sync
* log : fix compile warnings
- do not use C++20 stuff
- use PRIu64 to print uint64_t
- avoid string copies by using const ref
- fix ", ##__VA_ARGS__" warnings
- compare strings with == and !=
* log : do not append to existing log + disable file line func by default
* log : try to fix Windows build
* main : wip logs
* main : add trace log
* review: macro f lowercase, str append to sstream
* review: simplify ifs and str comparisons
* fix MSVC, formatting, FMT/VAL placeholders
* review: if/else cleanup
* review: if/else cleanup (2)
* replace _ prefix with _impl suffix
---------
Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
2023-08-30 06:29:32 +00:00
|
|
|
#endif // LOG_DISABLE_LOGS
|
|
|
|
|
2023-03-10 18:40:58 +00:00
|
|
|
return 0;
|
|
|
|
}
|