subject:"\[gentoo\-commits\] repo\/proj\/guru\:master commit in\: sci\-misc\/llama\-cpp\/"

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2026-02-04 Thread Haelwenn Monnier

commit: d8c38483068a6c6fddff7436972afcc4b9948587
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Tue Feb  3 23:02:28 2026 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Tue Feb  3 23:02:28 2026 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d8c38483

sci-misc/llama-cpp: add 0_pre7924, drop 0_pre6318

bump for ngram hasher support

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest|  2 +-
 ...0_pre6318.ebuild => llama-cpp-0_pre7924.ebuild} | 81 --
 2 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index 5c86cf9090..1659db8229 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -1,8 +1,8 @@
 DIST 
ggml-org_models_tinyllamas_stories15M-q4_0-99dd1a73db5a37100bd4ae633f4cfce6560e1567.gguf
 19077344 BLAKE2B 
16e65adf9785e3091c51f1de59e5580f93fb47f79961513aeb3dbb8a0f5930f7120f0304f0f293a006170805e2b70ee1fcff0496b63356323d32c2caa55be8a8
 SHA512 
f9944886089958e0d97b1906cfd45020e0821c65429346e76fae29136c634ae5d039dffbae5933a95b0674f4acd87b656feb9f9e1b16dd434c5c9b5886f4f617
-DIST llama-cpp-0_pre6318.tar.gz 25626090 BLAKE2B 
b95826a5fd4ab27927d390cdc091648d1ffe281d5d9946fdfa4e6c8c59fb7461dd1e2b83751c86c575b4f00207bbd0cfbe467a0ae9dfdb3b192356bc77e0f808
 SHA512 
f3b5655123919a76fa27f1be05ffb2a7f681d7793d4d9e24106739a21846a2918ffdf9ef326ac99a55f6b4943059e4f76de754da894ff6fdd7e2d56a41edc56b
 DIST llama-cpp-0_pre6710.tar.gz 25894417 BLAKE2B 
147f30d76fd49bf18fa0ab9e3e75d0ad337dcd87a73f1dbce43f180488ea06b40b1a2a93b4686a88b5a442dd4dd6a8e45bf848ceb549bdc0ad0078427336c56e
 SHA512 
75c5918713256cb11f704b94d6e249a9f3ac2dde1107a6f4506134ba9c772e1c42d991915b571887207003f4b0679a183cd0787ffd742a08d2283fdfb86695eb
 DIST llama-cpp-0_pre6980.tar.gz 26431911 BLAKE2B 
b7d7c0dcdabde01acb816e73bc344564823dd1fc498fb98bf3c611b2d7a964af4d94f7cad533fe675a30685d510829160e392ab0f3bd16f4757a2f3446b8e3ca
 SHA512 
33e63336ad7c0fc653acd409d9314ce3fc3755ed1c03b4806c647b7c80d91b3c883aec664555c3855a24276d4975a54c96af91df8d2f818d4dd1dbcbabfb
 DIST llama-cpp-0_pre7276.tar.gz 27765814 BLAKE2B 
d0553ab1dd29c9d93a18c6217aab4553faf09e385a94b90732a537bbcf9bded54d5cda28553543e2c0cc71b6a157bfb80a48405f3f8281c51525757967b33e16
 SHA512 
3035fe53fea2ca3b0f35e479f4eaec75e38a2ea670600445776cd6fa696fc83ca19eb6dd7cd2ab1da69e78293c62318b5182e6e5b3423ae6c1f00854c5132a4c
 DIST llama-cpp-0_pre7611.tar.gz 28622786 BLAKE2B 
3c345645c9bcf07d8a513b9e883619b31b5254581f73429d638403758429fd2dfc5f78a22d538e8d88eb6c1be74bf805481af697480727ed750492ddec5c37fe
 SHA512 
c6c4780d7e68adfc385b57c6f7530423f8205bfa283572b0d414d55e143c03307e98676e41ad527c37d7837f831f8ff24be0f7bf59e366ea82f3802cdc946821
 DIST llama-cpp-0_pre7770.tar.gz 28797089 BLAKE2B 
0ad614f16c19ff1339571dd90be566ff4ccedfd991dfeb948f0cedc54f8447a3e72e35ac392bb60d5bc8a44d1757be3bea0123eac02b694f5f0a8f2c2b941b6a
 SHA512 
78896fdcf05330bb4b1fd86a985da56882d0166c6f276afda273dca183e4c7365decd5e9630c8d633e065162cbb06d6d8e4fdcf76be9768b238ee5053abaa3aa
 DIST llama-cpp-0_pre7836.tar.gz 28813563 BLAKE2B 
c843c0199b528114c23c58536552e2a7f581fda93364353e8aa38fda99ddb1942c421ad00be4daf86b49a2c311ef89bb6908b8900ca1ffb64df338cbfa11c354
 SHA512 
161176107de175d9b6fdc1ebfa9fe0cf6fd6968245730f7df7f17c6a179ef111685d0fed5a45031825dc4b07db270887a4307061f9918e375a1c65f261062d9d
+DIST llama-cpp-0_pre7924.tar.gz 28899921 BLAKE2B 
b89c8c170d1c2d52390dfef35a4e0857b4a3aa174077f2fdfa0fbbe1a254c5e6ae9b976bde9f52e42ed3932403aec728b9c415ca44ccd22c061e7e8a1e481526
 SHA512 
689c73215e795a53be1d0e6a639983aded1ed7bdeb3a261556de3db2cfdc765a7daf4aa142433f5e99a255dc123035a929b57868d3941ddda400a3c2b1db31cb

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre6318.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre7924.ebuild
similarity index 64%
rename from sci-misc/llama-cpp/llama-cpp-0_pre6318.ebuild
rename to sci-misc/llama-cpp/llama-cpp-0_pre7924.ebuild
index acbdfc0735..ff61000fd0 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre6318.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre7924.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2025 Gentoo Authors
+# Copyright 2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,24 +7,45 @@ ROCM_VERSION="6.3"
 
 inherit cmake cuda rocm linux-info
 
-if [[ "${PV}" != "" ]]; then
-   KEYWORDS="~amd64"
-   MY_PV="b${PV#0_pre}"
-   S="${WORKDIR}/llama.cpp-${MY_PV}"
-   
SRC_URI="https://github.com/ggml-org/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-else
+TINY_LLAMAS_COMMIT="99dd1a73db5a37100bd4ae633f4cfce6560e1567"
+
+DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
+HOMEPAGE="https://github.com/ggml-org/llama.cpp";
+
+if [[ ${PV} == ** ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ggml-org/llama.cpp.git";
+else
+   MY_PV="b${PV#0_pre}"
+   
SRC_URI="https://github.com/ggml-org/llama.cpp/archive

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2026-01-02 Thread Florian Schmaus

commit: 468f1780ee80239c9969cedb5533563d57e433d3
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Fri Jan  2 19:06:31 2026 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Fri Jan  2 19:06:31 2026 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=468f1780

sci-misc/llama-cpp: add 0_pre7611, drop 0_pre5633-r1

now prompt processing is very fast, at least with Vulkan on GLM 4.5 Air

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest|  2 +-
 ...re5633-r1.ebuild => llama-cpp-0_pre7611.ebuild} | 79 ++
 2 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index 0f81ecfa2b..2e4152f192 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -1,6 +1,6 @@
-DIST llama-cpp-0_pre5633.tar.gz 24986657 BLAKE2B 
6215dbfea54cb23a57419cc5a530be5622ec834c6d005337bcf92c50e152979375592088e215845e8f07c6b3f7eec15132cd15ebf9b0725adabe499951ae4735
 SHA512 
11a1917eb86c7065ea901cb62bdc7a25d8d7b962358570c2c7ae0c2d7abce6d19ebc6af74512593ebafbb4ee23546128cf8bfee5ba769c4f3cd2e254cdc1a1a4
 DIST llama-cpp-0_pre6140.tar.gz 25487270 BLAKE2B 
48b809c860437a8eb8b886e417299c2135dcd3c74aa2782b0380b0785b4e8c383c6061bd7ac43e9eddb1e31769ccceb48811a5433d45ac41adb00ece0e6af93d
 SHA512 
d8e904ddd6b935f84230ee163414922f572e71e2dd05d639a5b1a4a36c6841ac476f81be8e39f087712766e88564d8a499cdff4d717a5f910caf9f799a2b998d
 DIST llama-cpp-0_pre6318.tar.gz 25626090 BLAKE2B 
b95826a5fd4ab27927d390cdc091648d1ffe281d5d9946fdfa4e6c8c59fb7461dd1e2b83751c86c575b4f00207bbd0cfbe467a0ae9dfdb3b192356bc77e0f808
 SHA512 
f3b5655123919a76fa27f1be05ffb2a7f681d7793d4d9e24106739a21846a2918ffdf9ef326ac99a55f6b4943059e4f76de754da894ff6fdd7e2d56a41edc56b
 DIST llama-cpp-0_pre6710.tar.gz 25894417 BLAKE2B 
147f30d76fd49bf18fa0ab9e3e75d0ad337dcd87a73f1dbce43f180488ea06b40b1a2a93b4686a88b5a442dd4dd6a8e45bf848ceb549bdc0ad0078427336c56e
 SHA512 
75c5918713256cb11f704b94d6e249a9f3ac2dde1107a6f4506134ba9c772e1c42d991915b571887207003f4b0679a183cd0787ffd742a08d2283fdfb86695eb
 DIST llama-cpp-0_pre6980.tar.gz 26431911 BLAKE2B 
b7d7c0dcdabde01acb816e73bc344564823dd1fc498fb98bf3c611b2d7a964af4d94f7cad533fe675a30685d510829160e392ab0f3bd16f4757a2f3446b8e3ca
 SHA512 
33e63336ad7c0fc653acd409d9314ce3fc3755ed1c03b4806c647b7c80d91b3c883aec664555c3855a24276d4975a54c96af91df8d2f818d4dd1dbcbabfb
 DIST llama-cpp-0_pre7276.tar.gz 27765814 BLAKE2B 
d0553ab1dd29c9d93a18c6217aab4553faf09e385a94b90732a537bbcf9bded54d5cda28553543e2c0cc71b6a157bfb80a48405f3f8281c51525757967b33e16
 SHA512 
3035fe53fea2ca3b0f35e479f4eaec75e38a2ea670600445776cd6fa696fc83ca19eb6dd7cd2ab1da69e78293c62318b5182e6e5b3423ae6c1f00854c5132a4c
+DIST llama-cpp-0_pre7611.tar.gz 28622786 BLAKE2B 
3c345645c9bcf07d8a513b9e883619b31b5254581f73429d638403758429fd2dfc5f78a22d538e8d88eb6c1be74bf805481af697480727ed750492ddec5c37fe
 SHA512 
c6c4780d7e68adfc385b57c6f7530423f8205bfa283572b0d414d55e143c03307e98676e41ad527c37d7837f831f8ff24be0f7bf59e366ea82f3802cdc946821

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre5633-r1.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre7611.ebuild
similarity index 53%
rename from sci-misc/llama-cpp/llama-cpp-0_pre5633-r1.ebuild
rename to sci-misc/llama-cpp/llama-cpp-0_pre7611.ebuild
index e85f09260c..a81045e6d7 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre5633-r1.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre7611.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ROCM_VERSION="6.3"
 
-inherit cmake cuda rocm
+inherit cmake cuda rocm linux-info
 
 if [[ "${PV}" != "" ]]; then
KEYWORDS="~amd64"
@@ -23,42 +23,44 @@ HOMEPAGE="https://github.com/ggml-org/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis hip cuda"
-REQUIRED_USE="?? ( openblas blis )"
-
-AMDGPU_TARGETS_COMPAT=(
-   gfx900
-   gfx90c
-   gfx902
-   gfx1010
-   gfx1011
-   gfx1012
-   gfx1030
-   gfx1031
-   gfx1032
-   gfx1034
-   gfx1035
-   gfx1036
-   gfx1100
-   gfx1101
-   gfx1102
-   gfx1103
-   gfx1150
-   gfx1151
-)
+IUSE="curl openblas +openmp blis hip cuda opencl vulkan flexiblas"
+REQUIRED_USE="?? ( openblas blis flexiblas )"
 
 # curl is needed for pulling models from huggingface
 # numpy is used by convert_hf_to_gguf.py
-DEPEND="
+CDEPEND="
curl? ( net-misc/curl:= )
openblas? ( sci-libs/openblas:= )
+   openmp? ( llvm-runtimes/openmp:= )
blis? ( sci-libs/blis:= )
-   hip? (  >=dev-util/hip-6.3:= )
+   flexiblas? ( sci-libs/flexiblas:= )
+   hip? ( >=dev-util/hip-6.3:=
+   >=sci-libs/hipBLAS-6.3:=
+   )
cuda? ( dev-util/nvidia-cuda-toolkit:= )
 "
-RDEPEND="${DEPEND}
+DEPEND="${CDEPEND}
+   opencl? ( dev-util/opencl-headers )
+   vulkan? ( dev-util/vulkan-headers )
+"
+RDEPEND="${CDEPEND}
dev-python/numpy
+   opencl? ( dev-libs/opencl-icd-loader )
+

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-12-07 Thread Paul Zander

commit: 97cd3affb06bddc2de81f93a1cfb7ff2af69ad3c
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Fri Dec  5 14:52:52 2025 +
Commit: Paul Zander  gmail  com>
CommitDate: Fri Dec  5 14:52:52 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=97cd3aff

sci-misc/llama-cpp: bump for qwen3-next support, rm old

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest   |   2 +-
 sci-misc/llama-cpp/llama-cpp-0_pre5332.ebuild |  99 ---
 sci-misc/llama-cpp/llama-cpp-0_pre7276.ebuild | 132 ++
 3 files changed, 133 insertions(+), 100 deletions(-)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index 3972f0f9c0..0f81ecfa2b 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -1,6 +1,6 @@
-DIST llama-cpp-0_pre5332.tar.gz 21140774 BLAKE2B 
a390d4c1c6902d90d1e779291e1fcbe69ab57eb35a5df0be6fb3d9edc88b086a18bcf48983b3c0b2e88d0cfaaddbfdeee74fb126b8a758547836f5b83dd4bc33
 SHA512 
c19c3a6b47684f9466e2872aa67d8516add69028c4fdc7d1abb7a0ff7d87b92adfdaf773cda87461be8e891285c6de34a4edca70244936e8efaf10cc02126a8d
 DIST llama-cpp-0_pre5633.tar.gz 24986657 BLAKE2B 
6215dbfea54cb23a57419cc5a530be5622ec834c6d005337bcf92c50e152979375592088e215845e8f07c6b3f7eec15132cd15ebf9b0725adabe499951ae4735
 SHA512 
11a1917eb86c7065ea901cb62bdc7a25d8d7b962358570c2c7ae0c2d7abce6d19ebc6af74512593ebafbb4ee23546128cf8bfee5ba769c4f3cd2e254cdc1a1a4
 DIST llama-cpp-0_pre6140.tar.gz 25487270 BLAKE2B 
48b809c860437a8eb8b886e417299c2135dcd3c74aa2782b0380b0785b4e8c383c6061bd7ac43e9eddb1e31769ccceb48811a5433d45ac41adb00ece0e6af93d
 SHA512 
d8e904ddd6b935f84230ee163414922f572e71e2dd05d639a5b1a4a36c6841ac476f81be8e39f087712766e88564d8a499cdff4d717a5f910caf9f799a2b998d
 DIST llama-cpp-0_pre6318.tar.gz 25626090 BLAKE2B 
b95826a5fd4ab27927d390cdc091648d1ffe281d5d9946fdfa4e6c8c59fb7461dd1e2b83751c86c575b4f00207bbd0cfbe467a0ae9dfdb3b192356bc77e0f808
 SHA512 
f3b5655123919a76fa27f1be05ffb2a7f681d7793d4d9e24106739a21846a2918ffdf9ef326ac99a55f6b4943059e4f76de754da894ff6fdd7e2d56a41edc56b
 DIST llama-cpp-0_pre6710.tar.gz 25894417 BLAKE2B 
147f30d76fd49bf18fa0ab9e3e75d0ad337dcd87a73f1dbce43f180488ea06b40b1a2a93b4686a88b5a442dd4dd6a8e45bf848ceb549bdc0ad0078427336c56e
 SHA512 
75c5918713256cb11f704b94d6e249a9f3ac2dde1107a6f4506134ba9c772e1c42d991915b571887207003f4b0679a183cd0787ffd742a08d2283fdfb86695eb
 DIST llama-cpp-0_pre6980.tar.gz 26431911 BLAKE2B 
b7d7c0dcdabde01acb816e73bc344564823dd1fc498fb98bf3c611b2d7a964af4d94f7cad533fe675a30685d510829160e392ab0f3bd16f4757a2f3446b8e3ca
 SHA512 
33e63336ad7c0fc653acd409d9314ce3fc3755ed1c03b4806c647b7c80d91b3c883aec664555c3855a24276d4975a54c96af91df8d2f818d4dd1dbcbabfb
+DIST llama-cpp-0_pre7276.tar.gz 27765814 BLAKE2B 
d0553ab1dd29c9d93a18c6217aab4553faf09e385a94b90732a537bbcf9bded54d5cda28553543e2c0cc71b6a157bfb80a48405f3f8281c51525757967b33e16
 SHA512 
3035fe53fea2ca3b0f35e479f4eaec75e38a2ea670600445776cd6fa696fc83ca19eb6dd7cd2ab1da69e78293c62318b5182e6e5b3423ae6c1f00854c5132a4c

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre5332.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre5332.ebuild
deleted file mode 100644
index eb94fdfb0a..00
--- a/sci-misc/llama-cpp/llama-cpp-0_pre5332.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ROCM_VERSION="6.3"
-
-inherit cmake rocm
-
-if [[ "${PV}" != "" ]]; then
-   KEYWORDS="~amd64"
-   MY_PV="b${PV#0_pre}"
-   S="${WORKDIR}/llama.cpp-${MY_PV}"
-   
SRC_URI="https://github.com/ggerganov/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
-fi
-
-DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
-HOMEPAGE="https://github.com/ggerganov/llama.cpp";
-
-LICENSE="MIT"
-SLOT="0"
-CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis hip"
-REQUIRED_USE="?? ( openblas blis )"
-
-AMDGPU_TARGETS_COMPAT=(
-   gfx900
-   gfx90c
-   gfx902
-   gfx1010
-   gfx1011
-   gfx1012
-   gfx1030
-   gfx1031
-   gfx1032
-   gfx1034
-   gfx1035
-   gfx1036
-   gfx1100
-   gfx1101
-   gfx1102
-   gfx1103
-   gfx1150
-   gfx1151
-)
-
-# curl is needed for pulling models from huggingface
-# numpy is used by convert_hf_to_gguf.py
-DEPEND="
-   curl? ( net-misc/curl:= )
-   openblas? ( sci-libs/openblas:= )
-   blis? ( sci-libs/blis:= )
-   hip? (  >=dev-util/hip-6.3:= )
-"
-RDEPEND="${DEPEND}
-   dev-python/numpy
-"
-PATCHES=( "${FILESDIR}/blas-ld.diff" )
-
-src_configure() {
-   local mycmakeargs=(
-   -DLLAMA_BUILD_TESTS=OFF
-   -DLLAMA_BUILD_SERVER=ON
-   -DCMAKE_SKIP_BUILD_RPATH=ON
-   -DGGML_NATIVE=0 # don't set march
-   -DGGML_RPC=ON
-   -DLLAMA_

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-11-10 Thread David Roman

commit: b2cf10b4087169fd6ec3bf907138c938a282248e
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Mon Nov 10 02:24:29 2025 +
Commit: David Roman  gmail  com>
CommitDate: Mon Nov 10 02:24:29 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b2cf10b4

sci-misc/llama-cpp: + flexiblas backend

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/llama-cpp-0_pre6980.ebuild | 11 +--
 sci-misc/llama-cpp/llama-cpp-.ebuild  | 11 +--
 sci-misc/llama-cpp/metadata.xml   |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre6980.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre6980.ebuild
index acbdfc0735..a81045e6d7 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre6980.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre6980.ebuild
@@ -23,8 +23,8 @@ HOMEPAGE="https://github.com/ggml-org/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas +openmp blis hip cuda opencl vulkan"
-REQUIRED_USE="?? ( openblas blis )"
+IUSE="curl openblas +openmp blis hip cuda opencl vulkan flexiblas"
+REQUIRED_USE="?? ( openblas blis flexiblas )"
 
 # curl is needed for pulling models from huggingface
 # numpy is used by convert_hf_to_gguf.py
@@ -33,6 +33,7 @@ CDEPEND="
openblas? ( sci-libs/openblas:= )
openmp? ( llvm-runtimes/openmp:= )
blis? ( sci-libs/blis:= )
+   flexiblas? ( sci-libs/flexiblas:= )
hip? ( >=dev-util/hip-6.3:=
>=sci-libs/hipBLAS-6.3:=
)
@@ -99,6 +100,12 @@ src_configure() {
)
fi
 
+   if use flexiblas; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=FlexiBLAS
+   )
+   fi
+
if use cuda; then
local -x CUDAHOSTCXX="$(cuda_gccdir)"
# tries to recreate dev symlinks

diff --git a/sci-misc/llama-cpp/llama-cpp-.ebuild 
b/sci-misc/llama-cpp/llama-cpp-.ebuild
index acbdfc0735..a81045e6d7 100644
--- a/sci-misc/llama-cpp/llama-cpp-.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-.ebuild
@@ -23,8 +23,8 @@ HOMEPAGE="https://github.com/ggml-org/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas +openmp blis hip cuda opencl vulkan"
-REQUIRED_USE="?? ( openblas blis )"
+IUSE="curl openblas +openmp blis hip cuda opencl vulkan flexiblas"
+REQUIRED_USE="?? ( openblas blis flexiblas )"
 
 # curl is needed for pulling models from huggingface
 # numpy is used by convert_hf_to_gguf.py
@@ -33,6 +33,7 @@ CDEPEND="
openblas? ( sci-libs/openblas:= )
openmp? ( llvm-runtimes/openmp:= )
blis? ( sci-libs/blis:= )
+   flexiblas? ( sci-libs/flexiblas:= )
hip? ( >=dev-util/hip-6.3:=
>=sci-libs/hipBLAS-6.3:=
)
@@ -99,6 +100,12 @@ src_configure() {
)
fi
 
+   if use flexiblas; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=FlexiBLAS
+   )
+   fi
+
if use cuda; then
local -x CUDAHOSTCXX="$(cuda_gccdir)"
# tries to recreate dev symlinks

diff --git a/sci-misc/llama-cpp/metadata.xml b/sci-misc/llama-cpp/metadata.xml
index bd33ace1c0..63987291db 100644
--- a/sci-misc/llama-cpp/metadata.xml
+++ b/sci-misc/llama-cpp/metadata.xml
@@ -6,6 +6,7 @@


Build a BLIS backend
+   Build a FlexiBLAS backend
Build a HIP (ROCm) backend
Build an OpenBLAS backend
Build an OpenCL backend, so far only works 
on Adreno and Intel GPUs

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-11-07 Thread Haelwenn Monnier

commit: 4eab3d67999ffbee19a71a22ad7d01c1259125f4
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Sat Nov  8 03:10:20 2025 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Sat Nov  8 03:10:20 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4eab3d67

sci-misc/llama-cpp: add 0_pre6980

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest   |   1 +
 sci-misc/llama-cpp/llama-cpp-0_pre6980.ebuild | 125 ++
 2 files changed, 126 insertions(+)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index 1947f949f6..09aa9fac59 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -4,3 +4,4 @@ DIST llama-cpp-0_pre5633.tar.gz 24986657 BLAKE2B 
6215dbfea54cb23a57419cc5a530be5
 DIST llama-cpp-0_pre6140.tar.gz 25487270 BLAKE2B 
48b809c860437a8eb8b886e417299c2135dcd3c74aa2782b0380b0785b4e8c383c6061bd7ac43e9eddb1e31769ccceb48811a5433d45ac41adb00ece0e6af93d
 SHA512 
d8e904ddd6b935f84230ee163414922f572e71e2dd05d639a5b1a4a36c6841ac476f81be8e39f087712766e88564d8a499cdff4d717a5f910caf9f799a2b998d
 DIST llama-cpp-0_pre6318.tar.gz 25626090 BLAKE2B 
b95826a5fd4ab27927d390cdc091648d1ffe281d5d9946fdfa4e6c8c59fb7461dd1e2b83751c86c575b4f00207bbd0cfbe467a0ae9dfdb3b192356bc77e0f808
 SHA512 
f3b5655123919a76fa27f1be05ffb2a7f681d7793d4d9e24106739a21846a2918ffdf9ef326ac99a55f6b4943059e4f76de754da894ff6fdd7e2d56a41edc56b
 DIST llama-cpp-0_pre6710.tar.gz 25894417 BLAKE2B 
147f30d76fd49bf18fa0ab9e3e75d0ad337dcd87a73f1dbce43f180488ea06b40b1a2a93b4686a88b5a442dd4dd6a8e45bf848ceb549bdc0ad0078427336c56e
 SHA512 
75c5918713256cb11f704b94d6e249a9f3ac2dde1107a6f4506134ba9c772e1c42d991915b571887207003f4b0679a183cd0787ffd742a08d2283fdfb86695eb
+DIST llama-cpp-0_pre6980.tar.gz 26431911 BLAKE2B 
b7d7c0dcdabde01acb816e73bc344564823dd1fc498fb98bf3c611b2d7a964af4d94f7cad533fe675a30685d510829160e392ab0f3bd16f4757a2f3446b8e3ca
 SHA512 
33e63336ad7c0fc653acd409d9314ce3fc3755ed1c03b4806c647b7c80d91b3c883aec664555c3855a24276d4975a54c96af91df8d2f818d4dd1dbcbabfb

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre6980.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre6980.ebuild
new file mode 100644
index 00..acbdfc0735
--- /dev/null
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre6980.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION="6.3"
+
+inherit cmake cuda rocm linux-info
+
+if [[ "${PV}" != "" ]]; then
+   KEYWORDS="~amd64"
+   MY_PV="b${PV#0_pre}"
+   S="${WORKDIR}/llama.cpp-${MY_PV}"
+   
SRC_URI="https://github.com/ggml-org/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/ggml-org/llama.cpp.git";
+fi
+
+DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
+HOMEPAGE="https://github.com/ggml-org/llama.cpp";
+
+LICENSE="MIT"
+SLOT="0"
+CPU_FLAGS_X86=( avx avx2 f16c )
+IUSE="curl openblas +openmp blis hip cuda opencl vulkan"
+REQUIRED_USE="?? ( openblas blis )"
+
+# curl is needed for pulling models from huggingface
+# numpy is used by convert_hf_to_gguf.py
+CDEPEND="
+   curl? ( net-misc/curl:= )
+   openblas? ( sci-libs/openblas:= )
+   openmp? ( llvm-runtimes/openmp:= )
+   blis? ( sci-libs/blis:= )
+   hip? ( >=dev-util/hip-6.3:=
+   >=sci-libs/hipBLAS-6.3:=
+   )
+   cuda? ( dev-util/nvidia-cuda-toolkit:= )
+"
+DEPEND="${CDEPEND}
+   opencl? ( dev-util/opencl-headers )
+   vulkan? ( dev-util/vulkan-headers )
+"
+RDEPEND="${CDEPEND}
+   dev-python/numpy
+   opencl? ( dev-libs/opencl-icd-loader )
+   vulkan? ( media-libs/vulkan-loader )
+"
+BDEPEND="media-libs/shaderc"
+
+pkg_setup() {
+   if use hip; then
+   linux-info_pkg_setup
+   if linux-info_get_any_version && linux_config_exists; then
+   if ! linux_chkconfig_present HSA_AMD_SVM; then
+   ewarn "To use ROCm/HIP, you need to have 
HSA_AMD_SVM option enabled in your kernel."
+   fi
+   fi
+
+   fi
+}
+
+src_prepare() {
+   use cuda && cuda_src_prepare
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DLLAMA_BUILD_TESTS=OFF
+   -DLLAMA_BUILD_SERVER=ON
+   -DCMAKE_SKIP_BUILD_RPATH=ON
+   -DGGML_NATIVE=0 # don't set march
+   -DGGML_RPC=ON
+   -DLLAMA_CURL=$(usex curl ON OFF)
+   -DBUILD_NUMBER="1"
+   -DGENTOO_REMOVE_CMAKE_BLAS_HACK=ON
+   -DGGML_CUDA=$(usex cuda ON OFF)
+   -DGGML_OPENCL=$(usex opencl ON OFF)
+   -DGGML_OPENMP=$(usex openmp ON OFF)
+   -DGGML_VULKAN=$(usex vulkan ON OFF)
+
+   # avoid clashing with whisper.cpp
+   -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_l

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-11-07 Thread Haelwenn Monnier

commit: 8e54fa1530473f335c80c9707a9036029cb19984
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Sat Nov  8 03:10:41 2025 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Sat Nov  8 03:10:41 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8e54fa15

sci-misc/llama-cpp: drop 0_pre4576

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest   |  1 -
 sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild | 93 ---
 2 files changed, 94 deletions(-)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index 09aa9fac59..3972f0f9c0 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -1,4 +1,3 @@
-DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a709980e078dc7e769b33cbbb03a852a29b489f80c8a1e298fecea53997068f6b7897e4536ba5db289aa445a1a6f16f98adce3
 SHA512 
21150721524283454ab53e370fdaf4e766f89fbb8d4b43072b10657d8c8b686630616cddbae7954147a2ba0360ad20c4643761f3774481e13a7b180812935c4e
 DIST llama-cpp-0_pre5332.tar.gz 21140774 BLAKE2B 
a390d4c1c6902d90d1e779291e1fcbe69ab57eb35a5df0be6fb3d9edc88b086a18bcf48983b3c0b2e88d0cfaaddbfdeee74fb126b8a758547836f5b83dd4bc33
 SHA512 
c19c3a6b47684f9466e2872aa67d8516add69028c4fdc7d1abb7a0ff7d87b92adfdaf773cda87461be8e891285c6de34a4edca70244936e8efaf10cc02126a8d
 DIST llama-cpp-0_pre5633.tar.gz 24986657 BLAKE2B 
6215dbfea54cb23a57419cc5a530be5622ec834c6d005337bcf92c50e152979375592088e215845e8f07c6b3f7eec15132cd15ebf9b0725adabe499951ae4735
 SHA512 
11a1917eb86c7065ea901cb62bdc7a25d8d7b962358570c2c7ae0c2d7abce6d19ebc6af74512593ebafbb4ee23546128cf8bfee5ba769c4f3cd2e254cdc1a1a4
 DIST llama-cpp-0_pre6140.tar.gz 25487270 BLAKE2B 
48b809c860437a8eb8b886e417299c2135dcd3c74aa2782b0380b0785b4e8c383c6061bd7ac43e9eddb1e31769ccceb48811a5433d45ac41adb00ece0e6af93d
 SHA512 
d8e904ddd6b935f84230ee163414922f572e71e2dd05d639a5b1a4a36c6841ac476f81be8e39f087712766e88564d8a499cdff4d717a5f910caf9f799a2b998d

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
deleted file mode 100644
index b4db64b49d..00
--- a/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ROCM_VERSION="6.3"
-
-inherit cmake rocm
-
-if [[ "${PV}" != "" ]]; then
-   KEYWORDS="~amd64"
-   MY_PV="b${PV#0_pre}"
-   S="${WORKDIR}/llama.cpp-${MY_PV}"
-   
SRC_URI="https://github.com/ggerganov/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
-fi
-
-DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
-HOMEPAGE="https://github.com/ggerganov/llama.cpp";
-
-LICENSE="MIT"
-SLOT="0"
-CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis hip"
-REQUIRED_USE="?? ( openblas blis )"
-
-AMDGPU_TARGETS_COMPAT=(
-   gfx900
-   gfx90c
-   gfx902
-   gfx1010
-   gfx1011
-   gfx1012
-   gfx1030
-   gfx1031
-   gfx1032
-   gfx1034
-   gfx1035
-   gfx1036
-   gfx1100
-   gfx1101
-   gfx1102
-   gfx1103
-   gfx1150
-   gfx1151
-)
-
-# curl is needed for pulling models from huggingface
-# numpy is used by convert_hf_to_gguf.py
-DEPEND="
-   curl? ( net-misc/curl:= )
-   openblas? ( sci-libs/openblas:= )
-   blis? ( sci-libs/blis:= )
-   hip? (  >=dev-util/hip-6.3:= )
-"
-RDEPEND="${DEPEND}
-   dev-python/numpy
-"
-PATCHES=( "${FILESDIR}/blas-ld.diff" )
-
-src_configure() {
-   local mycmakeargs=(
-   -DLLAMA_BUILD_TESTS=OFF
-   -DLLAMA_BUILD_SERVER=ON
-   -DCMAKE_SKIP_BUILD_RPATH=ON
-   -DGGML_NATIVE=0 # don't set march
-   -DLLAMA_CURL=$(usex curl ON OFF)
-   -DBUILD_NUMBER="1"
-   )
-
-   if use openblas ; then
-   mycmakeargs+=(
-   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS
-   )
-   fi
-
-   if use blis ; then
-   mycmakeargs+=(
-   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=FLAME
-   )
-   fi
-
-   if use hip; then
-   rocm_use_hipcc
-   mycmakeargs+=(
-   -DGGML_HIP=ON -DAMDGPU_TARGETS=$(get_amdgpu_flags)
-   )
-   fi
-
-   cmake_src_configure
-}

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-11-07 Thread Haelwenn Monnier

commit: 0d5b89bb35c22be5c5861ddc97fba7de6b7663ac
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Sat Nov  8 02:40:54 2025 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Sat Nov  8 02:40:54 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0d5b89bb

sci-misc/llama-cpp: fixup bdep

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/llama-cpp-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-misc/llama-cpp/llama-cpp-.ebuild 
b/sci-misc/llama-cpp/llama-cpp-.ebuild
index 8b6d1fecff..acbdfc0735 100644
--- a/sci-misc/llama-cpp/llama-cpp-.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-.ebuild
@@ -47,6 +47,7 @@ RDEPEND="${CDEPEND}
opencl? ( dev-libs/opencl-icd-loader )
vulkan? ( media-libs/vulkan-loader )
 "
+BDEPEND="media-libs/shaderc"
 
 pkg_setup() {
if use hip; then

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-10-18 Thread David Roman

commit: acfe4100ae65b6aeff208b50529bd8b132ded8f3
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Wed Oct  8 02:10:18 2025 +
Commit: David Roman  gmail  com>
CommitDate: Wed Oct  8 02:10:18 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=acfe4100

sci-misc/llama-cpp: bump up to 6710, rm old

LFM2-MoE support and fixes

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest   |   2 +-
 sci-misc/llama-cpp/llama-cpp-0_pre5097.ebuild |  93 ---
 sci-misc/llama-cpp/llama-cpp-0_pre6710.ebuild | 125 ++
 3 files changed, 126 insertions(+), 94 deletions(-)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index dc9de598e4..1947f949f6 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -1,6 +1,6 @@
 DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a709980e078dc7e769b33cbbb03a852a29b489f80c8a1e298fecea53997068f6b7897e4536ba5db289aa445a1a6f16f98adce3
 SHA512 
21150721524283454ab53e370fdaf4e766f89fbb8d4b43072b10657d8c8b686630616cddbae7954147a2ba0360ad20c4643761f3774481e13a7b180812935c4e
-DIST llama-cpp-0_pre5097.tar.gz 21018571 BLAKE2B 
001241580964aa6874a3aa4dbfa0a8cda58a144578992f6a6df7c5c7887cda847503f47c7f3be7b19bb3758ab6ce8de60435e29129cac71672160b29b1cab340
 SHA512 
86543cd001014fa4fee01a37d46e1794c2ffac7c25c7ed328aa4afd3d615b7f42b617ca5d8a0a78b5a41e31cb81184fc6f55f58ffd9433acb3f36cb947a620a5
 DIST llama-cpp-0_pre5332.tar.gz 21140774 BLAKE2B 
a390d4c1c6902d90d1e779291e1fcbe69ab57eb35a5df0be6fb3d9edc88b086a18bcf48983b3c0b2e88d0cfaaddbfdeee74fb126b8a758547836f5b83dd4bc33
 SHA512 
c19c3a6b47684f9466e2872aa67d8516add69028c4fdc7d1abb7a0ff7d87b92adfdaf773cda87461be8e891285c6de34a4edca70244936e8efaf10cc02126a8d
 DIST llama-cpp-0_pre5633.tar.gz 24986657 BLAKE2B 
6215dbfea54cb23a57419cc5a530be5622ec834c6d005337bcf92c50e152979375592088e215845e8f07c6b3f7eec15132cd15ebf9b0725adabe499951ae4735
 SHA512 
11a1917eb86c7065ea901cb62bdc7a25d8d7b962358570c2c7ae0c2d7abce6d19ebc6af74512593ebafbb4ee23546128cf8bfee5ba769c4f3cd2e254cdc1a1a4
 DIST llama-cpp-0_pre6140.tar.gz 25487270 BLAKE2B 
48b809c860437a8eb8b886e417299c2135dcd3c74aa2782b0380b0785b4e8c383c6061bd7ac43e9eddb1e31769ccceb48811a5433d45ac41adb00ece0e6af93d
 SHA512 
d8e904ddd6b935f84230ee163414922f572e71e2dd05d639a5b1a4a36c6841ac476f81be8e39f087712766e88564d8a499cdff4d717a5f910caf9f799a2b998d
 DIST llama-cpp-0_pre6318.tar.gz 25626090 BLAKE2B 
b95826a5fd4ab27927d390cdc091648d1ffe281d5d9946fdfa4e6c8c59fb7461dd1e2b83751c86c575b4f00207bbd0cfbe467a0ae9dfdb3b192356bc77e0f808
 SHA512 
f3b5655123919a76fa27f1be05ffb2a7f681d7793d4d9e24106739a21846a2918ffdf9ef326ac99a55f6b4943059e4f76de754da894ff6fdd7e2d56a41edc56b
+DIST llama-cpp-0_pre6710.tar.gz 25894417 BLAKE2B 
147f30d76fd49bf18fa0ab9e3e75d0ad337dcd87a73f1dbce43f180488ea06b40b1a2a93b4686a88b5a442dd4dd6a8e45bf848ceb549bdc0ad0078427336c56e
 SHA512 
75c5918713256cb11f704b94d6e249a9f3ac2dde1107a6f4506134ba9c772e1c42d991915b571887207003f4b0679a183cd0787ffd742a08d2283fdfb86695eb

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre5097.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre5097.ebuild
deleted file mode 100644
index b4db64b49d..00
--- a/sci-misc/llama-cpp/llama-cpp-0_pre5097.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ROCM_VERSION="6.3"
-
-inherit cmake rocm
-
-if [[ "${PV}" != "" ]]; then
-   KEYWORDS="~amd64"
-   MY_PV="b${PV#0_pre}"
-   S="${WORKDIR}/llama.cpp-${MY_PV}"
-   
SRC_URI="https://github.com/ggerganov/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
-fi
-
-DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
-HOMEPAGE="https://github.com/ggerganov/llama.cpp";
-
-LICENSE="MIT"
-SLOT="0"
-CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis hip"
-REQUIRED_USE="?? ( openblas blis )"
-
-AMDGPU_TARGETS_COMPAT=(
-   gfx900
-   gfx90c
-   gfx902
-   gfx1010
-   gfx1011
-   gfx1012
-   gfx1030
-   gfx1031
-   gfx1032
-   gfx1034
-   gfx1035
-   gfx1036
-   gfx1100
-   gfx1101
-   gfx1102
-   gfx1103
-   gfx1150
-   gfx1151
-)
-
-# curl is needed for pulling models from huggingface
-# numpy is used by convert_hf_to_gguf.py
-DEPEND="
-   curl? ( net-misc/curl:= )
-   openblas? ( sci-libs/openblas:= )
-   blis? ( sci-libs/blis:= )
-   hip? (  >=dev-util/hip-6.3:= )
-"
-RDEPEND="${DEPEND}
-   dev-python/numpy
-"
-PATCHES=( "${FILESDIR}/blas-ld.diff" )
-
-src_configure() {
-   local mycmakeargs=(
-   -DLLAMA_BUILD_TESTS=OFF
-   -DLLAMA_BUILD_SERVER=ON
-   -DCMAKE_SKIP_BUILD_RPATH=ON
-   -DGGML_NATIVE=0 # don't set march
-   -DLLAMA_CURL=$(usex cur

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-09-12 Thread David Roman

commit: 8e62615b17434f76bac0392acc51942f41b0ebe9
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Fri Sep 12 00:40:18 2025 +
Commit: David Roman  gmail  com>
CommitDate: Fri Sep 12 00:40:18 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8e62615b

sci-misc/llama-cpp: depend on shaderc for glslc

Closes: https://bugs.gentoo.org/962755
Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/llama-cpp-0_pre6318.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre6318.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre6318.ebuild
index 8b6d1fecff..acbdfc0735 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre6318.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre6318.ebuild
@@ -47,6 +47,7 @@ RDEPEND="${CDEPEND}
opencl? ( dev-libs/opencl-icd-loader )
vulkan? ( media-libs/vulkan-loader )
 "
+BDEPEND="media-libs/shaderc"
 
 pkg_setup() {
if use hip; then

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-09-01 Thread David Roman

commit: 894d171ba3a079365d5e2a73de290cf14cd71595
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Fri Aug 29 16:25:30 2025 +
Commit: David Roman  gmail  com>
CommitDate: Fri Aug 29 16:25:30 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=894d171b

sci-misc/llama-cpp: add 0_pre6318, drop 0_pre6092

lots of bugfixes and new model architectures

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest | 2 +-
 .../{llama-cpp-0_pre6092.ebuild => llama-cpp-0_pre6318.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index 643be0d0c0..dc9de598e4 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -2,5 +2,5 @@ DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a7099
 DIST llama-cpp-0_pre5097.tar.gz 21018571 BLAKE2B 
001241580964aa6874a3aa4dbfa0a8cda58a144578992f6a6df7c5c7887cda847503f47c7f3be7b19bb3758ab6ce8de60435e29129cac71672160b29b1cab340
 SHA512 
86543cd001014fa4fee01a37d46e1794c2ffac7c25c7ed328aa4afd3d615b7f42b617ca5d8a0a78b5a41e31cb81184fc6f55f58ffd9433acb3f36cb947a620a5
 DIST llama-cpp-0_pre5332.tar.gz 21140774 BLAKE2B 
a390d4c1c6902d90d1e779291e1fcbe69ab57eb35a5df0be6fb3d9edc88b086a18bcf48983b3c0b2e88d0cfaaddbfdeee74fb126b8a758547836f5b83dd4bc33
 SHA512 
c19c3a6b47684f9466e2872aa67d8516add69028c4fdc7d1abb7a0ff7d87b92adfdaf773cda87461be8e891285c6de34a4edca70244936e8efaf10cc02126a8d
 DIST llama-cpp-0_pre5633.tar.gz 24986657 BLAKE2B 
6215dbfea54cb23a57419cc5a530be5622ec834c6d005337bcf92c50e152979375592088e215845e8f07c6b3f7eec15132cd15ebf9b0725adabe499951ae4735
 SHA512 
11a1917eb86c7065ea901cb62bdc7a25d8d7b962358570c2c7ae0c2d7abce6d19ebc6af74512593ebafbb4ee23546128cf8bfee5ba769c4f3cd2e254cdc1a1a4
-DIST llama-cpp-0_pre6092.tar.gz 25460137 BLAKE2B 
0860e6a6e469765d2a81202713e635eb9c3b269d6f6b57c09fe2c8d462b2c03e65858195ff89ce685fae14fa1c25bfe1fc4ce0fa40bfeabf85ce566867848be3
 SHA512 
3975d176316cc9f3fdfa2183581ca4c57b30f3fc9c15d7eb94144be2de323d5fd2cd82fc345965cc1b8334059657a7666331efdb4fa7adf74114282ecb2abbec
 DIST llama-cpp-0_pre6140.tar.gz 25487270 BLAKE2B 
48b809c860437a8eb8b886e417299c2135dcd3c74aa2782b0380b0785b4e8c383c6061bd7ac43e9eddb1e31769ccceb48811a5433d45ac41adb00ece0e6af93d
 SHA512 
d8e904ddd6b935f84230ee163414922f572e71e2dd05d639a5b1a4a36c6841ac476f81be8e39f087712766e88564d8a499cdff4d717a5f910caf9f799a2b998d
+DIST llama-cpp-0_pre6318.tar.gz 25626090 BLAKE2B 
b95826a5fd4ab27927d390cdc091648d1ffe281d5d9946fdfa4e6c8c59fb7461dd1e2b83751c86c575b4f00207bbd0cfbe467a0ae9dfdb3b192356bc77e0f808
 SHA512 
f3b5655123919a76fa27f1be05ffb2a7f681d7793d4d9e24106739a21846a2918ffdf9ef326ac99a55f6b4943059e4f76de754da894ff6fdd7e2d56a41edc56b

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre6092.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre6318.ebuild
similarity index 100%
rename from sci-misc/llama-cpp/llama-cpp-0_pre6092.ebuild
rename to sci-misc/llama-cpp/llama-cpp-0_pre6318.ebuild

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-08-13 Thread David Roman

commit: a16045671d92d0f8e5b9949eadd44af61e9653e1
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Tue Aug 12 21:38:33 2025 +
Commit: David Roman  gmail  com>
CommitDate: Tue Aug 12 21:38:33 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a1604567

sci-misc/llama-cpp: add 0_pre6140, drop 0_pre6002

for gpt-oss support

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest   | 2 +-
 .../{llama-cpp-0_pre6002.ebuild => llama-cpp-0_pre6140.ebuild}| 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index 13fbae4c70..643be0d0c0 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -2,5 +2,5 @@ DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a7099
 DIST llama-cpp-0_pre5097.tar.gz 21018571 BLAKE2B 
001241580964aa6874a3aa4dbfa0a8cda58a144578992f6a6df7c5c7887cda847503f47c7f3be7b19bb3758ab6ce8de60435e29129cac71672160b29b1cab340
 SHA512 
86543cd001014fa4fee01a37d46e1794c2ffac7c25c7ed328aa4afd3d615b7f42b617ca5d8a0a78b5a41e31cb81184fc6f55f58ffd9433acb3f36cb947a620a5
 DIST llama-cpp-0_pre5332.tar.gz 21140774 BLAKE2B 
a390d4c1c6902d90d1e779291e1fcbe69ab57eb35a5df0be6fb3d9edc88b086a18bcf48983b3c0b2e88d0cfaaddbfdeee74fb126b8a758547836f5b83dd4bc33
 SHA512 
c19c3a6b47684f9466e2872aa67d8516add69028c4fdc7d1abb7a0ff7d87b92adfdaf773cda87461be8e891285c6de34a4edca70244936e8efaf10cc02126a8d
 DIST llama-cpp-0_pre5633.tar.gz 24986657 BLAKE2B 
6215dbfea54cb23a57419cc5a530be5622ec834c6d005337bcf92c50e152979375592088e215845e8f07c6b3f7eec15132cd15ebf9b0725adabe499951ae4735
 SHA512 
11a1917eb86c7065ea901cb62bdc7a25d8d7b962358570c2c7ae0c2d7abce6d19ebc6af74512593ebafbb4ee23546128cf8bfee5ba769c4f3cd2e254cdc1a1a4
-DIST llama-cpp-0_pre6002.tar.gz 25253850 BLAKE2B 
0767feea94598bbe6ea4a27b20dfda9c3423a9a6c6e4fc66f464c58fda2b13becdd703789604f7a2b424e335ddbe7eef3ee9ee33415ce135ed6eda2456578cca
 SHA512 
5dc0bfc7386daac6d0ea677d9c56e0db2feac7fa83f2468a057fca5d5ba829bb332ee64ba6049c969cdd7c2eca7501fe401f1bd5f4e8728ce453b160511f
 DIST llama-cpp-0_pre6092.tar.gz 25460137 BLAKE2B 
0860e6a6e469765d2a81202713e635eb9c3b269d6f6b57c09fe2c8d462b2c03e65858195ff89ce685fae14fa1c25bfe1fc4ce0fa40bfeabf85ce566867848be3
 SHA512 
3975d176316cc9f3fdfa2183581ca4c57b30f3fc9c15d7eb94144be2de323d5fd2cd82fc345965cc1b8334059657a7666331efdb4fa7adf74114282ecb2abbec
+DIST llama-cpp-0_pre6140.tar.gz 25487270 BLAKE2B 
48b809c860437a8eb8b886e417299c2135dcd3c74aa2782b0380b0785b4e8c383c6061bd7ac43e9eddb1e31769ccceb48811a5433d45ac41adb00ece0e6af93d
 SHA512 
d8e904ddd6b935f84230ee163414922f572e71e2dd05d639a5b1a4a36c6841ac476f81be8e39f087712766e88564d8a499cdff4d717a5f910caf9f799a2b998d

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre6002.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre6140.ebuild
similarity index 95%
rename from sci-misc/llama-cpp/llama-cpp-0_pre6002.ebuild
rename to sci-misc/llama-cpp/llama-cpp-0_pre6140.ebuild
index 99dc17ab50..8b6d1fecff 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre6002.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre6140.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://github.com/ggml-org/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis hip cuda opencl vulkan"
+IUSE="curl openblas +openmp blis hip cuda opencl vulkan"
 REQUIRED_USE="?? ( openblas blis )"
 
 # curl is needed for pulling models from huggingface
@@ -31,6 +31,7 @@ REQUIRED_USE="?? ( openblas blis )"
 CDEPEND="
curl? ( net-misc/curl:= )
openblas? ( sci-libs/openblas:= )
+   openmp? ( llvm-runtimes/openmp:= )
blis? ( sci-libs/blis:= )
hip? ( >=dev-util/hip-6.3:=
>=sci-libs/hipBLAS-6.3:=
@@ -77,6 +78,7 @@ src_configure() {
-DGENTOO_REMOVE_CMAKE_BLAS_HACK=ON
-DGGML_CUDA=$(usex cuda ON OFF)
-DGGML_OPENCL=$(usex opencl ON OFF)
+   -DGGML_OPENMP=$(usex openmp ON OFF)
-DGGML_VULKAN=$(usex vulkan ON OFF)
 
# avoid clashing with whisper.cpp

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-08-10 Thread David Roman

commit: 3733474f9c1d366432ae59570970b06833cebb5e
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Sun Aug 10 00:35:22 2025 +
Commit: David Roman  gmail  com>
CommitDate: Sun Aug 10 00:35:22 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3733474f

sci-misc/llama-cpp: handle automagic openmp dep

enabled by default as otherwise results in severe performance hit
see https://github.com/ggml-org/llama.cpp/issues/12171

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/llama-cpp-0_pre6092.ebuild | 4 +++-
 sci-misc/llama-cpp/llama-cpp-.ebuild  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre6092.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre6092.ebuild
index 99dc17ab50..8b6d1fecff 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre6092.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre6092.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://github.com/ggml-org/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis hip cuda opencl vulkan"
+IUSE="curl openblas +openmp blis hip cuda opencl vulkan"
 REQUIRED_USE="?? ( openblas blis )"
 
 # curl is needed for pulling models from huggingface
@@ -31,6 +31,7 @@ REQUIRED_USE="?? ( openblas blis )"
 CDEPEND="
curl? ( net-misc/curl:= )
openblas? ( sci-libs/openblas:= )
+   openmp? ( llvm-runtimes/openmp:= )
blis? ( sci-libs/blis:= )
hip? ( >=dev-util/hip-6.3:=
>=sci-libs/hipBLAS-6.3:=
@@ -77,6 +78,7 @@ src_configure() {
-DGENTOO_REMOVE_CMAKE_BLAS_HACK=ON
-DGGML_CUDA=$(usex cuda ON OFF)
-DGGML_OPENCL=$(usex opencl ON OFF)
+   -DGGML_OPENMP=$(usex openmp ON OFF)
-DGGML_VULKAN=$(usex vulkan ON OFF)
 
# avoid clashing with whisper.cpp

diff --git a/sci-misc/llama-cpp/llama-cpp-.ebuild 
b/sci-misc/llama-cpp/llama-cpp-.ebuild
index 99dc17ab50..8b6d1fecff 100644
--- a/sci-misc/llama-cpp/llama-cpp-.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://github.com/ggml-org/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis hip cuda opencl vulkan"
+IUSE="curl openblas +openmp blis hip cuda opencl vulkan"
 REQUIRED_USE="?? ( openblas blis )"
 
 # curl is needed for pulling models from huggingface
@@ -31,6 +31,7 @@ REQUIRED_USE="?? ( openblas blis )"
 CDEPEND="
curl? ( net-misc/curl:= )
openblas? ( sci-libs/openblas:= )
+   openmp? ( llvm-runtimes/openmp:= )
blis? ( sci-libs/blis:= )
hip? ( >=dev-util/hip-6.3:=
>=sci-libs/hipBLAS-6.3:=
@@ -77,6 +78,7 @@ src_configure() {
-DGENTOO_REMOVE_CMAKE_BLAS_HACK=ON
-DGGML_CUDA=$(usex cuda ON OFF)
-DGGML_OPENCL=$(usex opencl ON OFF)
+   -DGGML_OPENMP=$(usex openmp ON OFF)
-DGGML_VULKAN=$(usex vulkan ON OFF)
 
# avoid clashing with whisper.cpp

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-08-07 Thread David Roman

commit: d34ca91c8f27f4b06f5ea95f165a680c87172f19
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Tue Aug  5 20:25:44 2025 +
Commit: David Roman  gmail  com>
CommitDate: Tue Aug  5 20:25:44 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d34ca91c

sci-misc/llama-cpp: add 0_pre6092, drop 0_pre5857

for glm4moe support

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest | 2 +-
 .../{llama-cpp-0_pre5857.ebuild => llama-cpp-0_pre6092.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index dc5a4e2df1..13fbae4c70 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -2,5 +2,5 @@ DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a7099
 DIST llama-cpp-0_pre5097.tar.gz 21018571 BLAKE2B 
001241580964aa6874a3aa4dbfa0a8cda58a144578992f6a6df7c5c7887cda847503f47c7f3be7b19bb3758ab6ce8de60435e29129cac71672160b29b1cab340
 SHA512 
86543cd001014fa4fee01a37d46e1794c2ffac7c25c7ed328aa4afd3d615b7f42b617ca5d8a0a78b5a41e31cb81184fc6f55f58ffd9433acb3f36cb947a620a5
 DIST llama-cpp-0_pre5332.tar.gz 21140774 BLAKE2B 
a390d4c1c6902d90d1e779291e1fcbe69ab57eb35a5df0be6fb3d9edc88b086a18bcf48983b3c0b2e88d0cfaaddbfdeee74fb126b8a758547836f5b83dd4bc33
 SHA512 
c19c3a6b47684f9466e2872aa67d8516add69028c4fdc7d1abb7a0ff7d87b92adfdaf773cda87461be8e891285c6de34a4edca70244936e8efaf10cc02126a8d
 DIST llama-cpp-0_pre5633.tar.gz 24986657 BLAKE2B 
6215dbfea54cb23a57419cc5a530be5622ec834c6d005337bcf92c50e152979375592088e215845e8f07c6b3f7eec15132cd15ebf9b0725adabe499951ae4735
 SHA512 
11a1917eb86c7065ea901cb62bdc7a25d8d7b962358570c2c7ae0c2d7abce6d19ebc6af74512593ebafbb4ee23546128cf8bfee5ba769c4f3cd2e254cdc1a1a4
-DIST llama-cpp-0_pre5857.tar.gz 25037397 BLAKE2B 
c5b9105ace7b66341b9dff32d3246f38e056097f2024df1919be2f7ac516ba37caa534aa521e5eb7717963b2df8a5fbe72663d829e0e67a0883edcbdb1b124d7
 SHA512 
1f91c4b11091a3ede785d5df1a0ab22360bafb36a0b7ee19ce70331bc36bae862ea52f2f0a5c8a4494022c37c8f363e850eb98d74ba910276267a7b5b4f927ed
 DIST llama-cpp-0_pre6002.tar.gz 25253850 BLAKE2B 
0767feea94598bbe6ea4a27b20dfda9c3423a9a6c6e4fc66f464c58fda2b13becdd703789604f7a2b424e335ddbe7eef3ee9ee33415ce135ed6eda2456578cca
 SHA512 
5dc0bfc7386daac6d0ea677d9c56e0db2feac7fa83f2468a057fca5d5ba829bb332ee64ba6049c969cdd7c2eca7501fe401f1bd5f4e8728ce453b160511f
+DIST llama-cpp-0_pre6092.tar.gz 25460137 BLAKE2B 
0860e6a6e469765d2a81202713e635eb9c3b269d6f6b57c09fe2c8d462b2c03e65858195ff89ce685fae14fa1c25bfe1fc4ce0fa40bfeabf85ce566867848be3
 SHA512 
3975d176316cc9f3fdfa2183581ca4c57b30f3fc9c15d7eb94144be2de323d5fd2cd82fc345965cc1b8334059657a7666331efdb4fa7adf74114282ecb2abbec

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre5857.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre6092.ebuild
similarity index 100%
rename from sci-misc/llama-cpp/llama-cpp-0_pre5857.ebuild
rename to sci-misc/llama-cpp/llama-cpp-0_pre6092.ebuild

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-08-01 Thread Viorel Munteanu

commit: dd6553618adb7bb29489c08843bac9618b42ee27
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Thu Jul 31 15:03:55 2025 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Thu Jul 31 15:03:55 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dd655361

sci-misc/llama-cpp: describe opencl USE

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-misc/llama-cpp/metadata.xml b/sci-misc/llama-cpp/metadata.xml
index ee98b16235..bd33ace1c0 100644
--- a/sci-misc/llama-cpp/metadata.xml
+++ b/sci-misc/llama-cpp/metadata.xml
@@ -8,6 +8,7 @@
Build a BLIS backend
Build a HIP (ROCm) backend
Build an OpenBLAS backend
+   Build an OpenCL backend, so far only works 
on Adreno and Intel GPUs


[email protected]

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-07-28 Thread Lucio Sauer

commit: bf6fdb43eb7155c0ca1e4b40f2d0e0a4a0732adf
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Sun Jul 27 22:59:07 2025 +
Commit: Lucio Sauer  posteo  net>
CommitDate: Sun Jul 27 22:59:07 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf6fdb43

sci-misc/llama-cpp: + opencl backend, bump

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest|  2 +-
 sci-misc/llama-cpp/llama-cpp-0_pre5857.ebuild  |  5 ++-
 ...0_pre5821.ebuild => llama-cpp-0_pre6002.ebuild} | 51 --
 sci-misc/llama-cpp/llama-cpp-.ebuild   |  5 ++-
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index 6f878fb6e4..dc5a4e2df1 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -2,5 +2,5 @@ DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a7099
 DIST llama-cpp-0_pre5097.tar.gz 21018571 BLAKE2B 
001241580964aa6874a3aa4dbfa0a8cda58a144578992f6a6df7c5c7887cda847503f47c7f3be7b19bb3758ab6ce8de60435e29129cac71672160b29b1cab340
 SHA512 
86543cd001014fa4fee01a37d46e1794c2ffac7c25c7ed328aa4afd3d615b7f42b617ca5d8a0a78b5a41e31cb81184fc6f55f58ffd9433acb3f36cb947a620a5
 DIST llama-cpp-0_pre5332.tar.gz 21140774 BLAKE2B 
a390d4c1c6902d90d1e779291e1fcbe69ab57eb35a5df0be6fb3d9edc88b086a18bcf48983b3c0b2e88d0cfaaddbfdeee74fb126b8a758547836f5b83dd4bc33
 SHA512 
c19c3a6b47684f9466e2872aa67d8516add69028c4fdc7d1abb7a0ff7d87b92adfdaf773cda87461be8e891285c6de34a4edca70244936e8efaf10cc02126a8d
 DIST llama-cpp-0_pre5633.tar.gz 24986657 BLAKE2B 
6215dbfea54cb23a57419cc5a530be5622ec834c6d005337bcf92c50e152979375592088e215845e8f07c6b3f7eec15132cd15ebf9b0725adabe499951ae4735
 SHA512 
11a1917eb86c7065ea901cb62bdc7a25d8d7b962358570c2c7ae0c2d7abce6d19ebc6af74512593ebafbb4ee23546128cf8bfee5ba769c4f3cd2e254cdc1a1a4
-DIST llama-cpp-0_pre5821.tar.gz 25019017 BLAKE2B 
5bf7e168a690ac02aee17dd72469481db3b7c61db990407596a99f814eef1737e9c83aae18ef27d3cd3cca01159104e702ed114cd28c1291aea03422a0b5c0f2
 SHA512 
7aed0a1a29bb4096d67f781299bf48718021f5a0916451a9bdaada2ac1181cc84cbaeab43811e12c13a10beb0d23f0897cfb5f2f26929a166dfd50d90d026d37
 DIST llama-cpp-0_pre5857.tar.gz 25037397 BLAKE2B 
c5b9105ace7b66341b9dff32d3246f38e056097f2024df1919be2f7ac516ba37caa534aa521e5eb7717963b2df8a5fbe72663d829e0e67a0883edcbdb1b124d7
 SHA512 
1f91c4b11091a3ede785d5df1a0ab22360bafb36a0b7ee19ce70331bc36bae862ea52f2f0a5c8a4494022c37c8f363e850eb98d74ba910276267a7b5b4f927ed
+DIST llama-cpp-0_pre6002.tar.gz 25253850 BLAKE2B 
0767feea94598bbe6ea4a27b20dfda9c3423a9a6c6e4fc66f464c58fda2b13becdd703789604f7a2b424e335ddbe7eef3ee9ee33415ce135ed6eda2456578cca
 SHA512 
5dc0bfc7386daac6d0ea677d9c56e0db2feac7fa83f2468a057fca5d5ba829bb332ee64ba6049c969cdd7c2eca7501fe401f1bd5f4e8728ce453b160511f

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre5857.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre5857.ebuild
index 3f39aebf74..99dc17ab50 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre5857.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre5857.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://github.com/ggml-org/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis hip cuda vulkan"
+IUSE="curl openblas blis hip cuda opencl vulkan"
 REQUIRED_USE="?? ( openblas blis )"
 
 # curl is needed for pulling models from huggingface
@@ -38,10 +38,12 @@ CDEPEND="
cuda? ( dev-util/nvidia-cuda-toolkit:= )
 "
 DEPEND="${CDEPEND}
+   opencl? ( dev-util/opencl-headers )
vulkan? ( dev-util/vulkan-headers )
 "
 RDEPEND="${CDEPEND}
dev-python/numpy
+   opencl? ( dev-libs/opencl-icd-loader )
vulkan? ( media-libs/vulkan-loader )
 "
 
@@ -74,6 +76,7 @@ src_configure() {
-DBUILD_NUMBER="1"
-DGENTOO_REMOVE_CMAKE_BLAS_HACK=ON
-DGGML_CUDA=$(usex cuda ON OFF)
+   -DGGML_OPENCL=$(usex opencl ON OFF)
-DGGML_VULKAN=$(usex vulkan ON OFF)
 
# avoid clashing with whisper.cpp

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre5821.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre6002.ebuild
similarity index 75%
rename from sci-misc/llama-cpp/llama-cpp-0_pre5821.ebuild
rename to sci-misc/llama-cpp/llama-cpp-0_pre6002.ebuild
index 297952fc97..99dc17ab50 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre5821.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre6002.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ROCM_VERSION="6.3"
 
-inherit cmake cuda rocm
+inherit cmake cuda rocm linux-info
 
 if [[ "${PV}" != "" ]]; then
KEYWORDS="~amd64"
@@ -23,47 +23,42 @@ HOMEPAGE="https://github.com/ggml-org/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis hip cuda vulkan"
+IUSE="curl openblas blis hip cuda opencl vulkan"
 REQUIRED_USE="?? ( openblas blis )"
 
-AMDGPU_TARGETS_COMPAT=(
-   gfx900
-   gfx90c
-   gfx902
-   gf

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-07-22 Thread David Roman

commit: 451623c534e7e4fa47a2793c85f5f4fbabc518c6
Author: Paul Zander  gmail  com>
AuthorDate: Tue Jul 22 17:55:49 2025 +
Commit: David Roman  gmail  com>
CommitDate: Tue Jul 22 18:25:30 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=451623c5

sci-misc/llama-cpp: set CUDAHOSTCXX via cuda.eclass

Closes: https://bugs.gentoo.org/960549
Signed-off-by: Paul Zander  gmail.com>

 sci-misc/llama-cpp/llama-cpp-0_pre5857.ebuild | 7 +++
 sci-misc/llama-cpp/llama-cpp-.ebuild  | 7 +++
 2 files changed, 14 insertions(+)

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre5857.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre5857.ebuild
index 3c299357c9..3f39aebf74 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre5857.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre5857.ebuild
@@ -93,6 +93,13 @@ src_configure() {
)
fi
 
+   if use cuda; then
+   local -x CUDAHOSTCXX="$(cuda_gccdir)"
+   # tries to recreate dev symlinks
+   cuda_add_sandbox
+   addpredict "/dev/char/"
+   fi
+
if use hip; then
rocm_use_hipcc
mycmakeargs+=(

diff --git a/sci-misc/llama-cpp/llama-cpp-.ebuild 
b/sci-misc/llama-cpp/llama-cpp-.ebuild
index 3c299357c9..3f39aebf74 100644
--- a/sci-misc/llama-cpp/llama-cpp-.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-.ebuild
@@ -93,6 +93,13 @@ src_configure() {
)
fi
 
+   if use cuda; then
+   local -x CUDAHOSTCXX="$(cuda_gccdir)"
+   # tries to recreate dev symlinks
+   cuda_add_sandbox
+   addpredict "/dev/char/"
+   fi
+
if use hip; then
rocm_use_hipcc
mycmakeargs+=(

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-07-10 Thread David Roman

commit: bd53f5db4fd7a23956623e81ce0058505609928b
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Thu Jul 10 00:16:05 2025 +
Commit: David Roman  gmail  com>
CommitDate: Thu Jul 10 00:16:05 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bd53f5db

sci-misc/llama-cpp: fix hip/rocm, remove old

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest|  2 +-
 sci-misc/llama-cpp/llama-cpp-0_pre4848.ebuild  | 93 --
 ...-cpp-.ebuild => llama-cpp-0_pre5857.ebuild} | 39 -
 sci-misc/llama-cpp/llama-cpp-.ebuild   | 39 -
 4 files changed, 33 insertions(+), 140 deletions(-)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index 5ac03312f7..6f878fb6e4 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -1,6 +1,6 @@
 DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a709980e078dc7e769b33cbbb03a852a29b489f80c8a1e298fecea53997068f6b7897e4536ba5db289aa445a1a6f16f98adce3
 SHA512 
21150721524283454ab53e370fdaf4e766f89fbb8d4b43072b10657d8c8b686630616cddbae7954147a2ba0360ad20c4643761f3774481e13a7b180812935c4e
-DIST llama-cpp-0_pre4848.tar.gz 20799416 BLAKE2B 
6731dd8ab01f66fca24ad385c2611bc4a11df8beda692e88d79e1d6ab931c908d5a5d304d9c423d43c09d89e80c0b8dd1d57be23cb1a3bb522dbeac112ded604
 SHA512 
4e08cd24a96ad7c96abdc834d4b5d2d74ce01dd8774d81b693c25b890a0982ca9135cfb743b02f886277d2d0fc92c4e4b330e9acf0977fe00b2f1d4df70243d3
 DIST llama-cpp-0_pre5097.tar.gz 21018571 BLAKE2B 
001241580964aa6874a3aa4dbfa0a8cda58a144578992f6a6df7c5c7887cda847503f47c7f3be7b19bb3758ab6ce8de60435e29129cac71672160b29b1cab340
 SHA512 
86543cd001014fa4fee01a37d46e1794c2ffac7c25c7ed328aa4afd3d615b7f42b617ca5d8a0a78b5a41e31cb81184fc6f55f58ffd9433acb3f36cb947a620a5
 DIST llama-cpp-0_pre5332.tar.gz 21140774 BLAKE2B 
a390d4c1c6902d90d1e779291e1fcbe69ab57eb35a5df0be6fb3d9edc88b086a18bcf48983b3c0b2e88d0cfaaddbfdeee74fb126b8a758547836f5b83dd4bc33
 SHA512 
c19c3a6b47684f9466e2872aa67d8516add69028c4fdc7d1abb7a0ff7d87b92adfdaf773cda87461be8e891285c6de34a4edca70244936e8efaf10cc02126a8d
 DIST llama-cpp-0_pre5633.tar.gz 24986657 BLAKE2B 
6215dbfea54cb23a57419cc5a530be5622ec834c6d005337bcf92c50e152979375592088e215845e8f07c6b3f7eec15132cd15ebf9b0725adabe499951ae4735
 SHA512 
11a1917eb86c7065ea901cb62bdc7a25d8d7b962358570c2c7ae0c2d7abce6d19ebc6af74512593ebafbb4ee23546128cf8bfee5ba769c4f3cd2e254cdc1a1a4
 DIST llama-cpp-0_pre5821.tar.gz 25019017 BLAKE2B 
5bf7e168a690ac02aee17dd72469481db3b7c61db990407596a99f814eef1737e9c83aae18ef27d3cd3cca01159104e702ed114cd28c1291aea03422a0b5c0f2
 SHA512 
7aed0a1a29bb4096d67f781299bf48718021f5a0916451a9bdaada2ac1181cc84cbaeab43811e12c13a10beb0d23f0897cfb5f2f26929a166dfd50d90d026d37
+DIST llama-cpp-0_pre5857.tar.gz 25037397 BLAKE2B 
c5b9105ace7b66341b9dff32d3246f38e056097f2024df1919be2f7ac516ba37caa534aa521e5eb7717963b2df8a5fbe72663d829e0e67a0883edcbdb1b124d7
 SHA512 
1f91c4b11091a3ede785d5df1a0ab22360bafb36a0b7ee19ce70331bc36bae862ea52f2f0a5c8a4494022c37c8f363e850eb98d74ba910276267a7b5b4f927ed

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre4848.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre4848.ebuild
deleted file mode 100644
index b4db64b49d..00
--- a/sci-misc/llama-cpp/llama-cpp-0_pre4848.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ROCM_VERSION="6.3"
-
-inherit cmake rocm
-
-if [[ "${PV}" != "" ]]; then
-   KEYWORDS="~amd64"
-   MY_PV="b${PV#0_pre}"
-   S="${WORKDIR}/llama.cpp-${MY_PV}"
-   
SRC_URI="https://github.com/ggerganov/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
-fi
-
-DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
-HOMEPAGE="https://github.com/ggerganov/llama.cpp";
-
-LICENSE="MIT"
-SLOT="0"
-CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis hip"
-REQUIRED_USE="?? ( openblas blis )"
-
-AMDGPU_TARGETS_COMPAT=(
-   gfx900
-   gfx90c
-   gfx902
-   gfx1010
-   gfx1011
-   gfx1012
-   gfx1030
-   gfx1031
-   gfx1032
-   gfx1034
-   gfx1035
-   gfx1036
-   gfx1100
-   gfx1101
-   gfx1102
-   gfx1103
-   gfx1150
-   gfx1151
-)
-
-# curl is needed for pulling models from huggingface
-# numpy is used by convert_hf_to_gguf.py
-DEPEND="
-   curl? ( net-misc/curl:= )
-   openblas? ( sci-libs/openblas:= )
-   blis? ( sci-libs/blis:= )
-   hip? (  >=dev-util/hip-6.3:= )
-"
-RDEPEND="${DEPEND}
-   dev-python/numpy
-"
-PATCHES=( "${FILESDIR}/blas-ld.diff" )
-
-src_configure() {
-   local mycmakeargs=(
-   -DLLAMA_BUILD_TESTS=OFF
-   -DLLAMA_BUILD_SERVER=ON
-   -DCMAKE_SKIP_BUILD_RPATH=ON
-   -DGGML_NATIVE=0 # don't set march
-

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-06-17 Thread David Roman

commit: d233181e96f30991c95ac43d5c70c8a4df145b3b
Author: Alexey Korepanov  yandex  ru>
AuthorDate: Mon Jun 16 13:01:09 2025 +
Commit: David Roman  gmail  com>
CommitDate: Mon Jun 16 13:01:09 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d233181e

sci-misc/llama-cpp: support cuda, update upstream url

Signed-off-by: Alexey Korepanov  yandex.ru>

 ..._pre5633.ebuild => llama-cpp-0_pre5633-r1.ebuild} | 20 ++--
 sci-misc/llama-cpp/llama-cpp-.ebuild | 20 ++--
 sci-misc/llama-cpp/metadata.xml  |  2 +-
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre5633.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre5633-r1.ebuild
similarity index 76%
rename from sci-misc/llama-cpp/llama-cpp-0_pre5633.ebuild
rename to sci-misc/llama-cpp/llama-cpp-0_pre5633-r1.ebuild
index eb94fdfb0a..e85f09260c 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre5633.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre5633-r1.ebuild
@@ -5,25 +5,25 @@ EAPI=8
 
 ROCM_VERSION="6.3"
 
-inherit cmake rocm
+inherit cmake cuda rocm
 
 if [[ "${PV}" != "" ]]; then
KEYWORDS="~amd64"
MY_PV="b${PV#0_pre}"
S="${WORKDIR}/llama.cpp-${MY_PV}"
-   
SRC_URI="https://github.com/ggerganov/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+   
SRC_URI="https://github.com/ggml-org/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
 else
inherit git-r3
-   EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
+   EGIT_REPO_URI="https://github.com/ggml-org/llama.cpp.git";
 fi
 
 DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
-HOMEPAGE="https://github.com/ggerganov/llama.cpp";
+HOMEPAGE="https://github.com/ggml-org/llama.cpp";
 
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis hip"
+IUSE="curl openblas blis hip cuda"
 REQUIRED_USE="?? ( openblas blis )"
 
 AMDGPU_TARGETS_COMPAT=(
@@ -54,11 +54,17 @@ DEPEND="
openblas? ( sci-libs/openblas:= )
blis? ( sci-libs/blis:= )
hip? (  >=dev-util/hip-6.3:= )
+   cuda? ( dev-util/nvidia-cuda-toolkit:= )
 "
 RDEPEND="${DEPEND}
dev-python/numpy
 "
-PATCHES=( "${FILESDIR}/blas-ld.diff" )
+
+src_prepare() {
+   use cuda && cuda_src_prepare
+
+   cmake_src_prepare
+}
 
 src_configure() {
local mycmakeargs=(
@@ -69,6 +75,8 @@ src_configure() {
-DGGML_RPC=ON
-DLLAMA_CURL=$(usex curl ON OFF)
-DBUILD_NUMBER="1"
+   -DGENTOO_REMOVE_CMAKE_BLAS_HACK=ON
+   -DGGML_CUDA=$(usex cuda ON OFF)
)
 
if use openblas ; then

diff --git a/sci-misc/llama-cpp/llama-cpp-.ebuild 
b/sci-misc/llama-cpp/llama-cpp-.ebuild
index eb94fdfb0a..e85f09260c 100644
--- a/sci-misc/llama-cpp/llama-cpp-.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-.ebuild
@@ -5,25 +5,25 @@ EAPI=8
 
 ROCM_VERSION="6.3"
 
-inherit cmake rocm
+inherit cmake cuda rocm
 
 if [[ "${PV}" != "" ]]; then
KEYWORDS="~amd64"
MY_PV="b${PV#0_pre}"
S="${WORKDIR}/llama.cpp-${MY_PV}"
-   
SRC_URI="https://github.com/ggerganov/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+   
SRC_URI="https://github.com/ggml-org/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
 else
inherit git-r3
-   EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
+   EGIT_REPO_URI="https://github.com/ggml-org/llama.cpp.git";
 fi
 
 DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
-HOMEPAGE="https://github.com/ggerganov/llama.cpp";
+HOMEPAGE="https://github.com/ggml-org/llama.cpp";
 
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis hip"
+IUSE="curl openblas blis hip cuda"
 REQUIRED_USE="?? ( openblas blis )"
 
 AMDGPU_TARGETS_COMPAT=(
@@ -54,11 +54,17 @@ DEPEND="
openblas? ( sci-libs/openblas:= )
blis? ( sci-libs/blis:= )
hip? (  >=dev-util/hip-6.3:= )
+   cuda? ( dev-util/nvidia-cuda-toolkit:= )
 "
 RDEPEND="${DEPEND}
dev-python/numpy
 "
-PATCHES=( "${FILESDIR}/blas-ld.diff" )
+
+src_prepare() {
+   use cuda && cuda_src_prepare
+
+   cmake_src_prepare
+}
 
 src_configure() {
local mycmakeargs=(
@@ -69,6 +75,8 @@ src_configure() {
-DGGML_RPC=ON
-DLLAMA_CURL=$(usex curl ON OFF)
-DBUILD_NUMBER="1"
+   -DGENTOO_REMOVE_CMAKE_BLAS_HACK=ON
+   -DGGML_CUDA=$(usex cuda ON OFF)
)
 
if use openblas ; then

diff --git a/sci-misc/llama-cpp/metadata.xml b/sci-misc/llama-cpp/metadata.xml
index 70af1186d9..ee98b16235 100644
--- a/sci-misc/llama-cpp/metadata.xml
+++ b/sci-misc/llama-cpp/metadata.xml
@@ -2,7 +2,7 @@
 https://www.gentoo.org/dtd/metadata.dtd";>
 

-   ggerganov/llama.cpp
+   ggml-org/llama.cpp

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-06-12 Thread David Roman

commit: 9343efb98748669fe5078b18c349fc28bd778ef2
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Wed Jun 11 12:52:57 2025 +
Commit: David Roman  gmail  com>
CommitDate: Wed Jun 11 12:52:57 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9343efb9

sci-misc/llama-cpp: add 0_pre5633, drop 0_pre4763

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest | 2 +-
 .../{llama-cpp-0_pre4763.ebuild => llama-cpp-0_pre5633.ebuild}  | 6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index 0943b142ce..2c1322d57c 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -1,5 +1,5 @@
 DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a709980e078dc7e769b33cbbb03a852a29b489f80c8a1e298fecea53997068f6b7897e4536ba5db289aa445a1a6f16f98adce3
 SHA512 
21150721524283454ab53e370fdaf4e766f89fbb8d4b43072b10657d8c8b686630616cddbae7954147a2ba0360ad20c4643761f3774481e13a7b180812935c4e
-DIST llama-cpp-0_pre4763.tar.gz 20737582 BLAKE2B 
f6cb6885465e144c19698ac65410f59a6cc2b78d511968bc26c521ba90be87d102eb413e3ef903da30dae3336780e80a4c20cbbea30cc67375f790567e0e6e7a
 SHA512 
c48923286e717d734a3414ae12182c869dd0a99fde722b46d48822a9cbcc5fc16ec5ade4108bd463990a3c9880ea58b559ba0a6975d04c348b474893df566bc9
 DIST llama-cpp-0_pre4848.tar.gz 20799416 BLAKE2B 
6731dd8ab01f66fca24ad385c2611bc4a11df8beda692e88d79e1d6ab931c908d5a5d304d9c423d43c09d89e80c0b8dd1d57be23cb1a3bb522dbeac112ded604
 SHA512 
4e08cd24a96ad7c96abdc834d4b5d2d74ce01dd8774d81b693c25b890a0982ca9135cfb743b02f886277d2d0fc92c4e4b330e9acf0977fe00b2f1d4df70243d3
 DIST llama-cpp-0_pre5097.tar.gz 21018571 BLAKE2B 
001241580964aa6874a3aa4dbfa0a8cda58a144578992f6a6df7c5c7887cda847503f47c7f3be7b19bb3758ab6ce8de60435e29129cac71672160b29b1cab340
 SHA512 
86543cd001014fa4fee01a37d46e1794c2ffac7c25c7ed328aa4afd3d615b7f42b617ca5d8a0a78b5a41e31cb81184fc6f55f58ffd9433acb3f36cb947a620a5
 DIST llama-cpp-0_pre5332.tar.gz 21140774 BLAKE2B 
a390d4c1c6902d90d1e779291e1fcbe69ab57eb35a5df0be6fb3d9edc88b086a18bcf48983b3c0b2e88d0cfaaddbfdeee74fb126b8a758547836f5b83dd4bc33
 SHA512 
c19c3a6b47684f9466e2872aa67d8516add69028c4fdc7d1abb7a0ff7d87b92adfdaf773cda87461be8e891285c6de34a4edca70244936e8efaf10cc02126a8d
+DIST llama-cpp-0_pre5633.tar.gz 24986657 BLAKE2B 
6215dbfea54cb23a57419cc5a530be5622ec834c6d005337bcf92c50e152979375592088e215845e8f07c6b3f7eec15132cd15ebf9b0725adabe499951ae4735
 SHA512 
11a1917eb86c7065ea901cb62bdc7a25d8d7b962358570c2c7ae0c2d7abce6d19ebc6af74512593ebafbb4ee23546128cf8bfee5ba769c4f3cd2e254cdc1a1a4

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre4763.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre5633.ebuild
similarity index 94%
rename from sci-misc/llama-cpp/llama-cpp-0_pre4763.ebuild
rename to sci-misc/llama-cpp/llama-cpp-0_pre5633.ebuild
index b4db64b49d..eb94fdfb0a 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre4763.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre5633.ebuild
@@ -66,6 +66,7 @@ src_configure() {
-DLLAMA_BUILD_SERVER=ON
-DCMAKE_SKIP_BUILD_RPATH=ON
-DGGML_NATIVE=0 # don't set march
+   -DGGML_RPC=ON
-DLLAMA_CURL=$(usex curl ON OFF)
-DBUILD_NUMBER="1"
)
@@ -91,3 +92,8 @@ src_configure() {
 
cmake_src_configure
 }
+
+src_install() {
+   cmake_src_install
+   dobin "${BUILD_DIR}/bin/rpc-server"
+}

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-05-10 Thread David Roman

commit: ea094d31a2643de0fec13f7f25b5870d40b8f4e9
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Fri May  9 23:38:54 2025 +
Commit: David Roman  gmail  com>
CommitDate: Fri May  9 23:39:42 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea094d31

sci-misc/llama-cpp: add 0_pre5332

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest   |  1 +
 sci-misc/llama-cpp/llama-cpp-0_pre5332.ebuild | 93 +++
 2 files changed, 94 insertions(+)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index cb8fe7c8a..0943b142c 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -2,3 +2,4 @@ DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a7099
 DIST llama-cpp-0_pre4763.tar.gz 20737582 BLAKE2B 
f6cb6885465e144c19698ac65410f59a6cc2b78d511968bc26c521ba90be87d102eb413e3ef903da30dae3336780e80a4c20cbbea30cc67375f790567e0e6e7a
 SHA512 
c48923286e717d734a3414ae12182c869dd0a99fde722b46d48822a9cbcc5fc16ec5ade4108bd463990a3c9880ea58b559ba0a6975d04c348b474893df566bc9
 DIST llama-cpp-0_pre4848.tar.gz 20799416 BLAKE2B 
6731dd8ab01f66fca24ad385c2611bc4a11df8beda692e88d79e1d6ab931c908d5a5d304d9c423d43c09d89e80c0b8dd1d57be23cb1a3bb522dbeac112ded604
 SHA512 
4e08cd24a96ad7c96abdc834d4b5d2d74ce01dd8774d81b693c25b890a0982ca9135cfb743b02f886277d2d0fc92c4e4b330e9acf0977fe00b2f1d4df70243d3
 DIST llama-cpp-0_pre5097.tar.gz 21018571 BLAKE2B 
001241580964aa6874a3aa4dbfa0a8cda58a144578992f6a6df7c5c7887cda847503f47c7f3be7b19bb3758ab6ce8de60435e29129cac71672160b29b1cab340
 SHA512 
86543cd001014fa4fee01a37d46e1794c2ffac7c25c7ed328aa4afd3d615b7f42b617ca5d8a0a78b5a41e31cb81184fc6f55f58ffd9433acb3f36cb947a620a5
+DIST llama-cpp-0_pre5332.tar.gz 21140774 BLAKE2B 
a390d4c1c6902d90d1e779291e1fcbe69ab57eb35a5df0be6fb3d9edc88b086a18bcf48983b3c0b2e88d0cfaaddbfdeee74fb126b8a758547836f5b83dd4bc33
 SHA512 
c19c3a6b47684f9466e2872aa67d8516add69028c4fdc7d1abb7a0ff7d87b92adfdaf773cda87461be8e891285c6de34a4edca70244936e8efaf10cc02126a8d

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre5332.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre5332.ebuild
new file mode 100644
index 0..b4db64b49
--- /dev/null
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre5332.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION="6.3"
+
+inherit cmake rocm
+
+if [[ "${PV}" != "" ]]; then
+   KEYWORDS="~amd64"
+   MY_PV="b${PV#0_pre}"
+   S="${WORKDIR}/llama.cpp-${MY_PV}"
+   
SRC_URI="https://github.com/ggerganov/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
+fi
+
+DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
+HOMEPAGE="https://github.com/ggerganov/llama.cpp";
+
+LICENSE="MIT"
+SLOT="0"
+CPU_FLAGS_X86=( avx avx2 f16c )
+IUSE="curl openblas blis hip"
+REQUIRED_USE="?? ( openblas blis )"
+
+AMDGPU_TARGETS_COMPAT=(
+   gfx900
+   gfx90c
+   gfx902
+   gfx1010
+   gfx1011
+   gfx1012
+   gfx1030
+   gfx1031
+   gfx1032
+   gfx1034
+   gfx1035
+   gfx1036
+   gfx1100
+   gfx1101
+   gfx1102
+   gfx1103
+   gfx1150
+   gfx1151
+)
+
+# curl is needed for pulling models from huggingface
+# numpy is used by convert_hf_to_gguf.py
+DEPEND="
+   curl? ( net-misc/curl:= )
+   openblas? ( sci-libs/openblas:= )
+   blis? ( sci-libs/blis:= )
+   hip? (  >=dev-util/hip-6.3:= )
+"
+RDEPEND="${DEPEND}
+   dev-python/numpy
+"
+PATCHES=( "${FILESDIR}/blas-ld.diff" )
+
+src_configure() {
+   local mycmakeargs=(
+   -DLLAMA_BUILD_TESTS=OFF
+   -DLLAMA_BUILD_SERVER=ON
+   -DCMAKE_SKIP_BUILD_RPATH=ON
+   -DGGML_NATIVE=0 # don't set march
+   -DLLAMA_CURL=$(usex curl ON OFF)
+   -DBUILD_NUMBER="1"
+   )
+
+   if use openblas ; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS
+   )
+   fi
+
+   if use blis ; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=FLAME
+   )
+   fi
+
+   if use hip; then
+   rocm_use_hipcc
+   mycmakeargs+=(
+   -DGGML_HIP=ON -DAMDGPU_TARGETS=$(get_amdgpu_flags)
+   )
+   fi
+
+   cmake_src_configure
+}

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-04-12 Thread David Roman

commit: edf82b33406c122f0cc42d8d7773c68e67fd986d
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Thu Apr 10 19:52:02 2025 +
Commit: David Roman  gmail  com>
CommitDate: Thu Apr 10 19:52:02 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=edf82b33

sci-misc/llama-cpp: add 0_pre5097

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest   |  1 +
 sci-misc/llama-cpp/llama-cpp-0_pre5097.ebuild | 93 +++
 2 files changed, 94 insertions(+)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index aa174fbbd..cb8fe7c8a 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -1,3 +1,4 @@
 DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a709980e078dc7e769b33cbbb03a852a29b489f80c8a1e298fecea53997068f6b7897e4536ba5db289aa445a1a6f16f98adce3
 SHA512 
21150721524283454ab53e370fdaf4e766f89fbb8d4b43072b10657d8c8b686630616cddbae7954147a2ba0360ad20c4643761f3774481e13a7b180812935c4e
 DIST llama-cpp-0_pre4763.tar.gz 20737582 BLAKE2B 
f6cb6885465e144c19698ac65410f59a6cc2b78d511968bc26c521ba90be87d102eb413e3ef903da30dae3336780e80a4c20cbbea30cc67375f790567e0e6e7a
 SHA512 
c48923286e717d734a3414ae12182c869dd0a99fde722b46d48822a9cbcc5fc16ec5ade4108bd463990a3c9880ea58b559ba0a6975d04c348b474893df566bc9
 DIST llama-cpp-0_pre4848.tar.gz 20799416 BLAKE2B 
6731dd8ab01f66fca24ad385c2611bc4a11df8beda692e88d79e1d6ab931c908d5a5d304d9c423d43c09d89e80c0b8dd1d57be23cb1a3bb522dbeac112ded604
 SHA512 
4e08cd24a96ad7c96abdc834d4b5d2d74ce01dd8774d81b693c25b890a0982ca9135cfb743b02f886277d2d0fc92c4e4b330e9acf0977fe00b2f1d4df70243d3
+DIST llama-cpp-0_pre5097.tar.gz 21018571 BLAKE2B 
001241580964aa6874a3aa4dbfa0a8cda58a144578992f6a6df7c5c7887cda847503f47c7f3be7b19bb3758ab6ce8de60435e29129cac71672160b29b1cab340
 SHA512 
86543cd001014fa4fee01a37d46e1794c2ffac7c25c7ed328aa4afd3d615b7f42b617ca5d8a0a78b5a41e31cb81184fc6f55f58ffd9433acb3f36cb947a620a5

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre5097.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre5097.ebuild
new file mode 100644
index 0..b4db64b49
--- /dev/null
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre5097.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION="6.3"
+
+inherit cmake rocm
+
+if [[ "${PV}" != "" ]]; then
+   KEYWORDS="~amd64"
+   MY_PV="b${PV#0_pre}"
+   S="${WORKDIR}/llama.cpp-${MY_PV}"
+   
SRC_URI="https://github.com/ggerganov/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
+fi
+
+DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
+HOMEPAGE="https://github.com/ggerganov/llama.cpp";
+
+LICENSE="MIT"
+SLOT="0"
+CPU_FLAGS_X86=( avx avx2 f16c )
+IUSE="curl openblas blis hip"
+REQUIRED_USE="?? ( openblas blis )"
+
+AMDGPU_TARGETS_COMPAT=(
+   gfx900
+   gfx90c
+   gfx902
+   gfx1010
+   gfx1011
+   gfx1012
+   gfx1030
+   gfx1031
+   gfx1032
+   gfx1034
+   gfx1035
+   gfx1036
+   gfx1100
+   gfx1101
+   gfx1102
+   gfx1103
+   gfx1150
+   gfx1151
+)
+
+# curl is needed for pulling models from huggingface
+# numpy is used by convert_hf_to_gguf.py
+DEPEND="
+   curl? ( net-misc/curl:= )
+   openblas? ( sci-libs/openblas:= )
+   blis? ( sci-libs/blis:= )
+   hip? (  >=dev-util/hip-6.3:= )
+"
+RDEPEND="${DEPEND}
+   dev-python/numpy
+"
+PATCHES=( "${FILESDIR}/blas-ld.diff" )
+
+src_configure() {
+   local mycmakeargs=(
+   -DLLAMA_BUILD_TESTS=OFF
+   -DLLAMA_BUILD_SERVER=ON
+   -DCMAKE_SKIP_BUILD_RPATH=ON
+   -DGGML_NATIVE=0 # don't set march
+   -DLLAMA_CURL=$(usex curl ON OFF)
+   -DBUILD_NUMBER="1"
+   )
+
+   if use openblas ; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS
+   )
+   fi
+
+   if use blis ; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=FLAME
+   )
+   fi
+
+   if use hip; then
+   rocm_use_hipcc
+   mycmakeargs+=(
+   -DGGML_HIP=ON -DAMDGPU_TARGETS=$(get_amdgpu_flags)
+   )
+   fi
+
+   cmake_src_configure
+}

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-03-08 Thread Lucio Sauer

commit: 19e74ee6a141256e081b6f4d7749ece9af97b307
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Fri Mar  7 11:16:01 2025 +
Commit: Lucio Sauer  posteo  net>
CommitDate: Fri Mar  7 11:16:18 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=19e74ee6

sci-misc/llama-cpp: add 0_pre4848

for QwQ-32B --jinja support

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest   |  1 +
 sci-misc/llama-cpp/llama-cpp-0_pre4848.ebuild | 93 +++
 2 files changed, 94 insertions(+)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index 3085f9c75..aa174fbbd 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -1,2 +1,3 @@
 DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a709980e078dc7e769b33cbbb03a852a29b489f80c8a1e298fecea53997068f6b7897e4536ba5db289aa445a1a6f16f98adce3
 SHA512 
21150721524283454ab53e370fdaf4e766f89fbb8d4b43072b10657d8c8b686630616cddbae7954147a2ba0360ad20c4643761f3774481e13a7b180812935c4e
 DIST llama-cpp-0_pre4763.tar.gz 20737582 BLAKE2B 
f6cb6885465e144c19698ac65410f59a6cc2b78d511968bc26c521ba90be87d102eb413e3ef903da30dae3336780e80a4c20cbbea30cc67375f790567e0e6e7a
 SHA512 
c48923286e717d734a3414ae12182c869dd0a99fde722b46d48822a9cbcc5fc16ec5ade4108bd463990a3c9880ea58b559ba0a6975d04c348b474893df566bc9
+DIST llama-cpp-0_pre4848.tar.gz 20799416 BLAKE2B 
6731dd8ab01f66fca24ad385c2611bc4a11df8beda692e88d79e1d6ab931c908d5a5d304d9c423d43c09d89e80c0b8dd1d57be23cb1a3bb522dbeac112ded604
 SHA512 
4e08cd24a96ad7c96abdc834d4b5d2d74ce01dd8774d81b693c25b890a0982ca9135cfb743b02f886277d2d0fc92c4e4b330e9acf0977fe00b2f1d4df70243d3

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre4848.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre4848.ebuild
new file mode 100644
index 0..b4db64b49
--- /dev/null
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre4848.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION="6.3"
+
+inherit cmake rocm
+
+if [[ "${PV}" != "" ]]; then
+   KEYWORDS="~amd64"
+   MY_PV="b${PV#0_pre}"
+   S="${WORKDIR}/llama.cpp-${MY_PV}"
+   
SRC_URI="https://github.com/ggerganov/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
+fi
+
+DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
+HOMEPAGE="https://github.com/ggerganov/llama.cpp";
+
+LICENSE="MIT"
+SLOT="0"
+CPU_FLAGS_X86=( avx avx2 f16c )
+IUSE="curl openblas blis hip"
+REQUIRED_USE="?? ( openblas blis )"
+
+AMDGPU_TARGETS_COMPAT=(
+   gfx900
+   gfx90c
+   gfx902
+   gfx1010
+   gfx1011
+   gfx1012
+   gfx1030
+   gfx1031
+   gfx1032
+   gfx1034
+   gfx1035
+   gfx1036
+   gfx1100
+   gfx1101
+   gfx1102
+   gfx1103
+   gfx1150
+   gfx1151
+)
+
+# curl is needed for pulling models from huggingface
+# numpy is used by convert_hf_to_gguf.py
+DEPEND="
+   curl? ( net-misc/curl:= )
+   openblas? ( sci-libs/openblas:= )
+   blis? ( sci-libs/blis:= )
+   hip? (  >=dev-util/hip-6.3:= )
+"
+RDEPEND="${DEPEND}
+   dev-python/numpy
+"
+PATCHES=( "${FILESDIR}/blas-ld.diff" )
+
+src_configure() {
+   local mycmakeargs=(
+   -DLLAMA_BUILD_TESTS=OFF
+   -DLLAMA_BUILD_SERVER=ON
+   -DCMAKE_SKIP_BUILD_RPATH=ON
+   -DGGML_NATIVE=0 # don't set march
+   -DLLAMA_CURL=$(usex curl ON OFF)
+   -DBUILD_NUMBER="1"
+   )
+
+   if use openblas ; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS
+   )
+   fi
+
+   if use blis ; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=FLAME
+   )
+   fi
+
+   if use hip; then
+   rocm_use_hipcc
+   mycmakeargs+=(
+   -DGGML_HIP=ON -DAMDGPU_TARGETS=$(get_amdgpu_flags)
+   )
+   fi
+
+   cmake_src_configure
+}

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-02-24 Thread David Roman

commit: dba4c2b3be4988d53c662f849e3785bf45488ddf
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Sun Feb 23 17:54:20 2025 +
Commit: David Roman  gmail  com>
CommitDate: Sun Feb 23 17:54:20 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dba4c2b3

sci-misc/llama-cpp: add 0_pre4763

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest   |  1 +
 sci-misc/llama-cpp/llama-cpp-0_pre4763.ebuild | 93 +++
 2 files changed, 94 insertions(+)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
index b7c2a37bb..3085f9c75 100644
--- a/sci-misc/llama-cpp/Manifest
+++ b/sci-misc/llama-cpp/Manifest
@@ -1 +1,2 @@
 DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a709980e078dc7e769b33cbbb03a852a29b489f80c8a1e298fecea53997068f6b7897e4536ba5db289aa445a1a6f16f98adce3
 SHA512 
21150721524283454ab53e370fdaf4e766f89fbb8d4b43072b10657d8c8b686630616cddbae7954147a2ba0360ad20c4643761f3774481e13a7b180812935c4e
+DIST llama-cpp-0_pre4763.tar.gz 20737582 BLAKE2B 
f6cb6885465e144c19698ac65410f59a6cc2b78d511968bc26c521ba90be87d102eb413e3ef903da30dae3336780e80a4c20cbbea30cc67375f790567e0e6e7a
 SHA512 
c48923286e717d734a3414ae12182c869dd0a99fde722b46d48822a9cbcc5fc16ec5ade4108bd463990a3c9880ea58b559ba0a6975d04c348b474893df566bc9

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre4763.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre4763.ebuild
new file mode 100644
index 0..b4db64b49
--- /dev/null
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre4763.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION="6.3"
+
+inherit cmake rocm
+
+if [[ "${PV}" != "" ]]; then
+   KEYWORDS="~amd64"
+   MY_PV="b${PV#0_pre}"
+   S="${WORKDIR}/llama.cpp-${MY_PV}"
+   
SRC_URI="https://github.com/ggerganov/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
+fi
+
+DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
+HOMEPAGE="https://github.com/ggerganov/llama.cpp";
+
+LICENSE="MIT"
+SLOT="0"
+CPU_FLAGS_X86=( avx avx2 f16c )
+IUSE="curl openblas blis hip"
+REQUIRED_USE="?? ( openblas blis )"
+
+AMDGPU_TARGETS_COMPAT=(
+   gfx900
+   gfx90c
+   gfx902
+   gfx1010
+   gfx1011
+   gfx1012
+   gfx1030
+   gfx1031
+   gfx1032
+   gfx1034
+   gfx1035
+   gfx1036
+   gfx1100
+   gfx1101
+   gfx1102
+   gfx1103
+   gfx1150
+   gfx1151
+)
+
+# curl is needed for pulling models from huggingface
+# numpy is used by convert_hf_to_gguf.py
+DEPEND="
+   curl? ( net-misc/curl:= )
+   openblas? ( sci-libs/openblas:= )
+   blis? ( sci-libs/blis:= )
+   hip? (  >=dev-util/hip-6.3:= )
+"
+RDEPEND="${DEPEND}
+   dev-python/numpy
+"
+PATCHES=( "${FILESDIR}/blas-ld.diff" )
+
+src_configure() {
+   local mycmakeargs=(
+   -DLLAMA_BUILD_TESTS=OFF
+   -DLLAMA_BUILD_SERVER=ON
+   -DCMAKE_SKIP_BUILD_RPATH=ON
+   -DGGML_NATIVE=0 # don't set march
+   -DLLAMA_CURL=$(usex curl ON OFF)
+   -DBUILD_NUMBER="1"
+   )
+
+   if use openblas ; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS
+   )
+   fi
+
+   if use blis ; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=FLAME
+   )
+   fi
+
+   if use hip; then
+   rocm_use_hipcc
+   mycmakeargs+=(
+   -DGGML_HIP=ON -DAMDGPU_TARGETS=$(get_amdgpu_flags)
+   )
+   fi
+
+   cmake_src_configure
+}

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-02-21 Thread David Roman

commit: e01288b79918003e5e4a26936c4ce46aa746e5b3
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Thu Feb 20 14:57:54 2025 +
Commit: David Roman  gmail  com>
CommitDate: Thu Feb 20 14:57:54 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e01288b7

sci-misc/llama-cpp: Add ROCm 6.3 HIP support

Closes: https://bugs.gentoo.org/949856
Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild | 35 +--
 sci-misc/llama-cpp/llama-cpp-.ebuild  | 35 +--
 sci-misc/llama-cpp/metadata.xml   |  1 +
 3 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
index 1e6b82c0d..b4db64b49 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit cmake
+ROCM_VERSION="6.3"
+
+inherit cmake rocm
 
 if [[ "${PV}" != "" ]]; then
KEYWORDS="~amd64"
@@ -21,15 +23,37 @@ HOMEPAGE="https://github.com/ggerganov/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis"
+IUSE="curl openblas blis hip"
 REQUIRED_USE="?? ( openblas blis )"
 
+AMDGPU_TARGETS_COMPAT=(
+   gfx900
+   gfx90c
+   gfx902
+   gfx1010
+   gfx1011
+   gfx1012
+   gfx1030
+   gfx1031
+   gfx1032
+   gfx1034
+   gfx1035
+   gfx1036
+   gfx1100
+   gfx1101
+   gfx1102
+   gfx1103
+   gfx1150
+   gfx1151
+)
+
 # curl is needed for pulling models from huggingface
 # numpy is used by convert_hf_to_gguf.py
 DEPEND="
curl? ( net-misc/curl:= )
openblas? ( sci-libs/openblas:= )
blis? ( sci-libs/blis:= )
+   hip? (  >=dev-util/hip-6.3:= )
 "
 RDEPEND="${DEPEND}
dev-python/numpy
@@ -58,5 +82,12 @@ src_configure() {
)
fi
 
+   if use hip; then
+   rocm_use_hipcc
+   mycmakeargs+=(
+   -DGGML_HIP=ON -DAMDGPU_TARGETS=$(get_amdgpu_flags)
+   )
+   fi
+
cmake_src_configure
 }

diff --git a/sci-misc/llama-cpp/llama-cpp-.ebuild 
b/sci-misc/llama-cpp/llama-cpp-.ebuild
index 1e6b82c0d..b4db64b49 100644
--- a/sci-misc/llama-cpp/llama-cpp-.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit cmake
+ROCM_VERSION="6.3"
+
+inherit cmake rocm
 
 if [[ "${PV}" != "" ]]; then
KEYWORDS="~amd64"
@@ -21,15 +23,37 @@ HOMEPAGE="https://github.com/ggerganov/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl openblas blis"
+IUSE="curl openblas blis hip"
 REQUIRED_USE="?? ( openblas blis )"
 
+AMDGPU_TARGETS_COMPAT=(
+   gfx900
+   gfx90c
+   gfx902
+   gfx1010
+   gfx1011
+   gfx1012
+   gfx1030
+   gfx1031
+   gfx1032
+   gfx1034
+   gfx1035
+   gfx1036
+   gfx1100
+   gfx1101
+   gfx1102
+   gfx1103
+   gfx1150
+   gfx1151
+)
+
 # curl is needed for pulling models from huggingface
 # numpy is used by convert_hf_to_gguf.py
 DEPEND="
curl? ( net-misc/curl:= )
openblas? ( sci-libs/openblas:= )
blis? ( sci-libs/blis:= )
+   hip? (  >=dev-util/hip-6.3:= )
 "
 RDEPEND="${DEPEND}
dev-python/numpy
@@ -58,5 +82,12 @@ src_configure() {
)
fi
 
+   if use hip; then
+   rocm_use_hipcc
+   mycmakeargs+=(
+   -DGGML_HIP=ON -DAMDGPU_TARGETS=$(get_amdgpu_flags)
+   )
+   fi
+
cmake_src_configure
 }

diff --git a/sci-misc/llama-cpp/metadata.xml b/sci-misc/llama-cpp/metadata.xml
index c93fd3afb..70af1186d 100644
--- a/sci-misc/llama-cpp/metadata.xml
+++ b/sci-misc/llama-cpp/metadata.xml
@@ -6,6 +6,7 @@


Build a BLIS backend
+   Build a HIP (ROCm) backend
Build an OpenBLAS backend

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/files/, sci-misc/llama-cpp/

2025-02-10 Thread David Roman

commit: a48cf7afbbf35240bfe3cf0736098a8f7ec66c92
Author: Alexey Korepanov  yandex  ru>
AuthorDate: Sun Feb  9 11:51:53 2025 +
Commit: David Roman  gmail  com>
CommitDate: Sun Feb  9 11:55:04 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a48cf7af

sci-misc/llama-cpp: support OpenBLAS or BLIS backends

A significant speed up in some workflows when running on a CPU

Signed-off-by: Alexey Korepanov  yandex.ru>

 sci-misc/llama-cpp/files/blas-ld.diff | 16 
 sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild | 25 ++---
 sci-misc/llama-cpp/llama-cpp-.ebuild  | 25 ++---
 sci-misc/llama-cpp/metadata.xml   |  4 
 4 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/sci-misc/llama-cpp/files/blas-ld.diff 
b/sci-misc/llama-cpp/files/blas-ld.diff
new file mode 100644
index 0..884f218ed
--- /dev/null
+++ b/sci-misc/llama-cpp/files/blas-ld.diff
@@ -0,0 +1,16 @@
+cmake does not properly configure linking against OpenBLAS or BLIS
+https://github.com/ggerganov/llama.cpp/pull/11741
+
+diff --git a/ggml/src/ggml-blas/CMakeLists.txt 
b/ggml/src/ggml-blas/CMakeLists.txt
+index 0bf3c05d93a89..117416b988665 100644
+--- a/ggml/src/ggml-blas/CMakeLists.txt
 b/ggml/src/ggml-blas/CMakeLists.txt
+@@ -54,6 +54,8 @@ if (BLAS_FOUND)
+ endif()
+ if (DepBLAS_FOUND)
+ set(BLAS_INCLUDE_DIRS ${DepBLAS_INCLUDE_DIRS})
++set(BLAS_LIBRARIES ${DepBLAS_LIBRARIES})
++set(BLAS_LINKER_FLAGS ${DepBLAS_LINKER_FLAGS})
+ else()
+ message(WARNING "BLAS_INCLUDE_DIRS neither been provided nor been 
automatically"
+ " detected by pkgconfig, trying to find cblas.h from possible 
paths...")

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
index 8b9c1438d..1e6b82c0d 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,14 +21,20 @@ HOMEPAGE="https://github.com/ggerganov/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl"
+IUSE="curl openblas blis"
+REQUIRED_USE="?? ( openblas blis )"
 
 # curl is needed for pulling models from huggingface
 # numpy is used by convert_hf_to_gguf.py
-DEPEND="curl? ( net-misc/curl:= )"
+DEPEND="
+   curl? ( net-misc/curl:= )
+   openblas? ( sci-libs/openblas:= )
+   blis? ( sci-libs/blis:= )
+"
 RDEPEND="${DEPEND}
dev-python/numpy
 "
+PATCHES=( "${FILESDIR}/blas-ld.diff" )
 
 src_configure() {
local mycmakeargs=(
@@ -39,5 +45,18 @@ src_configure() {
-DLLAMA_CURL=$(usex curl ON OFF)
-DBUILD_NUMBER="1"
)
+
+   if use openblas ; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS
+   )
+   fi
+
+   if use blis ; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=FLAME
+   )
+   fi
+
cmake_src_configure
 }

diff --git a/sci-misc/llama-cpp/llama-cpp-.ebuild 
b/sci-misc/llama-cpp/llama-cpp-.ebuild
index 8b9c1438d..1e6b82c0d 100644
--- a/sci-misc/llama-cpp/llama-cpp-.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,14 +21,20 @@ HOMEPAGE="https://github.com/ggerganov/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
-IUSE="curl"
+IUSE="curl openblas blis"
+REQUIRED_USE="?? ( openblas blis )"
 
 # curl is needed for pulling models from huggingface
 # numpy is used by convert_hf_to_gguf.py
-DEPEND="curl? ( net-misc/curl:= )"
+DEPEND="
+   curl? ( net-misc/curl:= )
+   openblas? ( sci-libs/openblas:= )
+   blis? ( sci-libs/blis:= )
+"
 RDEPEND="${DEPEND}
dev-python/numpy
 "
+PATCHES=( "${FILESDIR}/blas-ld.diff" )
 
 src_configure() {
local mycmakeargs=(
@@ -39,5 +45,18 @@ src_configure() {
-DLLAMA_CURL=$(usex curl ON OFF)
-DBUILD_NUMBER="1"
)
+
+   if use openblas ; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=OpenBLAS
+   )
+   fi
+
+   if use blis ; then
+   mycmakeargs+=(
+   -DGGML_BLAS=ON -DGGML_BLAS_VENDOR=FLAME
+   )
+   fi
+
cmake_src_configure
 }

diff --git a/sci-misc/llama-cpp/metadata.xml b/sci-misc/llama-cpp/metadata.xml
index 53f72119c..c93fd3afb 100644
--- a/sci-misc/llama-cpp/metadata.xml
+++ b/sci-misc/llama-cpp/metadata.xml
@@ -4,6 +4,10 @@

ggerganov/llama.cpp

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-02-09 Thread Florian Schmaus

commit: fb105c916a2ee882686351f01f149e71594261cf
Author: Alexey Korepanov  yandex  ru>
AuthorDate: Sat Feb  8 16:49:15 2025 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sat Feb  8 16:49:15 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fb105c91

sci-misc/llama-cpp: add dependencies on curl and numpy

Signed-off-by: Alexey Korepanov  yandex.ru>

 sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild | 9 +
 sci-misc/llama-cpp/llama-cpp-.ebuild  | 9 +
 2 files changed, 18 insertions(+)

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
index 39210dddf..8b9c1438d 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
@@ -21,6 +21,14 @@ HOMEPAGE="https://github.com/ggerganov/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
+IUSE="curl"
+
+# curl is needed for pulling models from huggingface
+# numpy is used by convert_hf_to_gguf.py
+DEPEND="curl? ( net-misc/curl:= )"
+RDEPEND="${DEPEND}
+   dev-python/numpy
+"
 
 src_configure() {
local mycmakeargs=(
@@ -28,6 +36,7 @@ src_configure() {
-DLLAMA_BUILD_SERVER=ON
-DCMAKE_SKIP_BUILD_RPATH=ON
-DGGML_NATIVE=0 # don't set march
+   -DLLAMA_CURL=$(usex curl ON OFF)
-DBUILD_NUMBER="1"
)
cmake_src_configure

diff --git a/sci-misc/llama-cpp/llama-cpp-.ebuild 
b/sci-misc/llama-cpp/llama-cpp-.ebuild
index 39210dddf..8b9c1438d 100644
--- a/sci-misc/llama-cpp/llama-cpp-.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-.ebuild
@@ -21,6 +21,14 @@ HOMEPAGE="https://github.com/ggerganov/llama.cpp";
 LICENSE="MIT"
 SLOT="0"
 CPU_FLAGS_X86=( avx avx2 f16c )
+IUSE="curl"
+
+# curl is needed for pulling models from huggingface
+# numpy is used by convert_hf_to_gguf.py
+DEPEND="curl? ( net-misc/curl:= )"
+RDEPEND="${DEPEND}
+   dev-python/numpy
+"
 
 src_configure() {
local mycmakeargs=(
@@ -28,6 +36,7 @@ src_configure() {
-DLLAMA_BUILD_SERVER=ON
-DCMAKE_SKIP_BUILD_RPATH=ON
-DGGML_NATIVE=0 # don't set march
+   -DLLAMA_CURL=$(usex curl ON OFF)
-DBUILD_NUMBER="1"
)
cmake_src_configure

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-02-01 Thread David Roman

commit: b228272c6c4d9a2d51f473a6357c7341c1531396
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Sat Feb  1 11:19:51 2025 +
Commit: David Roman  gmail  com>
CommitDate: Sat Feb  1 11:19:51 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b228272c

sci-misc/llama-cpp: strip march=native

Closes: https://bugs.gentoo.org/949130
Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild | 1 +
 sci-misc/llama-cpp/llama-cpp-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
index 18a0a72d9..39210dddf 100644
--- a/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
@@ -27,6 +27,7 @@ src_configure() {
-DLLAMA_BUILD_TESTS=OFF
-DLLAMA_BUILD_SERVER=ON
-DCMAKE_SKIP_BUILD_RPATH=ON
+   -DGGML_NATIVE=0 # don't set march
-DBUILD_NUMBER="1"
)
cmake_src_configure

diff --git a/sci-misc/llama-cpp/llama-cpp-.ebuild 
b/sci-misc/llama-cpp/llama-cpp-.ebuild
index 18a0a72d9..39210dddf 100644
--- a/sci-misc/llama-cpp/llama-cpp-.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-.ebuild
@@ -27,6 +27,7 @@ src_configure() {
-DLLAMA_BUILD_TESTS=OFF
-DLLAMA_BUILD_SERVER=ON
-DCMAKE_SKIP_BUILD_RPATH=ON
+   -DGGML_NATIVE=0 # don't set march
-DBUILD_NUMBER="1"
)
cmake_src_configure

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-01-30 Thread David Roman

commit: 76de14abfe565eb3b06b1925f1995436f1dc322d
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Wed Jan 29 00:14:22 2025 +
Commit: David Roman  gmail  com>
CommitDate: Wed Jan 29 00:14:22 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=76de14ab

sci-misc/llama-cpp: hopefully satisfy email-checker.py

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-misc/llama-cpp/metadata.xml b/sci-misc/llama-cpp/metadata.xml
index af5a5e03e..53f72119c 100644
--- a/sci-misc/llama-cpp/metadata.xml
+++ b/sci-misc/llama-cpp/metadata.xml
@@ -5,7 +5,7 @@
ggerganov/llama.cpp


-   [email protected]
+   [email protected]
Sergey Alirzaev

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-01-30 Thread David Roman

commit: ab2a79180fb2b2d9bbe7531d0280d7099c773937
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Wed Jan 29 00:11:11 2025 +
Commit: David Roman  gmail  com>
CommitDate: Wed Jan 29 00:11:11 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ab2a7918

sci-misc/llama-cpp: new package, add 0_pre4576, 

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/Manifest   |  1 +
 sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild | 33 +++
 sci-misc/llama-cpp/llama-cpp-.ebuild  | 33 +++
 sci-misc/llama-cpp/metadata.xml   | 11 +
 4 files changed, 78 insertions(+)

diff --git a/sci-misc/llama-cpp/Manifest b/sci-misc/llama-cpp/Manifest
new file mode 100644
index 0..b7c2a37bb
--- /dev/null
+++ b/sci-misc/llama-cpp/Manifest
@@ -0,0 +1 @@
+DIST llama-cpp-0_pre4576.tar.gz 20506059 BLAKE2B 
8f011811e4df1f8d0c26b19f96a709980e078dc7e769b33cbbb03a852a29b489f80c8a1e298fecea53997068f6b7897e4536ba5db289aa445a1a6f16f98adce3
 SHA512 
21150721524283454ab53e370fdaf4e766f89fbb8d4b43072b10657d8c8b686630616cddbae7954147a2ba0360ad20c4643761f3774481e13a7b180812935c4e

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
new file mode 100644
index 0..18a0a72d9
--- /dev/null
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ "${PV}" != "" ]]; then
+   KEYWORDS="~amd64"
+   MY_PV="b${PV#0_pre}"
+   S="${WORKDIR}/llama.cpp-${MY_PV}"
+   
SRC_URI="https://github.com/ggerganov/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
+fi
+
+DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
+HOMEPAGE="https://github.com/ggerganov/llama.cpp";
+
+LICENSE="MIT"
+SLOT="0"
+CPU_FLAGS_X86=( avx avx2 f16c )
+
+src_configure() {
+   local mycmakeargs=(
+   -DLLAMA_BUILD_TESTS=OFF
+   -DLLAMA_BUILD_SERVER=ON
+   -DCMAKE_SKIP_BUILD_RPATH=ON
+   -DBUILD_NUMBER="1"
+   )
+   cmake_src_configure
+}

diff --git a/sci-misc/llama-cpp/llama-cpp-.ebuild 
b/sci-misc/llama-cpp/llama-cpp-.ebuild
new file mode 100644
index 0..18a0a72d9
--- /dev/null
+++ b/sci-misc/llama-cpp/llama-cpp-.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ "${PV}" != "" ]]; then
+   KEYWORDS="~amd64"
+   MY_PV="b${PV#0_pre}"
+   S="${WORKDIR}/llama.cpp-${MY_PV}"
+   
SRC_URI="https://github.com/ggerganov/llama.cpp/archive/refs/tags/${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
+fi
+
+DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
+HOMEPAGE="https://github.com/ggerganov/llama.cpp";
+
+LICENSE="MIT"
+SLOT="0"
+CPU_FLAGS_X86=( avx avx2 f16c )
+
+src_configure() {
+   local mycmakeargs=(
+   -DLLAMA_BUILD_TESTS=OFF
+   -DLLAMA_BUILD_SERVER=ON
+   -DCMAKE_SKIP_BUILD_RPATH=ON
+   -DBUILD_NUMBER="1"
+   )
+   cmake_src_configure
+}

diff --git a/sci-misc/llama-cpp/metadata.xml b/sci-misc/llama-cpp/metadata.xml
new file mode 100644
index 0..af5a5e03e
--- /dev/null
+++ b/sci-misc/llama-cpp/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   ggerganov/llama.cpp
+   
+   
+   [email protected]
+   Sergey Alirzaev
+   
+

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-01-29 Thread David Roman

commit: db9e23974f8408184fce018d6d95643883bb8dab
Author: Takuya Wakazono  gmail  com>
AuthorDate: Mon Jan 27 15:06:01 2025 +
Commit: David Roman  gmail  com>
CommitDate: Mon Jan 27 15:10:33 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=db9e2397

Revert "sci-misc/llama-cpp: new package, add 0_pre4564, "

This reverts commit e933540939add62cd4de6a464ddf73f912c423e6.

This ebuild has too many issues.
- missing manifest
- use of deprecated eclass
- broken dependency
- undescribed USE flags
- visible keyword for vcs version

Please get advice on a GitHub PR or IRC before committing

Signed-off-by: Takuya Wakazono  gmail.com>

 sci-misc/llama-cpp/llama-cpp-0_pre4564.ebuild | 43 ---
 sci-misc/llama-cpp/llama-cpp-.ebuild  | 43 ---
 2 files changed, 86 deletions(-)

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre4564.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre4564.ebuild
deleted file mode 100644
index 5d2ad01ea..0
--- a/sci-misc/llama-cpp/llama-cpp-0_pre4564.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=16
-
-EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
-inherit git-r3
-
-if [[ "${PV}" != "" ]]; then
-   KEYWORDS="~amd64 ~arm64"
-   EGIT_COMMIT="b${PV#0_pre}"
-fi
-
-DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
-HOMEPAGE="https://github.com/ggerganov/llama.cpp";
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="cublas tests tools"
-CPU_FLAGS_X86=( avx avx2 f16c )
-
-DEPEND="
-   cublas? ( dev-util/nvidia-cuda-toolkit )"
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   -DLLAMA_CUBLAS="$(usex cublas)"
-   -DLLAMA_BUILD_TESTS="$(usex tests)"
-   -DLLAMA_BUILD_SERVER=OFF
-   -DCMAKE_SKIP_BUILD_RPATH=ON
-   -DBUILD_NUMBER="1"
-   )
-   if use cublas ; then
-   addpredict /dev/nvidiactl
-   fi
-   cmake_src_configure
-}

diff --git a/sci-misc/llama-cpp/llama-cpp-.ebuild 
b/sci-misc/llama-cpp/llama-cpp-.ebuild
deleted file mode 100644
index 5d2ad01ea..0
--- a/sci-misc/llama-cpp/llama-cpp-.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=16
-
-EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
-inherit git-r3
-
-if [[ "${PV}" != "" ]]; then
-   KEYWORDS="~amd64 ~arm64"
-   EGIT_COMMIT="b${PV#0_pre}"
-fi
-
-DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
-HOMEPAGE="https://github.com/ggerganov/llama.cpp";
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="cublas tests tools"
-CPU_FLAGS_X86=( avx avx2 f16c )
-
-DEPEND="
-   cublas? ( dev-util/nvidia-cuda-toolkit )"
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   -DLLAMA_CUBLAS="$(usex cublas)"
-   -DLLAMA_BUILD_TESTS="$(usex tests)"
-   -DLLAMA_BUILD_SERVER=OFF
-   -DCMAKE_SKIP_BUILD_RPATH=ON
-   -DBUILD_NUMBER="1"
-   )
-   if use cublas ; then
-   addpredict /dev/nvidiactl
-   fi
-   cmake_src_configure
-}

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

2025-01-29 Thread David Roman

commit: e933540939add62cd4de6a464ddf73f912c423e6
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Mon Jan 27 11:52:32 2025 +
Commit: David Roman  gmail  com>
CommitDate: Mon Jan 27 11:52:32 2025 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9335409

sci-misc/llama-cpp: new package, add 0_pre4564, 

Signed-off-by: Sergey Alirzaev  riseup.net>

 sci-misc/llama-cpp/llama-cpp-0_pre4564.ebuild | 43 +++
 sci-misc/llama-cpp/llama-cpp-.ebuild  | 43 +++
 2 files changed, 86 insertions(+)

diff --git a/sci-misc/llama-cpp/llama-cpp-0_pre4564.ebuild 
b/sci-misc/llama-cpp/llama-cpp-0_pre4564.ebuild
new file mode 100644
index 0..5d2ad01ea
--- /dev/null
+++ b/sci-misc/llama-cpp/llama-cpp-0_pre4564.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake llvm
+
+LLVM_MAX_SLOT=16
+
+EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
+inherit git-r3
+
+if [[ "${PV}" != "" ]]; then
+   KEYWORDS="~amd64 ~arm64"
+   EGIT_COMMIT="b${PV#0_pre}"
+fi
+
+DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
+HOMEPAGE="https://github.com/ggerganov/llama.cpp";
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="cublas tests tools"
+CPU_FLAGS_X86=( avx avx2 f16c )
+
+DEPEND="
+   cublas? ( dev-util/nvidia-cuda-toolkit )"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+src_configure() {
+   local mycmakeargs=(
+   -DLLAMA_CUBLAS="$(usex cublas)"
+   -DLLAMA_BUILD_TESTS="$(usex tests)"
+   -DLLAMA_BUILD_SERVER=OFF
+   -DCMAKE_SKIP_BUILD_RPATH=ON
+   -DBUILD_NUMBER="1"
+   )
+   if use cublas ; then
+   addpredict /dev/nvidiactl
+   fi
+   cmake_src_configure
+}

diff --git a/sci-misc/llama-cpp/llama-cpp-.ebuild 
b/sci-misc/llama-cpp/llama-cpp-.ebuild
new file mode 100644
index 0..5d2ad01ea
--- /dev/null
+++ b/sci-misc/llama-cpp/llama-cpp-.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake llvm
+
+LLVM_MAX_SLOT=16
+
+EGIT_REPO_URI="https://github.com/ggerganov/llama.cpp.git";
+inherit git-r3
+
+if [[ "${PV}" != "" ]]; then
+   KEYWORDS="~amd64 ~arm64"
+   EGIT_COMMIT="b${PV#0_pre}"
+fi
+
+DESCRIPTION="Port of Facebook's LLaMA model in C/C++"
+HOMEPAGE="https://github.com/ggerganov/llama.cpp";
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="cublas tests tools"
+CPU_FLAGS_X86=( avx avx2 f16c )
+
+DEPEND="
+   cublas? ( dev-util/nvidia-cuda-toolkit )"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+src_configure() {
+   local mycmakeargs=(
+   -DLLAMA_CUBLAS="$(usex cublas)"
+   -DLLAMA_BUILD_TESTS="$(usex tests)"
+   -DLLAMA_BUILD_SERVER=OFF
+   -DCMAKE_SKIP_BUILD_RPATH=ON
+   -DBUILD_NUMBER="1"
+   )
+   if use cublas ; then
+   addpredict /dev/nvidiactl
+   fi
+   cmake_src_configure
+}

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/files/, sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

[gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/

31 matches

Site Navigation

Mail list logo

Footer information