diff --git a/backends/llamacpp/CMakeLists.txt b/backends/llamacpp/CMakeLists.txt index e536efc5..938f7360 100644 --- a/backends/llamacpp/CMakeLists.txt +++ b/backends/llamacpp/CMakeLists.txt @@ -19,7 +19,6 @@ else () endif () # Add dependencies -include(cmake/fmt.cmake) include(cmake/spdlog.cmake) if (${LLAMA_CPP_BUILD_CUDA}) diff --git a/backends/llamacpp/build.rs b/backends/llamacpp/build.rs index 1ab926d4..5331e87d 100644 --- a/backends/llamacpp/build.rs +++ b/backends/llamacpp/build.rs @@ -99,10 +99,10 @@ fn main() { println!("cargo:rustc-link-search=native={}", out_dir.display()); if is_debug { - println!("cargo:rustc-link-lib=dylib=fmtd"); + // println!("cargo:rustc-link-lib=dylib=fmtd"); println!("cargo:rustc-link-lib=dylib=spdlogd"); } else { - println!("cargo:rustc-link-lib=dylib=fmt"); + // println!("cargo:rustc-link-lib=dylib=fmt"); println!("cargo:rustc-link-lib=dylib=spdlog"); } diff --git a/backends/llamacpp/cmake/fmt.cmake b/backends/llamacpp/cmake/fmt.cmake deleted file mode 100644 index 840280ca..00000000 --- a/backends/llamacpp/cmake/fmt.cmake +++ /dev/null @@ -1,5 +0,0 @@ -FetchContent_Declare( - fmt - URL https://github.com/fmtlib/fmt/archive/refs/tags/11.0.2.tar.gz -) -FetchContent_MakeAvailable(fmt) diff --git a/backends/llamacpp/cmake/spdlog.cmake b/backends/llamacpp/cmake/spdlog.cmake index 04c218b5..bd81d6d5 100644 --- a/backends/llamacpp/cmake/spdlog.cmake +++ b/backends/llamacpp/cmake/spdlog.cmake @@ -1,6 +1,6 @@ set(SPDLOG_USE_FMT 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 if (CMAKE_BUILD_TYPE STREQUAL "Debug") diff --git a/backends/llamacpp/csrc/backend.cpp b/backends/llamacpp/csrc/backend.cpp index 739b84a1..11781273 100644 --- a/backends/llamacpp/csrc/backend.cpp +++ b/backends/llamacpp/csrc/backend.cpp @@ -7,9 +7,7 @@ #include #include -#include -#include -#include +#include #include #include "backend.hpp"