Skip to content

fix[notask]: remove OpenSSL from llama addons #3235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gianni-cor wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −12
Draft

fix[notask]: remove OpenSSL from llama addons #3235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions packages/embed-llamacpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

find_path(QVAC_LIB_INFERENCE_ADDON_CPP_INCLUDE_DIRS "inference-addon-cpp/JsInterface.hpp")
# llama-targets.cmake transitively requires OpenSSL::SSL via cpp-httplib's
# IMPORTED interface. Make OpenSSL discoverable before find_package(llama)
# so the target chain resolves on local builds.
find_package(OpenSSL)
find_package(llama CONFIG REQUIRED)

if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion packages/embed-llamacpp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@qvac/embed-llamacpp",
"version": "0.26.2",
"version": "0.26.3",
"description": "bert addon for qvac",
"addon": true,
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/embed-llamacpp/vcpkg-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"default-registry": {
"kind": "git",
"baseline": "803c0d119ea002694963e89237c207ff6ecf47f6",
"baseline": "c056353e0253ac0cc9a1dbb067d6c811ade086f6",
"repository": "https://github.com/tetherto/qvac-registry-vcpkg.git"
},
"registries": [
Expand Down
4 changes: 0 additions & 4 deletions packages/llm-llamacpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ configure_file(${VCPKG_INSTALLED_PATH}/share/lint-cpp/.clang-tidy

find_path(PICOJSON_INCLUDE_DIRS "picojson/picojson.h")
find_path(QVAC_LIB_INFERENCE_ADDON_CPP_INCLUDE_DIRS "inference-addon-cpp/JsInterface.hpp")
# llama-targets.cmake transitively requires OpenSSL::SSL via cpp-httplib's
# IMPORTED interface. Make OpenSSL discoverable before find_package(llama)
# so the target chain resolves on local builds.
find_package(OpenSSL)
find_package(llama CONFIG REQUIRED)
# Required to call llama.cpp's `json_schema_to_grammar()` for per-request
# JSON-Schema → GBNF conversion. The function signature lives in libcommon
Expand Down
2 changes: 1 addition & 1 deletion packages/llm-llamacpp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@qvac/llm-llamacpp",
"version": "0.36.3",
"version": "0.36.4",
"description": "llama addon for qvac",
"addon": true,
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/llm-llamacpp/vcpkg-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"default-registry": {
"kind": "git",
"baseline": "c57eec31bdc37ce3a98537b312f5a366b554db6a",
"baseline": "c056353e0253ac0cc9a1dbb067d6c811ade086f6",
"repository": "https://github.com/tetherto/qvac-registry-vcpkg.git"
},
"registries": [
Expand Down
Loading