Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion common/console.cpp
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ namespace console {
(void)codepoint;
return 1;
#else
return wcwidth(codepoint);
//return wcwidth(codepoint);
(void)codepoint;
return 1;
#endif
}

Expand Down
2 changes: 1 addition & 1 deletion examples/export-lora/export-lora.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ struct lora_merge_ctx {

ctx_out = gguf_init_empty();
struct ggml_init_params params = {
/*.mem_size =*/ gguf_get_n_tensors(base_model.ctx_gguf)*ggml_tensor_overhead(),
/*.mem_size =*/ static_cast<size_t>(gguf_get_n_tensors(base_model.ctx_gguf)*ggml_tensor_overhead()),
/*.mem_buffer =*/ NULL,
/*.no_alloc =*/ true,
};
Expand Down
8 changes: 4 additions & 4 deletions src/llama-mmap.cpp
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -481,10 +481,10 @@ struct llama_mlock::impl {
// Skip resource limit checks on visionOS/tvOS
suggest = false;
#else
struct rlimit lock_limit;
if (suggest && getrlimit(RLIMIT_MEMLOCK, &lock_limit)) {
suggest = false;
}
struct rlimit lock_limit = {};
//if (suggest && getrlimit(RLIMIT_MEMLOCK, &lock_limit)) {
// suggest = false;
//}
if (suggest && (lock_limit.rlim_max > lock_limit.rlim_cur + size)) {
suggest = false;
}
Expand Down
Loading