From 1ca5a9a98a85ca28c342ab3acffd90fc3aaeedc7 Mon Sep 17 00:00:00 2001
From: thxCode <thxcode0824@gmail.com>
Date: Thu, 26 Dec 2024 21:47:09 +0800
Subject: [PATCH] ci: fix windows amd64 build

Signed-off-by: thxCode <thxcode0824@gmail.com>
---
 .github/workflows/ci.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 83d87aa..0f3c58f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,8 @@ on:
       - "**.mdx"
       - "**.png"
       - "**.jpg"
-      - "!.github/workflows/ci.yml"
+      - ".github/workflows/prune.yml"
+      - ".github/workflows/sync.yml"
   pull_request:
     branches:
       - "main"
@@ -32,7 +33,8 @@ on:
       - "**.mdx"
       - "**.png"
       - "**.jpg"
-      - "!.github/workflows/ci.yml"
+      - ".github/workflows/prune.yml"
+      - ".github/workflows/sync.yml"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
@@ -83,7 +85,7 @@ jobs:
             -DGGML_NATIVE=on \
             -DGGML_OPENMP=off \
             -DGGML_RPC=on
-          cmake --build ${{ github.workspace }}/build --target llama-box --config Release -- -j $(nproc)
+          cmake --build ${{ github.workspace }}/build --target llama-box --config Release -- -j $(sysctl -n hw.physicalcpu)
           
           echo "===== RESULT ====="
           ls -alh ${{ github.workspace }}/build/bin/
@@ -146,7 +148,7 @@ jobs:
             -DGGML_NATIVE=on \
             -DGGML_OPENMP=off \
             -DGGML_RPC=on
-          cmake --build ${{ github.workspace }}/build --target llama-box --config Release -- -j $(nproc)
+          cmake --build ${{ github.workspace }}/build --target llama-box --config Release -- -j $(sysctl -n hw.physicalcpu)
 
           echo "===== RESULT ====="
           ls -alh ${{ github.workspace }}/build/bin/
@@ -290,8 +292,8 @@ jobs:
           echo "===== BUILD ====="
           cmake -S ${{ github.workspace }} -B ${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=Release \
             -DGGML_NATIVE=off \
-            ${{ matrix.instruction == 'avx2' && '-DGGML_AVX=on -DGGML_AVX2=on' || '' }} \
-            ${{ matrix.instruction == 'avx512' && '-DGGML_AVX512=on -DGGML_AVX512_VBMI=on -DGGML_AVX512_VNNI=on -DGGML_AVX512_BF16=on' || '' }} \
+            ${{ matrix.instruction == 'avx2' && '-DGGML_AVX=on -DGGML_AVX_VNNI=off -DGGML_AVX2=on' || '' }} \
+            ${{ matrix.instruction == 'avx512' && '-DGGML_AVX512=on -DGGML_AVX512_BF16=off -DGGML_AVX512_VBMI=on -DGGML_AVX512_VNNI=on' || '' }} \
             ${{ matrix.instruction == 'neon' && '-DGGML_CPU_ARM_ARCH="armv8.2-a"' || '' }} \
             -DGGML_BLAS_VENDOR=OpenBLAS \
             -DGGML_STATIC=on \
@@ -994,10 +996,10 @@ jobs:
           Write-Host "===== BUILD ====="
           New-Item -Force -ItemType Directory -Path "${{ github.workspace }}\.cache" -ErrorAction Ignore | Out-Null
           cmake ${{ matrix.arch == 'arm64' && '-G "Ninja Multi-Config"'|| '' }} -S ${{ github.workspace }} -B ${{ github.workspace }}\build -DCMAKE_BUILD_TYPE=Release `
-            ${{ matrix.arch == 'arm64' && format('-DCMAKE_TOOLCHAIN_FILE={0}\llama-box\scripts\build-windows-arm64.cmake', github.workspace) || '' }} `
             -DGGML_NATIVE=off `
-            ${{ matrix.instruction == 'avx2' && '-DGGML_AVX=on -DGGML_AVX2=on' || '' }} `
-            ${{ matrix.instruction == 'avx512' && '-DGGML_AVX512=on -DGGML_AVX512_VBMI=on -DGGML_AVX512_VNNI=on -DGGML_AVX512_BF16=on' || '' }} `
+            ${{ matrix.instruction == 'avx2' && '-DGGML_AVX=on -DGGML_AVX_VNNI=off -DGGML_AVX2=on' || '' }} `
+            ${{ matrix.instruction == 'avx512' && '-DGGML_AVX512=on -DGGML_AVX512_BF16=off -DGGML_AVX512_VBMI=on -DGGML_AVX512_VNNI=on' || '' }} `
+            ${{ matrix.instruction == 'neon' && format('-DCMAKE_TOOLCHAIN_FILE={0}\llama-box\scripts\build-windows-arm64.cmake', github.workspace) || '' }} `
             -DGGML_STATIC=on `
             -DGGML_OPENMP=off `
             -DGGML_RPC=on