Name colors

It's more descriptive, use #define's so we can use compile-time
concatenations.

Signed-off-by: Eric Curtin <[email protected]>

Author: ericcurtin

common/common.h

@@ -8,6 +8,16 @@
 #include <vector>
 #include <sstream>
 
+#define COL_DEFAULT "\033[0m"
+#define COL_BOLD    "\033[1m"
+#define COL_RED     "\033[31m"
+#define COL_GREEN   "\033[32m"
+#define COL_YELLOW  "\033[33m"
+#define COL_BLUE    "\033[34m"
+#define COL_MAGENTA "\033[35m"
+#define COL_CYAN    "\033[36m"
+#define COL_WHITE   "\033[37m"
+
 #ifdef _WIN32
 #define DIRECTORY_SEPARATOR '\\'
 #else

common/log.cpp

@@ -8,22 +8,14 @@
 #include <thread>
 #include <vector>
 
+#include "common.h"
+
 int common_log_verbosity_thold = LOG_DEFAULT_LLAMA;
 
 void common_log_set_verbosity_thold(int verbosity) {
     common_log_verbosity_thold = verbosity;
 }
 
-#define LOG_COL_DEFAULT "\033[0m"
-#define LOG_COL_BOLD    "\033[1m"
-#define LOG_COL_RED     "\033[31m"
-#define LOG_COL_GREEN   "\033[32m"
-#define LOG_COL_YELLOW  "\033[33m"
-#define LOG_COL_BLUE    "\033[34m"
-#define LOG_COL_MAGENTA "\033[35m"
-#define LOG_COL_CYAN    "\033[36m"
-#define LOG_COL_WHITE   "\033[37m"
-
 static int64_t t_us() {
     return std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
 }
@@ -193,9 +185,9 @@ struct common_log {
             std::stringstream ss;
             for (int i = 0; fmt[i] != 0; i++) {
                 if (fmt[i] == '%') {
-                    ss << LOG_COL_BOLD;
+                    ss << COL_BOLD;
                     while (fmt[i] != ' ' && fmt[i] != ')' && fmt[i] != ']' && fmt[i] != 0) ss << fmt[i++];
-                    ss << LOG_COL_DEFAULT;
+                    ss << COL_DEFAULT;
                     if (fmt[i] == 0) break;
                 }
                 ss << fmt[i];
@@ -320,15 +312,15 @@ struct common_log {
         pause();
 
         if (colors) {
-            g_col[COMMON_LOG_COL_DEFAULT] = LOG_COL_DEFAULT;
-            g_col[COMMON_LOG_COL_BOLD]    = LOG_COL_BOLD;
-            g_col[COMMON_LOG_COL_RED]     = LOG_COL_RED;
-            g_col[COMMON_LOG_COL_GREEN]   = LOG_COL_GREEN;
-            g_col[COMMON_LOG_COL_YELLOW]  = LOG_COL_YELLOW;
-            g_col[COMMON_LOG_COL_BLUE]    = LOG_COL_BLUE;
-            g_col[COMMON_LOG_COL_MAGENTA] = LOG_COL_MAGENTA;
-            g_col[COMMON_LOG_COL_CYAN]    = LOG_COL_CYAN;
-            g_col[COMMON_LOG_COL_WHITE]   = LOG_COL_WHITE;
+            g_col[COMMON_LOG_COL_DEFAULT] = COL_DEFAULT;
+            g_col[COMMON_LOG_COL_BOLD]    = COL_BOLD;
+            g_col[COMMON_LOG_COL_RED]     = COL_RED;
+            g_col[COMMON_LOG_COL_GREEN]   = COL_GREEN;
+            g_col[COMMON_LOG_COL_YELLOW]  = COL_YELLOW;
+            g_col[COMMON_LOG_COL_BLUE]    = COL_BLUE;
+            g_col[COMMON_LOG_COL_MAGENTA] = COL_MAGENTA;
+            g_col[COMMON_LOG_COL_CYAN]    = COL_CYAN;
+            g_col[COMMON_LOG_COL_WHITE]   = COL_WHITE;
         } else {
             for (size_t i = 0; i < g_col.size(); i++) {
                 g_col[i] = "";

examples/run/run.cpp

@@ -32,7 +32,7 @@
 
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(_WIN32)
 [[noreturn]] static void sigint_handler(int) {
-    printf("\n\033[0m");
+    printf("\n" COL_DEFAULT);
     exit(0);  // not ideal, but it's the only way to guarantee exit in all cases
 }
 #endif
@@ -847,7 +847,7 @@ static int check_context_size(const llama_context_ptr & ctx, const llama_batch &
     const int n_ctx      = llama_n_ctx(ctx.get());
     const int n_ctx_used = llama_get_kv_cache_used_cells(ctx.get());
     if (n_ctx_used + batch.n_tokens > n_ctx) {
-        printf("\033[0m\n");
+        printf(COL_DEFAULT "\n");
         printe("context size exceeded\n");
         return 1;
     }
@@ -910,7 +910,7 @@ static int generate(LlamaData & llama_data, const std::string & prompt, std::str
         batch = llama_batch_get_one(&new_token_id, 1);
     }
 
-    printf("\033[0m");
+    printf(COL_DEFAULT);
     return 0;
 }
 
@@ -919,7 +919,7 @@ static int read_user_input(std::string & user_input) {
 #ifdef WIN32
     printf(
         "\r%*s"
-        "\r\033[0m%s",
+        "\r" COL_DEFAULT "%s",
         get_terminal_width(), " ", prompt_prefix);
 
     std::getline(std::cin, user_input);
@@ -956,7 +956,7 @@ static int generate_response(LlamaData & llama_data, const std::string & prompt,
                              const bool stdout_a_terminal) {
     // Set response color
     if (stdout_a_terminal) {
-        printf("\033[33m");
+        printf(COL_YELLOW);
     }
 
     if (generate(llama_data, prompt, response)) {
@@ -965,7 +965,7 @@ static int generate_response(LlamaData & llama_data, const std::string & prompt,
     }
 
     // End response with color reset and newline
-    printf("\n%s", stdout_a_terminal ? "\033[0m" : "");
+    printf("\n%s", stdout_a_terminal ? COL_DEFAULT : "");
     return 0;
 }