diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5c883db4..a1318b19 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -294,7 +294,7 @@ jobs: export C_INCLUDE_PATH=/usr/local/include export CPLUS_INCLUDE_PATH=/usr/local/include export PATH=$PATH:$GOPATH/bin - + export SKIP_GRPC_BACKEND=backend-assets/grpc/whisper make dist - uses: actions/upload-artifact@v4 with: @@ -327,7 +327,7 @@ jobs: cache: false - name: Dependencies run: | - brew install protobuf grpc + brew install protobuf grpc libomp llvm go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@1958fcbe2ca8bd93af633f11e97d44e567e945af go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.2 - name: Build @@ -336,7 +336,7 @@ jobs: export C_INCLUDE_PATH=/usr/local/include export CPLUS_INCLUDE_PATH=/usr/local/include export PATH=$PATH:$GOPATH/bin - + export CC=/opt/homebrew/opt/llvm/bin/clang make dist - uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e6efe77f..2af3fd00 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -214,12 +214,13 @@ jobs: run: go version - name: Dependencies run: | - brew install protobuf grpc make protoc-gen-go protoc-gen-go-grpc + brew install protobuf grpc make protoc-gen-go protoc-gen-go-grpc libomp llvm pip install --user --no-cache-dir grpcio-tools==1.64.1 - name: Test run: | export C_INCLUDE_PATH=/usr/local/include export CPLUS_INCLUDE_PATH=/usr/local/include + export CC=/opt/homebrew/opt/llvm/bin/clang # Used to run the newer GNUMake version from brew that supports --output-sync export PATH="/opt/homebrew/opt/make/libexec/gnubin:$PATH" BUILD_TYPE="GITHUB_CI_HAS_BROKEN_METAL" CMAKE_ARGS="-DGGML_F16C=OFF -DGGML_AVX512=OFF -DGGML_AVX2=OFF -DGGML_FMA=OFF" make --jobs 4 --output-sync=target test diff --git a/Makefile b/Makefile index a360fe88..43d711bd 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ RWKV_VERSION?=661e7ae26d442f5cfebd2a0881b44e8c55949ec6 # whisper.cpp version WHISPER_REPO?=https://github.com/ggerganov/whisper.cpp -WHISPER_CPP_VERSION?=9e3c5345cd46ea718209db53464e426c3fe7a25e +WHISPER_CPP_VERSION?=c96906d84dd6a1c40ea797ad542df3a0c47307a3 # bert.cpp version BERT_REPO?=https://github.com/go-skynet/go-bert.cpp