From 4bbb72ce662e7b3771c5ff6358cf557465387d1b Mon Sep 17 00:00:00 2001 From: Sandro Hanea Date: Sat, 11 Jan 2025 18:32:15 +0100 Subject: [PATCH] Little cleanup --- .github/workflows/windows-native-build.yml | 5 +---- windows-scripts.ps1 | 16 ++-------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/windows-native-build.yml b/.github/workflows/windows-native-build.yml index 5e04253a..c1684f10 100644 --- a/.github/workflows/windows-native-build.yml +++ b/.github/workflows/windows-native-build.yml @@ -46,10 +46,7 @@ jobs: id: install_ninja run: | choco install ninja - - - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v2 - + - name: Run Build run: | Import-Module ./windows-scripts.ps1 diff --git a/windows-scripts.ps1 b/windows-scripts.ps1 index 1bf171cc..bb0f75f8 100644 --- a/windows-scripts.ps1 +++ b/windows-scripts.ps1 @@ -25,20 +25,8 @@ function BuildWindows() { "-DGGML_NATIVE=OFF", "-DCMAKE_SYSTEM_NAME=Windows" ) - - if ($Arch -eq "arm64") { - $options += "-DCMAKE_TOOLCHAIN_FILE=cmake/arm64-windows-llvm.cmake" - } - - if ($Arch -eq 'x64') { - $options += "-DCMAKE_TOOLCHAIN_FILE=cmake/x64-windows-llvm.cmake" - - } - - if ($Arch -eq 'x86') { - $options += "-DCMAKE_TOOLCHAIN_FILE=cmake/x86-windows-llvm.cmake" - - } + + $options += "-DCMAKE_TOOLCHAIN_FILE=cmake/$Arch-windows-llvm.cmake" $avxOptions = @("-DGGML_AVX=ON", "-DGGML_AVX2=ON", "-DGGML_FMA=ON", "-DGGML_F16C=ON")