-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
c8f08a7
commit 1324d31
Showing
2 changed files
with
18 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,47 @@ | ||
commit 1e8fdf3f90fd142c5ddd63e44ca1e5c172dbfb7f | ||
commit 425b33877c819dd88f3692aae37452c767371f6b | ||
Author: Simon Gardling <[email protected]> | ||
Date: Tue Aug 27 12:45:14 2024 -0400 | ||
Date: Thu Sep 19 10:00:39 2024 -0400 | ||
|
||
use locally downloaded embeddings | ||
|
||
index 27f3f5d9..9e25528a 100644 | ||
--- a/CMakeLists.txt | ||
diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt | ||
index 900307ae..802fc31a 100644 | ||
--- a//CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -90,6 +90,7 @@ elseif (APPLE) | ||
@@ -120,6 +120,7 @@ elseif (APPLE) | ||
endif() | ||
|
||
# Embedding model | ||
+#[[ | ||
set(LOCAL_EMBEDDING_MODEL "nomic-embed-text-v1.5.f16.gguf") | ||
set(LOCAL_EMBEDDING_MODEL_MD5 "a5401e7f7e46ed9fcaed5b60a281d547") | ||
set(LOCAL_EMBEDDING_MODEL_PATH "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}") | ||
@@ -104,6 +105,7 @@ | ||
@@ -134,6 +135,7 @@ message(STATUS "Embedding model downloaded to ${LOCAL_EMBEDDING_MODEL_PATH}") | ||
if (APPLE) | ||
list(APPEND CHAT_EXE_RESOURCES "${LOCAL_EMBEDDING_MODEL_PATH}") | ||
endif() | ||
+]] | ||
|
||
qt_add_executable(chat | ||
main.cpp | ||
@@ -383,11 +385,13 @@ | ||
set(QAPPLICATION_CLASS QGuiApplication) | ||
add_subdirectory(deps/SingleApplication) | ||
@@ -348,11 +350,13 @@ if (LLMODEL_CUDA) | ||
endif() | ||
endif() | ||
|
||
+#[[ | ||
if (NOT APPLE) | ||
install(FILES "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}" | ||
install(FILES "${LOCAL_EMBEDDING_MODEL_PATH}" | ||
DESTINATION resources | ||
COMPONENT ${COMPONENT_NAME_MAIN}) | ||
endif() | ||
+]] | ||
|
||
set(CPACK_GENERATOR "IFW") | ||
set(CPACK_VERBATIM_VARIABLES YES) | ||
--- a/embllm.cpp | ||
+++ b/embllm.cpp | ||
diff --git a/gpt4all-chat/src/embllm.cpp b/gpt4all-chat/src/embllm.cpp | ||
index 81b1e9e1..e3266cc7 100644 | ||
--- a/src/embllm.cpp | ||
+++ b/src/embllm.cpp | ||
@@ -84,7 +84,7 @@ bool EmbeddingLLMWorker::loadModel() | ||
|
||
QString filePath = embPathFmt.arg(QCoreApplication::applicationDirPath(), LOCAL_EMBEDDING_MODEL); | ||
|
@@ -47,4 +50,4 @@ index 27f3f5d9..9e25528a 100644 | |
+ qWarning() << "embllm WARNING: Local embedding model not found: " << filePath; | ||
return false; | ||
} | ||
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters