commit: 6ffd638c2e5fa38aea21ec6d9b13587807588c24 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Mon Mar 31 21:32:01 2025 +0000 Commit: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> CommitDate: Mon Mar 31 21:32:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6ffd638c
sci-ml/ollama: add 0.6.3, update 9999 Reworked the openrc init files. Installs to /usr/$(get_libdir) now. Avoids pointless copying for CUDA/ROCM files just to delete them afterwards. Closes: https://bugs.gentoo.org/950633 Closes: https://bugs.gentoo.org/946268 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> sci-ml/ollama/Manifest | 2 + .../files/ollama-0.6.3-use-GNUInstallDirs.patch | 26 +++++++++++ sci-ml/ollama/files/ollama.confd | 11 +++++ sci-ml/ollama/files/ollama.init | 27 +----------- .../{ollama-9999.ebuild => ollama-0.6.3.ebuild} | 51 ++++++++++++++-------- sci-ml/ollama/ollama-9999.ebuild | 48 +++++++++++++------- 6 files changed, 107 insertions(+), 58 deletions(-) diff --git a/sci-ml/ollama/Manifest b/sci-ml/ollama/Manifest index 0d00a5bb0..c71b7d935 100644 --- a/sci-ml/ollama/Manifest +++ b/sci-ml/ollama/Manifest @@ -1,2 +1,4 @@ DIST ollama-0.5.7-deps.tar.xz 115361652 BLAKE2B 8694b35ef2545481c2e1f6a9d7c462177f25e78aab79288197ec4b33190a905c7e92e54734725cde7f122e1161cbdaf9c72ae40cbeb0b8ee0af9075e3dbb6691 SHA512 d7abe6266120cb9e731e53f6e14e16d8991e76fbab06348de945f53dc407788324b850308e7200616d92dd17a417ad0a2491eddd543bbe2cfee6a66c8ab81840 DIST ollama-0.5.7.gh.tar.gz 2345089 BLAKE2B 7d5063e9f665ab2a957d449b38017e6a9bb435c938749161c711cfc35d8a0361e7f4db214e0782f3b51c70c909fc5be8b76ca342cda6163b5aca5fdd733c55d9 SHA512 ea8adcec4f8f932c422a400b8cafb4b983bfa0721cd14383ceb8e0a4f588ecd1289d2e1de46a916c1b34d13e5dab2825ef11a37fc3e797345348dea3bd9144fe +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 diff --git a/sci-ml/ollama/files/ollama-0.6.3-use-GNUInstallDirs.patch b/sci-ml/ollama/files/ollama-0.6.3-use-GNUInstallDirs.patch new file mode 100644 index 000000000..5a69109aa --- /dev/null +++ b/sci-ml/ollama/files/ollama-0.6.3-use-GNUInstallDirs.patch @@ -0,0 +1,26 @@ +From 3e250053458fa33c97023ff8943e8c5daa4beeca Mon Sep 17 00:00:00 2001 +From: Paul Zander <[email protected]> +Date: Mon, 31 Mar 2025 18:07:47 +0200 +Subject: [PATCH] use GNUInstallDirs + +Signed-off-by: Paul Zander <[email protected]> + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9e107fe..79407ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,8 +35,9 @@ if (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") + set(CMAKE_INSTALL_RPATH "@loader_path") + endif() + +-set(OLLAMA_BUILD_DIR ${CMAKE_BINARY_DIR}/lib/ollama) +-set(OLLAMA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/ollama) ++include(GNUInstallDirs) ++set(OLLAMA_BUILD_DIR ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/ollama) ++set(OLLAMA_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/ollama) + + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OLLAMA_BUILD_DIR}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${OLLAMA_BUILD_DIR}) +-- +2.49.0 + diff --git a/sci-ml/ollama/files/ollama.confd b/sci-ml/ollama/files/ollama.confd new file mode 100644 index 000000000..fccb3dbc4 --- /dev/null +++ b/sci-ml/ollama/files/ollama.confd @@ -0,0 +1,11 @@ +# Ollama allows cross-origin requests from 127.0.0.1 and 0.0.0.0 by default. +# Additional origins can be configured with OLLAMA_ORIGINS. +# export OLLAMA_ORIGINS="<ip>" + +# log to syslog +# output_logger="logger -t \"$RC_SVCNAME\" -p daemon.info" +# error_logger="logger -t \"$RC_SVCNAME\" -p daemon.err" + +# log to file +output_log="/var/log/ollama/ollama.log" +error_log="/var/log/ollama/ollama.log" diff --git a/sci-ml/ollama/files/ollama.init b/sci-ml/ollama/files/ollama.init index 17e632899..50e2a8d6a 100644 --- a/sci-ml/ollama/files/ollama.init +++ b/sci-ml/ollama/files/ollama.init @@ -2,31 +2,8 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License, v2 +supervisor=supervise-daemon description="Ollama Service" command="/usr/bin/ollama" command_args="serve" -command_user="ollama" -command_group="ollama" -command_background="yes" -pidfile="/run/ollama.pid" -log="/var/log/ollama/ollama.log" - -# Ollama allows cross-origin requests from 127.0.0.1 and 0.0.0.0 by default. -# Additional origins can be configured with OLLAMA_ORIGINS. -# export OLLAMA_ORIGINS="<ip>" - -start() { - ebegin "Starting $description" - exec >> >(logger -t "$RC_SVCNAME Start daemon" -p daemon.info) - start-stop-daemon --start --background --user "$command_user" --group "$command_group" \ - --pidfile "$pidfile" --make-pidfile --exec $command $command_args -1 $log -2 $log - eend $? -} - -stop() { - ebegin "Stopping $description" - exec >> >(logger -t "$RC_SVCNAME Stop daemon" -p daemon.info) - start-stop-daemon --stop --pidfile "$pidfile" - eend $? -} - +command_user="ollama:ollama" diff --git a/sci-ml/ollama/ollama-9999.ebuild b/sci-ml/ollama/ollama-0.6.3.ebuild similarity index 83% copy from sci-ml/ollama/ollama-9999.ebuild copy to sci-ml/ollama/ollama-0.6.3.ebuild index d2f6a46c4..b4969fb21 100644 --- a/sci-ml/ollama/ollama-9999.ebuild +++ b/sci-ml/ollama/ollama-0.6.3.ebuild @@ -3,6 +3,7 @@ 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 @@ -15,6 +16,10 @@ 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 @@ -51,7 +56,7 @@ COMMON_DEPEND=" ) ) rocm? ( - >=sci-libs/hipBLAS-${ROCM_VERSION}:=[${ROCM_USEDEP}] + >=sci-libs/hipBLAS-5.5:=[${ROCM_USEDEP}] ) " @@ -63,9 +68,13 @@ DEPEND=" RDEPEND=" ${COMMON_DEPEND} acct-group/${PN} - acct-user/${PN}[cuda?] + acct-user/${PN} " +PATCHES=( + "${FILESDIR}/${PN}-0.6.3-use-GNUInstallDirs.patch" +) + src_unpack() { if [[ "${PV}" == *9999* ]]; then git-r3_src_unpack @@ -78,7 +87,11 @@ src_unpack() { src_prepare() { cmake_src_prepare - sed -e "/set(GGML_CCACHE/s/ON/OFF/g" -i CMakeLists.txt || die + 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 if use amd64; then if ! use cpu_flags_x86_avx; then @@ -157,8 +170,10 @@ src_prepare() { 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)" @@ -201,8 +216,10 @@ src_configure() { mycmakeargs+=( -DCMAKE_HIP_PLATFORM="amd" ) - local -x HIP_ARCHS=$(get_amdgpu_flags) - local -x HIP_PATH="/usr" + + local -x HIP_ARCHS HIP_PATH + HIP_ARCHS="$(get_amdgpu_flags)" + HIP_PATH="${ESYSROOT}/usr" check_amdgpu else @@ -261,24 +278,24 @@ src_install() { cmake_src_install - if use cuda; then - # remove the copied cuda files... - rm "${ED}/usr/lib/ollama"/cuda_*/libcu*.so* || die - fi + newinitd "${FILESDIR}/ollama.init" "${PN}" + newconfd "${FILESDIR}/ollama.confd" "${PN}" - doinitd "${FILESDIR}"/ollama.init - systemd_dounit "${FILESDIR}"/ollama.service + systemd_dounit "${FILESDIR}/ollama.service" } pkg_preinst() { keepdir /var/log/ollama - # fowners ollama:ollama /var/log/ollama - fperms 777 /var/log/ollama + fperms 750 /var/log/ollama + fowners "${PN}:${PN}" /var/log/ollama } pkg_postinst() { - einfo "Quick guide:" - einfo "ollama serve" - einfo "ollama run llama3:70b" - einfo "See available models at https://ollama.com/library"; + 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-9999.ebuild b/sci-ml/ollama/ollama-9999.ebuild index d2f6a46c4..7147e4cc8 100644 --- a/sci-ml/ollama/ollama-9999.ebuild +++ b/sci-ml/ollama/ollama-9999.ebuild @@ -3,6 +3,7 @@ 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 @@ -15,6 +16,10 @@ 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 @@ -51,7 +56,7 @@ COMMON_DEPEND=" ) ) rocm? ( - >=sci-libs/hipBLAS-${ROCM_VERSION}:=[${ROCM_USEDEP}] + >=sci-libs/hipBLAS-5.5:=[${ROCM_USEDEP}] ) " @@ -66,6 +71,10 @@ RDEPEND=" acct-user/${PN}[cuda?] " +PATCHES=( + "${FILESDIR}/${PN}-0.6.3-use-GNUInstallDirs.patch" +) + src_unpack() { if [[ "${PV}" == *9999* ]]; then git-r3_src_unpack @@ -78,7 +87,11 @@ src_unpack() { src_prepare() { cmake_src_prepare - sed -e "/set(GGML_CCACHE/s/ON/OFF/g" -i CMakeLists.txt || die + 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 if use amd64; then if ! use cpu_flags_x86_avx; then @@ -159,6 +172,7 @@ src_configure() { local mycmakeargs=( -DGGML_CCACHE="no" + # -DGGML_CPU="yes" -DGGML_BLAS="$(usex blas)" # -DGGML_CUDA="$(usex cuda)" # -DGGML_HIP="$(usex rocm)" @@ -201,8 +215,10 @@ src_configure() { mycmakeargs+=( -DCMAKE_HIP_PLATFORM="amd" ) - local -x HIP_ARCHS=$(get_amdgpu_flags) - local -x HIP_PATH="/usr" + + local -x HIP_ARCHS HIP_PATH + HIP_ARCHS="$(get_amdgpu_flags)" + HIP_PATH="${ESYSROOT}/usr" check_amdgpu else @@ -261,24 +277,24 @@ src_install() { cmake_src_install - if use cuda; then - # remove the copied cuda files... - rm "${ED}/usr/lib/ollama"/cuda_*/libcu*.so* || die - fi + newinitd "${FILESDIR}/ollama.init" "${PN}" + newconfd "${FILESDIR}/ollama.confd" "${PN}" - doinitd "${FILESDIR}"/ollama.init - systemd_dounit "${FILESDIR}"/ollama.service + systemd_dounit "${FILESDIR}/ollama.service" } pkg_preinst() { keepdir /var/log/ollama - # fowners ollama:ollama /var/log/ollama - fperms 777 /var/log/ollama + fperms 750 /var/log/ollama + fowners "${PN}:${PN}" /var/log/ollama } pkg_postinst() { - einfo "Quick guide:" - einfo "ollama serve" - einfo "ollama run llama3:70b" - einfo "See available models at https://ollama.com/library"; + 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 }
