diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e4599c85181dee..e75405eb370ec0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,13 +35,13 @@ env: jobs: windows-msys2-cpu-x86_64: runs-on: windows-latest + if: false strategy: fail-fast: false 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 +51,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,14 +73,8 @@ 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 @@ -96,25 +82,19 @@ jobs: 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 curl + run: | + curl.exe -O https://curl.se/windows/dl-8.11.0_4/curl-8.11.0_4-win64-mingw.zip + 7z x curl-8.11.0_4-win64-mingw.zip -ocurl + + - name: Configure using CMake + run: | + cmake -B build -G "MinGW Makefiles" -DLLAMA_CURL=ON -DLLAMA_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DGGML_NATIVE=OFF -DGGML_BACKEND_DL=ON -DCURL_USE_STATIC_LIBS=ON -DCURL_INCLUDE_DIR="curl/curl-8.11.0_4-win64-mingw/include/" -DCURL_LIBRARY="curl/curl-8.11.0_4-win64-mingw/lib/libcurl.a" -DCURL_USE_STATIC_LIBS=ON - 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 }} - rm build/bin/Release/ggml-cpu.dll + cmake --build build --config Release + rm build/bin/Release/ggml-cpu.dll - name: Download CPU backend artifacts uses: actions/download-artifact@v4 @@ -141,15 +121,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' }}