Skip to content

Commit 76ad2cf

Browse files
committed
Address .editorconfig issues. Address PR Comments.
1 parent b4c47a3 commit 76ad2cf

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "compat/mingw"]
2-
path = compat/mingw
3-
url = https://github.com/meganz/mingw-std-threads
2+
path = compat/mingw
3+
url = https://github.com/meganz/mingw-std-threads

CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 3.13 is required for target_link_libraries.
1+
# 3.13 is required for target_link_libraries.
22
# Don't bump this version for no reason.
33
cmake_minimum_required(VERSION 3.13)
44

@@ -61,12 +61,12 @@ option(LLAMA_SANITIZE_ADDRESS "llama: enable address sanitizer"
6161
option(LLAMA_SANITIZE_UNDEFINED "llama: enable undefined sanitizer" OFF)
6262

6363
# instruction set specific
64-
option(LLAMA_AVX "llama: enable AVX" OFF)
65-
option(LLAMA_AVX2 "llama: enable AVX2" OFF)
64+
option(LLAMA_AVX "llama: enable AVX" ON)
65+
option(LLAMA_AVX2 "llama: enable AVX2" ON)
6666
option(LLAMA_AVX512 "llama: enable AVX512" OFF)
6767
option(LLAMA_AVX512_VBMI "llama: enable AVX512-VBMI" OFF)
6868
option(LLAMA_AVX512_VNNI "llama: enable AVX512-VNNI" OFF)
69-
option(LLAMA_FMA "llama: enable FMA" OFF)
69+
option(LLAMA_FMA "llama: enable FMA" ON)
7070
# in MSVC F16C is implied with AVX2/AVX512
7171
if (NOT MSVC)
7272
option(LLAMA_F16C "llama: enable F16C" ON)

llama.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ struct llama_mmap {
698698
}
699699

700700
if (prefetch) {
701-
#if WINVER >= 0x0602
701+
#if WINVER >= 0x0602 // Windows 8 updated headers only
702702
// PrefetchVirtualMemory is only present on Windows 8 and above, so we dynamically load it
703703
BOOL (WINAPI *pPrefetchVirtualMemory) (HANDLE, ULONG_PTR, PWIN32_MEMORY_RANGE_ENTRY, ULONG);
704704
HMODULE hKernel32 = GetModuleHandleW(L"kernel32.dll");

0 commit comments

Comments
 (0)