f2890a4494
* fix(ext_server): Port llama.cpp sampling refactors to ext_server
This was a fairly large changeset. I closely followed the changes here:
df270ef745
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(server.cpp): Refactor server.cpp logging for llama.cpp overhaul
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* feat: Bump llama.cpp to the latest master with `granite` support
This does not yet have granite MoE support, but that can come in a
follow up PR
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(patches): Update all patches (except solar-pro) to work with bumped llama.cpp
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(solar): Update solar patch for llama.cpp bump
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* feat(llama.cpp): Bump llama.cpp for granitemoe support
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* feat(llama.cpp): Bump llama.cpp for granitemoe support
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(solar): Update the solar-pro patch for latest llama.cpp bump
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* feat(llama.cpp): Bump to the latest master of llama.cpp
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(patches): Update all patches for latest bump
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* feat(llama): Always run sync.sh from the right directory
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(llama/patches): Update llama patches
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* feat(llama)!: Rough sync with llama.cpp submodule
There are a number of changes that will need to be propagated to llama.go
before any of this works!
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(llama/patches): Add a patch and update for missing ggml-impl.h include
This include is where the ggml_cgraph struct is defined. It is included in
many of the .c files to define the forward declartion in ggml.h. It seems
that with the subset of code included here, the import was somehow lost (or
out-of-order) when building, so adding this include to llama.cpp fixes the
missing definition.
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(llama/sync): Add missing ggml-cpu-impl.h copy-over in sync.sh
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(llama): Add missing log.cpp
This was added as part of the logging overhaul done in llama.cpp
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(llama): Overhaul use of sampling module for llama.cpp changes
The changes here reflect the changes made in the big llama.cpp sampling PR
https://github.com/ggerganov/llama.cpp/pull/9294
The sampling functionality is now broken into the base interface
(llama_sampler) and the generation implementation (gpt_sampler). The
changes here reflect that. Since the sampling.h/sampling.cpp code uses c++
STL headers, the sampling_ext.[h|cpp] wrapper is maintained to allow go to
access a pure-C interface.
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(llama): Fix the impl of SampleTokenGreedy for new sampling
I don't think this method is currently used, so it could probably just be
removed so that all sampling goes through the GPT interface, but in the
interest of doing no harm, this should keep the method working as expected.
Branch: IBMGraniteArchitectureSupport
* fix(llama): Remove unused SampleTokenGreedy
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(sync): Remove bash-specific change to sync.sh
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* chore(gofumpt): Format on llama.go to pass linting
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(llm): Fix missing <thread> include in ext_server
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(llama): Remove TODO about grammar_first
This feature was not used/needed previously so should be fine without
plumbing it through now.
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(llama): Better naming for sampling wrapper and args
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(llama): Fix patch 05 to use new wrapper api and re-sync
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* runner: Flush pending responses before returning
If there are any pending reponses (such as from potential stop
tokens) then we should send them back before ending the sequence.
Otherwise, we can be missing tokens at the end of a response.
Fixes #6707
* fix(llama/sampling): Use gpt_sampler with a forward declaration
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(llama): Remove unnecessary patch for gguf impl header
This was caused by an earlier mistake in the embeddings patch that was
dereferencing the pointer instead of using the wrapper API.
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
* fix(llm): Remove use of deprecated --log-disable flag
Branch: IBMGraniteArchitectureSupport
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
---------
Signed-off-by: Gabe Goodhart <ghart@us.ibm.com>
427 lines
11 KiB
C++
Vendored
427 lines
11 KiB
C++
Vendored
/**
|
|
* llama.cpp - commit 3f1ae2e32cde00c39b96be6d01c2997c29bae555 - do not edit this file
|
|
*
|
|
* MIT License
|
|
*
|
|
* Copyright (c) 2023-2024 The ggml authors
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in all
|
|
* copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#include "log.h"
|
|
|
|
#include <condition_variable>
|
|
#include <cstdarg>
|
|
#include <cstdio>
|
|
#include <mutex>
|
|
#include <sstream>
|
|
#include <thread>
|
|
#include <vector>
|
|
|
|
int gpt_log_verbosity_thold = LOG_DEFAULT_LLAMA;
|
|
|
|
void gpt_log_set_verbosity_thold(int verbosity) {
|
|
gpt_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();
|
|
}
|
|
|
|
// colors
|
|
enum gpt_log_col : int {
|
|
GPT_LOG_COL_DEFAULT = 0,
|
|
GPT_LOG_COL_BOLD,
|
|
GPT_LOG_COL_RED,
|
|
GPT_LOG_COL_GREEN,
|
|
GPT_LOG_COL_YELLOW,
|
|
GPT_LOG_COL_BLUE,
|
|
GPT_LOG_COL_MAGENTA,
|
|
GPT_LOG_COL_CYAN,
|
|
GPT_LOG_COL_WHITE,
|
|
};
|
|
|
|
// disable colors by default
|
|
static std::vector<const char *> g_col = {
|
|
"",
|
|
"",
|
|
"",
|
|
"",
|
|
"",
|
|
"",
|
|
"",
|
|
"",
|
|
"",
|
|
};
|
|
|
|
struct gpt_log_entry {
|
|
enum ggml_log_level level;
|
|
|
|
bool prefix;
|
|
|
|
int64_t timestamp;
|
|
|
|
std::vector<char> msg;
|
|
|
|
// signals the worker thread to stop
|
|
bool is_end;
|
|
|
|
void print(FILE * file = nullptr) const {
|
|
FILE * fcur = file;
|
|
if (!fcur) {
|
|
// stderr displays DBG messages only when their verbosity level is not higher than the threshold
|
|
// these messages will still be logged to a file
|
|
if (level == GGML_LOG_LEVEL_DEBUG && gpt_log_verbosity_thold < LOG_DEFAULT_DEBUG) {
|
|
return;
|
|
}
|
|
|
|
fcur = stdout;
|
|
|
|
if (level != GGML_LOG_LEVEL_NONE) {
|
|
fcur = stderr;
|
|
}
|
|
}
|
|
|
|
if (level != GGML_LOG_LEVEL_NONE && level != GGML_LOG_LEVEL_CONT && prefix) {
|
|
if (timestamp) {
|
|
// [M.s.ms.us]
|
|
fprintf(fcur, "%s%d.%02d.%03d.%03d%s ",
|
|
g_col[GPT_LOG_COL_BLUE],
|
|
(int) (timestamp / 1000000 / 60),
|
|
(int) (timestamp / 1000000 % 60),
|
|
(int) (timestamp / 1000 % 1000),
|
|
(int) (timestamp % 1000),
|
|
g_col[GPT_LOG_COL_DEFAULT]);
|
|
}
|
|
|
|
switch (level) {
|
|
case GGML_LOG_LEVEL_INFO: fprintf(fcur, "%sI %s", g_col[GPT_LOG_COL_GREEN], g_col[GPT_LOG_COL_DEFAULT]); break;
|
|
case GGML_LOG_LEVEL_WARN: fprintf(fcur, "%sW %s", g_col[GPT_LOG_COL_MAGENTA], "" ); break;
|
|
case GGML_LOG_LEVEL_ERROR: fprintf(fcur, "%sE %s", g_col[GPT_LOG_COL_RED], "" ); break;
|
|
case GGML_LOG_LEVEL_DEBUG: fprintf(fcur, "%sD %s", g_col[GPT_LOG_COL_YELLOW], "" ); break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
fprintf(fcur, "%s", msg.data());
|
|
|
|
if (level == GGML_LOG_LEVEL_WARN || level == GGML_LOG_LEVEL_ERROR || level == GGML_LOG_LEVEL_DEBUG) {
|
|
fprintf(fcur, "%s", g_col[GPT_LOG_COL_DEFAULT]);
|
|
}
|
|
|
|
fflush(fcur);
|
|
}
|
|
};
|
|
|
|
struct gpt_log {
|
|
// default capacity - will be expanded if needed
|
|
gpt_log() : gpt_log(256) {}
|
|
|
|
gpt_log(size_t capacity) {
|
|
file = nullptr;
|
|
prefix = false;
|
|
timestamps = false;
|
|
running = false;
|
|
t_start = t_us();
|
|
|
|
// initial message size - will be expanded if longer messages arrive
|
|
entries.resize(capacity);
|
|
for (auto & entry : entries) {
|
|
entry.msg.resize(256);
|
|
}
|
|
|
|
head = 0;
|
|
tail = 0;
|
|
|
|
resume();
|
|
}
|
|
|
|
~gpt_log() {
|
|
pause();
|
|
if (file) {
|
|
fclose(file);
|
|
}
|
|
}
|
|
|
|
private:
|
|
std::mutex mtx;
|
|
std::thread thrd;
|
|
std::condition_variable cv;
|
|
|
|
FILE * file;
|
|
|
|
bool prefix;
|
|
bool timestamps;
|
|
bool running;
|
|
|
|
int64_t t_start;
|
|
|
|
// ring buffer of entries
|
|
std::vector<gpt_log_entry> entries;
|
|
size_t head;
|
|
size_t tail;
|
|
|
|
// worker thread copies into this
|
|
gpt_log_entry cur;
|
|
|
|
public:
|
|
void add(enum ggml_log_level level, const char * fmt, va_list args) {
|
|
std::lock_guard<std::mutex> lock(mtx);
|
|
|
|
if (!running) {
|
|
// discard messages while the worker thread is paused
|
|
return;
|
|
}
|
|
|
|
auto & entry = entries[tail];
|
|
|
|
{
|
|
// cannot use args twice, so make a copy in case we need to expand the buffer
|
|
va_list args_copy;
|
|
va_copy(args_copy, args);
|
|
|
|
#if 1
|
|
const size_t n = vsnprintf(entry.msg.data(), entry.msg.size(), fmt, args);
|
|
if (n >= entry.msg.size()) {
|
|
entry.msg.resize(n + 1);
|
|
vsnprintf(entry.msg.data(), entry.msg.size(), fmt, args_copy);
|
|
}
|
|
#else
|
|
// hack for bolding arguments
|
|
|
|
std::stringstream ss;
|
|
for (int i = 0; fmt[i] != 0; i++) {
|
|
if (fmt[i] == '%') {
|
|
ss << LOG_COL_BOLD;
|
|
while (fmt[i] != ' ' && fmt[i] != ')' && fmt[i] != ']' && fmt[i] != 0) ss << fmt[i++];
|
|
ss << LOG_COL_DEFAULT;
|
|
if (fmt[i] == 0) break;
|
|
}
|
|
ss << fmt[i];
|
|
}
|
|
const size_t n = vsnprintf(entry.msg.data(), entry.msg.size(), ss.str().c_str(), args);
|
|
if (n >= entry.msg.size()) {
|
|
entry.msg.resize(n + 1);
|
|
vsnprintf(entry.msg.data(), entry.msg.size(), ss.str().c_str(), args_copy);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
entry.level = level;
|
|
entry.prefix = prefix;
|
|
entry.timestamp = 0;
|
|
if (timestamps) {
|
|
entry.timestamp = t_us() - t_start;
|
|
}
|
|
entry.is_end = false;
|
|
|
|
tail = (tail + 1) % entries.size();
|
|
if (tail == head) {
|
|
// expand the buffer
|
|
std::vector<gpt_log_entry> new_entries(2*entries.size());
|
|
|
|
size_t new_tail = 0;
|
|
|
|
do {
|
|
new_entries[new_tail] = std::move(entries[head]);
|
|
|
|
head = (head + 1) % entries.size();
|
|
new_tail = (new_tail + 1);
|
|
} while (head != tail);
|
|
|
|
head = 0;
|
|
tail = new_tail;
|
|
|
|
for (size_t i = tail; i < new_entries.size(); i++) {
|
|
new_entries[i].msg.resize(256);
|
|
}
|
|
|
|
entries = std::move(new_entries);
|
|
}
|
|
|
|
cv.notify_one();
|
|
}
|
|
|
|
void resume() {
|
|
std::lock_guard<std::mutex> lock(mtx);
|
|
|
|
if (running) {
|
|
return;
|
|
}
|
|
|
|
running = true;
|
|
|
|
thrd = std::thread([this]() {
|
|
while (true) {
|
|
{
|
|
std::unique_lock<std::mutex> lock(mtx);
|
|
cv.wait(lock, [this]() { return head != tail; });
|
|
|
|
cur = entries[head];
|
|
|
|
head = (head + 1) % entries.size();
|
|
}
|
|
|
|
if (cur.is_end) {
|
|
break;
|
|
}
|
|
|
|
cur.print(); // stdout and stderr
|
|
|
|
if (file) {
|
|
cur.print(file);
|
|
}
|
|
}
|
|
});
|
|
}
|
|
|
|
void pause() {
|
|
{
|
|
std::lock_guard<std::mutex> lock(mtx);
|
|
|
|
if (!running) {
|
|
return;
|
|
}
|
|
|
|
running = false;
|
|
|
|
// push an entry to signal the worker thread to stop
|
|
{
|
|
auto & entry = entries[tail];
|
|
entry.is_end = true;
|
|
|
|
tail = (tail + 1) % entries.size();
|
|
}
|
|
|
|
cv.notify_one();
|
|
}
|
|
|
|
thrd.join();
|
|
}
|
|
|
|
void set_file(const char * path) {
|
|
pause();
|
|
|
|
if (file) {
|
|
fclose(file);
|
|
}
|
|
|
|
if (path) {
|
|
file = fopen(path, "w");
|
|
} else {
|
|
file = nullptr;
|
|
}
|
|
|
|
resume();
|
|
}
|
|
|
|
void set_colors(bool colors) {
|
|
pause();
|
|
|
|
if (colors) {
|
|
g_col[GPT_LOG_COL_DEFAULT] = LOG_COL_DEFAULT;
|
|
g_col[GPT_LOG_COL_BOLD] = LOG_COL_BOLD;
|
|
g_col[GPT_LOG_COL_RED] = LOG_COL_RED;
|
|
g_col[GPT_LOG_COL_GREEN] = LOG_COL_GREEN;
|
|
g_col[GPT_LOG_COL_YELLOW] = LOG_COL_YELLOW;
|
|
g_col[GPT_LOG_COL_BLUE] = LOG_COL_BLUE;
|
|
g_col[GPT_LOG_COL_MAGENTA] = LOG_COL_MAGENTA;
|
|
g_col[GPT_LOG_COL_CYAN] = LOG_COL_CYAN;
|
|
g_col[GPT_LOG_COL_WHITE] = LOG_COL_WHITE;
|
|
} else {
|
|
for (size_t i = 0; i < g_col.size(); i++) {
|
|
g_col[i] = "";
|
|
}
|
|
}
|
|
|
|
resume();
|
|
}
|
|
|
|
void set_prefix(bool prefix) {
|
|
std::lock_guard<std::mutex> lock(mtx);
|
|
|
|
this->prefix = prefix;
|
|
}
|
|
|
|
void set_timestamps(bool timestamps) {
|
|
std::lock_guard<std::mutex> lock(mtx);
|
|
|
|
this->timestamps = timestamps;
|
|
}
|
|
};
|
|
|
|
//
|
|
// public API
|
|
//
|
|
|
|
struct gpt_log * gpt_log_init() {
|
|
return new gpt_log;
|
|
}
|
|
|
|
struct gpt_log * gpt_log_main() {
|
|
static struct gpt_log log;
|
|
|
|
return &log;
|
|
}
|
|
|
|
void gpt_log_pause(struct gpt_log * log) {
|
|
log->pause();
|
|
}
|
|
|
|
void gpt_log_resume(struct gpt_log * log) {
|
|
log->resume();
|
|
}
|
|
|
|
void gpt_log_free(struct gpt_log * log) {
|
|
delete log;
|
|
}
|
|
|
|
void gpt_log_add(struct gpt_log * log, enum ggml_log_level level, const char * fmt, ...) {
|
|
va_list args;
|
|
va_start(args, fmt);
|
|
log->add(level, fmt, args);
|
|
va_end(args);
|
|
}
|
|
|
|
void gpt_log_set_file(struct gpt_log * log, const char * file) {
|
|
log->set_file(file);
|
|
}
|
|
|
|
void gpt_log_set_colors(struct gpt_log * log, bool colors) {
|
|
log->set_colors(colors);
|
|
}
|
|
|
|
void gpt_log_set_prefix(struct gpt_log * log, bool prefix) {
|
|
log->set_prefix(prefix);
|
|
}
|
|
|
|
void gpt_log_set_timestamps(struct gpt_log * log, bool timestamps) {
|
|
log->set_timestamps(timestamps);
|
|
}
|