fix(rocm): Address package review findings
CI / check (push) Has been cancelled

This commit is contained in:
2026-11-12 23:55:09 +03:00
parent 8630307624
commit f2abdc96f9
6 changed files with 28 additions and 26 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
{"_type":"issue","id":"nix-overlay-5p5","title":"Update versions of all packages in repo","description":"Run nix-update for every package in packages/ to bump to latest upstream versions, then verify builds.","status":"in_progress","priority":2,"issue_type":"task","assignee":"Alexander Miroshnichenko","owner":"alex@millerson.name","created_at":"2026-10-06T11:18:07Z","created_by":"Alexander Miroshnichenko","updated_at":"2026-10-06T11:18:16Z","started_at":"2026-10-06T11:18:16Z","lease_expires_at":"2026-10-06T11:23:16Z","heartbeat_at":"2026-10-06T11:18:16Z","dependency_count":0,"dependent_count":0,"comment_count":0} {"_type":"issue","id":"nix-overlay-5p5","title":"Update versions of all packages in repo","description":"Run nix-update for every package in packages/ to bump to latest upstream versions, then verify builds.","status":"in_progress","priority":2,"issue_type":"task","assignee":"Alexander Miroshnichenko","owner":"alex@millerson.name","created_at":"2026-10-06T11:18:07Z","created_by":"Alexander Miroshnichenko","updated_at":"2026-10-06T11:18:16Z","started_at":"2026-10-06T11:18:16Z","lease_expires_at":"2026-10-06T11:23:16Z","heartbeat_at":"2026-10-06T11:18:16Z","dependency_count":0,"dependent_count":0,"comment_count":0}
{"_type":"issue","id":"nix-overlay-67e","title":"Add traycer package","description":"Add new package for traycer from https://github.com/traycerai/traycer. Steps: research repo build system, create packages/traycer/, stage with git add, test nix build, update README.","status":"closed","priority":2,"issue_type":"task","assignee":"Alexander Miroshnichenko","owner":"alex@millerson.name","created_at":"2026-08-07T08:59:25Z","created_by":"Alexander Miroshnichenko","updated_at":"2026-08-07T09:22:07Z","started_at":"2026-08-07T09:00:29Z","closed_at":"2026-08-07T09:22:07Z","close_reason":"Traycer package added, built, pushed","dependency_count":0,"dependent_count":0,"comment_count":0} {"_type":"issue","id":"nix-overlay-67e","title":"Add traycer package","description":"Add new package for traycer from https://github.com/traycerai/traycer. Steps: research repo build system, create packages/traycer/, stage with git add, test nix build, update README.","status":"closed","priority":2,"issue_type":"task","assignee":"Alexander Miroshnichenko","owner":"alex@millerson.name","created_at":"2026-08-07T08:59:25Z","created_by":"Alexander Miroshnichenko","updated_at":"2026-08-07T09:22:07Z","started_at":"2026-08-07T09:00:29Z","closed_at":"2026-08-07T09:22:07Z","close_reason":"Traycer package added, built, pushed","dependency_count":0,"dependent_count":0,"comment_count":0}
{"id":"nix-overlay-6pp","title":"Migrate issue tracking from bd (beads) to br (beads_rust)","status":"closed","priority":2,"issue_type":"task","assignee":"minder","created_at":"2026-10-21T15:46:41.935573511Z","created_by":"minder","updated_at":"2026-10-21T15:46:47.717419622Z","closed_at":"2026-10-21T15:46:47.716915059Z","close_reason":"Migrated AGENTS.md, docs/agents/*, .serena memories, .claude hooks, and .beads config/ignore from bd to br; removed bd git hooks; br verified in sync with .beads/issues.jsonl","source_repo":".","compaction_level":0,"original_size":0} {"id":"nix-overlay-6pp","title":"Migrate issue tracking from bd (beads) to br (beads_rust)","status":"closed","priority":2,"issue_type":"task","assignee":"minder","created_at":"2026-10-21T15:46:41.935573511Z","created_by":"minder","updated_at":"2026-10-21T15:46:47.717419622Z","closed_at":"2026-10-21T15:46:47.716915059Z","close_reason":"Migrated AGENTS.md, docs/agents/*, .serena memories, .claude hooks, and .beads config/ignore from bd to br; removed bd git hooks; br verified in sync with .beads/issues.jsonl","source_repo":".","compaction_level":0,"original_size":0}
{"id":"nix-overlay-858","title":"Correct Crucible compiler provenance documentation","description":"Review of 24195451db1a0cd8c9633a500bcfd4df9398d011...2f3f3f3250face8f341d62dc7558938806522207 found README.md:160-161 and packages/crucible-strix-halo/package.nix:32 incorrectly say upstream requires ROCm 7.2.4 for source builds. In pinned v0.37.0, tools/release_engine.py restricts compiler series for official release packaging; ordinary engine builds do not enforce it, and tools/hipcc_checked.sh refers to both 7.2.4 and 10.1. Describe official binary build provenance and tested runtime compatibility accurately. Keep binary packaging unchanged unless source compilation is separately requested and verified.","status":"open","priority":3,"issue_type":"bug","created_at":"2026-11-12T20:52:04.370312466Z","created_by":"minder","updated_at":"2026-11-12T20:52:04.370312466Z","source_repo":"nix-overlay","compaction_level":0,"original_size":0} {"id":"nix-overlay-858","title":"Correct Crucible compiler provenance documentation","description":"Review of 24195451db1a0cd8c9633a500bcfd4df9398d011...2f3f3f3250face8f341d62dc7558938806522207 found README.md:160-161 and packages/crucible-strix-halo/package.nix:32 incorrectly say upstream requires ROCm 7.2.4 for source builds. In pinned v0.37.0, tools/release_engine.py restricts compiler series for official release packaging; ordinary engine builds do not enforce it, and tools/hipcc_checked.sh refers to both 7.2.4 and 10.1. Describe official binary build provenance and tested runtime compatibility accurately. Keep binary packaging unchanged unless source compilation is separately requested and verified.","notes":"User requested fixes for the review findings. Scope also includes sharing the duplicated Strata/Strixite host compiler flags while preserving evaluated derivations and existing overrides.\nCorrected README and package comment to describe the official Crucible binary built with ROCm 7.2.4 and upstream-tested with ROCm 10.1. Extracted Strata/Strixite host flags into _lib/therock-host-flags.nix, preserving the explicit Strata glibc override and Strixite stdenv libc. Before/after drvPaths match exactly for Strata, Strixite and Crucible; nix build succeeds for all three with existing outputs. nixfmt and git diff --check pass. Reviewed the final diff; no behavior change.","status":"closed","priority":3,"issue_type":"bug","assignee":"minder","created_at":"2026-11-12T20:52:04.370312466Z","created_by":"minder","updated_at":"2026-11-12T20:55:05.309065392Z","closed_at":"2026-11-12T20:55:05.308129263Z","close_reason":"Both review findings addressed: compiler provenance documentation corrected and shared host flags extracted; identical derivations and all three package builds verified.","source_repo":"nix-overlay","compaction_level":0,"original_size":0}
{"_type":"issue","id":"nix-overlay-8wl","title":"marmel: bump to 1.0.0 (pin d6627d7c)","description":"Update packages/marmel to version 1.0.0, pinning upstream commit d6627d7cf3bf509d1e6db0d9d78736116e92e82a (the 1.0.0 release commit). Update src hash and cargoHash, verify build.","status":"closed","priority":2,"issue_type":"task","assignee":"Alexander Miroshnichenko","owner":"alex@millerson.name","created_at":"2026-10-06T15:44:55Z","created_by":"Alexander Miroshnichenko","updated_at":"2026-10-16T13:34:44Z","started_at":"2026-10-06T15:45:40Z","closed_at":"2026-10-16T13:34:44Z","close_reason":"Closed","dependency_count":0,"dependent_count":0,"comment_count":0} {"_type":"issue","id":"nix-overlay-8wl","title":"marmel: bump to 1.0.0 (pin d6627d7c)","description":"Update packages/marmel to version 1.0.0, pinning upstream commit d6627d7cf3bf509d1e6db0d9d78736116e92e82a (the 1.0.0 release commit). Update src hash and cargoHash, verify build.","status":"closed","priority":2,"issue_type":"task","assignee":"Alexander Miroshnichenko","owner":"alex@millerson.name","created_at":"2026-10-06T15:44:55Z","created_by":"Alexander Miroshnichenko","updated_at":"2026-10-16T13:34:44Z","started_at":"2026-10-06T15:45:40Z","closed_at":"2026-10-16T13:34:44Z","close_reason":"Closed","dependency_count":0,"dependent_count":0,"comment_count":0}
{"_type":"issue","id":"nix-overlay-8y9","title":"Package opencode plugin as open-code-review passthru","description":"Expose plugins/open-code-review/opencode from the open-code-review source as passthru.opencode-plugin: single TS plugin file + node_modules built from the repo lockfile, installed under share/open-code-review/opencode","status":"closed","priority":2,"issue_type":"feature","assignee":"Alexander Miroshnichenko","owner":"alex@millerson.name","created_at":"2026-09-26T07:41:49Z","created_by":"Alexander Miroshnichenko","updated_at":"2026-09-26T08:35:15Z","started_at":"2026-09-26T07:43:56Z","closed_at":"2026-09-26T08:35:15Z","close_reason":"Closed","dependency_count":0,"dependent_count":0,"comment_count":0} {"_type":"issue","id":"nix-overlay-8y9","title":"Package opencode plugin as open-code-review passthru","description":"Expose plugins/open-code-review/opencode from the open-code-review source as passthru.opencode-plugin: single TS plugin file + node_modules built from the repo lockfile, installed under share/open-code-review/opencode","status":"closed","priority":2,"issue_type":"feature","assignee":"Alexander Miroshnichenko","owner":"alex@millerson.name","created_at":"2026-09-26T07:41:49Z","created_by":"Alexander Miroshnichenko","updated_at":"2026-09-26T08:35:15Z","started_at":"2026-09-26T07:43:56Z","closed_at":"2026-09-26T08:35:15Z","close_reason":"Closed","dependency_count":0,"dependent_count":0,"comment_count":0}
{"id":"nix-overlay-9i8","title":"therock-rocm: drop private patchelf after SDK RPATH alignment fix","description":"TheRock 10.1.0 gfx1151 SDK (internal stamp 10.1.0rc3) librocsparse.so.1.0 fails both stock patchelf 0.19.2 and freshly tested 0.19.3 when its RPATH is extended: section content is not naturally aligned. The SDK recipe uses TheRock-pinned patchelf d0f70eea5397606c486857e0a105e53ec123904a, which includes PHDR fix #544 and passes the exact same rewrite. TheRock main still pins this commit. Revisit the private override once stock patchelf passes this real SDK input without ELF corruption. Require SDK install checks, dlopen of librocsparse/HSA/HIP and therock-rocm.tests.hip GPU tests before dropping it. See docs/therock-rocm.md.","status":"open","priority":3,"issue_type":"task","created_at":"2026-11-12T19:33:13.832941867Z","created_by":"minder","updated_at":"2026-11-12T20:12:38.441357445Z","source_repo":"nix-overlay","compaction_level":0,"original_size":0} {"id":"nix-overlay-9i8","title":"therock-rocm: drop private patchelf after SDK RPATH alignment fix","description":"TheRock 10.1.0 gfx1151 SDK (internal stamp 10.1.0rc3) librocsparse.so.1.0 fails both stock patchelf 0.19.2 and freshly tested 0.19.3 when its RPATH is extended: section content is not naturally aligned. The SDK recipe uses TheRock-pinned patchelf d0f70eea5397606c486857e0a105e53ec123904a, which includes PHDR fix #544 and passes the exact same rewrite. TheRock main still pins this commit. Revisit the private override once stock patchelf passes this real SDK input without ELF corruption. Require SDK install checks, dlopen of librocsparse/HSA/HIP and therock-rocm.tests.hip GPU tests before dropping it. See docs/therock-rocm.md.","status":"open","priority":3,"issue_type":"task","created_at":"2026-11-12T19:33:13.832941867Z","created_by":"minder","updated_at":"2026-11-12T20:12:38.441357445Z","source_repo":"nix-overlay","compaction_level":0,"original_size":0}
+3 -3
View File
@@ -156,9 +156,9 @@ The ROCm 7.14.1 hipBLASLt tuning table from the reference recipe is not enabled
with ROCm 10; the engine falls back to hipBLAS when no matching table is supplied. with ROCm 10; the engine falls back to hipBLAS when no matching table is supplied.
Crucible ships `crucible-server` (also `nix run .#crucible-strix-halo`) and Crucible ships `crucible-server` (also `nix run .#crucible-strix-halo`) and
`crucible-engine`. It uses upstream's release engine compiled with ROCm 7.2.4, `crucible-engine`. Upstream built the release engine with ROCm 7.2.4 and tested
patched to use this overlay's TheRock ROCm 10.1 runtime. Upstream requires the it with ROCm 10.1. This package uses the overlay's TheRock ROCm 10.1 runtime
7.2.4 compiler for source builds. The Python server comes from the matching tag. and the Python server from the matching tag.
The package targets the Ryzen AI Max+ 395 / Radeon 8060S (`gfx1151`) with 128 GB The package targets the Ryzen AI Max+ 395 / Radeon 8060S (`gfx1151`) with 128 GB
RAM. Supply a compatible Qwen3.8-Flash-Next EXL3 pack separately: RAM. Supply a compatible Qwen3.8-Flash-Next EXL3 pack separately:
+15
View File
@@ -0,0 +1,15 @@
{
lib,
stdenv,
libc ? stdenv.cc.libc,
}:
# TheRock's compiler bypasses the Nix cc wrapper and needs explicit host paths.
lib.concatStringsSep " " [
"--gcc-toolchain=${stdenv.cc.cc}"
"-idirafter ${lib.getDev libc}/include"
"-B${libc}/lib"
"-L${libc}/lib"
"-L${stdenv.cc.cc.lib}/lib"
"-Wl,-rpath,${libc}/lib:${stdenv.cc.cc.lib}/lib"
"-Wl,--dynamic-linker=${stdenv.cc.bintools.dynamicLinker}"
]
+2 -2
View File
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-Uv7/bM0zLc01hciLSdvY9fHJdpSYoOrgSK6WwyWHnWQ="; hash = "sha256-Uv7/bM0zLc01hciLSdvY9fHJdpSYoOrgSK6WwyWHnWQ=";
}; };
# Upstream requires the ROCm 7.2.4 compiler for source builds, but supports # Upstream built this release engine with ROCm 7.2.4 and tested it on ROCm 10.1.
# running its release engine on ROCm 10. Keep the official gfx1151 code objects. # Keep the official gfx1151 code objects.
engine = fetchurl { engine = fetchurl {
url = "https://github.com/jaedync/crucible-strix-halo/releases/download/v${finalAttrs.version}/crucible-engine-v${finalAttrs.version}-gfx1151-rocm7.2-linux-x86_64.gz"; url = "https://github.com/jaedync/crucible-strix-halo/releases/download/v${finalAttrs.version}/crucible-engine-v${finalAttrs.version}-gfx1151-rocm7.2-linux-x86_64.gz";
hash = "sha256-U6P7SRFB86QgXQljvBQwTm8dNFHV5OrPEb/JkxX6Uzo="; hash = "sha256-U6P7SRFB86QgXQljvBQwTm8dNFHV5OrPEb/JkxX6Uzo=";
+4 -10
View File
@@ -33,16 +33,10 @@ let
tqdm tqdm
] ]
); );
# The SDK compiler bypasses Nix's cc wrapper and needs explicit host paths. hipHostFlags = import ../../_lib/therock-host-flags.nix {
hipHostFlags = lib.concatStringsSep " " [ inherit lib stdenv;
"--gcc-toolchain=${stdenv.cc.cc}" libc = glibc;
"-idirafter ${lib.getDev glibc}/include" };
"-B${glibc}/lib"
"-L${glibc}/lib"
"-L${stdenv.cc.cc.lib}/lib"
"-Wl,-rpath,${glibc}/lib:${stdenv.cc.cc.lib}/lib"
"-Wl,--dynamic-linker=${stdenv.cc.bintools.dynamicLinker}"
];
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "strata"; pname = "strata";
+3 -10
View File
@@ -7,16 +7,9 @@
therockRocm, therockRocm,
}: }:
let let
# TheRock's compiler bypasses the Nix cc wrapper. hostFlags = import ../../_lib/therock-host-flags.nix {
hostFlags = lib.concatStringsSep " " [ inherit lib stdenv;
"--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 = [ programs = [
"strix_server" "strix_server"
"convert_qwen4exp" "convert_qwen4exp"