diff --git a/.beads/issues.jsonl b/.beads/issues.jsonl index 8ede3d9..51ee407 100644 --- a/.beads/issues.jsonl +++ b/.beads/issues.jsonl @@ -18,6 +18,7 @@ {"_type":"issue","id":"nix-overlay-bju","title":"codeaf: build furrow from source instead of embedding the upstream release binary","description":"The codeaf package embeds the upstream Agent-Field/furrow release asset (fetchurl -\u003e cmd/fetch -from -\u003e go:embed). Those bytes are glibc-dynamic and never patched, so the copy codeaf extracts to ~/.codeaf/bin/furrow-0.1.0 dies on NixOS with 'Could not start dynamically linked executable ... stub-ld'. Build furrow (Rust, Apache-2.0, same version as internal/furrowbin/pin.json) from source in this overlay and hand it to codeaf through CODEAF_FURROW, which internal/furrow lookBinary prefers over the embedded copy.","status":"closed","priority":2,"issue_type":"task","assignee":"Alexander Miroshnichenko","owner":"alex@millerson.name","created_at":"2026-10-07T07:44:58Z","created_by":"Alexander Miroshnichenko","updated_at":"2026-10-07T08:33:54Z","started_at":"2026-10-07T07:45:20Z","closed_at":"2026-10-07T08:33:54Z","close_reason":"Shipped in ff1fecc0edc4: packages/codeaf/furrow.nix builds furrow 0.1.0 from source, codeaf wraps its binary with CODEAF_FURROW and no longer stages the upstream release asset.","dependency_count":0,"dependent_count":0,"comment_count":0} {"id":"nix-overlay-bo0","title":"Add crucible-strix-halo package","description":"Package Crucible engine and server for gfx1151, document use, verify build and GPU checks, commit and merge to main.","status":"closed","priority":2,"issue_type":"feature","assignee":"minder","created_at":"2026-11-12T18:32:23.813387090Z","created_by":"minder","updated_at":"2026-11-12T18:41:52.838705822Z","closed_at":"2026-11-12T18:41:52.836329254Z","close_reason":"Completed: Crucible 0.37.0 official gfx1151 release engine packaged with TheRock ROCm 10.0 runtime and matching Python server. Nix build, install/version checks, formatting, and flake evaluation pass. All 36 selected installed API/template/HTTP tests pass; upstream argmax numerical GPU test passes on Radeon 8060S. Full model inference not exercised.","source_repo":"nix-overlay","compaction_level":0,"original_size":0} {"id":"nix-overlay-c5y","title":"chore: update packages to latest upstream versions","description":"Bump all packages in packages/ to their latest upstream release where appropriate; recompute source/npm/cargo hashes and verify builds.","status":"closed","priority":2,"issue_type":"chore","assignee":"minder","created_at":"2026-10-24T08:00:40.304835399Z","created_by":"minder","updated_at":"2026-10-24T11:10:02.842081264Z","closed_at":"2026-10-24T11:10:02.830616733Z","close_reason":"Bumped all stale packages (awg-tool, awgen, codeaf, ds4, freebuff, graphify, hipengine, kubernetes-mcp-server, kyojin, marmel, omniroute, open-code-review, pilotdeck, radar, traycer), removed llama-cpp, and verified every bumped package with nix build; kyojin.tests.jit passes. Remaining packages are already current; freetoken 0.2.0 stays blocked on newer torch (nix-overlay-qcg).","source_repo":"nix-overlay","compaction_level":0,"original_size":0} +{"id":"nix-overlay-cn2","title":"Add strixite inference package for gfx1151","description":"Package shawnshekari/strixite with HIP support for gfx1151 using the shared ROCm 10 SDK where compatible; build, test on GPU, document, commit and merge main.","status":"closed","priority":2,"issue_type":"feature","assignee":"minder","created_at":"2026-11-12T18:46:59.399326164Z","created_by":"minder","updated_at":"2026-11-12T18:57:23.772391125Z","closed_at":"2026-11-12T18:57:23.772137028Z","close_reason":"Completed: Strixite 0.7.0 built from source with TheRock ROCm 10.0, gfx1151 and znver5. Build/install checks, nix run help, flake evaluation, formatting, config/CLI precedence, external model paths and runtime linkage pass. Upstream first_kernel GPU test passed all 9 CPU-reference comparisons on Radeon 8060S. Full model inference not exercised.","source_repo":"nix-overlay","compaction_level":0,"original_size":0} {"_type":"issue","id":"nix-overlay-du9","title":"Add kyojin package (Yamz-Labs/kyojin, ExLlamaV3 fork for Strix Halo)","description":"Package https://github.com/Yamz-Labs/kyojin: Yamz inference engine, a fork of ExLlamaV3 targeting AMD Strix Halo (gfx1151) on ROCm 7. Build the python package with the ROCm build of torch from nixpkgs and compile the HIP extension for gfx1151.","notes":"re-pinned to release tag v1.3 (latest GitHub release; v1.1 was stale), version = \"1.3\", updateScript uses tags; rebuilt from v1.3 sources, wrappers --help verified","status":"closed","priority":2,"issue_type":"feature","assignee":"Alexander Miroshnichenko","owner":"alex@millerson.name","created_at":"2026-10-07T08:44:23Z","created_by":"Alexander Miroshnichenko","updated_at":"2026-10-07T15:14:30Z","started_at":"2026-10-07T08:49:12Z","closed_at":"2026-10-07T15:14:30Z","close_reason":"Closed","dependency_count":0,"dependent_count":0,"comment_count":0} {"_type":"issue","id":"nix-overlay-dv3","title":"Fix Config screen crash on F2","description":"F2 opens ConfigScreen then Textual raises InvalidSelectValueError because _refresh_aggregator_dropdown assigns Select.BLANK, resolved as False, instead of clearing selection.\\n\\nAcceptance: Config screen opens with saved consensus configuration; regression covers no selected aggregator; targeted tests pass.","status":"closed","priority":1,"issue_type":"bug","assignee":"Alexander Miroshnichenko","owner":"alex@millerson.name","created_at":"2026-08-20T11:34:03Z","created_by":"Alexander Miroshnichenko","updated_at":"2026-08-20T11:37:47Z","started_at":"2026-08-20T11:34:07Z","closed_at":"2026-08-20T11:37:47Z","close_reason":"Replaced invalid Select.BLANK handling; built haivemind and verified ConfigScreen headlessly.","dependency_count":0,"dependent_count":0,"comment_count":0} {"id":"nix-overlay-e2b","title":"awgen: bump 0.2 -> 0.3","description":"Upstream tag v0.3 exists at git.millerson.name/alex/awgen (commit 3d10c5f). Bump version + src/cargo hashes in packages/awgen/package.nix and verify nix build .#awgen.","status":"closed","priority":2,"issue_type":"task","assignee":"pi","created_at":"2026-10-25T13:58:22.504514222Z","created_by":"minder","updated_at":"2026-10-25T14:06:10.968003613Z","closed_at":"2026-10-25T14:06:10.966719541Z","close_reason":"Completed: awgen pinned to v0.3 (src sha256-86YT...), cargoHash unchanged (Cargo.lock deps identical). nix build .#awgen green, cargo checkPhase 29 passed/0 failed; result/bin/awgen runs.","source_repo":"nix-overlay","compaction_level":0,"original_size":0} diff --git a/README.md b/README.md index 0aac306..122ba3f 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ A custom Nix overlay and flake providing additional packages not found in upstre | `therock-rocm` | TheRock 10.0 SDK for gfx1151 | AI Inference | | `strata` | Strata inference engine, API server and CPU vision encoder with ROCm 10 HIP support for gfx1151 | AI Inference | | `crucible-strix-halo` | Crucible EXL3 inference engine and OpenAI-compatible server for gfx1151 with the ROCm 10 runtime | AI Inference | +| `strixite` | Source-built HIP inference engine and OpenAI-compatible server for gfx1151 / Zen 5 with ROCm 10 | AI Inference | | `pwilkin-llama-cpp` | pwilkin llama.cpp fork with ROCm for gfx1151 | AI Inference | | `strix-llama-cpp` | halo-box llama.cpp fork with Vulkan | AI Inference | | `loop` | Corporate messenger for your team | Communication | @@ -168,6 +169,24 @@ is not included. Model downloads and conversation state belong outside the Nix store. See the upstream [setup guide](https://github.com/jaedync/crucible-strix-halo/blob/v0.37.0/docs/QUICKSTART.md) for GPU memory configuration and model requirements. +Strixite builds from source with the shared TheRock ROCm 10.0 SDK for `gfx1151` +and the Zen 5 host CPU. It ships `strix_server` (the default entry point), +`convert_qwen4exp`, `convert_ngram_table`, `transcode_ngram_table`, `inspect_strixw` +and `check_stream_calls`. Supply the upstream `.strixw` weights, tokenizer and +n-gram table separately, following the [model setup](https://github.com/shawnshekari/strixite/tree/v0.7.0#quick-start). + +```bash +STRIX_MODELS_DIR=/path/to/models nix run .#strixite -- --host 127.0.0.1 +``` + +The default port is 5300. `strix_server --help` lists all settings; the commented +upstream configuration is installed at `share/strixite/strix-server.conf`. +Model and prompt-cache paths stay outside the Nix store. The upstream defaults +assume a dedicated 128 GB machine; see its [memory guide](https://github.com/shawnshekari/strixite/blob/v0.7.0/docs/memory.md) +when sharing the GPU with a desktop or another model. +`nix run .#strixite.tests.gpu` builds and runs the upstream kernel tutorial's +CPU/GPU correctness checks on a machine with GPU access. + ### nftablesbuilder Runtime Notes `nftablesbuilder` is a web interface for managing nftables. It consists of a diff --git a/_lib/llm-packages.nix b/_lib/llm-packages.nix index 2a61567..bb7243f 100644 --- a/_lib/llm-packages.nix +++ b/_lib/llm-packages.nix @@ -26,6 +26,9 @@ builtins.mapAttrs ) { inherit hipfire therock-rocm gufo; + strixite = pkgs.callPackage ../packages/strixite/package.nix { + therockRocm = therock-rocm; + }; crucible-strix-halo = pkgs.callPackage ../packages/crucible-strix-halo/package.nix { therockRocm = therock-rocm; }; diff --git a/packages/strixite/default.nix b/packages/strixite/default.nix new file mode 100644 index 0000000..a1cd121 --- /dev/null +++ b/packages/strixite/default.nix @@ -0,0 +1,5 @@ +{ pkgs, inputs, ... }: +(import ../../_lib/llm-packages.nix { + inherit inputs; + system = pkgs.stdenv.hostPlatform.system; +}).strixite diff --git a/packages/strixite/package.nix b/packages/strixite/package.nix new file mode 100644 index 0000000..e7672e0 --- /dev/null +++ b/packages/strixite/package.nix @@ -0,0 +1,112 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + therockRocm, +}: +let + # TheRock's compiler bypasses the Nix cc wrapper. + hostFlags = lib.concatStringsSep " " [ + "--gcc-toolchain=${stdenv.cc.cc}" + "-idirafter ${stdenv.cc.libc.dev}/include" + "-B${stdenv.cc.libc}/lib" + "-L${stdenv.cc.libc}/lib" + "-L${stdenv.cc.cc.lib}/lib" + "-Wl,-rpath,${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" + "-Wl,--dynamic-linker=${stdenv.cc.bintools.dynamicLinker}" + ]; + programs = [ + "strix_server" + "convert_qwen4exp" + "convert_ngram_table" + "transcode_ngram_table" + "inspect_strixw" + "check_stream_calls" + ]; +in +stdenv.mkDerivation (finalAttrs: { + pname = "strixite"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "shawnshekari"; + repo = "strixite"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zhyM4weEwMmjcTtxiJOi0PDatj4X8QAPSZKkLmqMAJo="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + cmakeFlags = [ + "-DSTRIX_ROCM_ROOT=${therockRocm}" + "-DSTRIX_GPU_ARCH=gfx1151" + "-DSTRIX_HOST_ARCH=znver5" + "-DSTRIX_GCC_INSTALL_DIR=${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${stdenv.cc.cc.version}" + "-DCMAKE_C_COMPILER=${therockRocm}/lib/llvm/bin/clang" + "-DCMAKE_CXX_COMPILER=${therockRocm}/lib/llvm/bin/clang++" + ]; + + env = { + CFLAGS = hostFlags; + CXXFLAGS = hostFlags; + ROCM_PATH = "${therockRocm}"; + }; + + preConfigure = '' + export PATH=${therockRocm}/lib/llvm/bin:$PATH + export LD_LIBRARY_PATH=${therockRocm}/lib:${therockRocm}/lib/llvm/lib''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + ''; + + ninjaFlags = programs; + + installPhase = '' + runHook preInstall + install -Dt $out/bin ${lib.concatStringsSep " " programs} + install -Dm644 ../deploy/strix-server.conf $out/share/strixite/strix-server.conf + install -Dm644 ../LICENSE $out/share/licenses/strixite/LICENSE + install -Dm644 ../THIRD_PARTY.md $out/share/licenses/strixite/THIRD_PARTY.md + install -Dm644 ../third_party/cpp-httplib/LICENSE $out/share/licenses/strixite/cpp-httplib/LICENSE + install -Dm644 ../third_party/libwebp/COPYING $out/share/licenses/strixite/libwebp/COPYING + install -Dm644 ../third_party/libwebp/PATENTS $out/share/licenses/strixite/libwebp/PATENTS + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/strix_server --help > /dev/null + $out/bin/strix_server --print-config > /dev/null + runHook postInstallCheck + ''; + + passthru = { + rocm = therockRocm; + category = "AI Inference"; + # Build in the Nix sandbox, then run explicitly on a host with GPU access. + tests.gpu = finalAttrs.finalPackage.overrideAttrs (old: { + pname = "strixite-gpu-smoke"; + ninjaFlags = [ "first_kernel" ]; + installPhase = '' + install -Dm755 tutorial/first_kernel $out/bin/first_kernel + ''; + doInstallCheck = false; + passthru = { }; + meta = old.meta // { + mainProgram = "first_kernel"; + }; + }); + }; + + meta = { + description = "HIP inference engine and OpenAI-compatible server for Qwen3.8-Flash-Next on AMD Strix Halo"; + homepage = "https://github.com/shawnshekari/strixite"; + license = lib.licenses.agpl3Only; + platforms = [ "x86_64-linux" ]; + mainProgram = "strix_server"; + }; +})