Mirrors
/
hf_text-generation-inference
mirror of https://github.com/huggingface/text-generation-inference.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc(cmake): remove dependency on fmt

This commit is contained in:
Morgan Funtowicz 2024-11-08 00:53:53 +01:00
parent 26d0266cec
commit cf17928f83
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backends/llamacpp/CMakeLists.txt
View File

@ -19,7 +19,6 @@ else ()
endif () endif ()
# Add dependencies # Add dependencies
include(cmake/fmt.cmake)
include(cmake/spdlog.cmake) include(cmake/spdlog.cmake)
if (${LLAMA_CPP_BUILD_CUDA}) if (${LLAMA_CPP_BUILD_CUDA})

4
backends/llamacpp/build.rs
View File

@ -99,10 +99,10 @@ fn main() {
println!("cargo:rustc-link-search=native={}", out_dir.display()); println!("cargo:rustc-link-search=native={}", out_dir.display());
if is_debug { if is_debug {
println!("cargo:rustc-link-lib=dylib=fmtd"); // println!("cargo:rustc-link-lib=dylib=fmtd");
println!("cargo:rustc-link-lib=dylib=spdlogd"); println!("cargo:rustc-link-lib=dylib=spdlogd");
} else { } else {
println!("cargo:rustc-link-lib=dylib=fmt"); // println!("cargo:rustc-link-lib=dylib=fmt");
println!("cargo:rustc-link-lib=dylib=spdlog"); println!("cargo:rustc-link-lib=dylib=spdlog");
} }

5
backends/llamacpp/cmake/fmt.cmake
View File

@ -1,5 +0,0 @@
FetchContent_Declare(
fmt
URL https://github.com/fmtlib/fmt/archive/refs/tags/11.0.2.tar.gz
)
FetchContent_MakeAvailable(fmt)

2
backends/llamacpp/cmake/spdlog.cmake
View File

@ -1,6 +1,6 @@
set(SPDLOG_USE_FMT ON) set(SPDLOG_USE_FMT ON)
set(SPDLOG_BUILD_SHARED ON) set(SPDLOG_BUILD_SHARED ON)
set(SPDLOG_FMT_EXTERNAL ON) set(SPDLOG_FMT_EXTERNAL OFF)
# Define the level at which SPDLOG_ compilation level is defined # Define the level at which SPDLOG_ compilation level is defined
if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (CMAKE_BUILD_TYPE STREQUAL "Debug")

4
backends/llamacpp/csrc/backend.cpp
View File

@ -7,9 +7,7 @@
#include <ggml.h> #include <ggml.h>
#include <llama.h> #include <llama.h>
#include <fmt/chrono.h> #include <spdlog/fmt/chrono.h>
#include <fmt/format.h>
#include <fmt/std.h>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include "backend.hpp" #include "backend.hpp"