Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(log): implement Android logging in rn-llama.hpp as opposed to printf #106

Merged
merged 2 commits into from
Jan 9, 2025
Merged

fix(log): implement Android logging in rn-llama.hpp as opposed to printf #106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d79070e
fix(log): implement Android logging in rn-llama.hpp as opposed to printf
a-ghorbani Jan 6, 2025
1e8a334
fix: add back printf for non-android systems
a-ghorbani Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 31 additions & 8 deletions cpp/rn-llama.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
#include "llama.h"
#include "llama-impl.h"
#include "sampling.h"
#if defined(__ANDROID__)
#include <android/log.h>
#endif

namespace rnllama {

Expand Down Expand Up @@ -106,16 +109,32 @@ static void llama_batch_add(llama_batch *batch, llama_token id, llama_pos pos, s
static void log(const char *level, const char *function, int line,
const char *format, ...)
{
printf("[%s] %s:%d ", level, function, line);

va_list args;
va_start(args, format);
vprintf(format, args);
va_end(args);

printf("\n");
#if defined(__ANDROID__)
char prefix[256];
snprintf(prefix, sizeof(prefix), "%s:%d %s", function, line, format);

va_start(args, format);
android_LogPriority priority;
if (strcmp(level, "ERROR") == 0) {
priority = ANDROID_LOG_ERROR;
} else if (strcmp(level, "WARNING") == 0) {
priority = ANDROID_LOG_WARN;
} else if (strcmp(level, "INFO") == 0) {
priority = ANDROID_LOG_INFO;
} else {
priority = ANDROID_LOG_DEBUG;
}
__android_log_vprint(priority, "RNLlama", prefix, args);
va_end(args);
#else
printf("[%s] %s:%d ", level, function, line);
va_start(args, format);
vprintf(format, args);
va_end(args);
printf("\n");
#endif
}

static bool rnllama_verbose = false;

#if RNLLAMA_VERBOSE != 1
Expand Down Expand Up @@ -311,6 +330,10 @@ struct llama_rn_context
return false;
}
n_ctx = llama_n_ctx(ctx);

// We can uncomment for debugging or after this fix: https://github.com/ggerganov/llama.cpp/pull/11101
// LOG_INFO("%s\n", common_params_get_system_info(params).c_str());

return true;
}

Expand Down
Loading