-
Notifications
You must be signed in to change notification settings - Fork 10.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for properly optimized Windows ARM64 builds with LLVM and…
… MSVC (#7191) * logging: add proper checks for clang to avoid errors and warnings with VA_ARGS * build: add CMake Presets and toolchian files for Windows ARM64 * matmul-int8: enable matmul-int8 with MSVC and fix Clang warnings * ci: add support for optimized Windows ARM64 builds with MSVC and LLVM * matmul-int8: fixed typos in q8_0_q8_0 matmuls Co-authored-by: Georgi Gerganov <[email protected]> * matmul-int8: remove unnecessary casts in q8_0_q8_0 --------- Co-authored-by: Georgi Gerganov <[email protected]>
- Loading branch information
1 parent
8f7080b
commit 13ad16a
Showing
7 changed files
with
138 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| { | ||
| "version": 4, | ||
| "configurePresets": [ | ||
| { | ||
| "name": "base", | ||
| "hidden": true, | ||
| "generator": "Ninja", | ||
| "binaryDir": "${sourceDir}/build-${presetName}", | ||
| "cacheVariables": { | ||
| "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", | ||
| "CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.." | ||
| } | ||
| }, | ||
|
|
||
| { "name": "debug", "hidden": true, "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" } }, | ||
| { "name": "release", "hidden": true, "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" } }, | ||
| { "name": "static", "hidden": true, "cacheVariables": { "LLAMA_STATIC": "ON" } }, | ||
|
|
||
| { | ||
| "name": "arm64-windows-msvc", "hidden": true, | ||
| "architecture": { "value": "arm64", "strategy": "external" }, | ||
| "toolset": { "value": "host=x86_64", "strategy": "external" }, | ||
| "cacheVariables": { | ||
| "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/cmake/arm64-windows-msvc.cmake" | ||
| } | ||
| }, | ||
|
|
||
| { | ||
| "name": "arm64-windows-llvm", "hidden": true, | ||
| "architecture": { "value": "arm64", "strategy": "external" }, | ||
| "toolset": { "value": "host=x86_64", "strategy": "external" }, | ||
| "cacheVariables": { | ||
| "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/cmake/arm64-windows-llvm.cmake" | ||
| } | ||
| }, | ||
|
|
||
| { "name": "arm64-windows-llvm-debug" , "inherits": [ "base", "arm64-windows-llvm", "debug" ] }, | ||
| { "name": "arm64-windows-llvm-release", "inherits": [ "base", "arm64-windows-llvm", "release" ] }, | ||
| { "name": "arm64-windows-llvm+static-release", "inherits": [ "base", "arm64-windows-llvm", "release", "static" ] }, | ||
|
|
||
| { "name": "arm64-windows-msvc-debug" , "inherits": [ "base", "arm64-windows-msvc", "debug" ] }, | ||
| { "name": "arm64-windows-msvc-release", "inherits": [ "base", "arm64-windows-msvc", "release" ] }, | ||
| { "name": "arm64-windows-msvc+static-release", "inherits": [ "base", "arm64-windows-msvc", "release", "static" ] } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| set( CMAKE_SYSTEM_NAME Windows ) | ||
| set( CMAKE_SYSTEM_PROCESSOR arm64 ) | ||
|
|
||
| set( target arm64-pc-windows-msvc ) | ||
|
|
||
| set( CMAKE_C_COMPILER clang ) | ||
| set( CMAKE_CXX_COMPILER clang++ ) | ||
|
|
||
| set( CMAKE_C_COMPILER_TARGET ${target} ) | ||
| set( CMAKE_CXX_COMPILER_TARGET ${target} ) | ||
|
|
||
| set( arch_c_flags "-march=armv8.7-a -fvectorize -ffp-model=fast" ) | ||
| set( warn_c_flags "-Wno-format -Wno-unused-variable -Wno-unused-function -Wno-gnu-zero-variadic-macro-arguments" ) | ||
|
|
||
| set( CMAKE_C_FLAGS_INIT "${arch_c_flags} ${warn_c_flags}" ) | ||
| set( CMAKE_CXX_FLAGS_INIT "${arch_c_flags} ${warn_c_flags}" ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| set( CMAKE_SYSTEM_NAME Windows ) | ||
| set( CMAKE_SYSTEM_PROCESSOR arm64 ) | ||
|
|
||
| set( target arm64-pc-windows-msvc ) | ||
| set( CMAKE_C_COMPILER_TARGET ${target} ) | ||
| set( CMAKE_CXX_COMPILER_TARGET ${target} ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.