happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge e56aae793a into e06088da0f

This commit is contained in:
Lasse Lauwerys 2026-02-08 15:21:46 +02:00 committed by GitHub
parent e06088da0f e56aae793a
commit 288818b5b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/common.cpp
View File

@ -41,6 +41,7 @@
# define NOMINMAX
#endif
#include <locale>
#include <winapifamily.h>
#include <windows.h>
#include <string.h>
#include <fcntl.h>
@ -381,7 +382,7 @@ std::string common_params_get_system_info(const common_params & params) {
if (params.cpuparams_batch.n_threads != -1) {
os << " (n_threads_batch = " << params.cpuparams_batch.n_threads << ")";
}
#if defined(_WIN32) && (_WIN32_WINNT >= 0x0601) && !defined(__MINGW64__) // windows 7 and later
#if defined(_WIN32) && (_WIN32_WINNT >= 0x0601) && !defined(__MINGW64__) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && !defined(LLAMA_UWP) // windows 7 and later
// TODO: windows + arm64 + mingw64
DWORD logicalProcessorCount = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS);
os << " / " << logicalProcessorCount << " | " << llama_print_system_info();

6
src/llama-mmap.cpp
View File

@ -29,6 +29,7 @@
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <winapifamily.h>
#include <windows.h>
#ifndef PATH_MAX
#define PATH_MAX MAX_PATH
@ -660,6 +661,7 @@ struct llama_mlock::impl {
return false;
}
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && !defined(LLAMA_UWP)
SIZE_T min_ws_size, max_ws_size;
if (!GetProcessWorkingSetSize(GetCurrentProcess(), &min_ws_size, &max_ws_size)) {
LLAMA_LOG_WARN("warning: GetProcessWorkingSetSize failed: %s\n",
@ -674,6 +676,10 @@ struct llama_mlock::impl {
llama_format_win_err(GetLastError()).c_str());
return false;
}
#else
LLAMA_LOG_WARN("warning: MMAP is not supported for UWP\n");
return false;
#endif
}
}