<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c20bd5f7eecb5f5894b16434c4c973348c00e961">https://github.com/macports/macports-ports/commit/c20bd5f7eecb5f5894b16434c4c973348c00e961</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c20bd5f7eec llama.cpp: update to 5466
</span>c20bd5f7eec is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c20bd5f7eecb5f5894b16434c4c973348c00e961
</span>Author: i0ntempest <i0ntempest@i0ntempest.com>
AuthorDate: Sat May 24 02:38:48 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> llama.cpp: update to 5466
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add model_converters variant
</span><span style='display:block; white-space:pre;color:#404040;'> Supersedes: https://github.com/macports/macports-ports/pull/27526
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/71927
</span>---
llm/llama.cpp/Portfile | 65 ++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 58 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/llm/llama.cpp/Portfile b/llm/llama.cpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6707b31268b..6781baa5179 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/llm/llama.cpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/llm/llama.cpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,9 +5,9 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ggerganov llama.cpp 4534 b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ggerganov llama.cpp 5466 b
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git-commit 955a6c2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git-commit 9ecf3e6
</span> # This line is for displaying commit in CLI only
revision 0
categories llm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,9 @@ long_description The main goal of ${name} is to enable LLM inference with
</span> setup and state-of-the-art performance on a wide variety of hardware\
- locally and in the cloud.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 771fa15d2c7b6a3ef9114fd3c0afb676e0ba6559 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f4b57daa8d6bfe957f08a79f02ea9d24018ce9e73663c35a5c21f31ed3ccfcb8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20496342
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1740f698e446a4bb54b29b09aaeab64649324e79 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2354a9808e5f9bd237a5b4b85c6fed264b7e1765dbbd123e1e37603b312d5c88 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22445517
</span>
# error: 'filesystem' file not found on 10.14
legacysupport.newest_darwin_requires_legacy \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,8 +41,7 @@ post-patch {
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -LAH \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGGML_LTO=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DGGML_LTO=ON \
</span> -DGGML_CCACHE=OFF \
-DGGML_OPENMP=OFF \
-DLLAMA_CURL=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +59,10 @@ if {${os.platform} eq "darwin" && ${os.subplatform} eq "macosx" && \
</span> -DGGML_METAL_EMBED_LIBRARY=OFF
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete {*}[glob -directory ${destroot}${prefix}/bin/ convert*.py]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant blas description {Uses BLAS, improves performance} {
configure.args-append \
-DGGML_BLAS=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,6 +93,54 @@ variant openmp description {enable parallelism support using OpenMP} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant model_converters description {install extra model conversion Python scripts} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 {*}[glob ${worksrcpath}/convert*.py] ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Model conversion scripts have been installed to:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/share/${name}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ These scripts should be executed in a Python virtual environment with at least\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ these dependencies installed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pytorch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transformers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gguf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This can replace the variant above once we have all the dependencies updated and fixed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/macports/macports-ports/pull/27526
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#variant model_converters description {install extra model conversion Python scripts} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set ::python_branch 3.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set ::python_version [string map {. ""} ${::python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# depends_run-append port:python${::python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:py${::python_version}-numpy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:py${::python_version}-pytorch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:py${::python_version}-transformers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:py${::python_version}-gguf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# reinplace "s|#!/usr/bin/env python3|#!${prefix}/bin/python${::python_branch}|" {*}[glob ${worksrcpath}/convert*.py]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# xinstall -d ${destroot}${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# xinstall -m 755 {*}[glob ${worksrcpath}/convert*.py] ${destroot}${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# foreach file [glob -directory ${destroot}${prefix}/libexec/${name} *.py] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set filebasename [file rootname [file tail $file]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set link ${destroot}${prefix}/bin/[lindex [split ${name} .] 0]-[string map {_ -} ${filebasename}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set target [string replace ${file} 0 [string length ${destroot}]-1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ui_debug "Creating symlink: ${link} => ${target}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ln -s ${target} ${link}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant native description "Force local build and optimize for CPU" {
configure.args-append \
-DGGML_NATIVE=ON
</pre><pre style='margin:0'>
</pre>