Skip to content

Commit 6a89f3e

Browse files
ggerganovggerganov
committed
cont : disabled wrong build
1 parent 318dad5 commit 6a89f3e

File tree

1 file changed

+77
-77
lines changed

1 file changed

+77
-77
lines changed

‎.github/workflows/build.yml‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -304,13 +304,12 @@ jobs:
304304
shell: msys2 {0}
305305
run: |
306306
rm -rf build
307-
# TODO: fails for some reason: https://github.com/ggerganov/whisper.cpp/actions/runs/11516781296/job/32060139298?pr=2511
308-
#
309-
# - name: Build using CMake w/ OpenBLAS
310-
# shell: msys2 {0}
311-
# run: |
312-
# cmake -B build -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS
313-
# cmake --build build --config ${{ matrix.build }} -j $(nproc)
307+
308+
- name: Build using CMake w/ OpenBLAS
309+
shell: msys2 {0}
310+
run: |
311+
cmake -B build -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS
312+
cmake --build build --config ${{ matrix.build }} -j $(nproc)
314313
315314
windows:
316315
runs-on: windows-latest
@@ -372,76 +371,77 @@ jobs:
372371
name: whisper-bin-${{ matrix.arch }}
373372
path: build/bin/${{ matrix.build }}
374373

375-
windows-blas:
376-
runs-on: windows-latest
377-
378-
strategy:
379-
matrix:
380-
build: [Release]
381-
arch: [Win32, x64]
382-
blas: [ON]
383-
sdl2: [ON]
384-
include:
385-
- arch: Win32
386-
obzip: https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.25/OpenBLAS-0.3.25-x86.zip
387-
s2arc: x86
388-
- arch: x64
389-
obzip: https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.25/OpenBLAS-0.3.25-x64.zip
390-
s2arc: x64
391-
- sdl2: ON
392-
s2ver: 2.28.5
393-
394-
steps:
395-
- name: Clone
396-
uses: actions/checkout@v4
397-
398-
- name: Add msbuild to PATH
399-
uses: microsoft/setup-msbuild@v2
400-
401-
- name: Fetch OpenBLAS
402-
if: matrix.blas == 'ON'
403-
run: |
404-
C:/msys64/usr/bin/wget.exe -qO blas.zip ${{ matrix.obzip }}
405-
7z x blas.zip -oblas -y
406-
copy blas/include/cblas.h .
407-
copy blas/include/openblas_config.h .
408-
echo "OPENBLAS_PATH=$env:GITHUB_WORKSPACE/blas" >> $env:GITHUB_ENV
409-
410-
- name: Fetch SDL2 and set SDL2_DIR
411-
if: matrix.sdl2 == 'ON'
412-
run: |
413-
C:/msys64/usr/bin/wget.exe -qO sdl2.zip https://github.com/libsdl-org/SDL/releases/download/release-${{ matrix.s2ver }}/SDL2-devel-${{ matrix.s2ver }}-VC.zip
414-
7z x sdl2.zip
415-
echo "SDL2_DIR=$env:GITHUB_WORKSPACE/SDL2-${{ matrix.s2ver }}/cmake" >> $env:GITHUB_ENV
416-
417-
- name: Configure
418-
run: >
419-
cmake -S . -B ./build -A ${{ matrix.arch }}
420-
-DCMAKE_BUILD_TYPE=${{ matrix.build }}
421-
-DGGML_BLAS=${{ matrix.blas }}
422-
-DGGML_BLAS_VENDOR=OpenBLAS
423-
-DCMAKE_LIBRARY_PATH="$env:OPENBLAS_PATH/lib"
424-
-DWHISPER_SDL2=${{ matrix.sdl2 }}
425-
426-
- name: Build
427-
run: |
428-
cd ./build
429-
msbuild ALL_BUILD.vcxproj -t:build -p:configuration=${{ matrix.build }} -p:platform=${{ matrix.arch }}
430-
431-
- name: Copy libopenblas.dll
432-
if: matrix.blas == 'ON'
433-
run: copy "$env:OPENBLAS_PATH/bin/libopenblas.dll" build/bin/${{ matrix.build }}
434-
435-
- name: Copy SDL2.dll
436-
if: matrix.sdl2 == 'ON'
437-
run: copy "$env:SDL2_DIR/../lib/${{ matrix.s2arc }}/SDL2.dll" build/bin/${{ matrix.build }}
438-
439-
- name: Upload binaries
440-
if: matrix.blas == 'ON' && matrix.sdl2 == 'ON'
441-
uses: actions/upload-artifact@v4
442-
with:
443-
name: whisper-blas-bin-${{ matrix.arch }}
444-
path: build/bin/${{ matrix.build }}
374+
# TODO: fails for some reason: https://github.com/ggerganov/whisper.cpp/actions/runs/11516781296/job/32060139298?pr=2511
375+
# windows-blas:
376+
# runs-on: windows-latest
377+
#
378+
# strategy:
379+
# matrix:
380+
# build: [Release]
381+
# arch: [Win32, x64]
382+
# blas: [ON]
383+
# sdl2: [ON]
384+
# include:
385+
# - arch: Win32
386+
# obzip: https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.25/OpenBLAS-0.3.25-x86.zip
387+
# s2arc: x86
388+
# - arch: x64
389+
# obzip: https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.25/OpenBLAS-0.3.25-x64.zip
390+
# s2arc: x64
391+
# - sdl2: ON
392+
# s2ver: 2.28.5
393+
#
394+
# steps:
395+
# - name: Clone
396+
# uses: actions/checkout@v4
397+
#
398+
# - name: Add msbuild to PATH
399+
# uses: microsoft/setup-msbuild@v2
400+
#
401+
# - name: Fetch OpenBLAS
402+
# if: matrix.blas == 'ON'
403+
# run: |
404+
# C:/msys64/usr/bin/wget.exe -qO blas.zip ${{ matrix.obzip }}
405+
# 7z x blas.zip -oblas -y
406+
# copy blas/include/cblas.h .
407+
# copy blas/include/openblas_config.h .
408+
# echo "OPENBLAS_PATH=$env:GITHUB_WORKSPACE/blas" >> $env:GITHUB_ENV
409+
#
410+
# - name: Fetch SDL2 and set SDL2_DIR
411+
# if: matrix.sdl2 == 'ON'
412+
# run: |
413+
# C:/msys64/usr/bin/wget.exe -qO sdl2.zip https://github.com/libsdl-org/SDL/releases/download/release-${{ matrix.s2ver }}/SDL2-devel-${{ matrix.s2ver }}-VC.zip
414+
# 7z x sdl2.zip
415+
# echo "SDL2_DIR=$env:GITHUB_WORKSPACE/SDL2-${{ matrix.s2ver }}/cmake" >> $env:GITHUB_ENV
416+
#
417+
# - name: Configure
418+
# run: >
419+
# cmake -S . -B ./build -A ${{ matrix.arch }}
420+
# -DCMAKE_BUILD_TYPE=${{ matrix.build }}
421+
# -DGGML_BLAS=${{ matrix.blas }}
422+
# -DGGML_BLAS_VENDOR=OpenBLAS
423+
# -DCMAKE_LIBRARY_PATH="$env:OPENBLAS_PATH/lib"
424+
# -DWHISPER_SDL2=${{ matrix.sdl2 }}
425+
#
426+
# - name: Build
427+
# run: |
428+
# cd ./build
429+
# msbuild ALL_BUILD.vcxproj -t:build -p:configuration=${{ matrix.build }} -p:platform=${{ matrix.arch }}
430+
#
431+
# - name: Copy libopenblas.dll
432+
# if: matrix.blas == 'ON'
433+
# run: copy "$env:OPENBLAS_PATH/bin/libopenblas.dll" build/bin/${{ matrix.build }}
434+
#
435+
# - name: Copy SDL2.dll
436+
# if: matrix.sdl2 == 'ON'
437+
# run: copy "$env:SDL2_DIR/../lib/${{ matrix.s2arc }}/SDL2.dll" build/bin/${{ matrix.build }}
438+
#
439+
# - name: Upload binaries
440+
# if: matrix.blas == 'ON' && matrix.sdl2 == 'ON'
441+
# uses: actions/upload-artifact@v4
442+
# with:
443+
# name: whisper-blas-bin-${{ matrix.arch }}
444+
# path: build/bin/${{ matrix.build }}
445445

446446
windows-cublas:
447447
runs-on: windows-2019

0 commit comments

Comments
 (0)