wip4

slaren · Dec 1, 2024 · ca6ea9f · ca6ea9f
1 parent edddcaf
commit ca6ea9f
Showing 1 changed file with 18 additions and 39 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,7 +41,6 @@ jobs:
       matrix:
         arch: [avx, avx2, avx512, amx]
         include:
-          - { sys: UCRT64, env: ucrt-x86_64, build: Release }
           - { arch: avx,    defines: '-DGGML_AVX=ON -DGGML_AVX2=OFF -DGGML_AVX512=OFF -DGGML_AMX_TILE=OFF -DGGML_AMX_INT8=OFF' }
           - { arch: avx2,   defines: '-DGGML_AVX=ON -DGGML_AVX2=ON  -DGGML_AVX512=OFF -DGGML_AMX_TILE=OFF -DGGML_AMX_INT8=OFF' }
           - { arch: avx512, defines: '-DGGML_AVX=ON -DGGML_AVX2=ON  -DGGML_AVX512=ON  -DGGML_AMX_TILE=OFF -DGGML_AMX_INT8=OFF' }
@@ -51,22 +50,14 @@ jobs:
       - name: Clone
         uses: actions/checkout@v4
 
-      - name: Setup ${{ matrix.sys }}
-        uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          msystem: ${{matrix.sys}}
-          install: >-
-            base-devel
-            mingw-w64-${{matrix.env}}-toolchain
-            mingw-w64-${{matrix.env}}-cmake
-            mingw-w64-${{matrix.env}}-ninja
+      - name: Install Ninja
+        run: |
+          choco install ninja
 
       - name: Build using CMake
-        shell: msys2 {0}
         run: |
             cmake -B build -G "Ninja Multi-Config" -DGGML_NATIVE=OFF -DBUILD_SHARED_LIBS=ON -DGGML_BACKEND_DL=ON ${{ matrix.defines }}
-            cmake --build build --config ${{ matrix.build }} -t ggml-cpu
+            cmake --build build --config Release -t ggml-cpu
 
       - name: Rename artifacts
         run: mv build/bin/Release/ggml-cpu.dll ggml-cpu-${{ matrix.arch }}.dll
@@ -81,39 +72,27 @@ jobs:
   windows-msys2-x86_64:
     runs-on: windows-latest
 
-    needs:
-      - windows-msys2-cpu-x86_64
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { sys: UCRT64, env: ucrt-x86_64, build: Release }
+    #needs:
+    #  - windows-msys2-cpu-x86_64
 
     steps:
       - name: Clone
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup ${{ matrix.sys }}
-        uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          msystem: ${{matrix.sys}}
-          install: >-
-            base-devel
-            git
-            mingw-w64-${{matrix.env}}-toolchain
-            mingw-w64-${{matrix.env}}-cmake
-            mingw-w64-${{matrix.env}}-ninja
-            mingw-w64-${{matrix.env}}-curl
+      - name: Install Ninja
+        run: |
+          choco install ninja
+
+      - name: Install curl
+        run: |
+          vcpkg install curl:x64-mingw-static
 
       - name: Build using CMake
-        shell: msys2 {0}
         run: |
-            cmake -B build -G "Ninja Multi-Config" -DLLAMA_CURL=ON -DLLAMA_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DGGML_BACKEND_DL=ON
-            cmake --build build --config ${{ matrix.build }}
+            cmake -B build -G "Ninja Multi-Config" -DLLAMA_CURL=ON -DLLAMA_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DGGML_BACKEND_DL=ON -DCURL_USE_STATIC_LIBS=ON -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPPKG_TARGET_TRIPLET=x64-mingw-static
+            cmake --build build --config Release
             rm build/bin/Release/ggml-cpu.dll
 
       - name: Download CPU backend artifacts
@@ -141,15 +120,15 @@ jobs:
         if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
         run: |
           Copy-Item LICENSE .\build\bin\Release\llama.cpp.txt
-          7z a llama-${{ steps.tag.outputs.name }}-bin-msys2-cpu-${{ matrix.build }}.zip .\build\bin\Release\*
+          7z a llama-${{ steps.tag.outputs.name }}-bin-msys2-cpu.zip .\build\bin\Release\*
 
       - name: Upload artifacts
         id: upload_artifacts
         if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}
         uses: actions/upload-artifact@v4
         with:
-          path: llama-${{ steps.tag.outputs.name }}-bin-msys2-cpu-${{ matrix.build }}.zip
-          name: llama-${{ steps.tag.outputs.name }}-bin-msys2-cpu-${{ matrix.build }}.zip
+          path: llama-${{ steps.tag.outputs.name }}-bin-msys2-cpu.zip
+          name: llama-${{ steps.tag.outputs.name }}-bin-msys2-cpu.zip
 
   release:
     if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }}