vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add windows support for console width

Browse source
This commit is contained in:
TevinWang 2024-04-28 18:49:09 -04:00
parent 763460ba71
commit 6d5c7f0903
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
common/common.cpp
View file

@ -1896,6 +1896,21 @@ static int shard_progress_callback(void* clientp, double dltotal, double dlnow,
return 0; return 0;
} }
// function to get the console width
static int get_console_width() {
#ifdef _WIN32
CONSOLE_SCREEN_BUFFER_INFO csbi;
GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi);
return csbi.dwSize.X;
#elif defined(__linux__) || defined(__APPLE__)
struct winsize ws;
ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws);
return ws.ws_col;
#else
return 80; // Default value
#endif
}
static void print_shard_progress_table(bool first_progress) { static void print_shard_progress_table(bool first_progress) {
if (first_progress) { if (first_progress) {
fprintf(stderr, "=========================\n"); fprintf(stderr, "=========================\n");
@ -1910,9 +1925,8 @@ static void print_shard_progress_table(bool first_progress) {
} }
} }
struct winsize ws;
ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws); int progress_bar_width = get_console_width() - LLAMA_PROGRESS_PERCENTAGE_WIDTH;
int progress_bar_width = ws.ws_col - LLAMA_PROGRESS_PERCENTAGE_WIDTH;
// Print the progress information for each downloading file // Print the progress information for each downloading file
{ {