GNU bug report logs - #67873
[PATCH] llama-cpp: Update to commit 2994f0

Previous Next

Package: guix-patches;

Reported by: Andy Tai <atai <at> atai.org>

Date: Mon, 18 Dec 2023 01:11:01 UTC

Severity: normal

Tags: patch

Done: Andreas Enge <andreas <at> enge.fr>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67873 in the body.
You can then email your comments to 67873 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#67873; Package guix-patches. (Mon, 18 Dec 2023 01:11:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Andy Tai <atai <at> atai.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Mon, 18 Dec 2023 01:11:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: guix-patches <at> gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH] llama-cpp: Update to commit 2994f0
Date: Sun, 17 Dec 2023 17:09:47 -0800
* gnu/packages/machine-learning.scm (llama-cpp): Update to commit 2994f0

Change-Id: I241752d2ac2aa893933e87111454636f08df1af7
---
 gnu/packages/machine-learning.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index c100e0be6e..dbac325eb3 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -516,8 +516,8 @@ (define-public guile-aiscm-next
   (deprecated-package "guile-aiscm-next" guile-aiscm))
 
 (define-public llama-cpp
-  (let ((commit "f31b5397143009d682db90fd2a6cde83f1ef00eb")
-        (revision "0"))
+  (let ((commit "2994f0c5a2e8c96955b422dedc93ec2595d16b82")
+        (revision "1"))
     (package
       (name "llama-cpp")
       (version (git-version "0.0.0" revision commit))
@@ -526,10 +526,10 @@ (define-public llama-cpp
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/ggerganov/llama.cpp")
-               (commit (string-append "master-" (string-take commit 7)))))
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0ys6n53n032zq1ll9f3vgxk8sw0qq7x3fi7awsyy13adzp3hn08p"))))
+          (base32 "0g02jh9qz74vmvqh4485jsfcg26r02hn5sji4ckzsnkv627rw9mz"))))
       (build-system cmake-build-system)
       (arguments
        (list
@@ -556,7 +556,6 @@ (define-public llama-cpp
                                       (get-string-all input))))))
                       (chmod (string-append bin script) #o555)))
                   (mkdir-p bin)
-                  (make-script "convert-pth-to-ggml")
                   (make-script "convert-lora-to-ggml")
                   (make-script "convert"))))
             (add-after 'install-python-scripts 'wrap-python-scripts

base-commit: 6ab242609daec00e8bd54f7bff54557c92695724
-- 
2.41.0





Information forwarded to guix-patches <at> gnu.org:
bug#67873; Package guix-patches. (Mon, 01 Jan 2024 02:03:02 GMT) Full text and rfc822 format available.

Message #8 received at 67873 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 67873 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v2] llama-cpp: Update to commit 2994f0
Date: Sun, 31 Dec 2023 18:02:39 -0800
* gnu/packages/machine-learning.scm (llama-cpp): Update to commit 2994f0

Change-Id: I241752d2ac2aa893933e87111454636f08df1af7
---
 gnu/packages/machine-learning.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 53a955bb90..19344a00eb 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -516,8 +516,8 @@ (define-public guile-aiscm-next
   (deprecated-package "guile-aiscm-next" guile-aiscm))
 
 (define-public llama-cpp
-  (let ((commit "f31b5397143009d682db90fd2a6cde83f1ef00eb")
-        (revision "0"))
+  (let ((commit "2994f0c5a2e8c96955b422dedc93ec2595d16b82")
+        (revision "1"))
     (package
       (name "llama-cpp")
       (version (git-version "0.0.0" revision commit))
@@ -526,10 +526,10 @@ (define-public llama-cpp
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/ggerganov/llama.cpp")
-               (commit (string-append "master-" (string-take commit 7)))))
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0ys6n53n032zq1ll9f3vgxk8sw0qq7x3fi7awsyy13adzp3hn08p"))))
+          (base32 "0g02jh9qz74vmvqh4485jsfcg26r02hn5sji4ckzsnkv627rw9mz"))))
       (build-system cmake-build-system)
       (arguments
        (list
@@ -556,7 +556,6 @@ (define-public llama-cpp
                                       (get-string-all input))))))
                       (chmod (string-append bin script) #o555)))
                   (mkdir-p bin)
-                  (make-script "convert-pth-to-ggml")
                   (make-script "convert-lora-to-ggml")
                   (make-script "convert"))))
             (add-after 'install-python-scripts 'wrap-python-scripts

base-commit: 19f5302d136783d861b42107ae5e2920bbd769d9
-- 
2.41.0





Information forwarded to guix-patches <at> gnu.org:
bug#67873; Package guix-patches. (Tue, 27 Feb 2024 05:31:02 GMT) Full text and rfc822 format available.

Message #11 received at 67873 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 67873 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v3] llama-cpp: Update to commit de473f
Date: Mon, 26 Feb 2024 21:29:53 -0800
* gnu/packages/machine-learning.scm (llama-cpp): Update to commit de473f

Change-Id: Ib6c53df05a6def119c9bebacbf3ab9765ef82ecc
---
 gnu/packages/machine-learning.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 6e94e21f3e..2646bf2b3f 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -523,8 +523,8 @@ (define-public guile-aiscm-next
   (deprecated-package "guile-aiscm-next" guile-aiscm))
 
 (define-public llama-cpp
-  (let ((commit "f31b5397143009d682db90fd2a6cde83f1ef00eb")
-        (revision "0"))
+  (let ((commit "de473f5f8e19ba5e659cdf5af65fb9251dce16c5")
+        (revision "1"))
     (package
       (name "llama-cpp")
       (version (git-version "0.0.0" revision commit))
@@ -533,10 +533,10 @@ (define-public llama-cpp
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/ggerganov/llama.cpp")
-               (commit (string-append "master-" (string-take commit 7)))))
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0ys6n53n032zq1ll9f3vgxk8sw0qq7x3fi7awsyy13adzp3hn08p"))))
+          (base32 "1ba3apr98i7b6wmk03v3df835x3l8p5sjp7nqya4wwrxln42dsia"))))
       (build-system cmake-build-system)
       (arguments
        (list
@@ -563,7 +563,6 @@ (define-public llama-cpp
                                       (get-string-all input))))))
                       (chmod (string-append bin script) #o555)))
                   (mkdir-p bin)
-                  (make-script "convert-pth-to-ggml")
                   (make-script "convert-lora-to-ggml")
                   (make-script "convert"))))
             (add-after 'install-python-scripts 'wrap-python-scripts

base-commit: 4b60a39aa5d3c10aada9a0be2ed1579e19bd118d
-- 
2.34.1





Reply sent to Andreas Enge <andreas <at> enge.fr>:
You have taken responsibility. (Fri, 08 Mar 2024 10:14:02 GMT) Full text and rfc822 format available.

Notification sent to Andy Tai <atai <at> atai.org>:
bug acknowledged by developer. (Fri, 08 Mar 2024 10:14:02 GMT) Full text and rfc822 format available.

Message #16 received at 67873-done <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: 67873-done <at> debbugs.gnu.org
Subject: Close
Date: Fri, 8 Mar 2024 11:12:30 +0100
Hello Andy,

I am closing this as a similar patch has been applied already:
commit 6e7484808fa2979bd686aae5b64a71849e9391b9
Author: John Fremlin <john <at> fremlin.org>
Date:   Tue Feb 13 10:32:12 2024 -0500
    gnu: llama-cpp: Update to 03bf16.
    * gnu/packages/machine-learning.scm (llama-cpp): Update to
    03bf161eb6dea6400ee49c6dc6b69bdcfa9fd3fc.
    [arguments]: Adjust program names.
    Change-Id: I9f5474606dd01be73fbc50813250991e9d248d85
    Signed-off-by: Ludovic Courtès <ludo <at> gnu.org>

Probably your commit is more recent; at the same time for a project
without releases or meaningful tags or branches, it is difficult to tell
when we should update, and there is no point in updating all the time.
I would say after a "meaningful" change, to be determined by users of the
software, for instance.

Thanks,

Andreas





bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 05 Apr 2024 11:24:31 GMT) Full text and rfc822 format available.

This bug report was last modified 112 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.