diff --git a/misc/llama-cpp/Makefile b/misc/llama-cpp/Makefile index 463389d10d70..c9edf8ce40bf 100644 --- a/misc/llama-cpp/Makefile +++ b/misc/llama-cpp/Makefile @@ -1,80 +1,81 @@ PORTNAME= llama-cpp DISTVERSIONPREFIX= b -DISTVERSION= 6374 +DISTVERSION= 6795 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Facebook's LLaMA model in C/C++ # ' WWW= https://github.com/ggerganov/llama.cpp LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv7= clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278810 BROKEN_i386= compilation fails, see https://github.com/ggerganov/llama.cpp/issues/9545 USES= cmake:testing compiler:c++11-lang python:run shebangfix USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= ggerganov GH_PROJECT= llama.cpp GH_TUPLE= nomic-ai:kompute:4565194:kompute/kompute SHEBANG_GLOB= *.py CMAKE_ON= BUILD_SHARED_LIBS + #LLAMA_USE_SYSTEM_GGML CMAKE_OFF= GGML_NATIVE \ FREEBSD_ALLOW_ADVANCED_CPU_FEATURES \ LLAMA_BUILD_TESTS CMAKE_TESTING_ON= LLAMA_BUILD_TESTS # user for llama-server, only used when EXAMPLES=ON USER= nobody SUB_LIST= USER=${USER} OPTIONS_DEFINE= CURL EXAMPLES VULKAN OPTIONS_DEFAULT= CURL VULKAN OPTIONS_SUB= yes CURL_DESCR= Use libcurl to download model from an URL CURL_CMAKE_BOOL= LLAMA_CURL CURL_USES= localbase CURL_LIB_DEPENDS= libcurl.so:ftp/curl EXAMPLES_CMAKE_BOOL= LLAMA_BUILD_EXAMPLES VULKAN_CMAKE_BOOL= GGML_VULKAN VULKAN_BUILD_DEPENDS= glslc:graphics/shaderc \ vulkan-headers>0:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader BINARY_ALIAS= git=false \ python=${PYTHON_CMD} # for tests post-patch: # set version in the code @${REINPLACE_CMD} \ -e "s|set(BUILD_NUMBER 0)|set(BUILD_NUMBER ${DISTVERSION})|" \ ${WRKSRC}/cmake/build-info.cmake do-test-ci: # build of tests fails, see https://github.com/ggerganov/llama.cpp/issues/10955 @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} bash ci/run.sh ./tmp/results ./tmp/mnt .include .if ${PORT_OPTIONS:MEXAMPLES} USE_RC_SUBR= llama-server .endif # tests as of 4458: 97% tests passed, 1 tests failed out of 31, see https://github.com/ggerganov/llama.cpp/issues/11036 # tests as of 4649: # 88% tests passed, 4 tests failed out of 32 # The following tests FAILED: # 18 - test-chat (Subprocess aborted) main # see https://github.com/ggerganov/llama.cpp/issues/11705 # 24 - test-gguf (SEGFAULT) main # 25 - test-backend-ops (SEGFAULT) main # 32 - test-eval-callback (SEGFAULT) curl eval-callback .include diff --git a/misc/llama-cpp/distinfo b/misc/llama-cpp/distinfo index ac00c83b7dba..fa0a53824637 100644 --- a/misc/llama-cpp/distinfo +++ b/misc/llama-cpp/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1756957718 -SHA256 (ggerganov-llama.cpp-b6374_GH0.tar.gz) = fe4392f8331a13fcd6ccf5fa4a7e9a79d58958394ef62bf8df6d214208619ed5 -SIZE (ggerganov-llama.cpp-b6374_GH0.tar.gz) = 25632053 +TIMESTAMP = 1760833602 +SHA256 (ggerganov-llama.cpp-b6795_GH0.tar.gz) = b037e5ecc5876e8c01c6b0a3010103b43d4883c3b1bc93fa60f09a751f256133 +SIZE (ggerganov-llama.cpp-b6795_GH0.tar.gz) = 25970813 SHA256 (nomic-ai-kompute-4565194_GH0.tar.gz) = 95b52d2f0514c5201c7838348a9c3c9e60902ea3c6c9aa862193a212150b2bfc SIZE (nomic-ai-kompute-4565194_GH0.tar.gz) = 13540496 diff --git a/misc/llama-cpp/files/patch-ggml_src_CMakeLists.txt b/misc/llama-cpp/files/patch-ggml_src_CMakeLists.txt deleted file mode 100644 index 8135824e1b8b..000000000000 --- a/misc/llama-cpp/files/patch-ggml_src_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -- workaround for https://github.com/ggerganov/llama.cpp/issues/11095 - ---- ggml/src/CMakeLists.txt.orig 2025-01-06 00:37:35 UTC -+++ ggml/src/CMakeLists.txt -@@ -152,15 +152,6 @@ endif() - # posix_memalign came in POSIX.1-2001 / SUSv3 - # M_PI is an XSI extension since POSIX.1-2001 / SUSv3, came in XPG1 (1985) - --# Somehow in OpenBSD whenever POSIX conformance is specified --# some string functions rely on locale_t availability, --# which was introduced in POSIX.1-2008, forcing us to go higher --if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") -- add_compile_definitions(_XOPEN_SOURCE=700) --else() -- add_compile_definitions(_XOPEN_SOURCE=600) --endif() -- - # Data types, macros and functions related to controlling CPU affinity and - # some memory allocation are available on Linux through GNU extensions in libc - if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android") diff --git a/misc/llama-cpp/pkg-plist b/misc/llama-cpp/pkg-plist index 9c53359aabc9..678dd2ed6420 100644 --- a/misc/llama-cpp/pkg-plist +++ b/misc/llama-cpp/pkg-plist @@ -1,69 +1,68 @@ bin/convert_hf_to_gguf.py %%EXAMPLES%%bin/llama-batched %%EXAMPLES%%bin/llama-batched-bench %%EXAMPLES%%bin/llama-bench %%EXAMPLES%%bin/llama-cli %%EXAMPLES%%bin/llama-convert-llama2c-to-ggml %%EXAMPLES%%bin/llama-cvector-generator %%EXAMPLES%%bin/llama-diffusion-cli %%EXAMPLES%%bin/llama-embedding %%EXAMPLES%%bin/llama-eval-callback %%EXAMPLES%%bin/llama-export-lora %%EXAMPLES%%bin/llama-finetune %%EXAMPLES%%bin/llama-gen-docs %%EXAMPLES%%bin/llama-gguf %%EXAMPLES%%bin/llama-gguf-hash %%EXAMPLES%%bin/llama-gguf-split -%%EXAMPLES%%bin/llama-gritlm %%EXAMPLES%%bin/llama-imatrix %%EXAMPLES%%bin/llama-logits %%EXAMPLES%%bin/llama-lookahead %%EXAMPLES%%bin/llama-lookup %%EXAMPLES%%bin/llama-lookup-create %%EXAMPLES%%bin/llama-lookup-merge %%EXAMPLES%%bin/llama-lookup-stats %%EXAMPLES%%bin/llama-mtmd-cli %%EXAMPLES%%bin/llama-parallel %%EXAMPLES%%bin/llama-passkey %%EXAMPLES%%bin/llama-perplexity %%EXAMPLES%%bin/llama-quantize %%EXAMPLES%%bin/llama-retrieval %%EXAMPLES%%bin/llama-run %%EXAMPLES%%bin/llama-save-load-state %%EXAMPLES%%bin/llama-server %%EXAMPLES%%bin/llama-simple %%EXAMPLES%%bin/llama-simple-chat %%EXAMPLES%%bin/llama-speculative %%EXAMPLES%%bin/llama-speculative-simple %%EXAMPLES%%bin/llama-tokenize %%EXAMPLES%%bin/llama-tts include/ggml-alloc.h include/ggml-backend.h include/ggml-blas.h include/ggml-cann.h include/ggml-cpp.h include/ggml-cpu.h include/ggml-cuda.h include/ggml-metal.h include/ggml-opt.h include/ggml-rpc.h include/ggml-sycl.h include/ggml-vulkan.h include/ggml-webgpu.h include/ggml.h include/gguf.h include/llama-cpp.h include/llama.h include/mtmd-helper.h include/mtmd.h lib/cmake/ggml/ggml-config.cmake lib/cmake/ggml/ggml-version.cmake lib/cmake/llama/llama-config.cmake lib/cmake/llama/llama-version.cmake lib/libggml-base.so lib/libggml-cpu.so %%VULKAN%%lib/libggml-vulkan.so lib/libggml.so lib/libllama.so lib/libmtmd.so libdata/pkgconfig/llama.pc