--- Begin Message ---
Subject: |
[PATCH] gnu: llama-cpp: Update to commit fed010. |
Date: |
Sat, 11 May 2024 12:10:07 -0700 |
* 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-Id: Ia6532945f588747c4d58fdb7611d6a9c3c596705
---
gnu/packages/machine-learning.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/machine-learning.scm
b/gnu/packages/machine-learning.scm
index 7ff8c098b1..b737707a75 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))
(add-before 'install 'install-python-scripts
(lambda _
(let ((bin (string-append #$output "/bin/")))
base-commit: 4eb1a5426b93bfd19282db0d255633ca2959efc5
--
2.34.1
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#70883] [PATCH v3] gnu: llama-cpp: Update to commit fed010. |
Date: |
Mon, 13 May 2024 09:31:35 +0100 |
User-agent: |
mu4e 1.12.2; emacs 29.3 |
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
signature.asc
Description: PGP signature
--- End Message ---