diff --git a/.gitea/workflows/poll-upstream.yml b/.gitea/workflows/poll-upstream.yml index 0a82f17..acd29cb 100644 --- a/.gitea/workflows/poll-upstream.yml +++ b/.gitea/workflows/poll-upstream.yml @@ -32,7 +32,7 @@ jobs: fedora_version="${target%%:*}" flavour="${target##*:}" base_url="https://rpm.lair.cafe/fedora/${fedora_version}/x86_64" - rpm_name="mistralrs-server-${flavour}-${version}-1.fc${fedora_version}.x86_64.rpm" + rpm_name="mistralrs-${flavour}-${version}-1.fc${fedora_version}.x86_64.rpm" # check that the rpm file exists http_code=$(curl \ @@ -62,13 +62,13 @@ jobs: --repofrompath=check,"${base_url}" \ --repo=check \ --quiet \ - "mistralrs-server-${flavour}-${version}" 2>&1 \ - | grep --quiet "mistralrs-server-${flavour}"; then - echo "repo index missing: mistralrs-server-${flavour}-${version} not in ${base_url}/repodata/" + "mistralrs-${flavour}-${version}" 2>&1 \ + | grep --quiet "mistralrs-${flavour}"; then + echo "repo index missing: mistralrs-${flavour}-${version} not in ${base_url}/repodata/" needs_build=true continue fi - echo "indexed: mistralrs-server-${flavour}-${version} in ${base_url}/repodata/" + echo "indexed: mistralrs-${flavour}-${version} in ${base_url}/repodata/" done echo "already_built=$( [ "${needs_build}" = "true" ] && echo false || echo true )" >> "$GITHUB_OUTPUT" env: diff --git a/CLAUDE.md b/CLAUDE.md index aefd842..6a4b4bb 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -39,7 +39,7 @@ FLAVOUR_NAME=cuda13 CUDA_HOME=/usr/local/cuda-13.0 CARGO_FEATURES="cuda cudnn fl Build an RPM from a pre-built binary: ```bash rpmdev-setuptree -cp artifacts/mistralrs-server-cuda13 ~/rpmbuild/SOURCES/ +cp artifacts/mistralrs-cuda13 ~/rpmbuild/SOURCES/ cp rpm/systemd/mistralrs@.service ~/rpmbuild/SOURCES/ cp rpm/systemd/mistralrs@.conf.example ~/rpmbuild/SOURCES/ rpmbuild -bb rpm/mistralrs.spec --define "mistralrs_version 0.7.0" --define "mistralrs_flavour cuda13" diff --git a/readme.md b/readme.md index 0daffd1..b5755aa 100644 --- a/readme.md +++ b/readme.md @@ -134,7 +134,7 @@ enabled=1 gpgcheck=1 gpgkey=https://rpm.lair.cafe/.gpg EOF -sudo dnf install mistralrs-server-cuda13 +sudo dnf install mistralrs-cuda13 ``` ## Forcing a rebuild @@ -142,9 +142,11 @@ sudo dnf install mistralrs-server-cuda13 To force a rebuild of an already-published RPM (e.g. after a packaging change), remove the RPM from the repo server and update the index: ```bash -ssh oolon "sudo rm /var/www/rpm/fedora/43/x86_64/mistralrs-server-cuda13--1.fc43.x86_64.rpm \ - && cd /var/www/rpm/fedora/43/x86_64 \ - && sudo createrepo_c --update ." +ssh oolon " + sudo rm /var/www/rpm/fedora/43/x86_64/mistralrs-cuda13--1.fc43.x86_64.rpm \ + && cd /var/www/rpm/fedora/43/x86_64 \ + && sudo createrepo_c --update .; +" ``` The next poll-upstream cycle (every 15 minutes) will detect the missing package and trigger a full rebuild. You can also trigger poll-upstream manually from the Gitea Actions UI to avoid waiting. diff --git a/rpm/mistralrs.spec b/rpm/mistralrs.spec index 84a459d..3bc6548 100644 --- a/rpm/mistralrs.spec +++ b/rpm/mistralrs.spec @@ -6,7 +6,7 @@ %{!?mistralrs_version: %global mistralrs_version 0.7.0} %{!?mistralrs_flavour: %global mistralrs_flavour cuda13} -Name: mistralrs-server-%{mistralrs_flavour} +Name: mistralrs-%{mistralrs_flavour} Version: %{mistralrs_version} Release: 1%{?dist} Summary: Fast, flexible LLM inference server (mistral.rs, %{mistralrs_flavour} flavour) @@ -29,7 +29,8 @@ ExclusiveArch: x86_64 %global __requires_exclude ^lib(cuda|cudart|cudnn|cublas|cublasLt|curand|nvrtc|nccl) Requires: systemd -Provides: mistralrs-server = %{version}-%{release} +Obsoletes: mistralrs-server-%{mistralrs_flavour} < %{version}-%{release} +Provides: mistralrs-server-%{mistralrs_flavour} = %{version}-%{release} %description mistral.rs is a blazingly fast LLM inference engine written in Rust. @@ -46,14 +47,14 @@ cp %{SOURCE2} . %install install -D -m 0755 mistralrs-%{mistralrs_flavour} \ - %{buildroot}%{_bindir}/mistralrs-server + %{buildroot}%{_bindir}/mistralrs install -D -m 0644 mistralrs@.service \ %{buildroot}%{_unitdir}/mistralrs@.service install -D -m 0644 mistralrs@.conf.example \ %{buildroot}%{_sysconfdir}/mistralrs/default.conf.example # Patch the unit to point at the binary -sed -i "s|@BINARY@|%{_bindir}/mistralrs-server|g" \ +sed -i "s|@BINARY@|%{_bindir}/mistralrs|g" \ %{buildroot}%{_unitdir}/mistralrs@.service sed -i "s|@FLAVOUR@|%{mistralrs_flavour}|g" \ %{buildroot}%{_unitdir}/mistralrs@.service @@ -72,7 +73,7 @@ getent passwd mistralrs >/dev/null || useradd -r -g mistralrs -d /var/lib/mistra %systemd_postun_with_restart mistralrs@.service %files -%{_bindir}/mistralrs-server +%{_bindir}/mistralrs %{_unitdir}/mistralrs@.service %{_sysconfdir}/mistralrs/default.conf.example diff --git a/ui/src/pages/Home.tsx b/ui/src/pages/Home.tsx index c9a760f..a9134a6 100644 --- a/ui/src/pages/Home.tsx +++ b/ui/src/pages/Home.tsx @@ -38,7 +38,7 @@ export function Home() {
3. Install a package
- {`sudo dnf install mistralrs-server-cuda13`} + {`sudo dnf install mistralrs-cuda13`}