From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id uOGIFIKEaGZauQAAe85BDQ:P1 (envelope-from ) for ; Tue, 11 Jun 2024 17:08:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id uOGIFIKEaGZauQAAe85BDQ (envelope-from ) for ; Tue, 11 Jun 2024 19:08:18 +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=QVJfRYTk; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1718125698; 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=ziNpeQthpl7f3VBANVESfV1GFh9uJhG2/xU6HeUs4Co=; b=VMR3Oj82XFQHQaN7/Q0qPQP2TN533CFaQe/Tqc0X/reNiC26j7Wr/4TUkWKehNKkbm+NKg VMfcnIKEnsQJT6oFRNFGySQohecyWTuwfIBl6FyoITMJn2XCJJFObzr9ImYiFKycgH7HJJ XXGK08wQY0QP92kT0edqF3kdpiylxa9t82RLgOyRJWXkQ1GjkSQ/2F4S2tZIW8YLXIodLx dyMhflhXZ+DJkxE/RHtoLkqpIhevZGczw1lPatH7mUZQfYtyVUazvumnp+a2rOU0vOSo+9 Hjr0N+HYVNOQiUzzINGSeJXRN0ncZ1SawJ6LCxDaPCshdV8TjmRC6asbCaM/MA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=QVJfRYTk; 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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718125698; a=rsa-sha256; cv=none; b=KXNoWAEWUIGWEiwcy9gajyTGntAbqDu7sG/hjp3tPVCK8e9IZDkP3HWHhognBpmf+wb+uD NgMEA9siVX6WcvF3MoaY9y7F6LgM8smWZgxmFv9iMxPwD8tnCu0zv+v61g99S4pLjuxnwD f7B4Lpr5SwzyJ9k2E/UiyTf8DAaXTGPKGGsXVqNR3DGynp8BEZCf7Pe1NxDewJYJF46HqT MSWM/tYKEKcZo1X3qSuxYaMGf2UIyx4PTSvRjnZu6Md4y+xcX34EgQVVkmdZlcQuSt08xd kYNwH4LEYAmUKfG89vH7/0EpjSzhj4fjum66+so2aRdQ5XlwtWr8Vy6f/HtkXQ== 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 EF94C70CDB for ; Tue, 11 Jun 2024 19:08:17 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sH4ye-00012F-AS; Tue, 11 Jun 2024 13:08:09 -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 1sH4ya-00011g-PQ for guix-patches@gnu.org; Tue, 11 Jun 2024 13:08:04 -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 1sH4ya-0002h6-B0 for guix-patches@gnu.org; Tue, 11 Jun 2024 13:08:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sH4yX-0005pP-Pe for guix-patches@gnu.org; Tue, 11 Jun 2024 13:08:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71219] [PATCH v4] 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: Tue, 11 Jun 2024 17:08:01 +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.171812566722379 (code B ref 71219); Tue, 11 Jun 2024 17:08:01 +0000 Received: (at 71219) by debbugs.gnu.org; 11 Jun 2024 17:07:47 +0000 Received: from localhost ([127.0.0.1]:36172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH4yI-0005ot-Pw for submit@debbugs.gnu.org; Tue, 11 Jun 2024 13:07:47 -0400 Received: from mail-io1-f44.google.com ([209.85.166.44]:44445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH4yG-0005od-74 for 71219@debbugs.gnu.org; Tue, 11 Jun 2024 13:07:45 -0400 Received: by mail-io1-f44.google.com with SMTP id ca18e2360f4ac-7eb7c8f114eso121314239f.1 for <71219@debbugs.gnu.org>; Tue, 11 Jun 2024 10:07:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718125600; x=1718730400; 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=ziNpeQthpl7f3VBANVESfV1GFh9uJhG2/xU6HeUs4Co=; b=QVJfRYTk/q/bV+ctYpvHA4Hk+3DYGoy64RVFc27rQGV72ZzUx1DbpsW06VcSieWNmW AE+G5qi8nflm74nGdeUJC1zdKK0wraHnxxr6c0NYd1J0zIY4yUDT0HIIT8b6fHBgRj0P KFmsrJa11Q9RqLU2O+9lEip4o1MofHHVtT1cYLjRvgUDUzziH9O2064IyhwQWHSAs3M+ nlaWiZqkFEJ5ZibnGLSuv5WNbPYdaPB7oN3GvtUdyf3xTEEiD7gBLWyOIHDDa5VtbLjk rNMwPIM6yWZfE8cqwstrWfEciZYKJeL5Q53bZkVHTYZRyg/zpmi3Y3JfJUZ6TJ2zVAKv 4Rcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718125600; x=1718730400; 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=ziNpeQthpl7f3VBANVESfV1GFh9uJhG2/xU6HeUs4Co=; b=PNd8b3B3Bf4TNLcQnDyKRRDmK2KpMF94MOc58HXMJzr1k6rVTrgfVtzErsT2sxAAZ4 lfJftLhjacF5muWburaZt2pOeWsURmN3YiMsdvekVVsuFAnD5jzsZsjIppuQU8w0NoY1 CIn0XpO+ldlPh6dwoUzi0mBkdWNf6ivIzvZLyS29JN0ChxVRLdedVJ17Qyx7LgJ77rHa 6qswsmIGGgMVxIFblDB1PP9SflnMFYF0buUZ5u4LdDhnCAGcwoKEsJciYxHedHOo6E+D zr7LhfRUpsVmYm54B0O8X3Dm9fUqHAijp4QVSL1QQMRixcl051a7tX2AYleX4me4zCop S23w== X-Gm-Message-State: AOJu0Yxi98vwkySl1dLToe7V/8ImS8+Ua275Vp2lYbLXX4RPUXuzwFV+ 6Y/Pq4VP+bcdD7XIg2KF7W3pBSyRY6S3pO4mCRSJAP2GYqs3HRkHEuroJQ== X-Google-Smtp-Source: AGHT+IFdQf3HdJlO0g0QW9XgTwa+hk+GWP5ZelNyvBuhq+ue3qVH9rktCi1slWIml6D0JEWkJJGZRw== X-Received: by 2002:a05:6a21:33a8:b0:1b5:69cd:870 with SMTP id adf61e73a8af0-1b569cd08d8mr8503556637.1.1718091024111; Tue, 11 Jun 2024 00:30: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 d2e1a72fcca58-7041e229f20sm5805993b3a.18.2024.06.11.00.30.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 00:30:23 -0700 (PDT) From: Andy Tai Date: Tue, 11 Jun 2024 00:30:20 -0700 Message-ID: <6757d7bf6c980f67a9dbae7af763ac1eeb0d34b6.1718090954.git.atai@atai.org> 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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -0.84 X-Migadu-Queue-Id: EF94C70CDB X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -0.84 X-TUID: tKa7lLn9UNXX Message-ID: <20240611073020.7JFu-OnP2Qe5dGIk6K05gi56nKE5N_-9qzspKsBrH7s@z> * 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 and adjust arguments to make openblas found by cmake. (phases) 'install-python-scripts: Remove references to deleted scripts and add new ones upsteeam. Change-Id: I7c4bc219a22aa9a949e811b340c7cf745b176d14 --- gnu/packages/machine-learning.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a385ddc18c..f433f8cd65 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,12 +537,16 @@ (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 + #~(list "-DBUILD_SHARED_LIBS=ON" + "-DLLAMA_BLAS=ON" "-DLLAMA_BLAS_VENDOR=OpenBLAS" + (string-append "-DBLAS_INCLUDE_DIRS=" #$(this-package-input "openblas") "/include") + (string-append "-DBLAS_LIBRARIES=" #$(this-package-input "openblas") "/lib/libopenblas.so") "-DLLAMA_NATIVE=OFF" ;no '-march=native' "-DLLAMA_FMA=OFF" ;and no '-mfma', etc. @@ -584,14 +588,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: bc8a41f4a8d9f1f0525d7bc97c67ed3c8aea3111 -- 2.45.1