From d458fcbc15da5a19a8e32faf77b1cb628aef1dd3 Mon Sep 17 00:00:00 2001 From: RelatedTitle Date: Wed, 3 May 2023 14:47:37 -0600 Subject: [PATCH] ci : add cuBLAS build workflow and fix error causing lines in CMakeLists (#867) * Add windows build with cuBLAS * Remove error causing lines for cuBLAS on Windows --- .github/workflows/build.yml | 57 ++++++++++++++++++++++++++++++++++++- CMakeLists.txt | 4 --- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08f039b..02c8900 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -235,6 +235,61 @@ jobs: with: name: whisper-blas-bin-${{ matrix.arch }} path: build/bin/${{ matrix.build }} + + windows-cublas: + runs-on: windows-latest + + strategy: + matrix: + build: [Release] + arch: [x64] + cublas: [ON] + sdl2: [ON] + include: + - arch: x64 + s2arc: x64 + - sdl2: ON + s2ver: 2.26.0 + + steps: + - name: Clone + uses: actions/checkout@v1 + + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1 + + - name: Install CUDA Toolkit + id: cuda-toolkit + uses: Jimver/cuda-toolkit@v0.2.10 + + - name: Fetch SDL2 and set SDL2_DIR + if: matrix.sdl2 == 'ON' + run: | + 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 + 7z x sdl2.zip + echo "SDL2_DIR=$env:GITHUB_WORKSPACE/SDL2-${{ matrix.s2ver }}/cmake" >> $env:GITHUB_ENV + + - name: Configure + run: > + cmake -S . -B ./build -A ${{ matrix.arch }} + -DCMAKE_BUILD_TYPE=${{ matrix.build }} + -DWHISPER_CUBLAS=1 + + - name: Build + run: | + cd ./build + msbuild ALL_BUILD.vcxproj -t:build -p:configuration=${{ matrix.build }} -p:platform=${{ matrix.arch }} + + - name: Copy SDL2.dll + if: matrix.sdl2 == 'ON' + run: copy "$env:SDL2_DIR/../lib/${{ matrix.s2arc }}/SDL2.dll" build/bin/${{ matrix.build }} + + - name: Upload binaries + if: matrix.sdl2 == 'ON' + uses: actions/upload-artifact@v1 + with: + name: whisper-cublas-bin-${{ matrix.arch }} + path: build/bin/${{ matrix.build }} emscripten: runs-on: ubuntu-latest @@ -305,4 +360,4 @@ jobs: - name: Build run: | cd examples/whisper.android - ./gradlew assembleRelease --no-daemon \ No newline at end of file + ./gradlew assembleRelease --no-daemon diff --git a/CMakeLists.txt b/CMakeLists.txt index f17bb24..7289a23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required (VERSION 3.0) project(whisper.cpp VERSION 1.4.1) -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - add_compile_options(/utf-8) -endif () - # Add path to modules list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")