Received: (at 70883-done) by debbugs.gnu.org; 13 May 2024 08:31:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon May 13 04:31:47 2024
Received: from localhost ([127.0.0.1]:59500 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s6R61-0001c4-1c
for submit <at> debbugs.gnu.org; Mon, 13 May 2024 04:31:47 -0400
Received: from mira.cbaines.net ([212.71.252.8]:43480)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <mail@HIDDEN>) id 1s6R5w-0001by-FI
for 70883-done <at> debbugs.gnu.org; Mon, 13 May 2024 04:31:43 -0400
Received: from localhost (unknown [45.67.83.168])
by mira.cbaines.net (Postfix) with ESMTPSA id 3F86327BBE2;
Mon, 13 May 2024 09:31:39 +0100 (BST)
Received: from felis (localhost [127.0.0.1])
by localhost (OpenSMTPD) with ESMTP id 6daedb21;
Mon, 13 May 2024 08:31:38 +0000 (UTC)
From: Christopher Baines <mail@HIDDEN>
To: Andy Tai <atai@HIDDEN>
Subject: Re: [bug#70883] [PATCH v3] gnu: llama-cpp: Update to commit fed010.
In-Reply-To: <b6fb60c643008c1ae9fd99e18561e7d9742ba9f3.1715472290.git.atai@HIDDEN>
(Andy Tai's message of "Sat, 11 May 2024 17:05:02 -0700")
References: <7c2a1ab89edc065ae01fa817955ec92b8f49b575.1715454561.git.atai@HIDDEN>
<b6fb60c643008c1ae9fd99e18561e7d9742ba9f3.1715472290.git.atai@HIDDEN>
User-Agent: mu4e 1.12.2; emacs 29.3
Date: Mon, 13 May 2024 09:31:35 +0100
Message-ID: <87zfsu3yfs.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 70883-done
Cc: 70883-done <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Andy Tai <atai@HIDDEN> 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-lea=
rning.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))
>=20=20
> (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, can=
not 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
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZBz+dfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xdyow//fXJV+6lbAw1xgkz6zRJxqTxhd7zp1uYk
vOMa1Gh07DqgqLh9uMbapYewclwc0uOgjYX3ru0ohU2brFRzL2b5qJQ3rfGD4hw+
Ac6lDslhDGj3icv6/bVeS0nm15uOXCQkRdRuvOW5hWBhCu7jPz6q8OospY36j5Aj
GUTbhfcXydCgak3jspvZAeLwcZpvJJwbETCKHA7OHlEAq0MXKx9gC4Y5YvtKnS7M
cC7cMWxcLFi24fzA/bQ5ZPOI4HXQKHd/gbWR7N+Wr6GZGDNHGTqWpBLW53exfok6
8fFEAHwKN716V0JMbQKCplYNgUQG0B5ojsIODuHvsjT513bwxhIklSIngQZiZ1dc
zkAx2D3t9uzcS2p0xlvE7tNyszxOw5lMZdFVc3IFRnMLOaKdfN2NcFtnWLg1o6m+
+bORoikpuUAVr/b0MTBuXX1SEiU61W9c+KLOgAECmX5Jm+rJVN9FR8IYOmX6mrUA
+pNNZMe5Wm9i6h57kYlu1goruFoYioKhzGJzI3iXrTkE63B6YbAkXQwrA63iR07x
8POTWsxBYAxzFQY95c9zZytbvSbDt+qgIQM4iApHSv41lvOQ154UhrKccsZtYw3O
lkHqDWCunWZpYYKFJAH8tATjmrFw5hfAQRxgCsQHCdv9wbA9NfIuwo3iDbze5Y4y
fRSN2kte08Y=
=aBfk
-----END PGP SIGNATURE-----
--=-=-=--
Andy Tai <atai@HIDDEN>:Christopher Baines <mail@HIDDEN>:Received: (at 70883) by debbugs.gnu.org; 13 May 2024 05:28:17 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon May 13 01:28:16 2024 Received: from localhost ([127.0.0.1]:58538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1s6OES-0007zk-MW for submit <at> debbugs.gnu.org; Mon, 13 May 2024 01:28:16 -0400 Received: from 6.mo583.mail-out.ovh.net ([178.32.119.138]:45807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1s6OEM-0007zR-Lj for 70883 <at> debbugs.gnu.org; Mon, 13 May 2024 01:28:13 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.176.211]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Vd7LJ4VrWz1CNY for <70883 <at> debbugs.gnu.org>; Mon, 13 May 2024 05:28:08 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-frgk5 (unknown [10.110.96.26]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 492E11FD2F; Mon, 13 May 2024 05:28:08 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-frgk5 with ESMTPSA id c5D3DeikQWbTFgAAqwjjMw (envelope-from <ngraves@HIDDEN>); Mon, 13 May 2024 05:28:08 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R0044b68d3ad-89e7-484d-87c9-f8d4f799aef2, AFD3D7969371CC029319C969337B9752385513BA) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves <ngraves@HIDDEN> To: control <at> debbugs.gnu.org,70883 <at> debbugs.gnu.org Subject: QA review for 70883 Date: Mon, 13 May 2024 07:28:07 +0200 Message-ID: <87msoucmc8.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 11882747617485775402 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdegfedgleefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffufffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepueejleeileejfffhleetjedtleejheevudffleevgfdufeekhefgvddvveegveefnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutddvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdekkeefseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70883 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) user guix usertag 70883 + reviewed-looks-good thanks Guix QA review form submission: Hi Andy, The trailing #t at the end of the 'disable-unrunable-tests phase is not necessary, otherwise LGTM. lint warns about possible upgrade but that's fine. Items marked as checked: Lint warnings, Package builds, Commit messages -- Best regards, Nicolas Graves
guix-patches@HIDDEN:bug#70883; Package guix-patches.
Full text available.
Received: (at 70883) by debbugs.gnu.org; 12 May 2024 21:57:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 12 17:57:45 2024
Received: from localhost ([127.0.0.1]:56698 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s6HCT-0001qo-Gn
for submit <at> debbugs.gnu.org; Sun, 12 May 2024 17:57:45 -0400
Received: from mail-vs1-f43.google.com ([209.85.217.43]:43394)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1s6HCQ-0001qV-01
for 70883 <at> debbugs.gnu.org; Sun, 12 May 2024 17:57:44 -0400
Received: by mail-vs1-f43.google.com with SMTP id
ada2fe7eead31-47eee2af758so2589510137.1
for <70883 <at> debbugs.gnu.org>; Sun, 12 May 2024 14:57:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail-com.20230601.gappssmtp.com; s=20230601; t=1715550996; x=1716155796;
darn=debbugs.gnu.org;
h=to:subject:message-id:date:from:mime-version:from:to:cc:subject
:date:message-id:reply-to;
bh=DrDhxgLxRI0WZDvFeh3ZHLE++LphVvxyh5TvIo+7qQQ=;
b=reZi8M8ZDrKLDbnk7N+SemN2IdmCXFre+q5M2uEGTahVGR9ugSxfver2IZi539u1SM
MDNtrCeWsFmhEH4yuuqYyfu6L8jj7xDbhe5Yn3nv/AWGacjNvKEnhfrgRDCRQzSZK0V2
6W8ZWnFo1+F2oAnhk1gkUvPTnVNWzKju8Fl+NAzWc6HeI4DhbwS3XH3lMic0ESe7SUsR
2kSxtGUoLbmWbvsoxMHvCmGNPR2+sIisCtBGkW4Wu9qPvBjUsOX46OCOWP6jxBek369U
r+rDwYOfUAPP4t5U03GPvMJMX2+cXS23ijuaLHtiRdaHv/GH0kY5qeMUu3wiSGxDPsEZ
8sWQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1715550996; x=1716155796;
h=to:subject:message-id:date:from:mime-version:x-gm-message-state
:from:to:cc:subject:date:message-id:reply-to;
bh=DrDhxgLxRI0WZDvFeh3ZHLE++LphVvxyh5TvIo+7qQQ=;
b=if3tLrPVruAyGd0PmvjoLH4HAv8y1ZE2VHKyKMpZZoSYdh/UXITywnXtE8A7bWVg1X
WMzVh4jRObzQx53X6CfaYdDAbwQFBLEFBL8VVKxNXSkXlF85OezgkqfEPIDtKz0XBju8
YTfNmxJdKvScZVs6LFpSCDt27E9qGZg4PiA+cGnIZxuncQvyAKhedgqetUrIty0koUmW
UX8x3xqJyhv0mm3mcJKirwfrs9B2yvfYWVDygarDC0hYM/1kMtzAb3zuaWMlvDJcd1gL
74AtsAdclsFpVyUx8j8/iXkk9t0JKeeLEA9TrIa1sGvLiziD+setLMEsE8Cb9EDuZJiA
sL3Q==
X-Gm-Message-State: AOJu0YwmAFD9z8KpMzBnEmwRZA1GQyG1pRKRjbXrrN2j1NER3dwk47Ij
c1Cr3XA9TkMmrj0XlJ9G6LR8vVXK/GJbmhpP1fU+V4OJA0F7DiewbAfhk9QUvACEUheBuSsSlH0
hnXZ2RRIwF1vUqSNCLF0Oultpsw2f5BeG
X-Google-Smtp-Source: AGHT+IGpnnJCRGbkwPBSmdEsSEbhjt0iYbLsHwhqan7qyhiVg0fZ+6V/GsUQWCoF0I7lmpxREPNDVEdFhcfjOykTfHk=
X-Received: by 2002:a05:6102:1914:b0:47f:2480:584d with SMTP id
ada2fe7eead31-47faba20f99mr9053747137.6.1715550994709; Sun, 12 May 2024
14:56:34 -0700 (PDT)
MIME-Version: 1.0
From: Andy Tai <atai@HIDDEN>
Date: Sun, 12 May 2024 14:55:58 -0700
Message-ID: <CAJsg1E-e9smmeaX-t-aeH8493FdYr=MzqzkcqkUkKY-++Jw+Eg@HIDDEN>
Subject:
To: 70883 <at> debbugs.gnu.org
Content-Type: text/plain; charset="UTF-8"
X-Spam-Score: 2.3 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: patch passes Guix QA https://qa.guix.gnu.org/issue/70883
Content analysis details: (2.3 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level
mail domains are different
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (lichengtai[at]gmail.com)
-0.0 SPF_PASS SPF: sender matches SPF record
-0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2)
[209.85.217.43 listed in wl.mailspike.net]
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [209.85.217.43 listed in list.dnswl.org]
0.0 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and
EnvelopeFrom freemail headers are different
2.0 BLANK_SUBJECT Subject is present but empty
0.0 BODY_SINGLE_URI Message body is only a URI
X-Debbugs-Envelope-To: 70883
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 1.3 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: patch passes Guix QA https://qa.guix.gnu.org/issue/70883
Content analysis details: (1.3 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2)
[209.85.217.43 listed in wl.mailspike.net]
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust
[209.85.217.43 listed in list.dnswl.org]
0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level
mail domains are different
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (lichengtai[at]gmail.com)
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and
EnvelopeFrom freemail headers are
different
2.0 BLANK_SUBJECT Subject is present but empty
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
patch passes Guix QA
https://qa.guix.gnu.org/issue/70883
guix-patches@HIDDEN:bug#70883; Package guix-patches.
Full text available.
Received: (at 70883) by debbugs.gnu.org; 12 May 2024 00:06:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 11 20:06:16 2024
Received: from localhost ([127.0.0.1]:51212 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s5wjI-00089Q-1p
for submit <at> debbugs.gnu.org; Sat, 11 May 2024 20:06:16 -0400
Received: from mail-ot1-f47.google.com ([209.85.210.47]:53318)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1s5wjG-00089K-4l
for 70883 <at> debbugs.gnu.org; Sat, 11 May 2024 20:06:14 -0400
Received: by mail-ot1-f47.google.com with SMTP id
46e09a7af769-6f0fd87da53so304691a34.2
for <70883 <at> debbugs.gnu.org>; Sat, 11 May 2024 17:06:14 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1715472308; x=1716077108; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=kiDni0a7VqY/kmbDEv7nDDJXk3vejIr+zFL1PAyMq8g=;
b=aMCDt819SlDzzXzzDvhLB9bT0YijV9Zfd0hOvoLiXR85rVbo2VQlMkPkL1ulfMHIVL
zi+V+EuZqs9j3/58AYt+Yc8Pc/0H0gZNTIcGeiE7WROo0ZYwSWIfp2ZlSO22nLiEFhsk
fxOlVCkMK6LA2l0EVHVqMhk2rlciTnQ84VSDKgOj4O1mUoyBoykbf3+C/slFRjLjQG/z
1HjTY1z2SAysH/Myt7jgTfzlu2EtCb5T2Wi6GybknBGeEaZPKmegJyGaoCHwJNObLXyc
TMEhLNnibP+fHqyTz3Y9CwdkiM+tzuQEQo11Df+km5NLozC0wTQK21zJBHKmXQHjREJW
PZQA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1715472308; x=1716077108;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=kiDni0a7VqY/kmbDEv7nDDJXk3vejIr+zFL1PAyMq8g=;
b=uwyvVWhrFwGYQQq4gMpEmX8Ex580zrmJIf+CHU0OenjSdY9l/gsazoIZ278t66uKEr
FvLI1rEsFptVp2Ax2iwAhSu+DWYWhJw969igq61hr3ASzviJ6LvLYXe+l2cgXRZapy8Y
2n/8CuoYbWvCaAx7ePSH3Zn+ITZHpa+p3HLLSKcNoVU3nfC5ZE5C6q+7rXaNtXASVzXC
b5AiRGxDWEIDhLSgMmReOt0zClVK7/+fNqkCjVtzCgVGqovLL4nGnPSEhCPNLEXm10Ja
hiKQJUmjQPAKiaGNslCabpFgHpyFnclj/VQ2QgHtgZTnHda9oT+IjCoVqc8Unr961em3
M5dA==
X-Gm-Message-State: AOJu0YwHXxjsqPO2j5Aaf6T5LlqGOA5WpPpiYCYFqjk3vHjjSX/0oOUY
ILZPyyhgqKWKKyepqyT9QbbDd8lstm3TQ03O//nAe25CMKHj7kByOYEFhQ==
X-Google-Smtp-Source: AGHT+IGLXGUS+q8Fm2CpHiO9x+VY3FRj+4xhwMUCxozQHS70lYjuPiOtdB/poSNXm7j+FNr5VWGrIQ==
X-Received: by 2002:a9d:4b03:0:b0:6ea:1bba:9622 with SMTP id
46e09a7af769-6f0e92d07d5mr6816856a34.35.1715472308167;
Sat, 11 May 2024 17:05:08 -0700 (PDT)
Received: from DEskMiniX300.. (c-98-37-226-154.hsd1.ca.comcast.net.
[98.37.226.154]) by smtp.gmail.com with ESMTPSA id
41be03b00d2f7-63411530b0esm5278227a12.88.2024.05.11.17.05.07
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 11 May 2024 17:05:07 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 70883 <at> debbugs.gnu.org
Subject: [PATCH v3] gnu: llama-cpp: Update to commit fed010.
Date: Sat, 11 May 2024 17:05:02 -0700
Message-Id: <b6fb60c643008c1ae9fd99e18561e7d9742ba9f3.1715472290.git.atai@HIDDEN>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 70883
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)
* 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))
(add-before 'install 'install-python-scripts
(lambda _
(let ((bin (string-append #$output "/bin/")))
@@ -581,7 +590,7 @@ (define-public llama-cpp
(make-script "convert"))))
(add-after 'install-python-scripts 'wrap-python-scripts
(assoc-ref python:%standard-phases 'wrap))
- (replace 'install
+ (add-after 'install 'install-main
(lambda _
(copy-file "bin/main" (string-append #$output "/bin/llama")))))))
(inputs (list python))
base-commit: 4eb1a5426b93bfd19282db0d255633ca2959efc5
--
2.34.1
guix-patches@HIDDEN:bug#70883; Package guix-patches.
Full text available.
Received: (at 70883) by debbugs.gnu.org; 11 May 2024 22:08:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 11 18:08:33 2024
Received: from localhost ([127.0.0.1]:50766 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s5utN-0006po-7n
for submit <at> debbugs.gnu.org; Sat, 11 May 2024 18:08:33 -0400
Received: from mail-pj1-f49.google.com ([209.85.216.49]:48307)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1s5utK-0006pi-VG
for 70883 <at> debbugs.gnu.org; Sat, 11 May 2024 18:08:31 -0400
Received: by mail-pj1-f49.google.com with SMTP id
98e67ed59e1d1-2b33e342c03so2866568a91.0
for <70883 <at> debbugs.gnu.org>; Sat, 11 May 2024 15:08:31 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1715465245; x=1716070045; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=Am4NDEVxOibiu1+hHvz07x694/hD/99I69zZJh5c7Ho=;
b=Z9IQA7HE5v9TS0UxKykE8r/CsnyffQScebwDvvX4i/rMdfOlViWan+ReqhtuC/5TJS
xr+7Ea2QvkhBITQB8pd34TeCJnqUztzEnZ00C747redq1UPm9olli5g/ckyzxG5+SFM+
xA8QLeZ7s+RbXzRZuR6523lkGGpwVDkrvvCP/+cj4PHfMQrGtPt+7of8+b22nSjt7wE0
frFXOV7y6wqJVP0okJIO9u1Bvn004UmPDEEAKGhauy26o4UTh+ZeLJG633msWmLMcJnR
FSDCdmLc9/pH49Bfg8AGEh0Jv5eaQWYcj82aOmwLyo9HXJg8vp7mKM38RYFSS3jfsWhw
jSIQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1715465245; x=1716070045;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=Am4NDEVxOibiu1+hHvz07x694/hD/99I69zZJh5c7Ho=;
b=pJoo4uhOCMNLJVOgwdebq1luEGAxob91rN7QR9QCqe155AnVMuT/XRJ+DXjMhGVTJF
WLM0RkPexpQAEl3KeA9PTvEybs7IAFW6qWW5SLXTO5vj2yXhWDIMH7j3t0Gl8BG1Tc16
FbNA+rE8B2fVRba9Umm20l9fisPMUT+kzwBeuSmXa1+cH0EXifPkoheyOV4TP+eRgoZO
rBxXoqD0aIufT/EC+G0TgnjJTDgxzSMS7byyKWsSO5VhvrLqm+eJHvMR6ndAH3EG7GtU
Bz/lF94Y2t912EoWB11DrJ+RnIei5v9CkNrrE3LsJQuCQWZkx1prGt0+fgSpeQv9tF7d
al6w==
X-Gm-Message-State: AOJu0YxUJHwRpico309cY2aYGAK/qpu72P3Cj4NWHIl0lK9Xm3H0Z/Oj
lUY3kz0Yfo57hEO+0wfGNkiyGSc9JuN/dLCznMSrRJXFodWar6iacQiu4g==
X-Google-Smtp-Source: AGHT+IFrt6nBMngzAQTz0Cgxhg0ZrHt457DX48EBOt+JtuAwMbj7QSfsfmwWTSUSoqgXawMSHzddMg==
X-Received: by 2002:a17:90a:b702:b0:2b2:7986:229b with SMTP id
98e67ed59e1d1-2b6ccc7304bmr6246955a91.37.1715465244798;
Sat, 11 May 2024 15:07:24 -0700 (PDT)
Received: from DEskMiniX300.. (c-98-37-226-154.hsd1.ca.comcast.net.
[98.37.226.154]) by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-2b62886b675sm7158595a91.28.2024.05.11.15.07.23
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 11 May 2024 15:07:24 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: 70883 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: llama-cpp: Update to commit fed010.
Date: Sat, 11 May 2024 15:07:20 -0700
Message-Id: <35146a33b9193b5f66dab0c4c83e65bb36219ff2.1715465193.git.atai@HIDDEN>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.3 (/)
X-Debbugs-Envelope-To: 70883
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)
* 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..1a3716b912 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/")))
@@ -581,7 +590,7 @@ (define-public llama-cpp
(make-script "convert"))))
(add-after 'install-python-scripts 'wrap-python-scripts
(assoc-ref python:%standard-phases 'wrap))
- (replace 'install
+ (add-after 'install 'install-bin
(lambda _
(copy-file "bin/main" (string-append #$output "/bin/llama")))))))
(inputs (list python))
base-commit: 4eb1a5426b93bfd19282db0d255633ca2959efc5
--
2.34.1
guix-patches@HIDDEN:bug#70883; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 11 May 2024 19:10:19 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 11 15:10:19 2024
Received: from localhost ([127.0.0.1]:50051 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s5s6s-0005AR-TY
for submit <at> debbugs.gnu.org; Sat, 11 May 2024 15:10:19 -0400
Received: from lists.gnu.org ([209.51.188.17]:38476)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lichengtai@HIDDEN>) id 1s5s6q-0005AL-V5
for submit <at> debbugs.gnu.org; Sat, 11 May 2024 15:10:17 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <lichengtai@HIDDEN>)
id 1s5s6q-0004p5-Lf
for guix-patches@HIDDEN; Sat, 11 May 2024 15:10:16 -0400
Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <lichengtai@HIDDEN>)
id 1s5s6o-0004i5-BO
for guix-patches@HIDDEN; Sat, 11 May 2024 15:10:16 -0400
Received: by mail-pl1-x632.google.com with SMTP id
d9443c01a7336-1eca195a7c8so27115475ad.2
for <guix-patches@HIDDEN>; Sat, 11 May 2024 12:10:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1715454612; x=1716059412; darn=gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:from:to:cc:subject:date:message-id:reply-to;
bh=it97gygeQ4Bqzg1y3EKNbi8wRjRhlHDaBo7ZYsRXGPM=;
b=dNzUv0tUCEbDI/+hba9NMTz+Xa/tu4rli2B3O9JpyIK2gOJVGjY++t9jU0AuJd6Xws
hbLZVxmRKAzGdU9q2B6vcNWfmN9KKLVQUFe3aA4YczZBGHau2/Sx2i9/+UE2pQhGj+9g
o5ICX7K+gRiv0PwzDxbu531/rJ8yv0EtOuoPaMlpICcsIqR3n9hW5utE9vh75Vnj67VZ
S/O6HKAZWEtIkALSobPB7LRCwdYM3FveARFaJu/bY0X54TbppMMExuD4iecE8eMvSwkQ
AkjA5lfdio5t+5jCMTm5/sTTQGgpuxXNndOtiliAjTglWnGJ9OFVX78yfTS/efZmEpyq
uhkw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1715454612; x=1716059412;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:sender:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=it97gygeQ4Bqzg1y3EKNbi8wRjRhlHDaBo7ZYsRXGPM=;
b=nk+a85bzS8nozE51crT3XrgPDTe/IPtjsR0Z+yIvOVab4r8rDfgrTTmMDLjSE3YuPV
k/1Sr4OZOdy+hJr9kxumDhIbpMcxseI13GX3eY4vHWh8PUewHD58w16hUP7RqbWMPKFM
GBF723+swPq/xq9rGwLVK7fibObpp+wJMrfPzE1atsCEjOkGjgziJShJZkl67CbiR5vr
mVawYOFPdLzaZ3aiHlAh123obtFgt6zBFXUhAgeWrErZPlNZ2iOw8+DuqbdFVgXw/S9Q
Ho6Ugca/OcIUQguFM7Ds+fCxU+6NHAx1ZECx/YgJSen/4MJI2lb4qwzLTMcceuZ/0hkR
6iqg==
X-Gm-Message-State: AOJu0Ywgwxjvg4O6nXk+1G3SFk54L7yWN7vuG0GthQYwi/OUIkkpaddn
bTvp6KDJn2FmkvRz74odbHSkUGji03+GLPcos+uF1FXXD6guegLqT854rw==
X-Google-Smtp-Source: AGHT+IEU+ID6rxdXK5cnnDEjGmvLP3SX5MEjNb9SJONDrlI0Tc7L1tfIxe0y0BUfyJDPRAzjiXIzpA==
X-Received: by 2002:a17:902:f64c:b0:1e4:54d1:a159 with SMTP id
d9443c01a7336-1ef4404957amr78307405ad.47.1715454612451;
Sat, 11 May 2024 12:10:12 -0700 (PDT)
Received: from DEskMiniX300.. (c-98-37-226-154.hsd1.ca.comcast.net.
[98.37.226.154]) by smtp.gmail.com with ESMTPSA id
d9443c01a7336-1ef0b9d161csm52004065ad.3.2024.05.11.12.10.11
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 11 May 2024 12:10:12 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: llama-cpp: Update to commit fed010.
Date: Sat, 11 May 2024 12:10:07 -0700
Message-Id: <7c2a1ab89edc065ae01fa817955ec92b8f49b575.1715454561.git.atai@HIDDEN>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::632;
envelope-from=lichengtai@HIDDEN; helo=mail-pl1-x632.google.com
X-Spam_score_int: -16
X-Spam_score: -1.7
X-Spam_bar: -
X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001,
FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.1 (-)
X-Debbugs-Envelope-To: submit
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.1 (--)
* 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
Andy Tai <atai@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#70883; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.