happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake : check if KleidiAI API has been fetched (#19640) 

This commit addresses a build issue with the KleidiAI backend when
building multiple cpu backends. Commmit
3a00c98584 ("cmake : fix KleidiAI install
target failure with EXCLUDE_FROM_ALL") introduced a change where
FetchContent_Populate is called instead of FetchContent_MakeAvailable,
where the latter does handle this case (it is idempotent but
FetchContent_Populate is not).

I missed this during my review and I should not have commited without
verifying the CI failure, sorry about that.
This commit is contained in:
Daniel Bevenius 2026-02-15 13:59:38 +01:00 committed by GitHub
parent 341bc7d23c
commit 57088276d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ggml/src/ggml-cpu/CMakeLists.txt
View File

@ -576,13 +576,13 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
DOWNLOAD_EXTRACT_TIMESTAMP NEW DOWNLOAD_EXTRACT_TIMESTAMP NEW
URL_HASH MD5=${KLEIDIAI_ARCHIVE_MD5}) URL_HASH MD5=${KLEIDIAI_ARCHIVE_MD5})
FetchContent_Populate(KleidiAI_Download)
FetchContent_GetProperties(KleidiAI_Download FetchContent_GetProperties(KleidiAI_Download
SOURCE_DIR KLEIDIAI_SRC SOURCE_DIR KLEIDIAI_SRC
POPULATED KLEIDIAI_POPULATED) POPULATED KLEIDIAI_POPULATED)
if (NOT KLEIDIAI_POPULATED) if (NOT KLEIDIAI_POPULATED)
message(FATAL_ERROR "KleidiAI source downloaded failed.") FetchContent_Populate(KleidiAI_Download)
FetchContent_GetProperties(KleidiAI_Download SOURCE_DIR KLEIDIAI_SRC)
endif() endif()
add_compile_definitions(GGML_USE_CPU_KLEIDIAI) add_compile_definitions(GGML_USE_CPU_KLEIDIAI)