Merge updates from master

This commit is contained in:
Repository mirror & CI
2025-05-23 22:24:06 +00:00
9 changed files with 733 additions and 26 deletions

View File

@@ -1 +1,2 @@
DIST anytree-2.12.0.gh.tar.gz 192330 BLAKE2B 117f80689b6610f622a41b2abb85cf54f2ba639659f80e6b8d163043d2552586ef11ed86532b19c7b69beec5e66ab3acad2f72ed0f1e9aa5d3832e4e8ec76457 SHA512 822a72cf84227a7b78cb3808eea585d783821d9c476f1b1e50d77cf982b4bf3c08011be9564ff5205a3efd0d982b03daabeb0067aea523a14002179c94451ff4
DIST anytree-2.13.0.gh.tar.gz 235959 BLAKE2B a49dfad2d4360e449ce666a8e9227bdb3f83c60dd7ca7a68081e046414f4da041deb4762d6f54372e32e48e6c9bdd93ee6de785b0f8c4c7e6f0622f4944c3051 SHA512 f587449b78877ee7f9ed1dedf88d55c75c05567fd7fe780808b2852152308a4bf2d42651fe1967b9eb67021ca33daa29ed387847ad93261ff93dfda356b4f296

View File

@@ -0,0 +1,65 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{11..13} )
DISTUTILS_USE_PEP517=pdm-backend
inherit distutils-r1
DESCRIPTION="Powerful and Lightweight Python Tree Data Structure with various plugins"
HOMEPAGE="https://anytree.readthedocs.io/"
SRC_URI="https://github.com/c0fec0de/anytree/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="dot"
RDEPEND="
dot? (
media-gfx/graphviz
)
"
DEPEND="${RDEPEND}
test? (
$(python_gen_cond_dep '
dev-python/six[${PYTHON_USEDEP}]
dev-python/pytest-cov[${PYTHON_USEDEP}]
')
)
"
distutils_enable_sphinx docs
distutils_enable_tests pytest
src_prepare(){
default
sed -e '/--cov/d' -i pyproject.toml || die
mkdir "${S}/tests/dotexport" || die
}
python_test() {
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
local -x EPYTEST_DESELECT=()
local -x EPYTEST_IGNORE=(
tests/test_dotexport.py
tests/test_dotexporter.py
tests/test_mermaidexporter.py
tests/test_uniquedotexporter.py
)
if ! use dot; then
EPYTEST_DESELECT+=(
"tests/test_dotexport.py::test_tree_png"
)
fi
distutils-r1_python_test "${S}/tests"
}

View File

@@ -70,7 +70,7 @@ DIST clap_derive-4.5.4.crate 29159 BLAKE2B 6f7087d553102f24c9de37e1ba85c0d540ea4
DIST clap_lex-0.7.0.crate 11915 BLAKE2B 03287f02067f6cb33bb3889e8032b0848e9a9cc17446eb0e2767768cf6ea8c579a7455d33c8af735fb8d0c16095b19f991a5e2528dee3a7628d68c16f9307fa4 SHA512 638feb2e4571677dbe15ef0423866d2f0df309723e5ad65ddeaff7fd5e2e83adcb973a32d52a5f3924ea88fcff865e956b7d30dcd569df0412ef47848af14036
DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e
DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201
DIST conduit-v0.10.2.tar.bz2 260741 BLAKE2B 8182df3a4219f9361796c02f724bef704314a5772985edd4113d6913463bc40c6b9ee61f3faa4d7ead9b5fb8c4d17a77b95b48fb10125458d889ff7151b4f065 SHA512 36d88e8522c132763833e603419f1fad298c6cd6c7c1a5c2922125b57f0441e38d091e18322071a6baa41c08161a6032c4865819b356d488cc03f0a7f8d4f7e8
DIST conduit-v0.10.3.tar.bz2 260547 BLAKE2B eee59a616844f28cb4860221ec68bfc3cb736d2f700b89079ed3602364c13973027b213f67869687ac93dc93388d92f181e7def8ddff4e0f11fb67095b655861 SHA512 f3cfdf46ba3a296eaf0de3e05b19769a1bd70b0d5db881fe77775125c528ec00c5ce17fa75c426696da1a06e2363f5734999d5676c2e19f992656e3f40547bfb
DIST conduit-v0.9.0.tar.bz2 233703 BLAKE2B 88715511046679b8e35cf2e8e317f95c6779fa33eabd9233e49adf4375540975fcb1fa5b4fc68207698900a93ab5470e19a5e79970fcfd3d990293c8b21a0730 SHA512 1031627cbc46dd3bd35ceac4fdec733de70e5710be182a16ba8ba8bf0939c6716bd14d3f0f0ea5223213c297901bfeafa268958e62a51e74d073cc7debf3c9f5
DIST const-oid-0.9.6.crate 45382 BLAKE2B ac27c689784fbb1f486cec1c17502c8738ce3d7d1b579391a151cb0f0a6a0c8335e474d0a517c59230fcac74317396f20ac15d66e2f6685780be01dab197fd96 SHA512 b871d3b4326c4828b1c1d7a3e968315fa320e0b52e97081a95617ded0dc5b93d42b3f79ad26ff3b58a4835dcc442473f3965c2b60026412ad6aacc0c23e9f399
DIST const_panic-0.2.8.crate 48077 BLAKE2B c263ddd7488e7d67eac7e678cbd56f5904c51b290f20f80cd32439f4584006463ba266db6af2f975365feadd500b414eaa6a6639949ada782e8a81b3878f3a85 SHA512 302388c0a91193eabd94a8d92c48bf65a428540eda09915553a4ba53906ee8dc1590695f2cf617d7914ea044add684dc983b29281cc78e4849e6be93b6f46b9d

View File

@@ -9,3 +9,4 @@ amx_bf16 - Use Advanced Matrix Extensions BFloat16 instruction set
amx_tile - Use Advanced Matrix Extensions Tile Matrix Multiply Instruction set
amx_int8 - Use Advanced Matrix Extensions INT8 instruction set
avx_vnni - Use VEX-coded vector neural network instructions for 8- and 16-bit multiply-add operations
bmi2 - Use Bit Manipulation Instruction Set 2

View File

@@ -2,3 +2,7 @@ DIST ollama-0.6.5-vendor.tar.xz 4416776 BLAKE2B be4ad1df96e17d94d5bd8464113d9551
DIST ollama-0.6.5.gh.tar.gz 7964755 BLAKE2B af059b433e28766988f7a4097fd2774d17331282ea670c588d69d69865b73f5460d0c9d271154228bb1e3488ccbe7fe785ed637acb88fb51f1efb5efed905ac6 SHA512 dc97098b51f215ec5259aece5872fe213aa7b413344aab30b6417754e15f9ce27d2515dd9134edf620d70b8af88d3de5d305ea4020adb7d281b268d26b672adf
DIST ollama-0.6.6-vendor.tar.xz 4411192 BLAKE2B 49eb6a51eba9faed05a61cb4769d4696a936b8fec65be56c6b5e95b59c8cfbb2505e1e3a1a15baeed7eac4a2651f4965eb4a70ba7ba36ae8b18955d305e450aa SHA512 319352dcb98195723800da3d5eb3bf12de521a7634a2a484d3d4b89f8e6661fff760bccef734a083f6b81bc837996f043fdbd2d7d1d9dcca5a069ede02f37592
DIST ollama-0.6.6.gh.tar.gz 8290979 BLAKE2B 3082cca4e9a9e690f792d8286888b4141fe7ada2b91a703503a0330f9da29a80bc29ac78b1308e5276868bd125f4fe68d644fba47ec930fe1373a850373f49d9 SHA512 83df0cd3c76d771d4486ecf9a6789287c309d4b99a0e1e2d2d895f4527592f219b06eb695d4cfc0b4f37446aa26883a407eecfd00ac043355e406ca919d7032b
DIST ollama-0.6.8-vendor.tar.xz 4409824 BLAKE2B 21c0ba500e39e1059b1375cdc3e1ea5f886005176c492a150ce546b318aa548d5d9768ab6b8afff0abe1d4cbeb84eab332641bd40943cc2fe30b9fd1a5101c92 SHA512 b1c2a6496daf657f6878ad51dc7e7ff6bbcd835f64ade0388cd5fdceb6bb642c0f479e11022c570beda3cfd5f082eac6cfad09a1652719ed675b8451c078547c
DIST ollama-0.6.8.gh.tar.gz 8330813 BLAKE2B 97bbf1d9c8b60a040c1965a5d5c808ca920cd64f83b440f14df85bbe1f668e5a185580aa521dc9b81aa1bef99402f80f286340037e0add81568646e0635ac0ce SHA512 b38033b2ff85f11b1acd6d677221e61efc2f61c12919f65b002f8a2f4162fd735305ed7d10d0db97cef870a2eb8759e6ac5b97dbe3adb3abe5809577605b5874
DIST ollama-0.7.0-vendor.tar.xz 4412128 BLAKE2B f7d0836a8c592e644888c9cc8990c3abb77f7c9500a71bc8b29df366642f1ea948ff2dbd6d691ec0c12482c3298ca833618591f7714d03e784d2ba810490e3a5 SHA512 064261c8eeae509babd160e72cffdff0f72da07376dc4d3b4f159660b9f14e023730050da2099de61e509626da807dab2a54c75c13aa8a336669bf06196eefe8
DIST ollama-0.7.0.gh.tar.gz 8349937 BLAKE2B b4f31067e599ad9a3adde8d1d847f5065d1f45a0ee4e8e1332c21629df1b8b2fb61f7e79524adf4bfe4c6fb2413135ce51098fd0f86b44e5a534d19a8fed2af5 SHA512 50b9594660aa13f401eae7d8584c479ebb6c0185e2b518a8f6c6e98de878acb048fa443ec7d480c439a8cfe8bba1eee3bbfaca6746fadb5b1b7b9815747b98dd

View File

@@ -0,0 +1,308 @@
# Copyright 2024-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# supports ROCM/HIP >=5.5, but we define 6.1 due to the eclass
ROCM_VERSION=6.1
inherit cuda rocm
inherit cmake
inherit go-module systemd toolchain-funcs
DESCRIPTION="Get up and running with Llama 3, Mistral, Gemma, and other language models."
HOMEPAGE="https://ollama.com"
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ollama/ollama.git"
else
SRC_URI="
https://github.com/ollama/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
https://github.com/negril/gentoo-overlay-vendored/raw/refs/heads/blobs/${P}-vendor.tar.xz
"
KEYWORDS="~amd64"
fi
LICENSE="MIT"
SLOT="0"
X86_CPU_FLAGS=(
sse4_2
avx
f16c
avx2
bmi2
fma3
avx512f
avx512vbmi
avx512_vnni
avx_vnni
)
CPU_FLAGS=( "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
IUSE="${CPU_FLAGS[*]} cuda blas mkl rocm"
# IUSE+=" opencl vulkan"
RESTRICT="test"
COMMON_DEPEND="
cuda? (
dev-util/nvidia-cuda-toolkit:=
)
blas? (
!mkl? (
virtual/blas
)
mkl? (
sci-libs/mkl
)
)
rocm? (
>=sci-libs/hipBLAS-5.5:=[${ROCM_USEDEP}]
)
"
DEPEND="
${COMMON_DEPEND}
>=dev-lang/go-1.23.4
"
RDEPEND="
${COMMON_DEPEND}
acct-group/${PN}
>=acct-user/${PN}-3[cuda?]
"
PATCHES=(
"${FILESDIR}/${PN}-0.6.3-use-GNUInstallDirs.patch"
)
pkg_pretend() {
if use amd64; then
if use cpu_flags_x86_f16c && use cpu_flags_x86_avx2 && use cpu_flags_x86_fma3 && ! use cpu_flags_x86_bmi2; then
ewarn
ewarn "CPU_FLAGS_X86: bmi2 not enabled."
ewarn " Not building haswell runner."
ewarn " Not building skylakex runner."
ewarn " Not building icelake runner."
ewarn " Not building alderlake runner."
ewarn
if grep bmi2 /proc/cpuinfo > /dev/null; then
ewarn "bmi2 found in /proc/cpuinfo"
ewarn
fi
fi
fi
}
src_unpack() {
if [[ "${PV}" == *9999* ]]; then
git-r3_src_unpack
go-module_live_vendor
else
go-module_src_unpack
fi
}
src_prepare() {
cmake_src_prepare
sed \
-e "/set(GGML_CCACHE/s/ON/OFF/g" \
-e "/PRE_INCLUDE_REGEXES.*cu/d" \
-e "/PRE_INCLUDE_REGEXES.*hip/d" \
-i CMakeLists.txt || die sed
sed \
-e "s/ -O3//g" \
-i ml/backend/ggml/ggml/src/ggml-cpu/cpu.go || die sed
# fix library location
sed \
-e "s#lib/ollama#$(get_libdir)/ollama#g" \
-i CMakeLists.txt || die sed
sed \
-e "s/\"..\", \"lib\"/\"..\", \"$(get_libdir)\"/" \
-e "s#\"lib/ollama\"#\"$(get_libdir)/ollama\"#" \
-i \
ml/backend/ggml/ggml/src/ggml.go \
discover/path.go \
|| die
if use amd64; then
if
! use cpu_flags_x86_sse4_2; then
sed -e "/ggml_add_cpu_backend_variant(sse42/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx; then
sed -e "/ggml_add_cpu_backend_variant(sandybridge/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42 AVX)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_bmi2 ||
! use cpu_flags_x86_fma3; then
sed -e "/ggml_add_cpu_backend_variant(haswell/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42 AVX F16C AVX2 BMI2 FMA)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_bmi2 ||
! use cpu_flags_x86_fma3 ||
! use cpu_flags_x86_avx512f; then
sed -e "/ggml_add_cpu_backend_variant(skylakex/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42 AVX F16C AVX2 BMI2 FMA AVX512)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_bmi2 ||
! use cpu_flags_x86_fma3 ||
! use cpu_flags_x86_avx512f ||
! use cpu_flags_x86_avx512vbmi ||
! use cpu_flags_x86_avx512_vnni; then
sed -e "/ggml_add_cpu_backend_variant(icelake/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_bmi2 ||
! use cpu_flags_x86_fma3 ||
! use cpu_flags_x86_avx_vnni; then
sed -e "/ggml_add_cpu_backend_variant(alderlake/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42 AVX F16C AVX2 BMI2 FMA AVX_VNNI)
fi
# ml/backend/ggml/ggml/src/CMakeLists.txt
fi
# default
# return
if use cuda; then
cuda_src_prepare
fi
if use rocm; then
# --hip-version gets appended to the compile flags which isn't a known flag.
# This causes rocm builds to fail because -Wunused-command-line-argument is turned on.
# Use nuclear option to fix this.
# Disable -Werror's from go modules.
find "${S}" -name ".go" -exec sed -i "s/ -Werror / /g" {} + || die
fi
}
src_configure() {
local mycmakeargs=(
-DGGML_CCACHE="no"
# -DGGML_CPU="yes"
-DGGML_BLAS="$(usex blas)"
# -DGGML_CUDA="$(usex cuda)"
# -DGGML_HIP="$(usex rocm)"
# -DGGML_METAL="yes" # apple
# missing from ml/backend/ggml/ggml/src/
# -DGGML_CANN="yes"
# -DGGML_MUSA="yes"
# -DGGML_RPC="yes"
# -DGGML_SYCL="yes"
# -DGGML_KOMPUTE="$(usex kompute)"
# -DGGML_OPENCL="$(usex opencl)"
# -DGGML_VULKAN="$(usex vulkan)"
)
if use blas; then
if use mkl; then
mycmakeargs+=(
-DGGML_BLAS_VENDOR="Intel"
)
else
mycmakeargs+=(
-DGGML_BLAS_VENDOR="Generic"
)
fi
fi
if use cuda; then
local -x CUDAHOSTCXX CUDAHOSTLD
CUDAHOSTCXX="$(cuda_gccdir)"
CUDAHOSTLD="$(tc-getCXX)"
cuda_add_sandbox -w
addpredict "/dev/char/"
else
mycmakeargs+=(
-DCMAKE_CUDA_COMPILER="NOTFOUND"
)
fi
if use rocm; then
mycmakeargs+=(
-DCMAKE_HIP_ARCHITECTURES="$(get_amdgpu_flags)"
-DCMAKE_HIP_PLATFORM="amd"
# ollama doesn't honor the default cmake options
-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
)
local -x HIP_PATH="${ESYSROOT}/usr"
check_amdgpu
else
mycmakeargs+=(
-DCMAKE_HIP_COMPILER="NOTFOUND"
)
fi
cmake_src_configure
}
src_compile() {
ego build
cmake_src_compile
}
src_install() {
dobin ollama
cmake_src_install
newinitd "${FILESDIR}/ollama.init" "${PN}"
newconfd "${FILESDIR}/ollama.confd" "${PN}"
systemd_dounit "${FILESDIR}/ollama.service"
}
pkg_preinst() {
keepdir /var/log/ollama
fperms 750 /var/log/ollama
fowners "${PN}:${PN}" /var/log/ollama
}
pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]] ; then
einfo "Quick guide:"
einfo "\tollama serve"
einfo "\tollama run llama3:70b"
einfo
einfo "See available models at https://ollama.com/library"
fi
if use cuda ; then
einfo "When using cuda the user running ${PN} has to be in the video group or it won't detect devices."
einfo "The ebuild ensures this for user ${PN} via acct-user/${PN}[cuda]"
fi
}

View File

@@ -0,0 +1,308 @@
# Copyright 2024-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# supports ROCM/HIP >=5.5, but we define 6.1 due to the eclass
ROCM_VERSION=6.1
inherit cuda rocm
inherit cmake
inherit go-module systemd toolchain-funcs
DESCRIPTION="Get up and running with Llama 3, Mistral, Gemma, and other language models."
HOMEPAGE="https://ollama.com"
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ollama/ollama.git"
else
SRC_URI="
https://github.com/ollama/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
https://github.com/negril/gentoo-overlay-vendored/raw/refs/heads/blobs/${P}-vendor.tar.xz
"
KEYWORDS="~amd64"
fi
LICENSE="MIT"
SLOT="0"
X86_CPU_FLAGS=(
sse4_2
avx
f16c
avx2
bmi2
fma3
avx512f
avx512vbmi
avx512_vnni
avx_vnni
)
CPU_FLAGS=( "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
IUSE="${CPU_FLAGS[*]} cuda blas mkl rocm"
# IUSE+=" opencl vulkan"
RESTRICT="test"
COMMON_DEPEND="
cuda? (
dev-util/nvidia-cuda-toolkit:=
)
blas? (
!mkl? (
virtual/blas
)
mkl? (
sci-libs/mkl
)
)
rocm? (
>=sci-libs/hipBLAS-5.5:=[${ROCM_USEDEP}]
)
"
DEPEND="
${COMMON_DEPEND}
>=dev-lang/go-1.23.4
"
RDEPEND="
${COMMON_DEPEND}
acct-group/${PN}
>=acct-user/${PN}-3[cuda?]
"
PATCHES=(
"${FILESDIR}/${PN}-0.6.3-use-GNUInstallDirs.patch"
)
pkg_pretend() {
if use amd64; then
if use cpu_flags_x86_f16c && use cpu_flags_x86_avx2 && use cpu_flags_x86_fma3 && ! use cpu_flags_x86_bmi2; then
ewarn
ewarn "CPU_FLAGS_X86: bmi2 not enabled."
ewarn " Not building haswell runner."
ewarn " Not building skylakex runner."
ewarn " Not building icelake runner."
ewarn " Not building alderlake runner."
ewarn
if grep bmi2 /proc/cpuinfo > /dev/null; then
ewarn "bmi2 found in /proc/cpuinfo"
ewarn
fi
fi
fi
}
src_unpack() {
if [[ "${PV}" == *9999* ]]; then
git-r3_src_unpack
go-module_live_vendor
else
go-module_src_unpack
fi
}
src_prepare() {
cmake_src_prepare
sed \
-e "/set(GGML_CCACHE/s/ON/OFF/g" \
-e "/PRE_INCLUDE_REGEXES.*cu/d" \
-e "/PRE_INCLUDE_REGEXES.*hip/d" \
-i CMakeLists.txt || die sed
sed \
-e "s/ -O3//g" \
-i ml/backend/ggml/ggml/src/ggml-cpu/cpu.go || die sed
# fix library location
sed \
-e "s#lib/ollama#$(get_libdir)/ollama#g" \
-i CMakeLists.txt || die sed
sed \
-e "s/\"..\", \"lib\"/\"..\", \"$(get_libdir)\"/" \
-e "s#\"lib/ollama\"#\"$(get_libdir)/ollama\"#" \
-i \
ml/backend/ggml/ggml/src/ggml.go \
discover/path.go \
|| die
if use amd64; then
if
! use cpu_flags_x86_sse4_2; then
sed -e "/ggml_add_cpu_backend_variant(sse42/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx; then
sed -e "/ggml_add_cpu_backend_variant(sandybridge/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42 AVX)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_bmi2 ||
! use cpu_flags_x86_fma3; then
sed -e "/ggml_add_cpu_backend_variant(haswell/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42 AVX F16C AVX2 BMI2 FMA)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_bmi2 ||
! use cpu_flags_x86_fma3 ||
! use cpu_flags_x86_avx512f; then
sed -e "/ggml_add_cpu_backend_variant(skylakex/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42 AVX F16C AVX2 BMI2 FMA AVX512)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_bmi2 ||
! use cpu_flags_x86_fma3 ||
! use cpu_flags_x86_avx512f ||
! use cpu_flags_x86_avx512vbmi ||
! use cpu_flags_x86_avx512_vnni; then
sed -e "/ggml_add_cpu_backend_variant(icelake/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_bmi2 ||
! use cpu_flags_x86_fma3 ||
! use cpu_flags_x86_avx_vnni; then
sed -e "/ggml_add_cpu_backend_variant(alderlake/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42 AVX F16C AVX2 BMI2 FMA AVX_VNNI)
fi
# ml/backend/ggml/ggml/src/CMakeLists.txt
fi
# default
# return
if use cuda; then
cuda_src_prepare
fi
if use rocm; then
# --hip-version gets appended to the compile flags which isn't a known flag.
# This causes rocm builds to fail because -Wunused-command-line-argument is turned on.
# Use nuclear option to fix this.
# Disable -Werror's from go modules.
find "${S}" -name ".go" -exec sed -i "s/ -Werror / /g" {} + || die
fi
}
src_configure() {
local mycmakeargs=(
-DGGML_CCACHE="no"
# -DGGML_CPU="yes"
-DGGML_BLAS="$(usex blas)"
# -DGGML_CUDA="$(usex cuda)"
# -DGGML_HIP="$(usex rocm)"
# -DGGML_METAL="yes" # apple
# missing from ml/backend/ggml/ggml/src/
# -DGGML_CANN="yes"
# -DGGML_MUSA="yes"
# -DGGML_RPC="yes"
# -DGGML_SYCL="yes"
# -DGGML_KOMPUTE="$(usex kompute)"
# -DGGML_OPENCL="$(usex opencl)"
# -DGGML_VULKAN="$(usex vulkan)"
)
if use blas; then
if use mkl; then
mycmakeargs+=(
-DGGML_BLAS_VENDOR="Intel"
)
else
mycmakeargs+=(
-DGGML_BLAS_VENDOR="Generic"
)
fi
fi
if use cuda; then
local -x CUDAHOSTCXX CUDAHOSTLD
CUDAHOSTCXX="$(cuda_gccdir)"
CUDAHOSTLD="$(tc-getCXX)"
cuda_add_sandbox -w
addpredict "/dev/char/"
else
mycmakeargs+=(
-DCMAKE_CUDA_COMPILER="NOTFOUND"
)
fi
if use rocm; then
mycmakeargs+=(
-DCMAKE_HIP_ARCHITECTURES="$(get_amdgpu_flags)"
-DCMAKE_HIP_PLATFORM="amd"
# ollama doesn't honor the default cmake options
-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
)
local -x HIP_PATH="${ESYSROOT}/usr"
check_amdgpu
else
mycmakeargs+=(
-DCMAKE_HIP_COMPILER="NOTFOUND"
)
fi
cmake_src_configure
}
src_compile() {
ego build
cmake_src_compile
}
src_install() {
dobin ollama
cmake_src_install
newinitd "${FILESDIR}/ollama.init" "${PN}"
newconfd "${FILESDIR}/ollama.confd" "${PN}"
systemd_dounit "${FILESDIR}/ollama.service"
}
pkg_preinst() {
keepdir /var/log/ollama
fperms 750 /var/log/ollama
fowners "${PN}:${PN}" /var/log/ollama
}
pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]] ; then
einfo "Quick guide:"
einfo "\tollama serve"
einfo "\tollama run llama3:70b"
einfo
einfo "See available models at https://ollama.com/library"
fi
if use cuda ; then
einfo "When using cuda the user running ${PN} has to be in the video group or it won't detect devices."
einfo "The ebuild ensures this for user ${PN} via acct-user/${PN}[cuda]"
fi
}

View File

@@ -27,22 +27,23 @@ LICENSE="MIT"
SLOT="0"
X86_CPU_FLAGS=(
sse4_2
avx
f16c
avx2
bmi2
fma3
avx512f
avx512vbmi
avx512_vnni
avx512_bf16
avx_vnni
amx_tile
amx_int8
)
CPU_FLAGS=( "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" )
IUSE="${CPU_FLAGS[*]} cuda blas mkl rocm"
# IUSE+=" opencl vulkan"
RESTRICT="test"
COMMON_DEPEND="
cuda? (
dev-util/nvidia-cuda-toolkit:=
@@ -75,6 +76,24 @@ PATCHES=(
"${FILESDIR}/${PN}-0.6.3-use-GNUInstallDirs.patch"
)
pkg_pretend() {
if use amd64; then
if use cpu_flags_x86_f16c && use cpu_flags_x86_avx2 && use cpu_flags_x86_fma3 && ! use cpu_flags_x86_bmi2; then
ewarn
ewarn "CPU_FLAGS_X86: bmi2 not enabled."
ewarn " Not building haswell runner."
ewarn " Not building skylakex runner."
ewarn " Not building icelake runner."
ewarn " Not building alderlake runner."
ewarn
if grep bmi2 /proc/cpuinfo > /dev/null; then
ewarn "bmi2 found in /proc/cpuinfo"
ewarn
fi
fi
fi
}
src_unpack() {
if [[ "${PV}" == *9999* ]]; then
git-r3_src_unpack
@@ -111,63 +130,64 @@ src_prepare() {
|| die
if use amd64; then
if ! use cpu_flags_x86_avx; then
sed -e "/ggml_add_cpu_backend_variant(sandybridge/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# AVX)
if
! use cpu_flags_x86_sse4_2; then
sed -e "/ggml_add_cpu_backend_variant(sse42/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx; then
sed -e "/ggml_add_cpu_backend_variant(sandybridge/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# SSE42 AVX)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_bmi2 ||
! use cpu_flags_x86_fma3; then
sed -e "/ggml_add_cpu_backend_variant(haswell/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# AVX F16C AVX2 FMA)
# SSE42 AVX F16C AVX2 BMI2 FMA)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_bmi2 ||
! use cpu_flags_x86_fma3 ||
! use cpu_flags_x86_avx512f; then
sed -e "/ggml_add_cpu_backend_variant(skylakex/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# AVX F16C AVX2 FMA AVX512)
# SSE42 AVX F16C AVX2 BMI2 FMA AVX512)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_bmi2 ||
! use cpu_flags_x86_fma3 ||
! use cpu_flags_x86_avx512f ||
! use cpu_flags_x86_avx512vbmi ||
! use cpu_flags_x86_avx512_vnni; then
sed -e "/ggml_add_cpu_backend_variant(icelake/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# AVX F16C AVX2 FMA AVX512 AVX512_VBMI AVX512_VNNI)
# SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI)
fi
if
! use cpu_flags_x86_sse4_2 ||
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_bmi2 ||
! use cpu_flags_x86_fma3 ||
! use cpu_flags_x86_avx_vnni; then
sed -e "/ggml_add_cpu_backend_variant(alderlake/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
# AVX F16C AVX2 FMA AVX_VNNI)
# SSE42 AVX F16C AVX2 BMI2 FMA AVX_VNNI)
fi
if
! use cpu_flags_x86_avx ||
! use cpu_flags_x86_f16c ||
! use cpu_flags_x86_avx2 ||
! use cpu_flags_x86_fma3 ||
! use cpu_flags_x86_avx512f ||
! use cpu_flags_x86_avx512vbmi ||
! use cpu_flags_x86_avx512_vnni ||
! use cpu_flags_x86_avx512_bf16 ||
! use cpu_flags_x86_amx_tile ||
! use cpu_flags_x86_amx_int8 ; then
sed -e "/ggml_add_cpu_backend_variant(sapphirerapids/s/^/# /g" -i ml/backend/ggml/ggml/src/CMakeLists.txt || die
#AVX F16C AVX2 FMA AVX512 AVX512_VBMI AVX512_VNNI AVX512_BF16 AMX_TILE AMX_INT8)
fi
: # ml/backend/ggml/ggml/src/CMakeLists.txt
# ml/backend/ggml/ggml/src/CMakeLists.txt
fi
# default