vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add new macros to avoid windows+mingw64

Browse source
This commit is contained in:
Jia Liu 2024-08-08 16:13:20 +08:00
parent f0a35519b0
commit 02ec917284
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/common.cpp
View file

@ -110,7 +110,8 @@ int32_t cpu_get_num_physical_cores() {
if (result == 0) { if (result == 0) {
return num_physical_cores; return num_physical_cores;
} }
#elif defined(_WIN32) #elif defined(_WIN32) && (_WIN32_WINNT >= 0x0601) && !defined(__MINGW64__) // windows 7 and later
// TODO: windows + arm64 + mingw64
DWORD buffer_size = 0; DWORD buffer_size = 0;
GetLogicalProcessorInformationEx(RelationProcessorCore, nullptr, &buffer_size); GetLogicalProcessorInformationEx(RelationProcessorCore, nullptr, &buffer_size);
std::vector<char> buffer(buffer_size); std::vector<char> buffer(buffer_size);
@ -1733,7 +1734,8 @@ std::string gpt_params_get_system_info(const gpt_params & params) {
if (params.n_threads_batch != -1) { if (params.n_threads_batch != -1) {
os << " (n_threads_batch = " << params.n_threads_batch << ")"; os << " (n_threads_batch = " << params.n_threads_batch << ")";
} }
#ifdef _WIN32 #if defined(_WIN32) && (_WIN32_WINNT >= 0x0601) && !defined(__MINGW64__) // windows 7 and later
// TODO: windows + arm64 + mingw64
DWORD logicalProcessorCount = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS); DWORD logicalProcessorCount = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS);
os << " / " << logicalProcessorCount << " | " << llama_print_system_info(); os << " / " << logicalProcessorCount << " | " << llama_print_system_info();
#else #else