happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert formatting cd.

This commit is contained in:
Piotr Wilkin 2026-02-05 20:48:01 +01:00
parent ed887e0d8c
commit 17919e700d
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/cli/cli.cpp
View File

@ -13,11 +13,11 @@
#include <signal.h> #include <signal.h>
#if defined(_WIN32) #if defined(_WIN32)
# define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
# ifndef NOMINMAX #ifndef NOMINMAX
# define NOMINMAX # define NOMINMAX
# endif #endif
# include <windows.h> #include <windows.h>
#endif #endif
const char * LLAMA_ASCII_LOGO = R"( const char * LLAMA_ASCII_LOGO = R"(
@ -31,12 +31,11 @@ const char * LLAMA_ASCII_LOGO = R"(
)"; )";
static std::atomic<bool> g_is_interrupted = false; static std::atomic<bool> g_is_interrupted = false;
static bool should_stop() { static bool should_stop() {
return g_is_interrupted.load(); return g_is_interrupted.load();
} }
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(_WIN32) #if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) || defined (_WIN32)
static void signal_handler(int) { static void signal_handler(int) {
if (g_is_interrupted.load()) { if (g_is_interrupted.load()) {
// second Ctrl+C - exit immediately // second Ctrl+C - exit immediately
@ -67,8 +66,8 @@ struct cli_context {
defaults.n_predict = params.n_predict; defaults.n_predict = params.n_predict;
defaults.antiprompt = params.antiprompt; defaults.antiprompt = params.antiprompt;
defaults.stream = true; // make sure we always use streaming mode defaults.stream = true; // make sure we always use streaming mode
defaults.timings_per_token = true; // in order to get timings even when we cancel mid-way defaults.timings_per_token = true; // in order to get timings even when we cancel mid-way
// defaults.return_progress = true; // TODO: show progress // defaults.return_progress = true; // TODO: show progress
} }
@ -92,7 +91,7 @@ struct cli_context {
task.params.chat_parser_params.parser.load(chat_params.parser); task.params.chat_parser_params.parser.load(chat_params.parser);
} }
rd.post_task({ std::move(task) }); rd.post_task({std::move(task)});
} }
// wait for first result // wait for first result
@ -101,7 +100,7 @@ struct cli_context {
console::spinner::stop(); console::spinner::stop();
std::string curr_content; std::string curr_content;
bool is_thinking = false; bool is_thinking = false;
while (result) { while (result) {
if (should_stop()) { if (should_stop()) {
@ -193,7 +192,7 @@ struct cli_context {
int main(int argc, char ** argv) { int main(int argc, char ** argv) {
common_params params; common_params params;
params.verbosity = LOG_LEVEL_ERROR; // by default, less verbose logs params.verbosity = LOG_LEVEL_ERROR; // by default, less verbose logs
if (!common_params_parse(argc, argv, params, LLAMA_EXAMPLE_CLI)) { if (!common_params_parse(argc, argv, params, LLAMA_EXAMPLE_CLI)) {
return 1; return 1;
@ -219,14 +218,14 @@ int main(int argc, char ** argv) {
console::set_display(DISPLAY_TYPE_RESET); console::set_display(DISPLAY_TYPE_RESET);
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) #if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
struct sigaction sigint_action; struct sigaction sigint_action;
sigint_action.sa_handler = signal_handler; sigint_action.sa_handler = signal_handler;
sigemptyset(&sigint_action.sa_mask); sigemptyset (&sigint_action.sa_mask);
sigint_action.sa_flags = 0; sigint_action.sa_flags = 0;
sigaction(SIGINT, &sigint_action, NULL); sigaction(SIGINT, &sigint_action, NULL);
sigaction(SIGTERM, &sigint_action, NULL); sigaction(SIGTERM, &sigint_action, NULL);
#elif defined(_WIN32) #elif defined (_WIN32)
auto console_ctrl_handler = +[](DWORD ctrl_type) -> BOOL { auto console_ctrl_handler = +[](DWORD ctrl_type) -> BOOL {
return (ctrl_type == CTRL_C_EVENT) ? (signal_handler(SIGINT), true) : false; return (ctrl_type == CTRL_C_EVENT) ? (signal_handler(SIGINT), true) : false;
}; };