github/gpt4all
1
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all.git synced 2025-06-22 05:29:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP: backend dependencies

Browse Source 
Signed-off-by: Jared Van Bortel <jared@nomic.ai>
This commit is contained in:
Jared Van Bortel 2025-02-18 12:41:16 -05:00
parent 9bfab99e2c
commit b194d71e86
11 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitmodules vendored
View File

@ -5,7 +5,7 @@
path = gpt4all-chat/deps/SingleApplication
url = https://github.com/nomic-ai/SingleApplication.git
[submodule "gpt4all-chat/deps/fmt"]
path = gpt4all-chat/deps/fmt
path = deps/fmt
url = https://github.com/fmtlib/fmt.git
[submodule "gpt4all-chat/deps/DuckX"]
path = gpt4all-chat/deps/DuckX
@ -17,5 +17,8 @@
path = gpt4all-chat/deps/minja
url = https://github.com/nomic-ai/minja.git
[submodule "gpt4all-chat/deps/json"]
path = gpt4all-chat/deps/json
path = deps/json
url = https://github.com/nlohmann/json.git
[submodule "gpt4all-backend/deps/ollama-hpp"]
path = gpt4all-backend/deps/ollama-hpp
url = github.com:nomic-ai/ollama-hpp.git

6
deps/CMakeLists.txt vendored Normal file
View File

@ -0,0 +1,6 @@
set(BUILD_SHARED_LIBS OFF)
set(FMT_INSTALL OFF)
add_subdirectory(fmt)
add_subdirectory(json)

0
gpt4all-chat/deps/fmt → deps/fmt vendored
View File

0
gpt4all-chat/deps/json → deps/json vendored
View File

2
gpt4all-backend/CMakeLists.txt
View File

@ -4,4 +4,6 @@ project(gpt4all-backend VERSION 0.1 LANGUAGES CXX)
find_package(Qt6 6.8 COMPONENTS Core REQUIRED)
add_subdirectory(../deps "${CMAKE_CURRENT_BINARY_DIR}/common_deps")
add_subdirectory(deps)
add_subdirectory(src)

7
gpt4all-backend/deps/CMakeLists.txt Normal file
View File

@ -0,0 +1,7 @@
add_library(ollama-hpp INTERFACE)
target_include_directories(ollama-hpp INTERFACE
"${CMAKE_CURRENT_SOURCE_DIR}/ollama-hpp/include"
)
target_link_libraries(ollama-hpp INTERFACE
nlohmann_json::nlohmann_json
)

1
gpt4all-backend/deps/ollama-hpp Submodule

@ -0,0 +1 @@
Subproject commit 9d697d1b5828d8bf143f4ef4de6432c479298c65

5
gpt4all-backend/src/CMakeLists.txt
View File

@ -14,6 +14,9 @@ target_sources(${TARGET} PUBLIC
main.cppm
)
gpt4all_add_warning_options(${TARGET})
target_link_libraries(${TARGET} PRIVATE
target_link_libraries(${TARGET} PUBLIC
Qt6::Core
)
target_link_libraries(${TARGET} PRIVATE
fmt::fmt ollama-hpp
)

2
gpt4all-backend/src/main.cpp
View File

@ -4,6 +4,8 @@ module;
#include <QString>
#include <ollama.hpp>
module gpt4all.backend.main;

5
gpt4all-chat/CMakeLists.txt
View File

@ -144,6 +144,7 @@ configure_file(
"${CMAKE_CURRENT_BINARY_DIR}/config.h"
)
add_subdirectory(../deps "${CMAKE_CURRENT_BINARY_DIR}/common_deps")
add_subdirectory(deps)
add_subdirectory(../gpt4all-backend llmodel)
@ -456,9 +457,7 @@ else()
target_link_libraries(chat PRIVATE pdfium)
endif()
target_link_libraries(chat
PRIVATE llmodel SingleApplication fmt::fmt duckx::duckx QXlsx)
target_include_directories(chat PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/deps/json/include)
target_include_directories(chat PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/deps/json/include/nlohmann)
PRIVATE llmodel nlohmann_json::nlohmann_json SingleApplication fmt::fmt duckx::duckx QXlsx)
target_include_directories(chat PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/deps/minja/include)
if (APPLE)

2
gpt4all-chat/deps/minja

@ -1 +1 @@
Subproject commit e97bb2442cd6ab3d5bb5f5a3e8a1f7d6081d613b
Subproject commit ee903646db1e6cb63dc5f864bb9834eb41422e21