<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/6c9dd593f236e51e1f1a5ce7994ed156a3803ce1">https://github.com/macports/macports-ports/commit/6c9dd593f236e51e1f1a5ce7994ed156a3803ce1</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 6c9dd593f23 llama.cpp: 4534, properly enable openmp
</span>6c9dd593f23 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6c9dd593f236e51e1f1a5ce7994ed156a3803ce1
</span>Author: i0ntempest <i0ntempest@i0ntempest.com>
AuthorDate: Thu Jan 23 16:50:24 2025 +0800
<span style='display:block; white-space:pre;color:#404040;'> llama.cpp: 4534, properly enable openmp
</span>---
llm/llama.cpp/Portfile | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 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 19bf807516e..6707b31268b 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 4508 b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ggerganov llama.cpp 4534 b
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git-commit a1649cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git-commit 955a6c2
</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 b6700c8d3311bfa382ef9db1881846e10329c990 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3fcc3ae6b2605dfcfaf871cfa4281ac7cf215eb738e876e193890e7837d256f2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20472113
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 771fa15d2c7b6a3ef9114fd3c0afb676e0ba6559 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f4b57daa8d6bfe957f08a79f02ea9d24018ce9e73663c35a5c21f31ed3ccfcb8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20496342
</span>
# error: 'filesystem' file not found on 10.14
legacysupport.newest_darwin_requires_legacy \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,11 +33,6 @@ depends_build-append path:bin/pkg-config:pkgconfig
</span>
depends_lib-append port:curl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Upstream patch for errno-related build failure; will be included in future release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://trac.macports.org/ticket/71880
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://github.com/ggerganov/llama.cpp/issues/11295
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-llama-mmap-errno.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # cmake relies on git for version info. We need to set them manually.
post-patch {
reinplace "s|@BUILD_NUMBER@|${version}|" ${worksrcpath}/common/build-info.cpp.in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +41,8 @@ post-patch {
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DGGML_LTO=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -LAH \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGGML_LTO=ON \
</span> -DGGML_CCACHE=OFF \
-DGGML_OPENMP=OFF \
-DLLAMA_CURL=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,9 +76,23 @@ variant blas description {Uses BLAS, improves performance} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openmp description {enable parallelism support using OpenMP} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.openmp_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {macports-clang-[0-9].*}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGGML_OPENMP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGGML_OPENMP=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/libomp -lomp
</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
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +blas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +blas +openmp
</span></pre><pre style='margin:0'>
</pre>