From 6568459590b67b0d2886d24c84ee87cb6c2029fe Mon Sep 17 00:00:00 2001 From: Alexey Kharlamov Date: Sat, 6 May 2023 17:25:52 +0100 Subject: [PATCH] Model built with Intel oneMKL --- .github/workflows/release-deb.yml | 18 +++++++++++------- CMakeLists.txt | 7 +++++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-deb.yml b/.github/workflows/release-deb.yml index 92b2b15f21..e974e23b64 100644 --- a/.github/workflows/release-deb.yml +++ b/.github/workflows/release-deb.yml @@ -25,8 +25,12 @@ jobs: - name: Build run: | - cmake -S . -B build-release -D BUILD_SHARED_LIBS=OFF - cd build-release + cmake -S . -B build-mkl \ + -DCMAKE_BUILD_TYPE=Release\ + -DBUILD_SHARED_LIBS=0\ + -DWHISPER_BLAS=1\ + -DWHISPER_BLAS_VENDOR=Intel10_64lp + cd build-mkl make cd .. @@ -39,15 +43,15 @@ jobs: mkdir -p $ROOT/share mkdir -p $PKG_ID/DEBIAN - cp build-release/bin/main $ROOT/bin/whisper + cp build-mkl/bin/main $ROOT/bin/whisper cp -r contrib/debian/control $PKG_ID/DEBIAN/ - echo "Version: $PKG_VERSION" >> $PKG_ID/DEBIAN/control - echo "Git-Repo: $GITHUB_REPO" >> $PKG_ID/DEBIAN/control - echo "Git-Commit: $GITHUB_SHA" >> $PKG_ID/DEBIAN/control + echo "Version: $PKG_VERSION" >> $PKG_ID/DEBIAN/control + echo "Vcs-Git: $GITHUB_REPO" >> $PKG_ID/DEBIAN/control + echo "Vcs-Git-Commit: $GITHUB_SHA" >> $PKG_ID/DEBIAN/control models/download-ggml-model.sh small - build-release/bin/quantize models/ggml-small.bin \ + build-mkl/bin/quantize models/ggml-small.bin \ $ROOT/share/ggml-small-q5_1.bin q5_1 - name: Create deb package diff --git a/CMakeLists.txt b/CMakeLists.txt index 4da0188dcb..e2de563170 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,9 +134,12 @@ if (WHISPER_OPENBLAS) endif() if (WHISPER_BLAS) - set(BLA_STATIC 1) + if (WHISPER_STATIC) + set(BLA_STATIC 1) + else() + set(BLA_STATIC 0) + endif () set(BLA_VENDOR ${WHISPER_BLAS_VENDOR}) -# set(BLA_PREFER_PKGCONFIG 1) set(BLA_SIZEOF_INTEGER 8) find_package(BLAS)