commit: 69efba9ce107ee517eeb05c80adbcc176c6e4440 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Wed Apr 16 12:17:02 2025 +0000 Commit: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> CommitDate: Wed Apr 16 12:17:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=69efba9c
sci-ml/ollama: drop 0.6.4 0.6.3 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> sci-ml/ollama/Manifest | 4 - sci-ml/ollama/ollama-0.6.3.ebuild | 305 -------------------------------------- sci-ml/ollama/ollama-0.6.4.ebuild | 305 -------------------------------------- 3 files changed, 614 deletions(-) diff --git a/sci-ml/ollama/Manifest b/sci-ml/ollama/Manifest index 292ef15d2..c8ac3ffaf 100644 --- a/sci-ml/ollama/Manifest +++ b/sci-ml/ollama/Manifest @@ -1,6 +1,2 @@ -DIST ollama-0.6.3-vendor.tar.xz 4417068 BLAKE2B 33aabb08f8582c7f211ebfc51c95af96d7ce1402c6350b656fb0114fe849901ea65f22bf833175a87aa318a685f35c0941b236dfcbf84c81d7766a91d66f6db3 SHA512 79044b751daba3d463d7890792d5a6581e96317951de763191b128237e90e81dac578b674654d527e70d48fa059cb62f40831554c432a2a424d659790dbd7a10 -DIST ollama-0.6.3.gh.tar.gz 7950300 BLAKE2B 4a14bab714b11104753caafe58a1301490d6a24d7af90a374741b6977fafb47792a50fa570e0883b13d5275f621ae1516f2d4055f6c32583e42821725d65e59f SHA512 28a0688f1aa35a161e09af19b643b2a53115fa29ce0b522ed2bd76bcaedc710553a266af2370886bc23408025935f786d13f07297ffb3e783b13132237f10712 -DIST ollama-0.6.4-vendor.tar.xz 4414140 BLAKE2B 72452a0143863afc6a748a78ece63d8e33842b8f53ae041b2a0e5d727765cf452ac95e81fff4af2fddbc86da793864ef1d2489f7feb15092b5732f1bcae1f698 SHA512 acb179bc8816e843cd78858be6af828496932385a4f1c7877af1de1ad38c68f55b789c2b0ab81b7ce92e0aea9e2224bc004d18b3fbce1ff81e2bc904234d9d48 -DIST ollama-0.6.4.gh.tar.gz 7958849 BLAKE2B 1cc6b1490913c3d11d1abe3ad99f44db0cc953ca58e507949b4cef02e37a1be20e7621627f999426a0d224a5a1a41de6186254730a2507f200540340f621e034 SHA512 ee2de90c51f4c85e6bacab8c570ffe3d0adc59369423127c0875cd328ea1469899f7ee847eb00c5e35856adba50d8c2d2e8de88df2389a043313d6f0edcbf5db DIST ollama-0.6.5-vendor.tar.xz 4416776 BLAKE2B be4ad1df96e17d94d5bd8464113d95518173aeccb998a22ee3bffb8788019b520f18a141d1e1e9c594295c9c4d20a9064eb86905c44520da00f170f769b11fed SHA512 ca8eb19061e6772d79f4f531d610692837334046d906a1c500202bafc3ae48b4c181c9d8a3f79b273bc5e8616012117f7ae248d3505d74bda3db942386923662 DIST ollama-0.6.5.gh.tar.gz 7964755 BLAKE2B af059b433e28766988f7a4097fd2774d17331282ea670c588d69d69865b73f5460d0c9d271154228bb1e3488ccbe7fe785ed637acb88fb51f1efb5efed905ac6 SHA512 dc97098b51f215ec5259aece5872fe213aa7b413344aab30b6417754e15f9ce27d2515dd9134edf620d70b8af88d3de5d305ea4020adb7d281b268d26b672adf diff --git a/sci-ml/ollama/ollama-0.6.3.ebuild b/sci-ml/ollama/ollama-0.6.3.ebuild deleted file mode 100644 index cf664c756..000000000 --- a/sci-ml/ollama/ollama-0.6.3.ebuild +++ /dev/null @@ -1,305 +0,0 @@ -# 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=( - avx - f16c - avx2 - 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" - -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}[cuda?] -" - -PATCHES=( - "${FILESDIR}/${PN}-0.6.3-use-GNUInstallDirs.patch" -) - -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/${CFLAGS}/g" \ - -i ml/backend/ggml/ggml/src/ggml-cpu/cpu.go || die sed - - 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) - fi - if - ! use cpu_flags_x86_avx || - ! use cpu_flags_x86_f16c || - ! use cpu_flags_x86_avx2 || - ! 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) - 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; 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) - 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; 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) - 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_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) - 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 - 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=( - -DCMAKE_POLICY_DEFAULT_CMP0177="OLD" - -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 - else - mycmakeargs+=( - -DCMAKE_CUDA_COMPILER="NOTFOUND" - ) - fi - - if use rocm; then - mycmakeargs+=( - -DCMAKE_HIP_PLATFORM="amd" - ) - - local -x HIP_ARCHS HIP_PATH - HIP_ARCHS="$(get_amdgpu_flags)" - HIP_PATH="${ESYSROOT}/usr" - - check_amdgpu - else - mycmakeargs+=( - -DCMAKE_HIP_COMPILER="NOTFOUND" - ) - fi - - cmake_src_configure - - # if ! use cuda && ! use rocm; then - # # to configure and build only CPU variants - # set -- cmake --preset Default "${mycmakeargs[@]}" - # fi - - # if use cuda; then - # # to configure and build only CUDA - # set -- cmake --preset CUDA "${mycmakeargs[@]}" - # fi - - # if use rocm; then - # # to configure and build only ROCm - # set -- cmake --preset ROCm "${mycmakeargs[@]}" - # fi - - # echo "$@" >&2 - # "$@" || die -n "${*} failed" -} - -src_compile() { - ego build - - cmake_src_compile - - # if ! use cuda && ! use rocm; then - # # to configure and build only CPU variants - # set -- cmake --build --preset Default -j16 - # fi - - # if use cuda; then - # # to configure and build only CUDA - # set -- cmake --build --preset CUDA -j16 - # fi - - # if use rocm; then - # # to configure and build only ROCm - # set -- cmake --build --preset ROCm -j16 - # fi - - # echo "$@" >&2 - # "$@" || die -n "${*} failed" -} - -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 -} diff --git a/sci-ml/ollama/ollama-0.6.4.ebuild b/sci-ml/ollama/ollama-0.6.4.ebuild deleted file mode 100644 index cf664c756..000000000 --- a/sci-ml/ollama/ollama-0.6.4.ebuild +++ /dev/null @@ -1,305 +0,0 @@ -# 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=( - avx - f16c - avx2 - 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" - -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}[cuda?] -" - -PATCHES=( - "${FILESDIR}/${PN}-0.6.3-use-GNUInstallDirs.patch" -) - -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/${CFLAGS}/g" \ - -i ml/backend/ggml/ggml/src/ggml-cpu/cpu.go || die sed - - 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) - fi - if - ! use cpu_flags_x86_avx || - ! use cpu_flags_x86_f16c || - ! use cpu_flags_x86_avx2 || - ! 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) - 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; 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) - 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; 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) - 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_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) - 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 - 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=( - -DCMAKE_POLICY_DEFAULT_CMP0177="OLD" - -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 - else - mycmakeargs+=( - -DCMAKE_CUDA_COMPILER="NOTFOUND" - ) - fi - - if use rocm; then - mycmakeargs+=( - -DCMAKE_HIP_PLATFORM="amd" - ) - - local -x HIP_ARCHS HIP_PATH - HIP_ARCHS="$(get_amdgpu_flags)" - HIP_PATH="${ESYSROOT}/usr" - - check_amdgpu - else - mycmakeargs+=( - -DCMAKE_HIP_COMPILER="NOTFOUND" - ) - fi - - cmake_src_configure - - # if ! use cuda && ! use rocm; then - # # to configure and build only CPU variants - # set -- cmake --preset Default "${mycmakeargs[@]}" - # fi - - # if use cuda; then - # # to configure and build only CUDA - # set -- cmake --preset CUDA "${mycmakeargs[@]}" - # fi - - # if use rocm; then - # # to configure and build only ROCm - # set -- cmake --preset ROCm "${mycmakeargs[@]}" - # fi - - # echo "$@" >&2 - # "$@" || die -n "${*} failed" -} - -src_compile() { - ego build - - cmake_src_compile - - # if ! use cuda && ! use rocm; then - # # to configure and build only CPU variants - # set -- cmake --build --preset Default -j16 - # fi - - # if use cuda; then - # # to configure and build only CUDA - # set -- cmake --build --preset CUDA -j16 - # fi - - # if use rocm; then - # # to configure and build only ROCm - # set -- cmake --build --preset ROCm -j16 - # fi - - # echo "$@" >&2 - # "$@" || die -n "${*} failed" -} - -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 -}
