From e9affaeb8774da7369101ffa7b95a3ac8dbbb7f0 Mon Sep 17 00:00:00 2001 From: Olivier van der Toorn Date: Thu, 3 Sep 2026 21:22:54 +0200 Subject: [PATCH] wip --- acct-user/sd-cpp-webui/Manifest | 1 + acct-user/sd-cpp-webui/sd-cpp-webui-1.ebuild | 13 ++ sci-ml/ggml/Manifest | 2 - sci-ml/ggml/ggml-0.22.0-r1.ebuild | 118 ------------------ sci-ml/ggml/metadata.xml | 14 --- sci-ml/sd-cpp-webui/Manifest | 2 +- sci-ml/sd-cpp-webui/sd-cpp-webui-1.0.0.ebuild | 26 ++-- sci-ml/stable-diffusion-cpp/Manifest | 2 +- .../stable-diffusion-cpp-1.0.0.ebuild | 10 +- 9 files changed, 36 insertions(+), 152 deletions(-) create mode 100644 acct-user/sd-cpp-webui/Manifest create mode 100644 acct-user/sd-cpp-webui/sd-cpp-webui-1.ebuild delete mode 100644 sci-ml/ggml/Manifest delete mode 100644 sci-ml/ggml/ggml-0.22.0-r1.ebuild delete mode 100644 sci-ml/ggml/metadata.xml diff --git a/acct-user/sd-cpp-webui/Manifest b/acct-user/sd-cpp-webui/Manifest new file mode 100644 index 0000000..f794a52 --- /dev/null +++ b/acct-user/sd-cpp-webui/Manifest @@ -0,0 +1 @@ +EBUILD sd-cpp-webui-1.ebuild 259 BLAKE2B fb4daf9c12fe8827e035fbff4db268e08c5dab3ed12137c6721546c9bb5bf4fb3b8b45394d5db4c05a4ec413b2b580e4ed720cec3332c667e6b36ed86b994b24 SHA512 fb86cf4b7c75f4c4ef875eabcd78fb6d036071451ae9b5d7ce78f66302ac275537b3b97fdec961dd89f2d4f63f142338e9a99d40b1463363b81b169e2b914357 diff --git a/acct-user/sd-cpp-webui/sd-cpp-webui-1.ebuild b/acct-user/sd-cpp-webui/sd-cpp-webui-1.ebuild new file mode 100644 index 0000000..2b23b4a --- /dev/null +++ b/acct-user/sd-cpp-webui/sd-cpp-webui-1.ebuild @@ -0,0 +1,13 @@ +EAPI=8 + +inherit acct-user + +DESCRIPTION="System user for sd.cpp-webui" +SLOT="0" +KEYWORDS="amd64" + +ACCT_USER_ID="sd-webui" +ACCT_USER_GROUPS=( sd-webui ) +ACCT_USER_HOME="/var/lib/sd-webui" +ACCT_USER_HOME_OWNER="sd-webui:sd-webui" +ACCT_USER_SHELL="/sbin/nologin" diff --git a/sci-ml/ggml/Manifest b/sci-ml/ggml/Manifest deleted file mode 100644 index 46e7646..0000000 --- a/sci-ml/ggml/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ggml-0.22.0.tar.gz 3767077 BLAKE2B 0ce794cd97a26d42490ee0ce3501ca7a7fc046b1827faeaeb28cdc2b4b01aad2d58d0ba6a2575def7792d9c3226acac43cd4c0839e1cd5143d80f50a87886205 SHA512 61ea7d216c949f0e484f2b4edf1a83226e452079ef0663575c1b2585a2960bc1318bdf64da817a89cbe0b3baa4d7cdec81fe33417d55bb4b2e80428486aebd5a -EBUILD ggml-0.22.0-r1.ebuild 2480 BLAKE2B f7afb8cb5872666a076f3aae17a1ce2657e49cb88cbffa3957c96ac0ba937c9d08dddb1d4162d24e5567b50b74b349320125e3fd20a863743963c70916cb487e SHA512 5bd16160222b8e4a5db957349f401c41065f73271ea5f536df2d1e3178adbe63b294033285d87fe4bfa3d2c5eee72457acdb7c1d362318a9d02411e58e48d178 diff --git a/sci-ml/ggml/ggml-0.22.0-r1.ebuild b/sci-ml/ggml/ggml-0.22.0-r1.ebuild deleted file mode 100644 index 9b5b04e..0000000 --- a/sci-ml/ggml/ggml-0.22.0-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ROCM_VERSION=7.2 -inherit cuda cmake rocm toolchain-funcs - -DESCRIPTION="Tensor library for machine learning" -HOMEPAGE="https://ggml.ai/" -SRC_URI="https://github.com/ggml-org/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64" - -X86_CPU_FLAGS=( - avx - avx_vnni - avx2 - avx512_bf16 - avx512bw - avx512f - avx512vbmi - avx512_vnni - bmi2 - fma3 - f16c - sse4_2 -) -CPU_FLAGS=( "${X86_CPU_FLAGS[@]/#/cpu_flags_x86_}" ) -IUSE="${CPU_FLAGS[*]} cuda openmp rocm test vulkan" - -REQUIRED_USE="rocm? ( ${ROCM_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -# Should be >=sci-libs/hipBLAS-${ROCM_VERSION}[${ROCM_USEDEP}] -# But pkgcheck can't elaborate that -RDEPEND=" - cuda? ( - dev-util/nvidia-cuda-toolkit:= - ) - vulkan? ( media-libs/vulkan-loader ) - rocm? ( - >=dev-util/hip-${ROCM_VERSION} - >=sci-libs/hipBLAS-${ROCM_VERSION} - ) -" -DEPEND="${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND="vulkan? ( media-libs/shaderc )" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - cmake_src_prepare - - if use cuda; then - cuda_src_prepare - fi -} - -src_configure() { - local mycmakeargs=( - -DGGML_BACKEND_DL=OFF - -DGGML_BUILD_EXAMPLES=OFF - -DGGML_NATIVE=OFF - -DGGML_HIP_MMQ_MFMA=OFF - - # CPU Flags - -DGGML_AVX=$(usex cpu_flags_x86_avx) - -DGGML_AVX_VNNI=$(usex cpu_flags_x86_avx_vnni) - -DGGML_AVX2=$(usex cpu_flags_x86_avx2) - -DGGML_AVX512_BF16=$(usex cpu_flags_x86_avx512_bf16) - -DGGML_AVX512_VBMI=$(usex cpu_flags_x86_avx512vbmi) - -DGGML_AVX512_VNNI=$(usex cpu_flags_x86_avx512_vnni) - -DGGML_BMI2=$(usex cpu_flags_x86_bmi2) - -DGGML_FMA=$(usex cpu_flags_x86_fma3) - -DGGML_F16C=$(usex cpu_flags_x86_f16c) - -DGGML_SSE42=$(usex cpu_flags_x86_sse4_2) - - -DGGML_CUDA=$(usex cuda) - -DGGML_OPENMP=$(usex openmp) - -DGGML_HIP=$(usex rocm) - -DGGML_VULKAN=$(usex vulkan) - - -DGGML_BUILD_TESTS=$(usex test) - - -DGGML_MAX_NAME=160 - ) - - # Enable AVX512 if ANY of the avx512 flags are present - if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx512bw; then - mycmakeargs+=( -DGGML_AVX512=ON ) - else - mycmakeargs+=( -DGGML_AVX512=OFF ) - fi - - if use cuda; then - cuda_add_sandbox -w - addpredict "/dev/char/" - cuda_sanitize - mycmakeargs+=( - -DCMAKE_CUDA_FLAGS="${NVCCFLAGS}" - ) - fi - - cmake_src_configure -} diff --git a/sci-ml/ggml/metadata.xml b/sci-ml/ggml/metadata.xml deleted file mode 100644 index 5f8845f..0000000 --- a/sci-ml/ggml/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - tupone@gentoo.org - Tupone Alfredo - - - Enable ROCm gpu computing support - - - ggml-org/ggml - - diff --git a/sci-ml/sd-cpp-webui/Manifest b/sci-ml/sd-cpp-webui/Manifest index 293ac0a..4e69302 100644 --- a/sci-ml/sd-cpp-webui/Manifest +++ b/sci-ml/sd-cpp-webui/Manifest @@ -1 +1 @@ -EBUILD sd-cpp-webui-1.0.0.ebuild 492 BLAKE2B c12311969719c3058cea4352f63eb706da190310ef10eb373a1625f0200afa7f2855f746e9cc274c658e71894fb600b782a152b76aaa6f454bf04bb8bb09329b SHA512 1c3ec9b979a526393cec8747ddf8779221b4b4d1baef77969b7855c61114ebdef363ca6bc192e425270513aa274a6b2b1160277abe6647700de5c8890664c1e2 +EBUILD sd-cpp-webui-1.0.0.ebuild 653 BLAKE2B 69ecce93ebb3f75721bebe23eaeabd730f48b652e5280dd369a35c177b2125fa9af6085d4352a8cb9fd463d6b755741b05b0a3858b6bb1b30ebca5f8d75a10ae SHA512 4465badd3ef11c9169ce6d0ade119a90aa5c5578c51a6d65e30d8b78717f2818cf05dc2930aa0f9147bbfa726cc7a6f7ef16c2153d7560cc2735b85523c7195e diff --git a/sci-ml/sd-cpp-webui/sd-cpp-webui-1.0.0.ebuild b/sci-ml/sd-cpp-webui/sd-cpp-webui-1.0.0.ebuild index da26099..17614b7 100644 --- a/sci-ml/sd-cpp-webui/sd-cpp-webui-1.0.0.ebuild +++ b/sci-ml/sd-cpp-webui/sd-cpp-webui-1.0.0.ebuild @@ -8,21 +8,29 @@ EGIT_REPO_URI="https://github.com/daniandtheweb/sd.cpp-webui.git" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="" +KEYWORDS="amd64" + +DEPEND=" + sci-ml/stable-diffusion-cpp + acct-user/sd-cpp-webui +" RDEPEND=" - dev-python/gradio + dev-python/gradio " src_install() { - insinto /usr/share/sd.cpp-webui + insinto /usr/share/sd.cpp-webui - doins sdcpp_webui.py - doins -r defaults - doins -r modules + doins sdcpp_webui.py + doins -r defaults + doins -r modules - exeinto /usr/share/sd.cpp-webui - doexe sdcpp_webui.sh + exeinto /usr/share/sd.cpp-webui + doexe sdcpp_webui.sh - dodoc README.md + dosym /usr/bin/sd-server /usr/share/sd.cpp-webui/sd-server + dosym /usr/bin/sd-cli /usr/share/sd.cpp-webui/sd-cli + + dodoc README.md } diff --git a/sci-ml/stable-diffusion-cpp/Manifest b/sci-ml/stable-diffusion-cpp/Manifest index 87bc50e..296978c 100644 --- a/sci-ml/stable-diffusion-cpp/Manifest +++ b/sci-ml/stable-diffusion-cpp/Manifest @@ -1,2 +1,2 @@ -EBUILD stable-diffusion-cpp-1.0.0.ebuild 885 BLAKE2B 146cf24558470d016e0e286f33725afb00976777cda0f3bf0c87ac9302b6c07a9fb91f75ed5fee4098493b1059540cb2d56a96f0c80205c57b5be72975bf488e SHA512 f9be946e419937f2f84e5e26a3a5d021bcba9ca4e154b2a1ea353352c477a4bd3ebd3ac81fb02f192fba37deeda0ab5ca7b8454865107aa020210c28a34cefb6 +EBUILD stable-diffusion-cpp-1.0.0.ebuild 867 BLAKE2B dfbcaf3b673a14cc40abe0f9fe3e780b98f7152b07f2d8c79992151f1966b7a95231d3f5c29709544aee70d40fa36310f838a1cacb1389f146c5a3ea25a605f4 SHA512 5f1e55e80fa313fae7cbd3177a356f3d0d90b396e2ee6d4bdd71c6aea3c388364b3b9aba83c577703b965796a2e2d0476e4510886423b689b8d744f07c397fab MISC metadata.xml 384 BLAKE2B 5d62a19c0060d2376b254317ee3a8b1eca0b05b6d9c034a2b8908cc42fa79882da3f6219e7b5495ca93ee1b99c8b2b3d9f9060c85cd95e374cb53f9c21d6c2c6 SHA512 b8d4a04a94d4bcb051836197f7196a116115105b1fcdc15595910a617146526468d561a84677a8221025295fa91697d4a116747230d17ac2b361f69415d2576e diff --git a/sci-ml/stable-diffusion-cpp/stable-diffusion-cpp-1.0.0.ebuild b/sci-ml/stable-diffusion-cpp/stable-diffusion-cpp-1.0.0.ebuild index c07c7e5..7200ab6 100644 --- a/sci-ml/stable-diffusion-cpp/stable-diffusion-cpp-1.0.0.ebuild +++ b/sci-ml/stable-diffusion-cpp/stable-diffusion-cpp-1.0.0.ebuild @@ -16,7 +16,6 @@ KEYWORDS="amd64 x86" IUSE="vulkan" DEPEND=" - sci-ml/ggml media-libs/libwebm vulkan? ( dev-util/glslang @@ -31,11 +30,6 @@ RDEPEND=" src_configure() { local mycmakeargs=( - -DSD_BUILD_EXAMPLES=OFF - -DSD_BUILD_SHARED_LIBS=ON - -DSD_BUILD_SHARED_GGML_LIB=OFF - -DSD_USE_SYSTEM_GGML=ON - -DSD_WEBP=ON -DSD_WEBM=ON ) @@ -50,5 +44,7 @@ src_configure() { } src_install() { - cmake_src_install + # cmake_src_install + dobin ${BUILD_DIR}/bin/sd-cli + dobin ${BUILD_DIR}/bin/sd-server }