回退whiper版本，并且使其依赖sd的ggml库，以后这两个将保持稳定，随sd更新

ylsdamxssjxxdd · Nov 5, 2024 · 97e7e7d · 97e7e7d
1 parent b81e9ed
commit 97e7e7d
Show file tree

Hide file tree

Showing 527 changed files with 10,945 additions and 139,347 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(version b4020) # 打包版本
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release) # 设置最终eva的输出目录
 
 ###################################### 编译选项 ######################################
-option(BODY_PACK                     "pack eva"                                   ON) # 是否打包
+option(BODY_PACK                     "pack eva"                                   OFF) # 是否打包
 option(GGML_CUDA                     "ggml: use CUDA"                             ON) # 速度900%
 option(GGML_VULKAN                   "ggml: use Vulkan"                           OFF) # 速度250%
 
@@ -105,7 +105,7 @@ add_definitions(-DGGML_MAX_N_THREADS=512) # llama原项目支持必须
 
 add_subdirectory(llama.cpp/ggml) # 添加ggml库
 
-# whisper.cpp-4e10afb
+# whisper.cpp-34972db
 add_subdirectory(whisper.cpp) # 添加whisper.dll
 add_subdirectory(whisper.cpp/examples) # 添加whisper执行程序
 
@@ -253,7 +253,7 @@ elseif(UNIX)
             COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/sd" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/AppDir/usr/bin/sd"
 
             COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/bin/libwhisper.so" "${CMAKE_BINARY_DIR}/Release/AppDir/usr/lib/libwhisper.so"
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/bin/libwhisper-ggml.so" "${CMAKE_BINARY_DIR}/Release/AppDir/usr/lib/libwhisper-ggml.so"
+            # COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/bin/libwhisper-ggml.so" "${CMAKE_BINARY_DIR}/Release/AppDir/usr/lib/libwhisper-ggml.so"
             COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/whisper-cli" "${CMAKE_BINARY_DIR}/Release/AppDir/usr/bin/whisper-cli"
 
             COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR}/ui/utils ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/ui/utils/eva.desktop ${CMAKE_BINARY_DIR}/Release/AppDir/usr/share/applications/eva.desktop

diff --git a/README_cmake.md b/README_cmake.md
@@ -67,10 +67,11 @@ inline bool mmap::open(const char *path) {
 - 修改stable-diffusion.cpp/ggml/src/ggml.c中的FILE * ggml_fopen(const char * fname, const char * mode)函数 -> 只要保留return fopen(fname, mode);其余删除
 
 ### whisper.cpp
-- 删除examples中cmakelists.txt里的DefaultTargetOptions
+- 删除自己的ggml文件夹
 - 删除whisper.cpp中的whisper_init_from_file_with_params_no_state里的#ifdef _MSC_VER部分以支持中文
+- 将examples中的common库更名为whisper-common
 - examples/main的taget名称改为whisper-cli
-- 其它步骤同stable-diffusion.cpp
+- 让所以对ggml库的链接更名为sd-ggml
 
 
 ### libsndfile 读写wav文件

diff --git a/llama.cpp/.devops/cloud-v-pipeline b/llama.cpp/.devops/cloud-v-pipeline
diff --git a/llama.cpp/.devops/full-cuda.Dockerfile b/llama.cpp/.devops/full-cuda.Dockerfile
diff --git a/llama.cpp/.devops/full-musa.Dockerfile b/llama.cpp/.devops/full-musa.Dockerfile
diff --git a/llama.cpp/.devops/full-rocm.Dockerfile b/llama.cpp/.devops/full-rocm.Dockerfile
diff --git a/llama.cpp/.devops/full.Dockerfile b/llama.cpp/.devops/full.Dockerfile
diff --git a/llama.cpp/.devops/llama-cli-cann.Dockerfile b/llama.cpp/.devops/llama-cli-cann.Dockerfile
diff --git a/llama.cpp/.devops/llama-cli-cuda.Dockerfile b/llama.cpp/.devops/llama-cli-cuda.Dockerfile
diff --git a/llama.cpp/.devops/llama-cli-intel.Dockerfile b/llama.cpp/.devops/llama-cli-intel.Dockerfile
diff --git a/llama.cpp/.devops/llama-cli-musa.Dockerfile b/llama.cpp/.devops/llama-cli-musa.Dockerfile
diff --git a/llama.cpp/.devops/llama-cli-rocm.Dockerfile b/llama.cpp/.devops/llama-cli-rocm.Dockerfile