From debbugs-submit-bounces@debbugs.gnu.org Mon May 27 01:19:39 2024 Received: (at submit) by debbugs.gnu.org; 27 May 2024 05:19:39 +0000 Received: from localhost ([127.0.0.1]:42884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBSlm-0005TK-Os for submit@debbugs.gnu.org; Mon, 27 May 2024 01:19:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:53598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBSlb-0005St-1b for submit@debbugs.gnu.org; Mon, 27 May 2024 01:19:37 -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 1sBSjB-000748-74 for guix-patches@gnu.org; Mon, 27 May 2024 01:17:01 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sBSj7-0000dc-Rv for guix-patches@gnu.org; Mon, 27 May 2024 01:16:56 -0400 Received: by mail-pg1-x52d.google.com with SMTP id 41be03b00d2f7-68195b58daeso2119797a12.2 for ; Sun, 26 May 2024 22:16:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716787012; x=1717391812; 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=jDmHd3wNGuAWDhnB+T4p8w7gQdzUD8n4kT+0N3t+JAQ=; b=JysxLu89FRwZWEA0lSsXcKkPsH9Sl+lt5ru3HatRuWhZZnZym1I9TdA4nWv3TlXdqn dPE2MKp8xwuS9xetye+8sTnzpLYrBJRn9tmVHvbD1s0MWeleeC+JPGROe8KnS7lm6txz 9CCkofRsaFuzfWIQNnE9DdIxRQKN1SqCgcMEybLWKa7YRev6sgpS6c23W0vgYXTaSOjc 4wDk6kzSb0zpqQZYH1lITja7cEebD9rLXX9IGp8JpK9ECHGH4WwchTqntkue7dRLx3Kg MELyfKElL9wioQ+v4grM5LX96i9c8dofi/afoomcECt8EovG31Qg4PG75nMlOKmfsKMd 0S9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716787012; x=1717391812; 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=jDmHd3wNGuAWDhnB+T4p8w7gQdzUD8n4kT+0N3t+JAQ=; b=hF91q+O2/k3VnoK/xRcsWx1bN0OhEWhxvOuw+EN1O5c4Yyz0SnI63w8Q08X0ZLp3Lm 74q+g3LzOzjSOAGvJqF+nRqHMMU9yTDKMP6b2iy5kzxpa91V4L+2Nzy7P08pcA0rMcyx jNHW9kHXTy53xhUtDZAWydc3zDLuAwyMmLqA3vbk+NetB3PudTeTvDJ6QTPAfqIXzWxe LDhrGXvdycav5bf+Up6JMxiBQhVjc2vRTIrDmPnIL4Q73NR/kOnEDaMdm7QEjOGyGC8K kIE/MGfiX03EiK3yI2aJ/1/NfyPP0xCXcg8Nt2j0iFGdAjawZiyCn2yqyF7cEBQVTszC 1tbw== X-Gm-Message-State: AOJu0Yxcmd5r7tsBSRWv8H3dnBud9GP1gHAVIu2k8IjkIlogT7BnT7Lz ejVFdwBYPCQ1ycnV0JXFbmerGqgr76yxe0zOVtR+CAmm4+hCXpmE+MteEA== X-Google-Smtp-Source: AGHT+IEl/oj8Z7j+FLFwWh/sZl6+pVI+d0Jtkeqx/e3jDFlsk+34UjPn8q5Pr9vGhca8hogStelE1g== X-Received: by 2002:a05:6a20:de16:b0:1af:597f:4970 with SMTP id adf61e73a8af0-1b212d2d0a4mr8507370637.24.1716787011938; Sun, 26 May 2024 22:16:51 -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-6f8fc36c547sm4263519b3a.90.2024.05.26.22.16.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 May 2024 22:16:51 -0700 (PDT) From: Andy Tai To: guix-patches@gnu.org Subject: [PATCH] gnu: llama-cpp: Update configure flags for shared library build. Date: Sun, 26 May 2024 22:16:48 -0700 Message-Id: <6c6fc91b2febb791d50aac5e9a16a220090eb31d.1716786995.git.atai@atai.org> 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::52d; envelope-from=lichengtai@gmail.com; helo=mail-pg1-x52d.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) * gnu/packages/machine-learning.scm (lama-cpp): [arguments](configure-flags): add cmake configure flag to force position independent code generation from C compiler for shared library build. Change-Id: I7c4bc219a22aa9a949e811b340c7cf745b176d14 --- gnu/packages/machine-learning.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a385ddc18c..398b42f203 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -541,7 +541,8 @@ (define-public llama-cpp (build-system cmake-build-system) (arguments (list - #:configure-flags #~'("-DLLAMA_BLAS=ON" + #:configure-flags #~'("-DCMAKE_POSITION_INDEPENDENT_CODE=TRUE" + "-DLLAMA_BLAS=ON" "-DLLAMA_BLAS_VENDOR=OpenBLAS" "-DLLAMA_NATIVE=OFF" ;no '-march=native' base-commit: 0f3a25a25e212bfa8ab9db37d267fb260a087e5d -- 2.34.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 27 21:59:00 2024 Received: (at 71219) by debbugs.gnu.org; 28 May 2024 01:59:00 +0000 Received: from localhost ([127.0.0.1]:45478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBm79-0002se-TV for submit@debbugs.gnu.org; Mon, 27 May 2024 21:59:00 -0400 Received: from mail-pf1-f178.google.com ([209.85.210.178]:55467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBm77-0002sQ-Ce for 71219@debbugs.gnu.org; Mon, 27 May 2024 21:58:57 -0400 Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-70109d34a16so224861b3a.2 for <71219@debbugs.gnu.org>; Mon, 27 May 2024 18:58:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716861462; x=1717466262; 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=gEJShkrTkiXsAOVRzdrEnPvXjAiO6ZokQc6R4FKroEQ=; b=fOOQeFT94mn+kWs+TiQxdNEB3kTzSTO+/w0M6D89CM9EceLhhzrWkU7c98cxRMBmPj +H6/Q6cbOGkmOWz5A6rbnDIBtvDW2k/JtkBe3NXtZA/5gpKewguhRFUumaXzDwXgQShP Ke0kXeeQ6n7gvmwa4+fubCbQseetySYPc/MwpzDhmT1eBRmaQBnQI+8NcO4lnnoaR5mI 5vdUShaY61RCdF0KzljBeNZXl3KrY8WmBnqjWiTyY22yj7D6atoYVMZPsfiTDvAH8JSe lIJVVOPHYTfsKosSVgcQfhxEh/x4T1ZHWhiok3As41Imtjpi7trtHZtKiOmteZo1B6ek UvFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716861462; x=1717466262; 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=gEJShkrTkiXsAOVRzdrEnPvXjAiO6ZokQc6R4FKroEQ=; b=n5UQ22VqyJJA0s9cx2+dlf+N/Hmi/RlWpE7JJDOeScudUnwDx34jHrjx9YGjjdpZiw JYMWrKYLYK42YbuxkOjJ+cgqntv3x3wpH28qsiGANP6gcIbXCDjPB16Ec0AVaPuRu6/t 2tp/y2wj2R/IUZc2BBrkMvIu/fnoiUAXY4hVl+K15zYmz3Yzrhabd4YTX04A9T0n6Z42 DCG0X1Rd9lq71UIZAenY8I7Jwr9QEru3IU/uQGIBqakUd99VfBPhTdT1PQrZzffKc9HQ fHFUv3fquPmZRGNOn0XaRZwP0Rzkt7uTWAiulFsbMPKkqtSwG54qNhyJhPE+yaPK1bgQ 2biw== X-Gm-Message-State: AOJu0YxmORkpa4aY97584s898LqFvM+RsT9eLvkgTgMZL+mJiIZBou0b WjS+tfKfMS6TJzbt/W/rTBZLNIVO3fALMTt+FCVzoguPSyjW846bkYAsOg== X-Google-Smtp-Source: AGHT+IE2o0itheS6XQq21R74zXAa0Ae9z0EOAFmLXG03nfkHR207UDUZ4PscpiRE55dOFAxlKMtXyw== X-Received: by 2002:a05:6a21:2705:b0:1b0:119c:7583 with SMTP id adf61e73a8af0-1b212e3a743mr9825776637.56.1716861461760; Mon, 27 May 2024 18:57:41 -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-68226549417sm6590155a12.71.2024.05.27.18.57.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 May 2024 18:57:40 -0700 (PDT) From: Andy Tai To: 71219@debbugs.gnu.org Subject: [PATCH v2] gnu: llama-cpp: Update configure flags for shared library build. Date: Mon, 27 May 2024 18:57:38 -0700 Message-Id: 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: 71219 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/machine-learning.scm (lama-cpp): [arguments](configure-flags): add cmake configure flag for shared library build. Change-Id: I7c4bc219a22aa9a949e811b340c7cf745b176d14 --- gnu/packages/machine-learning.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a385ddc18c..8a332a8b6f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -541,7 +541,8 @@ (define-public llama-cpp (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' @@ -591,7 +592,9 @@ (define-public llama-cpp (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: 0f3a25a25e212bfa8ab9db37d267fb260a087e5d -- 2.34.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 03 12:25:15 2024 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 To: 71219@debbugs.gnu.org Subject: [PATCH v3] gnu: llama-cpp: Update commit and update configure flags for shared library build. 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-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 71219 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 06 14:02:42 2024 Received: (at 71219) by debbugs.gnu.org; 6 Jun 2024 18:02:42 +0000 Received: from localhost ([127.0.0.1]:59646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sFHRh-0007oH-Ng for submit@debbugs.gnu.org; Thu, 06 Jun 2024 14:02:41 -0400 Received: from mail-yb1-f179.google.com ([209.85.219.179]:53636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sFHRf-0007nr-Pq for 71219@debbugs.gnu.org; Thu, 06 Jun 2024 14:02:40 -0400 Received: by mail-yb1-f179.google.com with SMTP id 3f1490d57ef6-dfa72c9d426so1516739276.3 for <71219@debbugs.gnu.org>; Thu, 06 Jun 2024 11:02:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail-com.20230601.gappssmtp.com; s=20230601; t=1717696879; x=1718301679; darn=debbugs.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=fhetR99BWoiz0E8xM7P/rWsdXV20N0/vZJCc/czWY7g=; b=SQgVH0d1wVi7gCbx5LH5C+VKNNb0tc8KsLcbki728RBBkjMwNObWEf5str6URXBlDi +0YbO2RBOtSDELiZ9tEmjAq36LxqodmizO21uj5eK6sXHdHBZ+WPkNwjoVyLwGVStno5 zDpbbbF3pIW1pVsUz1rb1fu+yBWrcJxlh5YERakaGZAlOgI40lekNyrEeO1L1LJvkveF b/pIef82gMkfDvpjD9hmraB2lsv6OouBEJP1ERf2N08Bi1JfOjOL6UrpVHELpWbF+78W EUlxeCZZcqZhLVCPS/hiekM7agCneHWYfQPkuOuWEqhsrEDTG7TTsrgiUu6YmWMVqxpO SFTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717696879; x=1718301679; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=fhetR99BWoiz0E8xM7P/rWsdXV20N0/vZJCc/czWY7g=; b=Iqa4WBoAKliKl1rH3QLkyHlKqF4JybAg7VpsUv5WwQfWgolxNtIRUC3Zwwic/YWkEG CfQsB7RQBiAu26SaOBSlcoH0PPQCKBIEvQPFEP2yaLQsa4PUVTf8i8uLgiTJOL2PqAJh 8ZsVZ3uXMiYJl0AY5Hkk21cdAYBF9NHLDCPKkhtFHEzM0JUEMUU8KtGS4VyJe9pyoI9x OIN9dVwvC8EReDVjBQ0ur+rAgx17TQAXai295JD/AfudSumma/eAqVbKT2GXZFZDZxYt uPDbmmW1evzSOB/jxy9Td/y6Y2OpwVzzgf7zUB5IvNE05kqfYXYss2/Vu3UlJqNF9ksm Hwvg== X-Gm-Message-State: AOJu0YyCEp31xNbvnjaLJ6wmmfivuJd+X/+7YRlPBWq8VvqEnel2k0nk tNYQa8rR9Y4tmGlYOAh29IwKk+t/TOZgWoJusN9B46P0lxFUKuGSRqnlJb8RgxfO4tf71SpYAf4 Zi/SJIS/z6NkX5EMvSe4pNGJ3KnDxg70C X-Google-Smtp-Source: AGHT+IEeezAzG+8hmqO0az5xpygRZNCHhB02BgtjL2xVe/FvTc5K0eE55G4hJ8j1A5EChmE0PW6ypAkbkLVPKVGt7q8= X-Received: by 2002:a67:ee16:0:b0:48b:9255:4a89 with SMTP id ada2fe7eead31-48c2755213cmr30911137.10.1717696396084; Thu, 06 Jun 2024 10:53:16 -0700 (PDT) MIME-Version: 1.0 From: Andy Tai Date: Thu, 6 Jun 2024 10:52:38 -0700 Message-ID: Subject: To: 71219@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/71219 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_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.219.179 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.219.179 listed in wl.mailspike.net] 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 TVD_SPACE_RATIO No description available. X-Debbugs-Envelope-To: 71219 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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/71219 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.219.179 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.219.179 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 0.0 TVD_SPACE_RATIO No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager patch passes Guix QA https://qa.guix.gnu.org/issue/71219 From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 06 14:20:29 2024 Received: (at 71219) by debbugs.gnu.org; 6 Jun 2024 18:20:29 +0000 Received: from localhost ([127.0.0.1]:60852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sFHis-0000Bz-0w for submit@debbugs.gnu.org; Thu, 06 Jun 2024 14:20:29 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sFHin-0000Bd-8K for 71219@debbugs.gnu.org; Thu, 06 Jun 2024 14:20:24 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 9B38327BBE2; Thu, 6 Jun 2024 19:12:28 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 3883e3a7; Thu, 6 Jun 2024 18:12:28 +0000 (UTC) From: Christopher Baines To: Andy Tai Subject: Re: [bug#71219] In-Reply-To: (Andy Tai's message of "Thu, 6 Jun 2024 10:52:38 -0700") References: <6c6fc91b2febb791d50aac5e9a16a220090eb31d.1716786995.git.atai@atai.org> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Thu, 06 Jun 2024 19:12:27 +0100 Message-ID: <87plsuc54k.fsf@cbaines.net> 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: 71219 Cc: 71219@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Andy Tai writes: > patch passes Guix QA > https://qa.guix.gnu.org/issue/71219 It does, but the build is still failing. The status is "Succeeding" overall because the package was failing to build before, so the situation isn't worse. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZh/AxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcAyQ//SlFUlodB6hJg6fluaRfi1aqXZcq+hE28 tPc3eswcmzTNW5N/lGOHDzxRcd5XBQxTHhOAlyCJzvnKcsuVNI7oGELU3i6jiq2W KJzA1+nb/sSxffZxw6Pza03r5W+Ye2FJLwiyCKNx32r2RtWEbmtEdPlsHBppC8x6 jZt3jTj7txoKqz+COMbG3s0HE36nvxZzzk9jMpDGuUiA0x9Itr3IxKd2Q4mWWzKq aAcfz7tkCrhSmN0soJelFs4Iu/6DPh2RGf00FmaiCLwGoUa225RIHU7QEK8ayOiI nfEftWfM7p20NVJq1Mn2v8z+T4Q89fJhuKXmC5yF15tslxrz19iu2VqOWqmtq6eV G/jDM4b0e/hSbXkmiJfhrKTVkx6IEW2k0WAebjo634+tapnRuESGC8HCLxCsv8CD 0jfH5+LJReZSdav2bpMY3T02PzcGDD6E0W4CCt6W9ronuuE7G0VpkqdDAmInpJA1 KdAEf5FVSwtBWhJGcXIsmu9BY5GehFH6A70tAsTe4wTbJeqePRdYhMa4xd2H7mr9 skRdVNE3MBzDgrDAh3JMEBI8xyZCoxbrpMxm03/CP8wBd3N4RM6m6ebb5d0Uwf6m emH+LxZzIMb0Rko19offRMgTyzOkGaijd2fc0IUSCtTxbK8I7ex7B4WUmaOCmSps aTixpnnu35I= =FNPb -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 11 11:45:46 2024 Received: (at 71219) by debbugs.gnu.org; 11 Jun 2024 15:45:46 +0000 Received: from localhost ([127.0.0.1]:35800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH3gv-0000WW-SS for submit@debbugs.gnu.org; Tue, 11 Jun 2024 11:45:46 -0400 Received: from mail-oo1-f43.google.com ([209.85.161.43]:45163) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH3gs-0000WE-FG for 71219@debbugs.gnu.org; Tue, 11 Jun 2024 11:45:43 -0400 Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-5baeab9fd60so1190914eaf.2 for <71219@debbugs.gnu.org>; Tue, 11 Jun 2024 08:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718120678; x=1718725478; 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=fzrA3UqqLRaWi1VpdC4MzzyhuBJq0hWv1kZ+oEznBlV+hfBUYpeKKF3I5sQKUTiDnL Z3HG09oFpyjG6sY5u/mjNiI4vwflWgLS4qYrMtEXmHHl/5T9QFgceFz19pEXo1/Uf+Bh bDJzBukJ0vI5L1ysyrGn5AJFGoUd1czRYLZKpGBq8pJp2r/IUXclV6MpHjAK/lYWTfFv VvVQvAtfA7sdb6WKOQEsZceFc2yUJrP9232fVIvdG+nQ/AjZBC57bZfu3J0cc1X/kgXW tYosayn0n9pYEs8nmnVsXK+oX+AmaHJFgq0J9b05pMwsKXjBv61ZTHWxuWZeX+WKeg6N WF4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718120678; x=1718725478; 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=qPzlbQdBzY7hUxYd5avn1GgAYsevjr2BNp/XuKHHn8I47zjJtMdR1Efet1zLfH7obz E/GTKwOt2ZzzgqA3TGuF7h5OYgTHqPeMt6DCYnFgpJh3uCOfpN43w614veKS8ofu0CHk 8GvtmobIEg8RsVKadZSlSw+xznWRIpCb6xwCKxjJSZ7TC62NTN2sCyH7HnSVqYQ290Da XIfyJkhYgGbV5fhHzyvH0WJIRCX8JmKcPiWQtkULC2PeguWbi5j58cmTzMPaYunlIszi krKV3W4VX8h911Gi20oN4PswLf4fHW+tlnZ1D5PamHS24eEisdAf7AJaSZBDlQg0qgma TP8Q== X-Gm-Message-State: AOJu0YzDMpYH0aB604nFoxxN5f5ZaqOQCZP9p0TLkRfMe68wGgzQukjU yrbX6HzgWfN46jVozGjBZqylO9DiqG6eRPFelTp2aJ5+5VaJcfS61wOAWg== X-Google-Smtp-Source: AGHT+IERYJkdJVfpSY/EZ9cM2/CBQ5ozw4DrYJMfq3jyoHkeSWX0CgHjOL1YOyJFpoyR5HFUQOKPEA== X-Received: by 2002:a05:6a20:a127:b0:1b8:27dc:10e3 with SMTP id adf61e73a8af0-1b827dc12f8mr4622838637.52.1718106107550; Tue, 11 Jun 2024 04:41:47 -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-6e76d693b19sm4441356a12.92.2024.06.11.04.41.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 04:41:47 -0700 (PDT) From: Andy Tai To: 71219@debbugs.gnu.org Subject: [PATCH v4] gnu: llama-cpp: Update commit and update configure flags for shared library build. Date: Tue, 11 Jun 2024 04:41:44 -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-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 71219 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) * 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 11 12:54:09 2024 Received: (at 71219) by debbugs.gnu.org; 11 Jun 2024 16:54:09 +0000 Received: from localhost ([127.0.0.1]:36155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH4l7-0005RJ-HV for submit@debbugs.gnu.org; Tue, 11 Jun 2024 12:54:09 -0400 Received: from mail-qt1-f171.google.com ([209.85.160.171]:50685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH4l5-0005Ql-EF for 71219@debbugs.gnu.org; Tue, 11 Jun 2024 12:54:07 -0400 Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-440609dd118so14575681cf.1 for <71219@debbugs.gnu.org>; Tue, 11 Jun 2024 09:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718124783; x=1718729583; 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=nidB8Ocux6Bd0xK/iUIZ8g5BXLUYsun8K4vVa9tutHw=; b=G59RYubMAZ+O3aUKctKZUQFjcVwnoI/LRGe2Mh4xOv5U9+AR6slE2l7/yzpAgtsj7X 1uG9Oet/nGk/A2OqdRMDYlvpljwClukBjM0IL3VmRGAK4PQ17n67CKWnYAfTDNCcC9uZ r11vmjEISK7j4dV2RNHEHS6IolObIepSL4VeQkrYRmgMgzV8+8m/fbApyEB1MeO12xmt LIH06MZxn1xEejIRB5kM55JubDegYlqCIKiwngeUu2vNkzmxijhHSidz1GNYHDUY7dV2 +ndYe7ydGApJYQV2SgbVmpDT8qRftu//v5OaEcS7h/hsFIOYs7qfcyues5MpweAELY5p /94g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718124783; x=1718729583; 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=nidB8Ocux6Bd0xK/iUIZ8g5BXLUYsun8K4vVa9tutHw=; b=sl3v+hKVvSqYjncrIpeC7h6OmV4kDXcwRm1goF/jJz6xLgy7+biTMQ1bxKPJeQXgNg z1DWCbnWKqqBD3b+jmLEpmCmpFI1b8UW4tmmVgzETM3eXeGA3IIIR/AXlm3mo+SkbBtq BA+qZDmVgWu1pIA15+aQbEdZQ+0cic9JyShPYC5OF7a+MwZFe0xG93L9vOtSzaGfmqxb eMGF40YZ4GxdqV6NheZpVM/QwrLTdY8UhuKj9FsZ6yQ+OTSnafLwfjyQsTwkOoc749mn LUnH57axgfq4UbwNkoKQgoooRRDpWwuPX7wRPtZHK+QBWyzXH+Ygwbu0MBmm+zgpPEaY JIHw== X-Gm-Message-State: AOJu0YzUrijwiYxt+Mtm/3vPKSXV1IA0W1fBtceAZXzkOkceyXzI91hD rszg6gKjCi0xBK2Q6BAPYdo6XhAmGRECErj5Z8pRql1R6lF1Eo3snVsh/Q== X-Google-Smtp-Source: AGHT+IG9paT9YCm7mIoSg5for+hZCHmKj9pmOXqmvpiaR+6iVw+ZI6naqasjh/1MT+uvqpgk4SHTEw== X-Received: by 2002:a05:6a21:195:b0:1b8:831f:c684 with SMTP id adf61e73a8af0-1b8831fc91fmr1816553637.53.1718107338152; Tue, 11 Jun 2024 05:02:18 -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-7041b841247sm6532027b3a.140.2024.06.11.05.02.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 05:02:17 -0700 (PDT) From: Andy Tai To: 71219@debbugs.gnu.org Subject: [PATCH v5] gnu: llama-cpp: Update commit and configure flags for shared library build. Date: Tue, 11 Jun 2024 05:02:13 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 71219 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) * gnu/packages/machine-learning.scm (lama-cpp): Update to commit a5735e with pkg-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 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 10 00:02:12 2024 Received: (at 71219) by debbugs.gnu.org; 10 Jul 2024 04:02:12 +0000 Received: from localhost ([127.0.0.1]:54634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sROWx-0002Hg-OH for submit@debbugs.gnu.org; Wed, 10 Jul 2024 00:02:11 -0400 Received: from mail-vs1-f51.google.com ([209.85.217.51]:49216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sROWv-0002HJ-5h for 71219@debbugs.gnu.org; Wed, 10 Jul 2024 00:02:09 -0400 Received: by mail-vs1-f51.google.com with SMTP id ada2fe7eead31-48fdec0b7d1so1746972137.2 for <71219@debbugs.gnu.org>; Tue, 09 Jul 2024 21:02:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail-com.20230601.gappssmtp.com; s=20230601; t=1720584057; x=1721188857; darn=debbugs.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=87hQP2wpD121VFFcf8e22CmgxdKz8n7Iz40EDsC571c=; b=ZQHeEReVhQGD4zWITtVQ5YUjibeE0i75rXVRcWgvePx/Rp2un5U2ubFvIQWbReGRbg nQWRVODcyCeO+S1RYFIqs3xAaAG+6EuCk1LVEmJuhkqfqLh5qwLTWhzL6aCSFa9c1zI0 D396+j3+Es8rim+BZkvuZv6btwvHKL2OzoMTyaVA7PDsUrurHf+PnMig6vdZ4Y8AkHl5 Um0rSgqEvJ8rypcIDElQFir80r8G4ieUqzWxdgTwPAmn57LpzC8xMnWchdEctxxN6786 ZHRv5w3FDz6AnVbUxAiJT7aRt9BsdjhE1QpMXM69T0Dj7A0xfzdKqVpQBLI+ZZaA3h20 308Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720584057; x=1721188857; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=87hQP2wpD121VFFcf8e22CmgxdKz8n7Iz40EDsC571c=; b=LK3w0giMGJNpD8GLAHGT68lA7+zF7eWmgiDhCKJ857J67rhokNWqBdpzsdVqiSu8eo hKdcbGr1iwqvSm7qXNhF/w4Z8Rt3zmEvyHtaD0S8HjHn68uY/KzCYsafBPdsxQR36TeW Fuv5ATRGh2Spt3uswt2VTlpasnVWUSxdQ5Yljo3zMw/OWgR6NASD+EUzoWs0AK11DPqB y0y7QxaTaAeCrqz3wiFLRodv1bdxrYUrQD5GZo9Tp8lTXjRnNBtD1klkeLUEdPCT24iW xnjeiph6HH+nyOpFXrb38QllCZKrwRn1+AvtS6JOYDIZ5VN+sSI7Y1AGRx72/p4M99Dr Xl0w== X-Gm-Message-State: AOJu0YxhJ5TUecpoWG82LASHVaeyuKllJZdjOnbTZmP/v9VEMSAAMN9I suk56eUoFBzP9EinziV9UfUUexFhF1kYy59rsTvm51ECn1qRK2w2ilx7TxChr1CRYWfuFMJ+WU7 7WTbO9vArzDvSTbr/LUOgGCiaai+h7S6f X-Google-Smtp-Source: AGHT+IE16RKY5EISKXDhV5kXwCXzq3tyiQZP4vAJyevrbEvM3k14XqCbyWTAaVgEy67RyEKnFsqTbTKcDfZ832GvGDg= X-Received: by 2002:a05:6102:1629:b0:48f:3e51:e829 with SMTP id ada2fe7eead31-4903210cd3bmr5040506137.10.1720584057191; Tue, 09 Jul 2024 21:00:57 -0700 (PDT) MIME-Version: 1.0 From: Andy Tai Date: Tue, 9 Jul 2024 21:00:20 -0700 Message-ID: Subject: To: 71219@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 passed QA https://qa.guix.gnu.org/issue/71219 Content analysis details: (2.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lichengtai[at]gmail.com) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.217.51 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.217.51 listed in wl.mailspike.net] 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 TVD_SPACE_RATIO No description available. X-Debbugs-Envelope-To: 71219 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 passed QA https://qa.guix.gnu.org/issue/71219 Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.217.51 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.217.51 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lichengtai[at]gmail.com) 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_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 2.0 BLANK_SUBJECT Subject is present but empty 0.0 TVD_SPACE_RATIO No description available. -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager patch passed QA https://qa.guix.gnu.org/issue/71219 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 10 09:47:58 2024 Received: (at 71219-done) by debbugs.gnu.org; 10 Jul 2024 13:47:58 +0000 Received: from localhost ([127.0.0.1]:55150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRXfq-0002ke-66 for submit@debbugs.gnu.org; Wed, 10 Jul 2024 09:47:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRXfm-0002kP-6I for 71219-done@debbugs.gnu.org; Wed, 10 Jul 2024 09:47:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sRXfX-0006WY-K4; Wed, 10 Jul 2024 09:47:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Gv8mW0g17zGcNd/EKELAphztjSI7npIs124VL1fEwWM=; b=o/YKLDu3aVcmvnxG/8zH wr46O5EO4LLMunlGsbfwP8QpirDXeVwYfG0f6FU+pfauSwP1nBZvZov9ouuYC3Nnf7pQ8maGc1t97 iNqF4NR0aCE2n8hGY+3/8MFvmLz9p4A9CZL8nASKiYI7AKTeRLyrU0GsrQN3eexDSU5gdIqmleD74 BnlzOzgyUM3ZjYX8rHqEqT5iPJUOd7/dKjQmJrNtnHwESEl8gy2ODkFPpPE68ukUcjMZxnnciP0DT uylNkWE8Cb+/DIAv9WBdGG9rPK3TmEbvukA02dQ/pM38ybaYIBzXM4ZaUDs1qBsPh5a0zaw+QIvkS ilaGxR4PExy0/Q==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Andy Tai Subject: Re: [bug#71219] [PATCH v5] gnu: llama-cpp: Update commit and configure flags for shared library build. In-Reply-To: (Andy Tai's message of "Tue, 11 Jun 2024 05:02:13 -0700") References: <6c6fc91b2febb791d50aac5e9a16a220090eb31d.1716786995.git.atai@atai.org> Date: Wed, 10 Jul 2024 15:47:36 +0200 Message-ID: <87msmp7407.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 71219-done Cc: 71219-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Andy, Andy Tai skribis: > * gnu/packages/machine-learning.scm (lama-cpp): Update to commit a5735e w= ith > pkg-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 Applied with the indentation changes shown below. Thanks! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a2be0bf9c8..1cb6586e81 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -567,18 +567,22 @@ (define-public llama-cpp (arguments (list #: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") + #~(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. - "-DLLAMA_AVX2=OFF" - "-DLLAMA_AVX512=OFF" - "-DLLAMA_AVX512_VBMI=OFF" - "-DLLAMA_AVX512_VNNI=OFF") + "-DLLAMA_NATIVE=OFF" ;no '-march=native' + "-DLLAMA_FMA=OFF" ;and no '-mfma', etc. + "-DLLAMA_AVX2=OFF" + "-DLLAMA_AVX512=OFF" + "-DLLAMA_AVX512_VBMI=OFF" + "-DLLAMA_AVX512_VNNI=OFF") #:modules '((ice-9 textual-ports) (guix build utils) --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 10 09:49:45 2024 Received: (at 71219) by debbugs.gnu.org; 10 Jul 2024 13:49:45 +0000 Received: from localhost ([127.0.0.1]:55161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRXhY-0002ru-Tk for submit@debbugs.gnu.org; Wed, 10 Jul 2024 09:49:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50798) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRXhW-0002rh-I9 for 71219@debbugs.gnu.org; Wed, 10 Jul 2024 09:49:43 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sRXhK-00073q-Dj; Wed, 10 Jul 2024 09:49:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=UNqtHOGPg3Z7hgLfNE54g3WNl3N+fE/1RFy8YYHvOJU=; b=TUTklRWxRQZooL32e2kg /8DQetpnUlfs6fxcV8piXrID6rHa/q2f0t5GjZW1ZXBH5z0kGzQec6CGVwWLpt5o+D6kjvEaFNtbz 3BAUTUQYr4Z0XXJZWZaXejGCUkgeRaaNN36nnczWVEZi1W7AV74SBcFpx/AuQWYiXMYzXMDDMvVrq qfWIRJAkm089gtto4X2mbCIXe96STbNNoJf+SWtkkj6F4tPC8n80mMiKlETyUtN28XZHlPBilq3sv yUAZm4TwgF8a1fLCqXC0uDsLrsAwdCBxisQ+np8P65PdILzPeUP7owQ7NWv/OgiIMUVO4MqKvojdI B7SC1Wi37lftmw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Andy Tai Subject: Re: [bug#71219] [PATCH v5] gnu: llama-cpp: Update commit and configure flags for shared library build. In-Reply-To: (Andy Tai's message of "Tue, 11 Jun 2024 05:02:13 -0700") References: <6c6fc91b2febb791d50aac5e9a16a220090eb31d.1716786995.git.atai@atai.org> Date: Wed, 10 Jul 2024 15:49:25 +0200 Message-ID: <87ikxd73x6.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 71219 Cc: 71219@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Andy Tai skribis: > (define-public llama-cpp > - (let ((commit "fed0108491a3a3cbec6c6480dc8667ffff9d7659") > + (let ((commit "a5735e4426b19a3ebd0c653ad8ac01420458ee95") > (revision "2")) Also bumped =E2=80=98revision=E2=80=99, as explained here: https://guix.gnu.org/manual/devel/en/html_node/Version-Numbers.html From unknown Fri Aug 15 04:03:33 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 08 Aug 2024 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator