ver4a/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sync : vendor (#13901)

Browse source 
* sync : vendor

ggml-ci

* cont : fix httplib version

ggml-ci

* cont : fix lint

* cont : fix lint

* vendor : move to common folder /vendor

ggml-ci

* cont : fix lint

* cont : move httplib to /vendor + use json_fwd.hpp

ggml-ci

* cont : fix server build

ggml-ci

* cont : add missing headers

ggml-ci

* cont : header clean-up

ggml-ci
This commit is contained in:
Georgi Gerganov 2025-05-30 16:25:45 +03:00 • committed by GitHub
parent db38704f01
commit 53f925074d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 2084 additions and 1096 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tools/mtmd/CMakeLists.txt
View file

@ -23,8 +23,7 @@ add_library(mtmd_helper OBJECT
target_link_libraries(mtmd_helper PRIVATE ggml llama mtmd ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(mtmd_helper PUBLIC .)
target_include_directories(mtmd_helper PRIVATE ./vendor)
target_include_directories(mtmd_helper PRIVATE ../..)
target_include_directories(mtmd_helper PRIVATE ../../vendor)
target_compile_features(mtmd_helper PRIVATE cxx_std_17)
if (BUILD_SHARED_LIBS)

4
tools/mtmd/mtmd-helper.cpp
View file

@ -27,10 +27,10 @@
#define MA_NO_ENGINE
#define MA_NO_GENERATION
#define MA_API static
#include "vendor/miniaudio.h"
#include "miniaudio/miniaudio.h"
#define STB_IMAGE_IMPLEMENTATION
#include "vendor/stb_image.h"
#include "stb/stb_image.h"
#define LOG_INF(...) fprintf(stdout, __VA_ARGS__)
#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__)

93468
tools/mtmd/vendor/miniaudio.h vendored
View file

File diff suppressed because it is too large Load diff

7988
tools/mtmd/vendor/stb_image.h vendored
View file

File diff suppressed because it is too large Load diff