public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/
@ 2025-01-29  9:37 David Roman
  0 siblings, 0 replies; 12+ messages in thread
From: David Roman @ 2025-01-29  9:37 UTC (permalink / raw
  To: gentoo-commits

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

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

Signed-off-by: Sergey Alirzaev <l29ah <AT> riseup.net>

 sci-misc/llama-cpp/llama-cpp-0_pre4564.ebuild | 43 +++++++++++++++++++++++++++
 sci-misc/llama-cpp/llama-cpp-9999.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 000000000..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}" != "9999" ]]; 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-9999.ebuild b/sci-misc/llama-cpp/llama-cpp-9999.ebuild
new file mode 100644
index 000000000..5d2ad01ea
--- /dev/null
+++ b/sci-misc/llama-cpp/llama-cpp-9999.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}" != "9999" ]]; 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
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/
@ 2025-01-29  9:37 David Roman
  0 siblings, 0 replies; 12+ messages in thread
From: David Roman @ 2025-01-29  9:37 UTC (permalink / raw
  To: gentoo-commits

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

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

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 <pastalian46 <AT> gmail.com>

 sci-misc/llama-cpp/llama-cpp-0_pre4564.ebuild | 43 ---------------------------
 sci-misc/llama-cpp/llama-cpp-9999.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..000000000
--- 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}" != "9999" ]]; 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-9999.ebuild b/sci-misc/llama-cpp/llama-cpp-9999.ebuild
deleted file mode 100644
index 5d2ad01ea..000000000
--- a/sci-misc/llama-cpp/llama-cpp-9999.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}" != "9999" ]]; 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
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/
@ 2025-01-30 15:26 David Roman
  0 siblings, 0 replies; 12+ messages in thread
From: David Roman @ 2025-01-30 15:26 UTC (permalink / raw
  To: gentoo-commits

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

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

Signed-off-by: Sergey Alirzaev <l29ah <AT> riseup.net>

 sci-misc/llama-cpp/Manifest                   |  1 +
 sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild | 33 +++++++++++++++++++++++++++
 sci-misc/llama-cpp/llama-cpp-9999.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 000000000..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 000000000..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}" != "9999" ]]; 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-9999.ebuild b/sci-misc/llama-cpp/llama-cpp-9999.ebuild
new file mode 100644
index 000000000..18a0a72d9
--- /dev/null
+++ b/sci-misc/llama-cpp/llama-cpp-9999.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}" != "9999" ]]; 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 000000000..af5a5e03e
--- /dev/null
+++ b/sci-misc/llama-cpp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">ggerganov/llama.cpp</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>l29ah@riseup.net</email>
+		<name>Sergey Alirzaev</name>
+	</maintainer>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/
@ 2025-01-30 15:26 David Roman
  0 siblings, 0 replies; 12+ messages in thread
From: David Roman @ 2025-01-30 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     76de14abfe565eb3b06b1925f1995436f1dc322d
Author:     Sergey Alirzaev <l29ah <AT> riseup <DOT> net>
AuthorDate: Wed Jan 29 00:14:22 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jan 29 00:14:22 2025 +0000
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 <l29ah <AT> 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 @@
 		<remote-id type="github">ggerganov/llama.cpp</remote-id>
 	</upstream>
 	<maintainer type="person">
-		<email>l29ah@riseup.net</email>
+		<email>zl29ah@gmail.com</email>
 		<name>Sergey Alirzaev</name>
 	</maintainer>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/
@ 2025-02-01 16:10 David Roman
  0 siblings, 0 replies; 12+ messages in thread
From: David Roman @ 2025-02-01 16:10 UTC (permalink / raw
  To: gentoo-commits

commit:     b228272c6c4d9a2d51f473a6357c7341c1531396
Author:     Sergey Alirzaev <l29ah <AT> riseup <DOT> net>
AuthorDate: Sat Feb  1 11:19:51 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Feb  1 11:19:51 2025 +0000
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 <l29ah <AT> riseup.net>

 sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild | 1 +
 sci-misc/llama-cpp/llama-cpp-9999.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-9999.ebuild b/sci-misc/llama-cpp/llama-cpp-9999.ebuild
index 18a0a72d9..39210dddf 100644
--- a/sci-misc/llama-cpp/llama-cpp-9999.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-9999.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


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/
@ 2025-02-09 10:28 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2025-02-09 10:28 UTC (permalink / raw
  To: gentoo-commits

commit:     fb105c916a2ee882686351f01f149e71594261cf
Author:     Alexey Korepanov <kaikaikai <AT> yandex <DOT> ru>
AuthorDate: Sat Feb  8 16:49:15 2025 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Feb  8 16:49:15 2025 +0000
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 <kaikaikai <AT> yandex.ru>

 sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild | 9 +++++++++
 sci-misc/llama-cpp/llama-cpp-9999.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-9999.ebuild b/sci-misc/llama-cpp/llama-cpp-9999.ebuild
index 39210dddf..8b9c1438d 100644
--- a/sci-misc/llama-cpp/llama-cpp-9999.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-9999.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


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/
@ 2025-02-21 12:04 David Roman
  0 siblings, 0 replies; 12+ messages in thread
From: David Roman @ 2025-02-21 12:04 UTC (permalink / raw
  To: gentoo-commits

commit:     e01288b79918003e5e4a26936c4ce46aa746e5b3
Author:     Sergey Alirzaev <l29ah <AT> riseup <DOT> net>
AuthorDate: Thu Feb 20 14:57:54 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Feb 20 14:57:54 2025 +0000
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 <l29ah <AT> riseup.net>

 sci-misc/llama-cpp/llama-cpp-0_pre4576.ebuild | 35 +++++++++++++++++++++++++--
 sci-misc/llama-cpp/llama-cpp-9999.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}" != "9999" ]]; 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-9999.ebuild b/sci-misc/llama-cpp/llama-cpp-9999.ebuild
index 1e6b82c0d..b4db64b49 100644
--- a/sci-misc/llama-cpp/llama-cpp-9999.ebuild
+++ b/sci-misc/llama-cpp/llama-cpp-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit cmake
+ROCM_VERSION="6.3"
+
+inherit cmake rocm
 
 if [[ "${PV}" != "9999" ]]; 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 @@
 	</upstream>
 	<use>
 		<flag name="blis">Build a BLIS backend</flag>
+		<flag name="hip">Build a HIP (ROCm) backend</flag>
 		<flag name="openblas">Build an OpenBLAS backend</flag>
 	</use>
 	<maintainer type="person">


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/
@ 2025-02-24 10:34 David Roman
  0 siblings, 0 replies; 12+ messages in thread
From: David Roman @ 2025-02-24 10:34 UTC (permalink / raw
  To: gentoo-commits

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

sci-misc/llama-cpp: add 0_pre4763

Signed-off-by: Sergey Alirzaev <l29ah <AT> 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 000000000..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}" != "9999" ]]; 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
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/
@ 2025-03-08 11:18 Lucio Sauer
  0 siblings, 0 replies; 12+ messages in thread
From: Lucio Sauer @ 2025-03-08 11:18 UTC (permalink / raw
  To: gentoo-commits

commit:     19e74ee6a141256e081b6f4d7749ece9af97b307
Author:     Sergey Alirzaev <l29ah <AT> riseup <DOT> net>
AuthorDate: Fri Mar  7 11:16:01 2025 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Fri Mar  7 11:16:18 2025 +0000
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 <l29ah <AT> 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 000000000..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}" != "9999" ]]; 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
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/
@ 2025-04-12  9:59 David Roman
  0 siblings, 0 replies; 12+ messages in thread
From: David Roman @ 2025-04-12  9:59 UTC (permalink / raw
  To: gentoo-commits

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

sci-misc/llama-cpp: add 0_pre5097

Signed-off-by: Sergey Alirzaev <l29ah <AT> 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 000000000..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}" != "9999" ]]; 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
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/
@ 2025-05-10 19:08 David Roman
  0 siblings, 0 replies; 12+ messages in thread
From: David Roman @ 2025-05-10 19:08 UTC (permalink / raw
  To: gentoo-commits

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

sci-misc/llama-cpp: add 0_pre5332

Signed-off-by: Sergey Alirzaev <l29ah <AT> 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 000000000..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}" != "9999" ]]; 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
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/
@ 2025-06-12  8:05 David Roman
  0 siblings, 0 replies; 12+ messages in thread
From: David Roman @ 2025-06-12  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     9343efb98748669fe5078b18c349fc28bd778ef2
Author:     Sergey Alirzaev <l29ah <AT> riseup <DOT> net>
AuthorDate: Wed Jun 11 12:52:57 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jun 11 12:52:57 2025 +0000
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 <l29ah <AT> 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"
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2025-06-12  8:05 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-09 10:28 [gentoo-commits] repo/proj/guru:master commit in: sci-misc/llama-cpp/ Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2025-06-12  8:05 David Roman
2025-05-10 19:08 David Roman
2025-04-12  9:59 David Roman
2025-03-08 11:18 Lucio Sauer
2025-02-24 10:34 David Roman
2025-02-21 12:04 David Roman
2025-02-01 16:10 David Roman
2025-01-30 15:26 David Roman
2025-01-30 15:26 David Roman
2025-01-29  9:37 David Roman
2025-01-29  9:37 David Roman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox