diff --git a/.github/workflows/generate_intel_image.yaml b/.github/workflows/generate_intel_image.yaml index 20ce1d5a7..cb795b502 100644 --- a/.github/workflows/generate_intel_image.yaml +++ b/.github/workflows/generate_intel_image.yaml @@ -15,7 +15,7 @@ jobs: strategy: matrix: include: - - base-image: intel/oneapi-basekit:2025.1.0-0-devel-ubuntu22.04 + - base-image: intel/oneapi-basekit:2025.2.0-0-devel-ubuntu22.04 runs-on: 'ubuntu-latest' platforms: 'linux/amd64' runs-on: ${{matrix.runs-on}} diff --git a/Makefile b/Makefile index 6f7f4fcb2..afbbfa423 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,8 @@ BINARY_NAME=local-ai GORELEASER?= +ONEAPI_VERSION?=2025.2 + export BUILD_TYPE?= GO_TAGS?= @@ -478,7 +480,7 @@ docker-save-piper: backend-images docker-save-llama-cpp: backend-images docker save local-ai-backend:llama-cpp -o backend-images/llama-cpp.tar - + docker-save-bark-cpp: backend-images docker save local-ai-backend:bark-cpp -o backend-images/bark-cpp.tar diff --git a/backend/go/whisper/Makefile b/backend/go/whisper/Makefile index 56b5dfebe..2c071b2a0 100644 --- a/backend/go/whisper/Makefile +++ b/backend/go/whisper/Makefile @@ -18,7 +18,7 @@ CGO_LDFLAGS_WHISPER+=-lggml CMAKE_ARGS+=-DBUILD_SHARED_LIBS=OFF -DLLAMA_CURL=OFF CUDA_LIBPATH?=/usr/local/cuda/lib64/ -ONEAPI_VERSION?=2025.1 +ONEAPI_VERSION?=2025.2 # IF native is false, we add -DGGML_NATIVE=OFF to CMAKE_ARGS ifeq ($(NATIVE),false) @@ -42,7 +42,7 @@ else ifeq ($(BUILD_TYPE),openblas) # If build type is clblas (openCL) we set -DGGML_CLBLAST=ON -DCLBlast_DIR=/some/path else ifeq ($(BUILD_TYPE),clblas) CMAKE_ARGS+=-DGGML_CLBLAST=ON -DCLBlast_DIR=/some/path -# If it's hipblas we do have also to set CC=/opt/rocm/llvm/bin/clang CXX=/opt/rocm/llvm/bin/clang++ +# If it's hipblas we do have also to set CC=/opt/rocm/llvm/bin/clang CXX=/opt/rocm/llvm/bin/clang++ else ifeq ($(BUILD_TYPE),hipblas) ROCM_HOME ?= /opt/rocm ROCM_PATH ?= /opt/rocm @@ -120,7 +120,7 @@ sources/whisper.cpp/build/src/libwhisper.a: sources/whisper.cpp whisper: sources/whisper.cpp sources/whisper.cpp/build/src/libwhisper.a $(GOCMD) mod edit -replace github.com/ggerganov/whisper.cpp=$(CURDIR)/sources/whisper.cpp - $(GOCMD) mod edit -replace github.com/ggerganov/whisper.cpp/bindings/go=$(CURDIR)/sources/whisper.cpp/bindings/go + $(GOCMD) mod edit -replace github.com/ggerganov/whisper.cpp/bindings/go=$(CURDIR)/sources/whisper.cpp/bindings/go CGO_LDFLAGS="$(CGO_LDFLAGS) $(CGO_LDFLAGS_WHISPER)" C_INCLUDE_PATH="${WHISPER_INCLUDE_PATH}" LIBRARY_PATH="${WHISPER_LIBRARY_PATH}" LD_LIBRARY_PATH="${WHISPER_LIBRARY_PATH}" \ CGO_CXXFLAGS="$(CGO_CXXFLAGS_WHISPER)" \ $(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o whisper ./ @@ -128,4 +128,4 @@ whisper: sources/whisper.cpp sources/whisper.cpp/build/src/libwhisper.a package: bash package.sh -build: whisper package \ No newline at end of file +build: whisper package