mirror of
https://github.com/mudler/LocalAI.git
synced 2026-10-01 02:24:34 -04:00
chore: ⬆️ Update ServeurpersoCom/omnivoice.cpp to 3ac485d0688fc684f5dcf2c95283b745220f9dcc (#12191)
* ⬆️ Update ServeurpersoCom/omnivoice.cpp Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix(omnivoice-cpp): workaround GGML_SOURCE_DIR for nested builds omnivoice.cpp 3ac485d changed from a relative add_subdirectory(ggml) to CMAKE_SOURCE_DIR-based path resolution. CMAKE_SOURCE_DIR points to the top-level project, not the current subdirectory, so when omnivoice is consumed via add_subdirectory() the build fails: add_subdirectory given source ".../omnivoice-cpp/ggml" which is not an existing directory. Set GGML_SOURCE_DIR to the correct path before add_subdirectory so the upstream code picks it up from the cache. This is a workaround until ServeurpersoCom/omnivoice.cpp#20 is merged upstream. Signed-off-by: Ettore Di Giacinto <mudler@localai.io> --------- Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: Ettore Di Giacinto <mudler@localai.io> Co-authored-by: mudler <2420543+mudler@users.noreply.github.com> Co-authored-by: Ettore Di Giacinto <mudler@localai.io>
This commit is contained in:
2 files changed
+7
-1
No files matched your search
@@ -5,6 +5,12 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||
|
||||
set(OMNIVOICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/sources/omnivoice.cpp)
|
||||
|
||||
# omnivoice.cpp 3ac485d uses CMAKE_SOURCE_DIR to locate ggml/, which is
|
||||
# wrong when omnivoice is nested under add_subdirectory (CMAKE_SOURCE_DIR
|
||||
# is the top-level project, not this CMakeLists.txt). Override it here
|
||||
# until the upstream fix (ServeurpersoCom/omnivoice.cpp#20) is merged.
|
||||
set(GGML_SOURCE_DIR "${OMNIVOICE_DIR}/ggml" CACHE PATH "ggml source tree")
|
||||
|
||||
# Override upstream's CMAKE_CUDA_ARCHITECTURES before add_subdirectory.
|
||||
if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
|
||||
set(CMAKE_CUDA_ARCHITECTURES "75-virtual;80-virtual;86-real;89-real")
|
||||
|
||||
@@ -8,7 +8,7 @@ JOBS?=$(shell nproc --ignore=1)
|
||||
|
||||
# omnivoice.cpp version
|
||||
OMNIVOICE_REPO?=https://github.com/ServeurpersoCom/omnivoice.cpp
|
||||
OMNIVOICE_VERSION?=ae9dd24b6a5ff72bf50519490092ad14c64627a8
|
||||
OMNIVOICE_VERSION?=3ac485d0688fc684f5dcf2c95283b745220f9dcc
|
||||
SO_TARGET?=libgomnivoicecpp.so
|
||||
|
||||
CMAKE_ARGS+=-DBUILD_SHARED_LIBS=OFF
|
||||
|
||||
Reference in new issue
Block a user