commit: 27d78765404f8fe9b852b399f23e4125d7931e54 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Thu Mar 5 21:31:18 2026 +0000 Commit: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> CommitDate: Thu Mar 5 21:32:45 2026 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=27d78765
Revert "sci-ml/ollama: add 0.17.4" This reverts commit fab26d56314ca3c21b7d2366307f72a989ed8ab5. Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> sci-ml/ollama/Manifest | 2 - sci-ml/ollama/ollama-0.17.4.ebuild | 367 ------------------------------------- 2 files changed, 369 deletions(-) diff --git a/sci-ml/ollama/Manifest b/sci-ml/ollama/Manifest index 54c1e57a71..e67915607e 100644 --- a/sci-ml/ollama/Manifest +++ b/sci-ml/ollama/Manifest @@ -10,5 +10,3 @@ DIST ollama-0.13.5-deps.tar.xz 49906880 BLAKE2B efd7b64921784b1d68a27d07c1de8083 DIST ollama-0.13.5.gh.tar.gz 20965129 BLAKE2B c72aed9bd42877dd43876c46609414e0a2bfb248114ede9d9d53e4f78000fa02c93728805e88620d467d6b06827639c969bd8382c9cbb755ad1710a92b5607f5 SHA512 c9d26a7993f3b63da9d734f45245118793ed8746052e33cf86bec24da9ec5811a969a079e8885537dce38f56042d9fbaccb524d417817cddd0372c1f3c68eab5 DIST ollama-0.14.2-deps.tar.xz 49830396 BLAKE2B 829c0746c72067290402862244ff610fc17a1226b90333f7a77a996d18a34121dd459104e071301ded851752114bdb8d7387f8ef8f7aaf816f670cb54378a762 SHA512 18fc1b7c60718ebbcdd22ae53b4abb78b5b521c3616715bf58ac199a70b901be95d350a6c70a120d7e3848b279c527d647d742010c13b160287ee7188236040d DIST ollama-0.14.2.gh.tar.gz 22876732 BLAKE2B 43090d604795c449700711614c7f04088b5158fc9c9dafa3df8687022facd1b3011b2396e7381be624a7024367c64d105e028dfac6d424cb617ca4424bd7ef13 SHA512 452e5dbd6badf1afdab606cabced247f84585049d2fdcad31380476f2a2d158549b7783f31728dc9ec9fed5f0cd18c40ca033fc02d06599fcb68d6cb47a6ec63 -DIST ollama-0.17.4-deps.tar.xz 84650388 BLAKE2B b83450c77d4b769b712d7cae5949a0b72931b03d131ec857c3f22d4e9f498a86b916aebdd26176294aca1133b6a58cfa063f58af232fdd30fd7f741fdc95dc85 SHA512 705c67b746e55b56273880fddb2afa18f6ad4989db67d425aadfd695807503861c38bf76da9bfe7d4118ac625b8554501cfa28fc334c7c7f6e09b96a84805691 -DIST ollama-0.17.4.gh.tar.gz 23227896 BLAKE2B 4e4cbecbbeb0269d7d05692356e4b078b68316c87a78570c22e1aeeabfcedf07ec6dddf99d2f19cbdd1dca1235d22844fd4894963b111727010ddcae948c71cf SHA512 3886382cb6fe18f9b79492b95f220af3679d093894a9a7fe585dd03f579f826125c3e2bf709a75336db4738b3ca6618353e44795492adb4cecccbe1e6a460606 diff --git a/sci-ml/ollama/ollama-0.17.4.ebuild b/sci-ml/ollama/ollama-0.17.4.ebuild deleted file mode 100644 index afa1a5e0f1..0000000000 --- a/sci-ml/ollama/ollama-0.17.4.ebuild +++ /dev/null @@ -1,367 +0,0 @@ -# Copyright 2024-2026 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 flag-o-matic go-module linux-info 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/gentoo-golang-dist/${PN}/releases/download/v${PV}/${P}-deps.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="blas ${CPU_FLAGS[*]} cuda mkl rocm vulkan" -# IUSE+=" opencl" - -RESTRICT="mirror test" - -COMMON_DEPEND=" - blas? ( - !mkl? ( - virtual/blas - ) - mkl? ( - sci-libs/mkl[llvm-openmp] - ) - ) - cuda? ( - dev-util/nvidia-cuda-toolkit:= - ) - rocm? ( - >=dev-util/hip-${ROCM_VERSION}:= - >=sci-libs/hipBLAS-${ROCM_VERSION}:= - >=sci-libs/rocBLAS-${ROCM_VERSION}:= - ) -" - -DEPEND=" - ${COMMON_DEPEND} - >=dev-lang/go-1.23.4 -" -BDEPEND=" - vulkan? ( - dev-util/vulkan-headers - media-libs/shaderc - ) -" - -RDEPEND=" - ${COMMON_DEPEND} - acct-group/${PN} - >=acct-user/${PN}-3[cuda?] -" - -PATCHES=( - "${FILESDIR}/${PN}-9999-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 -} - -pkg_setup() { - if use rocm; 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_unpack() { - # Already filter lto flags for ROCM - # 963401 - if use rocm; then - # copied from _rocm_strip_unsupported_flags - strip-unsupported-flags - export CXXFLAGS="$(test-flags-HIPCXX "${CXXFLAGS}")" - fi - - 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 "bundle headers sed failed" - - # TODO see src_unpack? - sed \ - -e "s/ -O3//g" \ - -i \ - ml/backend/ggml/ggml/src/ggml-cpu/cpu.go \ - || die "-O3 sed failed" - - # grep -Rl -e 'lib/ollama' -e '"..", "lib"' --include '*.go' - sed \ - -e "s/\"..\", \"lib\"/\"..\", \"$(get_libdir)\"/" \ - -e "s#\"lib/ollama\"#\"$(get_libdir)/ollama\"#" \ - -i \ - ml/backend/ggml/ggml/src/ggml.go \ - ml/path.go \ - || die "libdir sed failed" - - 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 - - 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" - - # backends end up in /usr/bin otherwise - -DGGML_BACKEND_DL="yes" - # TODO causes duplicate install warning but breaks detection otherwise ollama/issues/13614 - -DGGML_BACKEND_DIR="${EPREFIX}/usr/$(get_libdir)/${PN}" - - # -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)" - "$(cmake_use_find_package vulkan Vulkan)" - ) - - if use blas; then - if use mkl; then - mycmakeargs+=( - -DGGML_BLAS_VENDOR="Intel10_64lp" - ) - else - mycmakeargs+=( - -DGGML_BLAS_VENDOR="Generic" - ) - fi - fi - - if use cuda; then - local -x CUDAHOSTCXX CUDAHOSTLD - CUDAHOSTCXX="$(cuda_gccdir)" - CUDAHOSTLD="$(tc-getCXX)" - - # default to all for now until cuda.eclass is updated - if [[ ! -v CUDAARCHS ]]; then - local CUDAARCHS="all" - fi - - mycmakeargs+=( - -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}" - ) - - 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" - else - mycmakeargs+=( - -DCMAKE_HIP_COMPILER="NOTFOUND" - ) - fi - - cmake_src_configure -} - -src_compile() { - # export version information - # https://github.com/gentoo/guru/pull/205 - # https://forums.gentoo.org/viewtopic-p-8831646.html - local VERSION - if [[ "${PV}" == *9999* ]]; then - VERSION="$( - git describe --tags --first-parent --abbrev=7 --long --dirty --always \ - | sed -e "s/^v//g" - )" - else - VERSION="${PVR}" - fi - local EXTRA_GOFLAGS_LD=( - # "-w" # disable DWARF generation - # "-s" # disable symbol table - "-X=github.com/ollama/ollama/version.Version=${VERSION}" - "-X=github.com/ollama/ollama/server.mode=release" - ) - GOFLAGS+=" '-ldflags=${EXTRA_GOFLAGS_LD[*]}'" - - 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 -}
