Package: guix-patches;
Reported by: David Pflug <david <at> pflug.io>
Date: Sun, 14 Jan 2024 20:34:01 UTC
Severity: normal
Tags: patch
Done: André Batista <nandre <at> riseup.net>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: help-debbugs <at> gnu.org (GNU bug Tracking System) To: André Batista <nandre <at> riseup.net> Cc: tracker <at> debbugs.gnu.org Subject: bug#68455: closed ([PATCH] gnu: llama-cpp: Update to 1873.) Date: Thu, 05 Dec 2024 21:15:02 +0000
[Message part 1 (text/plain, inline)]
Your message dated Thu, 5 Dec 2024 18:14:34 -0300 with message-id <Z1IXuoePTIzYmeFS <at> andel> and subject line Re: [bug#68455] Close. has caused the debbugs.gnu.org bug report #68455, regarding [PATCH] gnu: llama-cpp: Update to 1873. to be marked as done. (If you believe you have received this mail in error, please contact help-debbugs <at> gnu.org.) -- 68455: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68455 GNU Bug Tracking System Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: David Pflug <david <at> pflug.io> To: guix-patches <at> gnu.org Cc: David Pflug <david <at> pflug.io> Subject: [PATCH] gnu: llama-cpp: Update to 1873. Date: Sun, 14 Jan 2024 15:32:45 -0500* gnu/packages/machine-learning.scm (llama-cpp): Update to 1873. Change-Id: I091cd20192743c87b497ea3c5fd18a75ada75d9d --- gnu/packages/machine-learning.scm | 133 ++++++++++++++++++------------ 1 file changed, 78 insertions(+), 55 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 1616738399..0cdfe7bb08 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2023 Navid Afkhami <navid.afkhami <at> mdc-berlin.de> ;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com> ;;; Copyright © 2023 Troy Figiel <troy <at> troyfigiel.com> +;;; Copyright © 2023 David Pflug <david <at> pflug.io> ;;; ;;; This file is part of GNU Guix. ;;; @@ -517,63 +518,63 @@ (define-public guile-aiscm-next (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((commit "f31b5397143009d682db90fd2a6cde83f1ef00eb") - (revision "0")) - (package - (name "llama-cpp") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ggerganov/llama.cpp") - (commit (string-append "master-" (string-take commit 7))))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0ys6n53n032zq1ll9f3vgxk8sw0qq7x3fi7awsyy13adzp3hn08p")))) - (build-system cmake-build-system) - (arguments - (list - #:modules '((ice-9 textual-ports) - (guix build utils) - ((guix build python-build-system) #:prefix python:) - (guix build cmake-build-system)) - #:imported-modules `(,@%cmake-build-system-modules - (guix build python-build-system)) - #:phases - #~(modify-phases %standard-phases - (add-before 'install 'install-python-scripts - (lambda _ - (let ((bin (string-append #$output "/bin/"))) - (define (make-script script) - (let ((suffix (if (string-suffix? ".py" script) "" ".py"))) - (call-with-input-file - (string-append "../source/" script suffix) - (lambda (input) - (call-with-output-file (string-append bin script) - (lambda (output) - (format output "#!~a/bin/python3\n~a" - #$(this-package-input "python") - (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 - (assoc-ref python:%standard-phases 'wrap)) - (replace 'install - (lambda _ - (copy-file "bin/main" (string-append #$output "/bin/llama"))))))) - (inputs (list python)) - (propagated-inputs - (list python-numpy python-pytorch python-sentencepiece)) - (home-page "https://github.com/ggerganov/llama.cpp") - (synopsis "Port of Facebook's LLaMA model in C/C++") - (description "This package provides a port to Facebook's LLaMA collection + (package + (name "llama-cpp") + (version "1873") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ggerganov/llama.cpp") + (commit (string-append "b" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11may9gkafg5bfma5incijvkypjgx9778gmygxp3x2dz1140809d")))) + (build-system cmake-build-system) + (arguments + (list + #:modules '((ice-9 textual-ports) + (guix build utils) + ((guix build python-build-system) #:prefix python:) + (guix build cmake-build-system)) + #:imported-modules `(,@%cmake-build-system-modules + (guix build python-build-system)) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'install-python-scripts + (lambda _ + (let ((bin (string-append #$output "/bin/"))) + (define (make-script script) + (let ((suffix (if (string-suffix? ".py" script) "" ".py"))) + (call-with-input-file + (string-append "../source/" script suffix) + (lambda (input) + (call-with-output-file (string-append bin script) + (lambda (output) + (format output "#!~a/bin/python3\n~a" + #$(this-package-input "python") + (get-string-all input)))))) + (chmod (string-append bin script) #o555))) + (mkdir-p bin) + (make-script "convert-hf-to-gguf") + (make-script "convert-llama-ggml-to-gguf") + (make-script "convert-lora-to-ggml") + (make-script "convert-persimmon-to-gguf") + (make-script "convert")))) + (add-after 'install-python-scripts 'wrap-python-scripts + (assoc-ref python:%standard-phases 'wrap)) + (replace 'install + (lambda _ + (copy-file "bin/main" (string-append #$output "/bin/llama"))))))) + (inputs (list python)) + (propagated-inputs + (list python-numpy python-pytorch python-sentencepiece python-gguf)) + (home-page "https://github.com/ggerganov/llama.cpp") + (synopsis "Port of Facebook's LLaMA model in C/C++") + (description "This package provides a port to Facebook's LLaMA collection of foundation language models. It requires models parameters to be downloaded independently to be able to run a LLaMA model.") - (license license:expat)))) + (license license:expat))) (define-public mcl (package @@ -5257,3 +5258,25 @@ (define-public oneapi-dnnl "OneAPI Deep Neural Network Library (oneDNN) is a cross-platform performance library of basic building blocks for deep learning applications.") (license license:asl2.0))) + +(define-public python-gguf + (package + (name "python-gguf") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "gguf" version)) + (sha256 + (base32 "0rbyc2h3kpqnrvbyjvv8a69l577jv55a31l12jnw21m1lamjxqmj")))) + (build-system pyproject-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'check)))) + (inputs (list poetry python-pytest)) + (propagated-inputs (list python-numpy)) + (home-page "https://ggml.ai") + (synopsis "Read and write ML models in GGUF for GGML") + (description "Read and write ML models in GGUF for GGML") + (license license:expat))) base-commit: 18393fcdddf5c3d834fa89ebf5f3925fc5b166ed -- 2.41.0
[Message part 3 (message/rfc822, inline)]
From: André Batista <nandre <at> riseup.net> To: David Pflug <david <at> pflug.io> Cc: 68455-done <at> debbugs.gnu.org Subject: Re: [bug#68455] Close. Date: Thu, 5 Dec 2024 18:14:34 -0300Hi David, sex 22 nov 2024 às 20:26:35 (1732317995), david <at> pflug.io enviou: > This can be closed. The package has moved on well beyond this commit. > See #70883. > You can close your own bug reports by adding "-done" in between the bug number and the "@" char on the email address, such as I've done here. See <https://debbugs.gnu.org/Developer.html> for more info. Thanks
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.