mirror of
https://github.com/ggml-org/llama.cpp.git
synced 2025-06-29 12:35:16 +00:00
llguidance build fixes for Windows (#11664)
* setup windows linking for llguidance; thanks @phil-scott-78 * add build instructions for windows and update script link * change VS Community link from DE to EN * whitespace fix
This commit is contained in:
@ -96,6 +96,22 @@ if (LLAMA_LLGUIDANCE)
|
|||||||
include(ExternalProject)
|
include(ExternalProject)
|
||||||
set(LLGUIDANCE_SRC ${CMAKE_BINARY_DIR}/llguidance/source)
|
set(LLGUIDANCE_SRC ${CMAKE_BINARY_DIR}/llguidance/source)
|
||||||
set(LLGUIDANCE_PATH ${LLGUIDANCE_SRC}/target/release)
|
set(LLGUIDANCE_PATH ${LLGUIDANCE_SRC}/target/release)
|
||||||
|
|
||||||
|
# Set the correct library file extension based on platform
|
||||||
|
if (WIN32)
|
||||||
|
set(LLGUIDANCE_LIB_NAME "llguidance.lib")
|
||||||
|
# Add Windows-specific libraries
|
||||||
|
set(LLGUIDANCE_PLATFORM_LIBS
|
||||||
|
ws2_32 # Windows Sockets API
|
||||||
|
userenv # For GetUserProfileDirectoryW
|
||||||
|
ntdll # For NT functions
|
||||||
|
bcrypt # For BCryptGenRandom
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
set(LLGUIDANCE_LIB_NAME "libllguidance.a")
|
||||||
|
set(LLGUIDANCE_PLATFORM_LIBS "")
|
||||||
|
endif()
|
||||||
|
|
||||||
ExternalProject_Add(llguidance_ext
|
ExternalProject_Add(llguidance_ext
|
||||||
GIT_REPOSITORY https://github.com/guidance-ai/llguidance
|
GIT_REPOSITORY https://github.com/guidance-ai/llguidance
|
||||||
# v0.6.12:
|
# v0.6.12:
|
||||||
@ -106,17 +122,18 @@ if (LLAMA_LLGUIDANCE)
|
|||||||
CONFIGURE_COMMAND ""
|
CONFIGURE_COMMAND ""
|
||||||
BUILD_COMMAND cargo build --release
|
BUILD_COMMAND cargo build --release
|
||||||
INSTALL_COMMAND ""
|
INSTALL_COMMAND ""
|
||||||
BUILD_BYPRODUCTS ${LLGUIDANCE_PATH}/libllguidance.a ${LLGUIDANCE_PATH}/llguidance.h
|
BUILD_BYPRODUCTS ${LLGUIDANCE_PATH}/${LLGUIDANCE_LIB_NAME} ${LLGUIDANCE_PATH}/llguidance.h
|
||||||
UPDATE_COMMAND ""
|
UPDATE_COMMAND ""
|
||||||
)
|
)
|
||||||
target_compile_definitions(${TARGET} PUBLIC LLAMA_USE_LLGUIDANCE)
|
target_compile_definitions(${TARGET} PUBLIC LLAMA_USE_LLGUIDANCE)
|
||||||
|
|
||||||
add_library(llguidance STATIC IMPORTED)
|
add_library(llguidance STATIC IMPORTED)
|
||||||
set_target_properties(llguidance PROPERTIES IMPORTED_LOCATION ${LLGUIDANCE_PATH}/libllguidance.a)
|
set_target_properties(llguidance PROPERTIES IMPORTED_LOCATION ${LLGUIDANCE_PATH}/${LLGUIDANCE_LIB_NAME})
|
||||||
add_dependencies(llguidance llguidance_ext)
|
add_dependencies(llguidance llguidance_ext)
|
||||||
|
|
||||||
target_include_directories(${TARGET} PRIVATE ${LLGUIDANCE_PATH})
|
target_include_directories(${TARGET} PRIVATE ${LLGUIDANCE_PATH})
|
||||||
set(LLAMA_COMMON_EXTRA_LIBS ${LLAMA_COMMON_EXTRA_LIBS} llguidance)
|
# Add platform libraries to the main target
|
||||||
|
set(LLAMA_COMMON_EXTRA_LIBS ${LLAMA_COMMON_EXTRA_LIBS} llguidance ${LLGUIDANCE_PLATFORM_LIBS})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
target_include_directories(${TARGET} PUBLIC .)
|
target_include_directories(${TARGET} PUBLIC .)
|
||||||
|
@ -46,7 +46,7 @@ cmake --build build --config Release
|
|||||||
```
|
```
|
||||||
|
|
||||||
- Building for Windows (x86, x64 and arm64) with MSVC or clang as compilers:
|
- Building for Windows (x86, x64 and arm64) with MSVC or clang as compilers:
|
||||||
- Install Visual Studio 2022, e.g. via the [Community Edition](https://visualstudio.microsoft.com/de/vs/community/). In the installer, select at least the following options (this also automatically installs the required additional tools like CMake,...):
|
- Install Visual Studio 2022, e.g. via the [Community Edition](https://visualstudio.microsoft.com/vs/community/). In the installer, select at least the following options (this also automatically installs the required additional tools like CMake,...):
|
||||||
- Tab Workload: Desktop-development with C++
|
- Tab Workload: Desktop-development with C++
|
||||||
- Tab Components (select quickly via search): C++-_CMake_ Tools for Windows, _Git_ for Windows, C++-_Clang_ Compiler for Windows, MS-Build Support for LLVM-Toolset (clang)
|
- Tab Components (select quickly via search): C++-_CMake_ Tools for Windows, _Git_ for Windows, C++-_Clang_ Compiler for Windows, MS-Build Support for LLVM-Toolset (clang)
|
||||||
- Please remember to always use a Developer Command Prompt / PowerShell for VS2022 for git, build, test
|
- Please remember to always use a Developer Command Prompt / PowerShell for VS2022 for git, build, test
|
||||||
|
@ -13,13 +13,15 @@ cmake -B build -DLLAMA_LLGUIDANCE=ON
|
|||||||
make -C build -j
|
make -C build -j
|
||||||
```
|
```
|
||||||
|
|
||||||
|
For Windows use `cmake --build build --config Release` instead of `make`.
|
||||||
|
|
||||||
This requires the Rust compiler and the `cargo` tool to be [installed](https://www.rust-lang.org/tools/install).
|
This requires the Rust compiler and the `cargo` tool to be [installed](https://www.rust-lang.org/tools/install).
|
||||||
|
|
||||||
## Interface
|
## Interface
|
||||||
|
|
||||||
There are no new command-line arguments or modifications to `common_params`. When enabled, grammars starting with `%llguidance` are passed to LLGuidance instead of the [current](../grammars/README.md) llama.cpp grammars. Additionally, JSON Schema requests (e.g., using the `-j` argument in `llama-cli`) are also passed to LLGuidance.
|
There are no new command-line arguments or modifications to `common_params`. When enabled, grammars starting with `%llguidance` are passed to LLGuidance instead of the [current](../grammars/README.md) llama.cpp grammars. Additionally, JSON Schema requests (e.g., using the `-j` argument in `llama-cli`) are also passed to LLGuidance.
|
||||||
|
|
||||||
For your existing GBNF grammars, you can use [gbnf_to_lark.py script](https://github.com/guidance-ai/llguidance/blob/main/scripts/gbnf_to_lark.py) to convert them to LLGuidance Lark-like format.
|
For your existing GBNF grammars, you can use [gbnf_to_lark.py script](https://github.com/guidance-ai/llguidance/blob/main/python/llguidance/gbnf_to_lark.py) to convert them to LLGuidance Lark-like format.
|
||||||
|
|
||||||
## Performance
|
## Performance
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user