From: Christopher Baines <mail@cbaines.net>
To: Andy Tai <atai@atai.org>
Cc: 70883-done@debbugs.gnu.org
Subject: bug#70883: [PATCH v3] gnu: llama-cpp: Update to commit fed010.
Date: Mon, 13 May 2024 09:31:35 +0100 [thread overview]
Message-ID: <87zfsu3yfs.fsf@cbaines.net> (raw)
In-Reply-To: <b6fb60c643008c1ae9fd99e18561e7d9742ba9f3.1715472290.git.atai@atai.org> (Andy Tai's message of "Sat, 11 May 2024 17:05:02 -0700")
[-- Attachment #1: Type: text/plain, Size: 2568 bytes --]
Andy Tai <atai@atai.org> writes:
> * gnu/packages/machine-learning.scm (llama-cpp): Update to commit fed010
> as last update was in February and new changes for new models and memory
> leaks fixes since then.
> [arguments]: <#:phases>: Add 'disable-unrunable-tests' phase.
> Change replacement of 'install to be a post-install 'install-main'
> phase so libraries and header files are normally installed.
>
> Change-Id: Ia6532945f588747c4d58fdb7611d6a9c3c596705
> ---
> gnu/packages/machine-learning.scm | 17 +++++++++++++----
> 1 file changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
> index 7ff8c098b1..53603e7133 100644
> --- a/gnu/packages/machine-learning.scm
> +++ b/gnu/packages/machine-learning.scm
> @@ -524,8 +524,8 @@ (define-public guile-aiscm-next
> (deprecated-package "guile-aiscm-next" guile-aiscm))
>
> (define-public llama-cpp
> - (let ((commit "03bf161eb6dea6400ee49c6dc6b69bdcfa9fd3fc")
> - (revision "1"))
> + (let ((commit "fed0108491a3a3cbec6c6480dc8667ffff9d7659")
> + (revision "2"))
> (package
> (name "llama-cpp")
> (version (git-version "0.0.0" revision commit))
> @@ -537,7 +537,7 @@ (define-public llama-cpp
> (commit commit)))
> (file-name (git-file-name name version))
> (sha256
> - (base32 "1ag1jash84hasz10h0piw72a8ginm8kzvhihbzzljz96gq2kjm88"))))
> + (base32 "16rm9gy0chd6k07crm8rkl2j3hg7y7h0km7k6c8q7bmm2jrd64la"))))
> (build-system cmake-build-system)
> (arguments
> (list
> @@ -559,6 +559,15 @@ (define-public llama-cpp
> (guix build python-build-system))
> #:phases
> #~(modify-phases %standard-phases
> + (add-after 'unpack 'disable-unrunable-tests
> + ; test-eval-callback downloads ML model from network, cannot run
> + ; in Guix build environment
> + (lambda _
> + (substitute* '("examples/eval-callback/CMakeLists.txt")
> + (("add_test") "#add_test"))
> + (substitute* '("examples/eval-callback/CMakeLists.txt")
> + (("set_property") "#set_property"))
> + #t))
Thanks, I've tweaked the commit message a bit, fixed the formatting for
this new phase and removed the #t at the end. I've pushed this to master
as 0b3f2f28c62ded05cacc6e278e5f7cf8a7d4ee1a.
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
next prev parent reply other threads:[~2024-05-13 8:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-11 19:10 [bug#70883] [PATCH] gnu: llama-cpp: Update to commit fed010 Andy Tai
2024-05-11 22:07 ` [bug#70883] [PATCH v2] " Andy Tai
2024-05-12 0:05 ` [bug#70883] [PATCH v3] " Andy Tai
2024-05-13 8:31 ` Christopher Baines [this message]
2024-05-12 21:55 ` [bug#70883] Andy Tai
2024-05-13 5:28 ` [bug#70883] QA review for 70883 Nicolas Graves via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zfsu3yfs.fsf@cbaines.net \
--to=mail@cbaines.net \
--cc=70883-done@debbugs.gnu.org \
--cc=atai@atai.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).