From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id cP9QCMXuXWY95wAAqHPOHw:P1 (envelope-from ) for ; Mon, 03 Jun 2024 18:26:45 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id cP9QCMXuXWY95wAAqHPOHw (envelope-from ) for ; Mon, 03 Jun 2024 18:26:45 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=liyaYqsj; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1717432005; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=AgzUVg8uaMlbpP3LfH9QfPUDky6FpdP8WwBsaXQ4vbg=; b=YoqfpHtTJP6lYGN9pCGx39vAqA74+kKIs1AZuwRZH/avcXDpBLYqBalFiJQSEagnaPrDyk hl6xVumx/d6llgyQJLFyLSEtj70sUXL/MVjiBb/5FWYAoytWO/Ri4Ss9qKrWHwQRj9tBYw fIt+LZZrGEdeFJfnHyiNuacBMkNVWk/Q63/INJgwwWISGx3WQYhXOtoLC7qyp9cajDBiN2 5Wiue6qUqcFVHxyLHfce8hto0EXalQHakwAUf2xl/r2eKhLXL73jSh/g/l/HdMvhP85477 KMhbdLC1rk0BE7n6VPod+LFGLhkIdaYdHLR/ozEC9AAKEfhxd4hwVWNIY4rtZA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717432005; a=rsa-sha256; cv=none; b=BfYySOyM1A3XL9d8P6F6C4BJEkDunJy48UiQ/+qvBoZXGG48CLCntSIArk+VLkD+TTWTF8 WmHBbOK9H3CDbuXTrDKNvXSGCBPPwTdsqabHjBdv3F/+AL6ghGjV0uW1NMkPqp0WPhXsCt yweuVrH5PwVTPM4Gc4IIjrGF/ScfxB3iX9RHCZVH51lCuANOFkNeijDK2xG6rlQEXzrKlA 795a6iUJII8lRz6+hKBDCm0bgknUlCI6vSwRjU/dcgvkmx1xPkWM7isujvDxEWldtgR1fS GXoS4Wsa6UWrpZispH1EynomMxV5cmLj7eG5a2UmDQfdNxkUcjUMH6ghJwV0mw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=liyaYqsj; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4F1F863F3C for ; Mon, 03 Jun 2024 18:26:43 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEAVW-0003ts-R2; Mon, 03 Jun 2024 12:26:02 -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 ) id 1sEAVN-0003rp-Pv for guix-patches@gnu.org; Mon, 03 Jun 2024 12:25:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sEAVK-0005Ed-A2 for guix-patches@gnu.org; Mon, 03 Jun 2024 12:25:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sEAVX-0002BY-5d for guix-patches@gnu.org; Mon, 03 Jun 2024 12:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71219] [PATCH v3] gnu: llama-cpp: Update commit and update configure flags for shared library build. References: <6c6fc91b2febb791d50aac5e9a16a220090eb31d.1716786995.git.atai@atai.org> In-Reply-To: <6c6fc91b2febb791d50aac5e9a16a220090eb31d.1716786995.git.atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 16:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71219@debbugs.gnu.org Cc: Andy Tai Received: via spool by 71219-submit@debbugs.gnu.org id=B71219.17174319158251 (code B ref 71219); Mon, 03 Jun 2024 16:26:03 +0000 Received: (at 71219) by debbugs.gnu.org; 3 Jun 2024 16:25:15 +0000 Received: from localhost ([127.0.0.1]:47364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEAUj-00028x-SE for submit@debbugs.gnu.org; Mon, 03 Jun 2024 12:25:15 -0400 Received: from mail-oo1-f52.google.com ([209.85.161.52]:42458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sEAHH-0001Qs-UK for 71219@debbugs.gnu.org; Mon, 03 Jun 2024 12:11:22 -0400 Received: by mail-oo1-f52.google.com with SMTP id 006d021491bc7-5ba18126a3bso1008045eaf.1 for <71219@debbugs.gnu.org>; Mon, 03 Jun 2024 09:11:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717431001; x=1718035801; 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=AgzUVg8uaMlbpP3LfH9QfPUDky6FpdP8WwBsaXQ4vbg=; b=liyaYqsjjrVyZai8UE1xtpif/DveM2o4im2MiWCIBgDwT8LXPNmoAJhdp0q5uHf0PP TsW4zk6ARqXnaOrtLioonp/N2+HAozJja0uwqWz61B9co+y/VKcCZnCoB+cy/99SQEli eW+McK81IN410gaXXj6ruv6IK8WOb2yg1yLePZA/vV7BPsYzlUIjnOT5d9TI782oaICw fqISBsKwfhaC4W/dxxOhUXztTKhNaQDyDrzjK/PTRVWegX9MLJpFcv79rIa2SBjMfVQm JVmCXMOJ4VMXdR4h3VvLEzN1LZ6hf3qAbVpEcCZBpBLBfX2cDRVFFpI+XaLC0f0IWOJy TNQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717431001; x=1718035801; 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=AgzUVg8uaMlbpP3LfH9QfPUDky6FpdP8WwBsaXQ4vbg=; b=bPgpfU+GpcpVxRYj3SOptKvFBHIsjmVVj8JY2rdHvP7b4ojppdkPAAJLjXJlbQA2wj gED0ATsm2q3A0ARYzKsYlZjOKlXUCvQfES0plrOy9CcNxCdEf6Mj7Y/Av50DBkS16Nt1 FdJbqCdgPpfFbb8EyqASL7EP3DflsUQRqlb/P6trql10X8ItML+sR+AP9xhfqtDRg9J/ 5ufHPG6NLv7BaD0mm21NBoVLjF3zwhyvLiVTlkGjaSJdtUoREDj9CknjRZNuewN4Iibq qlUrO/+b+5vyBZp9bzGWeiCwqd9K7C+dsUjeHOLeD4dKGe4wdmFMW5gAPgHQLjmwH2aq hhdA== X-Gm-Message-State: AOJu0YyUHwDoGX8dTIPjqLE3MagEOtWddFCuuWfkF1gAca/94TAoKrmJ HQRwTnviWSaIeaHm3UMMJ+VzA4qn1kvgo0PhzZ9u6kMsHjLMw0qdgLCB6A== X-Google-Smtp-Source: AGHT+IEQKBPxItvpJ9tKJFqKefhjmns7saXPelKTqgBGExj2K509u3NqGZjXDqqlqzRXc4C5KWAplw== X-Received: by 2002:a17:903:32c8:b0:1f2:fee2:82ed with SMTP id d9443c01a7336-1f6938ed651mr472365ad.30.1717429432644; Mon, 03 Jun 2024 08:43:52 -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-1f6323f6dadsm65991085ad.221.2024.06.03.08.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 08:43:52 -0700 (PDT) From: Andy Tai Date: Mon, 3 Jun 2024 08:43:48 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.84 X-Spam-Score: -0.84 X-Migadu-Queue-Id: 4F1F863F3C X-Migadu-Scanner: mx11.migadu.com X-TUID: eacN0qb2cFbI * gnu/packages/machine-learning.scm (lama-cpp): Update to commit a5735e with pkf-config support. [arguments](configure-flags): add cmake configure flag for shared library build. (phases) 'install-python-scripts: Remove references to deleted scripts and add new ones upsteeam. Change-Id: I7c4bc219a22aa9a949e811b340c7cf745b176d14 --- gnu/packages/machine-learning.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a385ddc18c..52966bd8bc 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -524,7 +524,7 @@ (define-public guile-aiscm-next (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((commit "fed0108491a3a3cbec6c6480dc8667ffff9d7659") + (let ((commit "a5735e4426b19a3ebd0c653ad8ac01420458ee95") (revision "2")) (package (name "llama-cpp") @@ -537,11 +537,12 @@ (define-public llama-cpp (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "16rm9gy0chd6k07crm8rkl2j3hg7y7h0km7k6c8q7bmm2jrd64la")))) + (base32 "0nx55wchwf204ld6jygfn37cjrzc4lspwn5v0qk8i6p92499bv0h")))) (build-system cmake-build-system) (arguments (list - #:configure-flags #~'("-DLLAMA_BLAS=ON" + #:configure-flags #~'("-DBUILD_SHARED_LIBS=ON" + "-DLLAMA_BLAS=ON" "-DLLAMA_BLAS_VENDOR=OpenBLAS" "-DLLAMA_NATIVE=OFF" ;no '-march=native' @@ -584,14 +585,14 @@ (define-public llama-cpp (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")))) + (make-script "convert-hf-to-gguf-update.py")))) (add-after 'install-python-scripts 'wrap-python-scripts (assoc-ref python:%standard-phases 'wrap)) (add-after 'install 'install-main (lambda _ - (copy-file "bin/main" (string-append #$output "/bin/llama"))))))) + (with-directory-excursion (string-append #$output "/bin") + (symlink "main" "llama")))) + ))) (inputs (list python)) (native-inputs (list pkg-config)) (propagated-inputs base-commit: 879fc9b3f0c2e58c6232da03b94eba98c78e2d99 -- 2.34.1