ggml update to 0.11.0， llama-cpp update to 9030 #51551
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 310a3dc..1f1495b 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -197,8 +197,8 @@ add_subdirectory(src) | ||
| # | ||
|
|
||
| if (LLAMA_BUILD_COMMON) | ||
| + find_package(httplib CONFIG REQUIRED) | ||
| add_subdirectory(common) | ||
| - add_subdirectory(vendor/cpp-httplib) | ||
|
Comment on lines
+9
to
+12
Contributor
There was a problem hiding this comment. add_subdirectory(common)
- add_subdirectory(vendor/cpp-httplib)
+ find_package(httplib CONFIG REQUIRED)
+ add_library(cpp-httplib ALIAS httplib::httplib)would avoid of changing all the uses of cpp-httplib (and still export httplib::httplib to cmake config). ... And we probably need a
Contributor
Author
There was a problem hiding this comment.
and https://github.com/ggml-org/llama.cpp/blob/master/cmake/llama-config.cmake.in#L20 |
||
| endif() | ||
|
|
||
| if (LLAMA_BUILD_COMMON AND LLAMA_BUILD_TESTS AND NOT CMAKE_JS_VERSION) | ||
| diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt | ||
| index 1a56c25..4612a21 100644 | ||
| --- a/common/CMakeLists.txt | ||
| +++ b/common/CMakeLists.txt | ||
| @@ -135,7 +135,7 @@ if (BUILD_SHARED_LIBS) | ||
| endif() | ||
|
|
||
| target_link_libraries(${TARGET} PUBLIC llama-common-base) | ||
| -target_link_libraries(${TARGET} PRIVATE cpp-httplib) | ||
| +target_link_libraries(${TARGET} PRIVATE httplib::httplib) | ||
|
|
||
| if (LLAMA_LLGUIDANCE) | ||
| include(ExternalProject) | ||
| diff --git a/common/http.h b/common/http.h | ||
| index d3daccd..be18264 100644 | ||
| --- a/common/http.h | ||
| +++ b/common/http.h | ||
| @@ -1,6 +1,6 @@ | ||
| #pragma once | ||
|
|
||
| -#include <cpp-httplib/httplib.h> | ||
| +#include <httplib.h> | ||
|
|
||
| struct common_http_url { | ||
| std::string scheme; | ||
| diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | ||
| index edb585b..5b0fec7 100644 | ||
| --- a/tests/CMakeLists.txt | ||
| +++ b/tests/CMakeLists.txt | ||
| @@ -267,11 +267,11 @@ unset(LLAMA_TEST_NAME) | ||
|
|
||
| # GGUF model data fetcher library for tests that need real model metadata | ||
| # Only compile when cpp-httplib has SSL support (CPPHTTPLIB_OPENSSL_SUPPORT) | ||
| -if (TARGET cpp-httplib) | ||
| - get_target_property(_cpp_httplib_defs cpp-httplib INTERFACE_COMPILE_DEFINITIONS) | ||
| +if (TARGET httplib::httplib) | ||
| + get_target_property(_cpp_httplib_defs httplib::httplib INTERFACE_COMPILE_DEFINITIONS) | ||
| if (_cpp_httplib_defs MATCHES "CPPHTTPLIB_OPENSSL_SUPPORT") | ||
| add_library(gguf-model-data STATIC gguf-model-data.cpp) | ||
| - target_link_libraries(gguf-model-data PRIVATE llama-common cpp-httplib) | ||
| + target_link_libraries(gguf-model-data PRIVATE llama-common httplib::httplib) | ||
| target_include_directories(gguf-model-data PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) | ||
|
|
||
| add_executable(test-gguf-model-data test-gguf-model-data.cpp) | ||
| diff --git a/tools/mtmd/CMakeLists.txt b/tools/mtmd/CMakeLists.txt | ||
| index 35d721d..18eabc4 100644 | ||
| --- a/tools/mtmd/CMakeLists.txt | ||
| +++ b/tools/mtmd/CMakeLists.txt | ||
| @@ -53,7 +53,6 @@ target_link_libraries (mtmd PUBLIC ggml llama) | ||
| target_link_libraries (mtmd PRIVATE Threads::Threads) | ||
| target_include_directories(mtmd PUBLIC .) | ||
| target_include_directories(mtmd PRIVATE ../..) | ||
| -target_include_directories(mtmd PRIVATE ../../vendor) | ||
| target_compile_features (mtmd PRIVATE cxx_std_17) | ||
|
|
||
| if (BUILD_SHARED_LIBS) | ||
| diff --git a/tools/mtmd/mtmd-helper.cpp b/tools/mtmd/mtmd-helper.cpp | ||
| index 4094074..d40ae74 100644 | ||
| --- a/tools/mtmd/mtmd-helper.cpp | ||
| +++ b/tools/mtmd/mtmd-helper.cpp | ||
| @@ -27,10 +27,10 @@ | ||
| #define MA_NO_ENGINE | ||
| #define MA_NO_GENERATION | ||
| #define MA_API static | ||
| -#include "miniaudio/miniaudio.h" | ||
| +#include "miniaudio.h" | ||
|
|
||
| #define STB_IMAGE_IMPLEMENTATION | ||
| -#include "stb/stb_image.h" | ||
| +#include "stb_image.h" | ||
|
|
||
| #ifdef MTMD_INTERNAL_HEADER | ||
| #error "mtmd-helper is a public library outside of mtmd. it must not include internal headers" | ||
| diff --git a/tools/server/CMakeLists.txt b/tools/server/CMakeLists.txt | ||
| index 71cc0e7..1925fff 100644 | ||
| --- a/tools/server/CMakeLists.txt | ||
| +++ b/tools/server/CMakeLists.txt | ||
| @@ -70,6 +70,6 @@ install(TARGETS ${TARGET} RUNTIME) | ||
|
|
||
| target_include_directories(${TARGET} PRIVATE ../mtmd) | ||
| target_include_directories(${TARGET} PRIVATE ${CMAKE_SOURCE_DIR}) | ||
| -target_link_libraries(${TARGET} PRIVATE server-context PUBLIC llama-common cpp-httplib ${CMAKE_THREAD_LIBS_INIT}) | ||
| +target_link_libraries(${TARGET} PRIVATE server-context PUBLIC llama-common httplib::httplib ${CMAKE_THREAD_LIBS_INIT}) | ||
|
|
||
| target_compile_features(${TARGET} PRIVATE cxx_std_17) | ||
| diff --git a/tools/server/server-http.cpp b/tools/server/server-http.cpp | ||
| index 6f24f83..40a5c85 100644 | ||
| --- a/tools/server/server-http.cpp | ||
| +++ b/tools/server/server-http.cpp | ||
| @@ -2,7 +2,7 @@ | ||
| #include "server-http.h" | ||
| #include "server-common.h" | ||
|
|
||
| -#include <cpp-httplib/httplib.h> | ||
| +#include <httplib.h> | ||
|
|
||
| #include <functional> | ||
| #include <string> | ||
| diff --git a/tools/server/server-models.cpp b/tools/server/server-models.cpp | ||
| index 5a05ca2..3b7aef9 100644 | ||
| --- a/tools/server/server-models.cpp | ||
| +++ b/tools/server/server-models.cpp | ||
| @@ -5,7 +5,7 @@ | ||
| #include "preset.h" | ||
| #include "download.h" | ||
|
|
||
| -#include <cpp-httplib/httplib.h> // TODO: remove this once we use HTTP client from download.h | ||
| +#include <httplib.h> // TODO: remove this once we use HTTP client from download.h | ||
| #include <sheredom/subprocess.h> | ||
|
|
||
| #include <functional> | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.