root/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2025-01-13 04:00:16 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

minor : better names

Browse Source 
ggml-ci
This commit is contained in:
Georgi Gerganov 2025-01-12 17:22:16 +02:00
parent 36803b1902
commit afd40ea206
No known key found for this signature in database
GPG Key ID: 449E073F9DC10735
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/convert-llama2c-to-ggml/convert-llama2c-to-ggml.cpp
View File

@ -471,12 +471,12 @@ struct my_llama_file {
GGML_ASSERT(ret == 0); // same
}
void read_raw(void * ptr, size_t size_cur) {
if (size_cur == 0) {
void read_raw(void * raw_addr, size_t raw_size) {
if (raw_size == 0) {
return;
}
errno = 0;
std::size_t ret = std::fread(ptr, size_cur, 1, fp);
std::size_t ret = std::fread(raw_addr, raw_size, 1, fp);
if (ferror(fp)) {
die_fmt("fread failed: %s", strerror(errno));
}

10
src/llama-mmap.cpp
View File

@ -454,8 +454,8 @@ struct llama_mlock::impl {
return (size_t) sysconf(_SC_PAGESIZE);
}
bool raw_lock(const void * addr_cur, size_t size_cur) const {
if (!mlock(addr_cur, size_cur)) {
bool raw_lock(const void * lock_addr, size_t lock_len) const {
if (!mlock(lock_addr, lock_len)) {
return true;
}
@ -475,12 +475,12 @@ struct llama_mlock::impl {
if (suggest && getrlimit(RLIMIT_MEMLOCK, &lock_limit)) {
suggest = false;
}
if (suggest && (lock_limit.rlim_max > lock_limit.rlim_cur + size_cur)) {
if (suggest && (lock_limit.rlim_max > lock_limit.rlim_cur + lock_len)) {
suggest = false;
}
LLAMA_LOG_WARN("warning: failed to mlock %zu-byte buffer (after previously locking %zu bytes): %s\n%s",
size_cur, size, errmsg, suggest ? MLOCK_SUGGESTION : "");
lock_len, size, errmsg, suggest ? MLOCK_SUGGESTION : "");
return false;
}
@ -535,7 +535,7 @@ struct llama_mlock::impl {
return (size_t) 65536;
}
bool raw_lock(const void * addr_cur, size_t size_cur) const {
bool raw_lock(const void * lock_addr, size_t lock_len) const {
LLAMA_LOG_WARN("warning: mlock not supported on this system\n");
return false;
}