Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
0184ccab28
|
|||
|
471b9b7629
|
|||
|
abe4ff7ccc
|
|||
|
7c3390a4e1
|
|||
|
2ff062da0e
|
|||
|
|
357f858a29 |
@@ -24,19 +24,6 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Cache cargo registry and target
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/bin
|
||||
~/.cargo/registry/index
|
||||
~/.cargo/registry/cache
|
||||
~/.cargo/git/db
|
||||
target
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Ensure sccache with S3 support
|
||||
env:
|
||||
RUSTC_WRAPPER: ""
|
||||
@@ -139,37 +126,37 @@ jobs:
|
||||
run: |
|
||||
VERSION="${{ steps.version.outputs.VERSION }}"
|
||||
sed -i '/\[workspace\.package\]/,/\[/{ s/^version = ".*"/version = "'"${VERSION}"'"/ }' Cargo.toml
|
||||
sed -i "s/^Version:.*/Version: ${VERSION}/" neuron.spec
|
||||
sed -i "s/^Version:.*/Version: ${VERSION}/" helexa-neuron.spec
|
||||
|
||||
- name: Generate changelog entry
|
||||
uses: https://git.lair.cafe/actions/rpm-changelog@v1
|
||||
with:
|
||||
spec: neuron.spec
|
||||
spec: helexa-neuron.spec
|
||||
version: ${{ steps.version.outputs.VERSION }}
|
||||
|
||||
- name: Generate source tarball
|
||||
run: |
|
||||
set -ex
|
||||
VERSION="${{ steps.version.outputs.VERSION }}"
|
||||
tar czf /tmp/neuron-${VERSION}.tar.gz \
|
||||
--transform "s,^\.,neuron-${VERSION}," \
|
||||
tar czf /tmp/helexa-neuron-${VERSION}.tar.gz \
|
||||
--transform "s,^\.,helexa-neuron-${VERSION}," \
|
||||
--exclude='./target' \
|
||||
--exclude='./.git' \
|
||||
--exclude='*.tar.gz' \
|
||||
--exclude='*.src.rpm' \
|
||||
.
|
||||
mv /tmp/neuron-${VERSION}.tar.gz .
|
||||
mv /tmp/helexa-neuron-${VERSION}.tar.gz .
|
||||
|
||||
- name: Vendor Rust dependencies
|
||||
run: |
|
||||
VERSION="${{ steps.version.outputs.VERSION }}"
|
||||
cargo vendor vendor/
|
||||
tar czf neuron-${VERSION}-vendor.tar.gz vendor/
|
||||
tar czf helexa-neuron-${VERSION}-vendor.tar.gz vendor/
|
||||
rm -rf vendor/
|
||||
|
||||
- name: Build SRPM
|
||||
run: |
|
||||
rpmbuild -bs neuron.spec \
|
||||
rpmbuild -bs helexa-neuron.spec \
|
||||
--define "_sourcedir $(pwd)" \
|
||||
--define "_srcrpmdir $(pwd)"
|
||||
|
||||
@@ -192,7 +179,7 @@ jobs:
|
||||
- name: Publish to COPR
|
||||
uses: https://git.lair.cafe/actions/copr-publish@v1
|
||||
with:
|
||||
project: helexa/cortex
|
||||
project: helexa/helexa
|
||||
srpm: "*.src.rpm"
|
||||
copr-config: ${{ secrets.COPR_CONFIG }}
|
||||
|
||||
@@ -209,7 +196,7 @@ jobs:
|
||||
- name: Publish to COPR
|
||||
uses: https://git.lair.cafe/actions/copr-publish@v1
|
||||
with:
|
||||
project: helexa/neuron
|
||||
project: helexa/helexa
|
||||
srpm: "*.src.rpm"
|
||||
copr-config: ${{ secrets.COPR_CONFIG }}
|
||||
|
||||
@@ -219,21 +206,43 @@ jobs:
|
||||
needs: [copr-cortex, copr-neuron]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Stamp version and push
|
||||
- name: Determine version
|
||||
id: version
|
||||
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Stamp version
|
||||
run: |
|
||||
VERSION="${{ steps.version.outputs.VERSION }}"
|
||||
sed -i '/\[workspace\.package\]/,/\[/{ s/^version = ".*"/version = "'"${VERSION}"'"/ }' Cargo.toml
|
||||
sed -i "s/^Version:.*/Version: ${VERSION}/" cortex.spec
|
||||
sed -i "s/^Version:.*/Version: ${VERSION}/" helexa-neuron.spec
|
||||
cargo check --workspace 2>/dev/null || true
|
||||
|
||||
- name: Generate cortex changelog entry
|
||||
uses: https://git.lair.cafe/actions/rpm-changelog@v1
|
||||
with:
|
||||
spec: cortex.spec
|
||||
version: ${{ steps.version.outputs.VERSION }}
|
||||
|
||||
- name: Generate helexa-neuron changelog entry
|
||||
uses: https://git.lair.cafe/actions/rpm-changelog@v1
|
||||
with:
|
||||
spec: helexa-neuron.spec
|
||||
version: ${{ steps.version.outputs.VERSION }}
|
||||
|
||||
- name: Commit and push
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
run: |
|
||||
VERSION="${GITHUB_REF#refs/tags/v}"
|
||||
sed -i '/\[workspace\.package\]/,/\[/{ s/^version = ".*"/version = "'"${VERSION}"'"/ }' Cargo.toml
|
||||
sed -i "s/^Version:.*/Version: ${VERSION}/" cortex.spec
|
||||
sed -i "s/^Version:.*/Version: ${VERSION}/" neuron.spec
|
||||
cargo check --workspace 2>/dev/null || true
|
||||
VERSION="${{ steps.version.outputs.VERSION }}"
|
||||
git config user.name "Gitea Actions"
|
||||
git config user.email "actions@git.lair.cafe"
|
||||
git add Cargo.toml Cargo.lock cortex.spec neuron.spec
|
||||
git add Cargo.toml Cargo.lock cortex.spec helexa-neuron.spec
|
||||
if git diff --cached --quiet; then
|
||||
echo "Version already at ${VERSION}"
|
||||
echo "Nothing to commit for ${VERSION}"
|
||||
else
|
||||
git commit -m "chore: bump version to ${VERSION}"
|
||||
git remote set-url origin "https://gitea-actions:${GITEA_TOKEN}@git.lair.cafe/helexa/cortex.git"
|
||||
|
||||
35
CLAUDE.md
35
CLAUDE.md
@@ -125,7 +125,8 @@ automatically. Clippy warnings must be resolved, not suppressed with
|
||||
- One or more GPU nodes running mistral.rs on port 8080
|
||||
- Optionally a metrics-only node (no GPU) for Prometheus/Grafana
|
||||
- Each node runs `mistralrs serve` on port 8080
|
||||
- Gateway listens on port 8000 (API) and 9100 (metrics)
|
||||
- Gateway listens on port 31313 (API) and 31314 (metrics)
|
||||
- neuron listens on port 13131 on each GPU host
|
||||
- TLS terminated at gateway or via nginx; internal traffic is plaintext over WireGuard
|
||||
|
||||
## Conventions
|
||||
@@ -380,7 +381,7 @@ processes (one process per loaded model, each on its own port).
|
||||
|
||||
## neuron API
|
||||
|
||||
neuron exposes an HTTP API on port 9090 that cortex polls and calls.
|
||||
neuron exposes an HTTP API on port 13131 that cortex polls and calls.
|
||||
|
||||
```
|
||||
GET /discovery
|
||||
@@ -424,8 +425,8 @@ endpoint. cortex.toml shrinks to:
|
||||
|
||||
```toml
|
||||
[gateway]
|
||||
listen = "0.0.0.0:8000"
|
||||
metrics_listen = "0.0.0.0:9100"
|
||||
listen = "0.0.0.0:31313"
|
||||
metrics_listen = "0.0.0.0:31314"
|
||||
|
||||
[eviction]
|
||||
strategy = "lru"
|
||||
@@ -433,15 +434,15 @@ defrag_after_cycles = 50
|
||||
|
||||
[[neurons]]
|
||||
name = "beast"
|
||||
endpoint = "http://beast.hanzalova.internal:9090"
|
||||
endpoint = "http://beast.hanzalova.internal:13131"
|
||||
|
||||
[[neurons]]
|
||||
name = "benjy"
|
||||
endpoint = "http://benjy.kosherinata.internal:9090"
|
||||
endpoint = "http://benjy.hanzalova.internal:13131"
|
||||
|
||||
[[neurons]]
|
||||
name = "quadbrat"
|
||||
endpoint = "http://quadbrat.hanzalova.internal:9090"
|
||||
endpoint = "http://quadbrat.hanzalova.internal:13131"
|
||||
```
|
||||
|
||||
On startup and periodically, cortex calls `GET /discovery` and
|
||||
@@ -521,7 +522,7 @@ cortex/
|
||||
│ │ └── metrics.rs # prometheus exporter (unchanged)
|
||||
│ ├── neuron/ # node plane (replaces cortex-agent)
|
||||
│ │ └── src/
|
||||
│ │ ├── main.rs # binary entrypoint, axum server on :9090
|
||||
│ │ ├── main.rs # binary entrypoint, axum server on :13131
|
||||
│ │ ├── discovery.rs # nvidia-smi, device enumeration
|
||||
│ │ ├── health.rs # runtime GPU polling
|
||||
│ │ ├── api.rs # HTTP handlers for /discovery, /models, etc.
|
||||
@@ -595,16 +596,24 @@ placement matching can be added incrementally.
|
||||
Completed. Both packages have RPM specs, systemd units, and example configs.
|
||||
CI builds parallel SRPMs on tag push and publishes to separate COPR repos.
|
||||
|
||||
- `cortex.spec` → `helexa/cortex` COPR: binary, systemd unit, config files
|
||||
- `neuron.spec` → `helexa/neuron` COPR: binary, systemd unit, config
|
||||
- `cortex.spec` — installs the `cortex` binary. Package name keeps the
|
||||
short `cortex` because no Fedora package collides with it.
|
||||
- `helexa-neuron.spec` — installs the `neuron` binary under package name
|
||||
`helexa-neuron`. Renamed from bare `neuron` to avoid collision with
|
||||
Fedora's NEURON neural-simulation package
|
||||
(https://src.fedoraproject.org/rpms/neuron); binary, systemd unit,
|
||||
system user, and config dir all stay named `neuron` since those are
|
||||
project-local contexts.
|
||||
- `data/cortex.service`, `data/neuron.service` — systemd units
|
||||
- `cortex.example.toml`, `neuron.example.toml`, `models.example.toml`
|
||||
- CI: parallel `srpm-cortex` + `srpm-neuron` jobs, then parallel COPR publish
|
||||
- CI: parallel `srpm-cortex` + `srpm-neuron` jobs, then parallel COPR
|
||||
publish to a single project `helexa/helexa` hosting both packages.
|
||||
|
||||
Install:
|
||||
```sh
|
||||
dnf copr enable helexa/cortex && dnf install cortex # gateway host
|
||||
dnf copr enable helexa/neuron && dnf install neuron # GPU nodes
|
||||
dnf copr enable helexa/helexa
|
||||
dnf install cortex # gateway host
|
||||
dnf install helexa-neuron # GPU nodes
|
||||
```
|
||||
|
||||
### Phase 11: llama.cpp harness stub
|
||||
|
||||
8
Cargo.lock
generated
8
Cargo.lock
generated
@@ -351,7 +351,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
|
||||
|
||||
[[package]]
|
||||
name = "cortex-cli"
|
||||
version = "0.1.10"
|
||||
version = "0.1.12"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
@@ -366,7 +366,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cortex-core"
|
||||
version = "0.1.10"
|
||||
version = "0.1.12"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@@ -381,7 +381,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cortex-gateway"
|
||||
version = "0.1.10"
|
||||
version = "0.1.12"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"axum",
|
||||
@@ -1184,7 +1184,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "neuron"
|
||||
version = "0.1.10"
|
||||
version = "0.1.12"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
|
||||
@@ -8,7 +8,7 @@ members = [
|
||||
]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.1.10"
|
||||
version = "0.1.12"
|
||||
edition = "2024"
|
||||
license = "GPL-3.0-or-later"
|
||||
repository = "https://git.lair.cafe/helexa/cortex"
|
||||
|
||||
@@ -88,8 +88,8 @@ WantedBy=multi-user.target
|
||||
```toml
|
||||
# cortex.toml
|
||||
[gateway]
|
||||
listen = "0.0.0.0:8000"
|
||||
metrics_listen = "0.0.0.0:9100"
|
||||
listen = "0.0.0.0:31313"
|
||||
metrics_listen = "0.0.0.0:31314"
|
||||
|
||||
[eviction]
|
||||
strategy = "lru" # lru | priority
|
||||
@@ -143,7 +143,7 @@ cortex serve --config cortex.toml
|
||||
cortex status
|
||||
|
||||
# list all models across nodes
|
||||
curl http://localhost:8000/v1/models
|
||||
curl http://localhost:31313/v1/models
|
||||
```
|
||||
|
||||
## License
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
# Copy to cortex.toml and adjust for your environment.
|
||||
#
|
||||
# Environment variable overrides use CORTEX_ prefix with __ separators:
|
||||
# CORTEX_GATEWAY__LISTEN=0.0.0.0:9000
|
||||
# CORTEX_GATEWAY__LISTEN=0.0.0.0:31313
|
||||
|
||||
[gateway]
|
||||
listen = "0.0.0.0:8000"
|
||||
metrics_listen = "0.0.0.0:9100"
|
||||
listen = "0.0.0.0:31313"
|
||||
metrics_listen = "0.0.0.0:31314"
|
||||
|
||||
[eviction]
|
||||
strategy = "lru"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Name: cortex
|
||||
Version: 0.1.10
|
||||
Version: 0.1.12
|
||||
Release: 1%{?dist}
|
||||
Summary: Inference gateway for multi-node GPU clusters
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ enum Commands {
|
||||
/// Print the fleet status (models, nodes, health).
|
||||
Status {
|
||||
/// Gateway API endpoint to query.
|
||||
#[arg(short, long, default_value = "http://localhost:8000")]
|
||||
#[arg(short, long, default_value = "http://localhost:31313")]
|
||||
endpoint: String,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -22,9 +22,9 @@ fn default_models_path() -> String {
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct GatewaySettings {
|
||||
/// Address to listen on for API requests (e.g. "0.0.0.0:8000")
|
||||
/// Address to listen on for API requests (e.g. "0.0.0.0:31313")
|
||||
pub listen: String,
|
||||
/// Address to listen on for Prometheus metrics (e.g. "0.0.0.0:9100")
|
||||
/// Address to listen on for Prometheus metrics (e.g. "0.0.0.0:31314")
|
||||
pub metrics_listen: String,
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ pub enum EvictionStrategy {
|
||||
pub struct NeuronEndpoint {
|
||||
/// Human-readable node name (e.g. "beast")
|
||||
pub name: String,
|
||||
/// Base URL of the neuron daemon (e.g. "http://beast.internal:9090")
|
||||
/// Base URL of the neuron daemon (e.g. "http://beast.internal:13131")
|
||||
pub endpoint: String,
|
||||
}
|
||||
|
||||
@@ -70,8 +70,8 @@ impl Default for GatewayConfig {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
gateway: GatewaySettings {
|
||||
listen: "0.0.0.0:8000".into(),
|
||||
metrics_listen: "0.0.0.0:9100".into(),
|
||||
listen: "0.0.0.0:31313".into(),
|
||||
metrics_listen: "0.0.0.0:31314".into(),
|
||||
},
|
||||
eviction: EvictionSettings {
|
||||
strategy: EvictionStrategy::Lru,
|
||||
|
||||
@@ -6,7 +6,7 @@ use std::collections::HashMap;
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct NodeState {
|
||||
pub name: String,
|
||||
/// Base URL of the neuron daemon (e.g. "http://beast.internal:9090").
|
||||
/// Base URL of the neuron daemon (e.g. "http://beast.internal:13131").
|
||||
pub endpoint: String,
|
||||
pub healthy: bool,
|
||||
pub models: HashMap<String, ModelEntry>,
|
||||
|
||||
@@ -17,7 +17,7 @@ pub struct NeuronConfig {
|
||||
}
|
||||
|
||||
fn default_port() -> u16 {
|
||||
9090
|
||||
13131
|
||||
}
|
||||
|
||||
impl NeuronConfig {
|
||||
@@ -33,7 +33,7 @@ impl NeuronConfig {
|
||||
impl Default for NeuronConfig {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
port: 9090,
|
||||
port: 13131,
|
||||
harnesses: vec![],
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
Name: neuron
|
||||
Version: 0.1.10
|
||||
Name: helexa-neuron
|
||||
Version: 0.1.12
|
||||
Release: 1%{?dist}
|
||||
Summary: Per-node GPU discovery and harness management daemon for cortex
|
||||
# Package name disambiguates from Fedora's existing "neuron" package
|
||||
# (NEURON neural simulation environment from Yale). Binary, systemd
|
||||
# unit, and system user are still called "neuron" for brevity.
|
||||
|
||||
License: GPL-3.0-or-later
|
||||
URL: https://git.lair.cafe/helexa/cortex
|
||||
@@ -3,9 +3,9 @@
|
||||
# Copy to /etc/neuron/neuron.toml and adjust for your environment.
|
||||
#
|
||||
# Environment variable overrides use NEURON_ prefix with __ separators:
|
||||
# NEURON_PORT=9090
|
||||
# NEURON_PORT=13131
|
||||
|
||||
port = 9090
|
||||
port = 13131
|
||||
|
||||
# -- Harnesses ---------------------------------------------------------------
|
||||
# Each [[harnesses]] entry declares an inference engine managed by neuron.
|
||||
|
||||
Reference in New Issue
Block a user