Release validated Ling runtime and installer fixes

.gitattributes

@@ -1,4 +1,4 @@
-*.bundle binary
+*.bundle filter=lfs diff=lfs merge=lfs -text
 *.patch text eol=lf
 *.sh text eol=lf
 *.md text eol=lf

CHANGELOG.md

@@ -6,13 +6,40 @@
 - Model revision: `ca3ea63b0255d212c4fe6020db9e0a51ce136006`
 - Model format: 24 safetensors shards, 77,012,299,464 bytes total
 - vLLM upstream base: `d35eb6c44071ea806018841c490f0d2f3219c485`
-- CIRU runtime head: `91fab4e6dcaa683911655630dae8a5b140a7cb91`
-- Net vLLM delta: eight files, 459 insertions, 28 deletions, including regression tests
+- CIRU runtime head: `838616875c5dd4913d9f753221bf05f64cb7a7ed`
+- Net vLLM delta: 10 files, 477 insertions, 28 deletions, including regression tests
 
 ## Weight changes
 
 None. No tensor, quantization scale, tokenizer, template, configuration, or MTP weight was modified. The official packed-INT4 checkpoint is consumed directly.
 
+## Cold-start diagnostics and environment registration — August 10, 2026
+
+- Register the required `VLLM_ROCM_SAFE_MERGE_ATTN_STATES` switch in vLLM's
+  environment registry and read it through that registry. The fork no longer
+  warns that its own packaged setting is unknown.
+- Make the Inductor max-autotune defaults explicit in the launcher and reject
+  malformed values before model loading.
+- Explain before launch that the pinned Triton `make_block_ptr`, PyTorch
+  `TypedStorage`, and Inductor `AUTOTUNE` output is expected during a cold
+  compile. Readiness remains `Application startup complete` plus `/health`.
+- Print the package's expected fork head beside the installed editable-source
+  head. A mismatch now produces the exact model-preserving CIRU rebuild command;
+  the ROCr-only `install.sh --upgrade` path is no longer easy to mistake for a
+  vLLM source update.
+
+## Clean NixOS installer correction — August 10, 2026
+
+- Restore the host-toolchain bridge used by the validated NixOS build. The
+  installer now derives the active GCC, glibc, libstdc++, and NUMA paths instead
+  of embedding machine-specific Nix store hashes.
+- Supply the pinned ROCr rebuild's `pkg-config`, `xxd`, DRM, ELF, NUMA, and
+  OpenSSL inputs through an ephemeral `nix-shell`, then translate its search
+  flags for CMake. No package is added to the user's Nix profile.
+- Make the existing-install command update both the CIRU vLLM fork and the
+  corrected ROCr runtime while preserving the 77 GB checkpoint. Keep
+  `install.sh --upgrade` explicitly ROCr-only.
+
 ## Installer release-gate hardening — August 10, 2026
 
 - Reconstruct the pinned vLLM commit through a dedicated remote ref and a

Ling-3.0-Flash-CIRU-int4-Strix-native.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebda74c970ce2794942c259d52eea4666de000a54788575849f8a2dd2dd37d1f
-size 114586870
+oid sha256:c4c88fb110c892da8069c59b370c2994f59ce968ce2baf8632b18b0aee9bdb2f
+size 114330579

MANIFEST.json

@@ -22,12 +22,12 @@
   "runtime": {
     "upstream_repo": "https://github.com/vllm-project/vllm.git",
     "upstream_base": "d35eb6c44071ea806018841c490f0d2f3219c485",
-    "ciru_head": "91fab4e6dcaa683911655630dae8a5b140a7cb91",
-    "commits_ahead": 16,
-    "net_files_changed": 8,
-    "net_insertions": 459,
+    "ciru_head": "838616875c5dd4913d9f753221bf05f64cb7a7ed",
+    "commits_ahead": 17,
+    "net_files_changed": 10,
+    "net_insertions": 477,
     "net_deletions": 28,
-    "engine_revision": "2026-08-10-installer-release-gate",
+    "engine_revision": "2026-08-10-startup-and-installer-hardening",
     "rocr_idle_fix": {
       "upstream_repo": "https://github.com/ROCm/rocm-systems.git",
       "upstream_commit": "44be71b52284948e58c93f65f46910399773fdcd",

README.md

@@ -75,11 +75,21 @@ quoted. Because Linux `LD_PRELOAD` uses whitespace and colons as separators,
 the runtime install root must not contain either character. The installer now
 rejects such a root immediately instead of producing a broken launch later.
 
+The current launcher also identifies cold-cache compilation before vLLM starts.
+Messages containing `tl.make_block_ptr is deprecated`, `TypedStorage is
+deprecated`, `Autotune Choices Stats`, or `AUTOTUNE mm(...)` are emitted by the
+pinned Triton/PyTorch compiler path and are not startup failures. Wait for
+`Application startup complete`, then verify `/health`; a traceback,
+`EngineCore failed`, a nonzero process exit, or a failed health check is an
+actual failure. The required `VLLM_ROCM_SAFE_MERGE_ATTN_STATES` setting is now
+registered by the CIRU fork, so vLLM no longer mislabels it as an unknown
+environment variable.
+
 **A 97.5x native ROCm serving campaign:** the first working upstream-compatible build decoded at 0.269 tok/s; this distribution reaches 26.23 tok/s with native MTP K1, while retaining the official vendor checkpoint, OpenAI-compatible serving, continuous batching, and Ling's structured tool parser.
 
 ## What this release changes
 
-The runtime is based on vLLM commit `d35eb6c44071ea806018841c490f0d2f3219c485` plus a 16-commit CIRU branch ending at `91fab4e6dcaa683911655630dae8a5b140a7cb91`. Its net source delta is eight files, 459 insertions, and 28 deletions, including regression tests.
+The runtime is based on vLLM commit `d35eb6c44071ea806018841c490f0d2f3219c485` plus a 17-commit CIRU branch ending at `838616875c5dd4913d9f753221bf05f64cb7a7ed`. Its net source delta is 10 files, 477 insertions, and 28 deletions, including regression tests.
 
 - Includes [`liminfei-amd`'s Wave32 LDS fix](https://github.com/vllm-project/vllm/pull/46012) for the ROCm top-k merge launch, preserving the AMD author's commit credit.
 - Adds an opt-in safe PyTorch attention-state merge for a `gfx1151` Triton/HSA fault, including both supported MLA LSE layouts.
@@ -167,7 +177,7 @@ The named release archive is `Ling-3.0-Flash-CIRU-int4-Strix-native.tar.gz`. It
 
 ## Quick start
 
-The exact validated environment is Python 3.12, Torch `2.13.0+rocm7.15.0a20260728`, HIP `7.15.0`, Triton `3.8.0+git4cff872c.rocm7.15.0a20260728`, FlashAttention `2.8.3`, and the CIRU vLLM source at `91fab4e6d`.
+The exact validated environment is Python 3.12, Torch `2.13.0+rocm7.15.0a20260728`, HIP `7.15.0`, Triton `3.8.0+git4cff872c.rocm7.15.0a20260728`, FlashAttention `2.8.3`, and the CIRU vLLM source at `838616875`.
 
 For a clean runtime installation, download the 115 MB release archive instead
 of cloning this model repository. A normal Git LFS clone can also download the
@@ -217,24 +227,27 @@ installed. Add `--download-model` only when you want this installer to fetch
 the checkpoint; omit it for a runtime-only install. Use
 `bash install.sh --help` for the complete agent interface.
 
-### Upgrade an existing CIRU engine
+### Update an existing CIRU installation
 
-Users who already installed this release do not need to download the model or
-rebuild vLLM. From the updated package directory, run:
+From the updated package directory, rebuild the packaged fork and the corrected
+ROCr runtime while preserving the existing model:
 
 ```bash
-bash install.sh --upgrade \
+bash install.sh \
   --install-root "$HOME/ciru-ling-runtime" \
+  --model-path "/path/to/Ling-checkpoint" \
   --install-host-deps
 ```
 
 Replace the install root with the directory that contains the existing
-`.venv`. The upgrade compiles the pinned ROCr userspace library with the host
-GCC, records and verifies its SHA-256 checksum, and makes the launchers preload
-it automatically. It does not modify model weights, the model directory, or
-`ling3-runtime.env`. Restart the server after the command completes. If an
-emergency rollback is needed, launch once with
-`CIRU_DISABLE_ROCR_IDLE_FIX=1`.
+`.venv` and use the existing checkpoint directory. This does not download,
+move, or modify the weights. It installs runtime head `838616875`, builds the
+pinned ROCr userspace override that fixes the idle 100% CPU spin, and rewrites
+`ling3-runtime.env` with those same paths. Restart the server afterward.
+
+`install.sh --upgrade` is intentionally ROCr-only. Use it only when the vLLM
+source already matches the package and just the idle-CPU override needs repair.
+For emergency ROCr rollback, launch once with `CIRU_DISABLE_ROCR_IDLE_FIX=1`.
 
 The API advertises model ID `Ling-3.0-Flash-CIRU-int4-Strix-native` on `http://127.0.0.1:18081/v1`.
 
@@ -251,6 +264,35 @@ bash scripts/run-256k.sh
 
 Lower values reduce KV-cache capacity. Even at the packaged 0.72 setting, six requests cannot all occupy the full 256K limit simultaneously; verify the reported KV-cache capacity at startup for your workload and host.
 
+### Cold-start compiler output
+
+The optimized launcher deliberately uses vLLM compilation mode 3 with static
+decode sizes `[1,2]` and Inductor max autotuning. On an empty cache, model
+loading plus compilation can take several minutes and prints kernel comparisons
+such as `AUTOTUNE mm(...)`. The two deprecation warnings named above are also
+expected with the pinned dependency versions. They occurred in the validated
+run before the API became healthy and returned HTTP 200.
+
+Do not remove launcher flags merely to make these messages disappear. First
+run the packaged command unchanged and wait for `Application startup complete`:
+
+```bash
+source ling3-runtime.env
+bash scripts/run-256k.sh
+```
+
+The launcher prints both the runtime head expected by the package and the head
+of the installed editable vLLM source. If they differ, update the CIRU fork by
+running the exact rebuild command printed there. That command reuses the model
+path and does not download weights; `install.sh --upgrade` is intentionally
+ROCr-only and is not a vLLM source update.
+
+If a modified command is required on another distribution, retain the complete
+command, the first traceback or `EngineCore failed` block, and the final 100 log
+lines. Performance from a command with MTP, compilation, max autotuning, prefix
+caching, or the 8,192-token scheduler budget disabled is not comparable to the
+published benchmark profile.
+
 For the experimental 1M profile instead:
 
 ```bash

SHA256SUMS

@@ -1,23 +1,25 @@
-7b77dda00cc6bd6d0ce15f7c055f9e997f56e1cf1709c61cca5a57283ce3f008  ./.gitattributes
-b3a12fee0f8e5187dcb389bbb8fc944b84e132b395a43edd8feee1c9e725a057  ./CHANGELOG.md
-95d15a4b46e2c38c1c2af5e098166d43bdd192653a12cc53ad7159420f81e711  ./MANIFEST.json
-9151f96f0a7322d759e1c2f9aa95530fa621f4a78a10f8e85e2fa04bf59e61bb  ./README.md
+46cf1b9e12bdc3a2efbcd762a98b55b2a2b0e30ade3eb03134e0b8c45e84049a  ./.gitattributes
+90b6bea03f33e6c0a9830ea4e43eb0c1ab9477241af0c42e2a7eb7da689e4a38  ./CHANGELOG.md
+c641ecff9c6ef45d00e2bda4d7995d4e25522b213fc838100babd8fac86121f0  ./MANIFEST.json
+49062288d0b8895baca666fc5d76559ae5ae1bedad7114e62000dc5b1538cbcb  ./README.md
 411ac21b4849cb3bf65f84a55263550dcd658e0623c2b117233ba1fced1c17ff  ./assets/ling30int4.png
 dbf3f912d175e69d30b9d352bb01446f231d72112181be6ba3d5b34be741a869  ./config/experimental-yarn-1m.env
 725bb450e9df2f76bc34604ec6c08c55aa7e19034f244e76a6cc57d0b9ebcbaa  ./config/native-256k.env
-c9fb6ed33fa8f98e1c4969f5e06118836da733f719b24f7a95a5a48bcb85b3f6  ./docs/BENCHMARKS.md
-801506edabd1e1f3e15c41a3890084d8e15946123652d8677379699009866ace  ./docs/UBUNTU_BUILD.md
-cb071718556c99c46e7168e02a6ed645daaad0d078f96d9d948217e261a30e4d  ./docs/VALIDATED_ENVIRONMENT.md
+3f67af3f3acaf08815ece0d373f2a9edf7abfc4e3910bb7061e7b8f01070152c  ./docs/BENCHMARKS.md
+28fb88619cb4b51790dd267506410bf81530d9ad17c1cee290866d3c23c4c708  ./docs/UBUNTU_BUILD.md
+86501c16acd668d0e25613c60c61a395c31731836c09c37fafe11490d0eb2370  ./docs/VALIDATED_ENVIRONMENT.md
 eb927bfb99e64911dbc0f6bc0b41f692a07f8d9aed4b551de2de3b1a1acbfd64  ./docs/WINDOWS_WSL2.md
 06c78a1ef6f5ee0c3571bd5d35a0ea0f32e2620d999d02f2c9e9f175141851e1  ./install.sh
-a14fcd3747829be98a73a453057bd451a492d87a236c2affcf57db1cbbf18386  ./runtime/COMMITS.txt
-9cbcbbef5e113e22b753801ee141bd877b20c84f25f15cc159d0ae508aaf4324  ./runtime/Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.bundle
-c0c1446ea2c7334ef8b888f3104ec660d2ab41d2cb08bb9d90a3f589dba040e8  ./runtime/Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.patch
-ecab16a7d189d48ff85942ebefd49f2c206445a4e4a85de440ebde19b6555551  ./runtime/SHA256SUMS.runtime
-0831d1f5c296525333323250227b20be8cee450c33a398d5f2629893b634e1ce  ./scripts/build-vllm-gfx1151.sh
+1bec28ea9c6bfa28aea0e0c7adf3d46b56eb399156680278fba0e5b5e3cc87b7  ./runtime/COMMITS.txt
+58dde46a772bedfaa7a2bd806a774db15352d5b53ad7c5c681b6857c273561b5  ./runtime/Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.bundle
+c6839a15d8250d7e9541f6a12b8cef0f9ccfbfdd825f095ee313048c56bdb0f4  ./runtime/Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.patch
+fc47eb458b4d8e4db52b5cb8d9dbd912ee16dbd63ade61861d196e300374c4ca  ./runtime/SHA256SUMS.runtime
+8541e877203c3954bf0df44b2a4027188ef694a0ee644e29ddcdfa0d4d2c21c0  ./scripts/build-vllm-gfx1151.sh
 e41ff92b71b146a745161f6b6b09f1c85d4b828e68aa1e2a151311656c19a7d7  ./scripts/download-model.sh
-566b45b97266bdf215c2da2765b52465c515808223098819ac4086335e6759e4  ./scripts/install-host-deps.sh
-2ace002dc64d1ccd20df9ad02b8d3d0212c05c50ced8f26be9c24cf889c0f925  ./scripts/install-rocr-idle-fix.sh
+37e5e506ce70b0388926456c59ed14b3565a6067ecdb19242e73252fb91b0792  ./scripts/hipcc-nixos-linker-helper.sh
+a16abc24cfcb590b191bf122aaf3df01549ea3baf6b5eaa8d089da064b15f043  ./scripts/install-host-deps.sh
+d2793fc18ee5438efa55b77ff0f4cfe090c52ea1541b82fa94cd8da5d128a7d6  ./scripts/install-rocr-idle-fix.sh
+881b565217b0881b78e0e9bec074ffd27ba013ec21f63d595de76b0693289067  ./scripts/rocm715-nixos-numa-target.cmake
 72f4024af2ad19ee58af201d4fc29f84481b521a80e36c88ae1ab0b6edf7e0e1  ./scripts/run-1m-yarn-experimental.sh
 f3fa5364ce194b6676bbe3566604f73d2df9ac381fe1937bf7abc465dde8fd2c  ./scripts/run-256k.sh
-581792ad19506e9db61fddcf1c077c8b81dc72e8e5a5ac72eba722597052dfb6  ./scripts/run-common.sh
+e705d68ea20fc4dd07ead15111ace08f29b6ea7c60f3613690a111bdfd31b437  ./scripts/run-common.sh

SHA256SUMS.release

@@ -1,25 +1,27 @@
-ebda74c970ce2794942c259d52eea4666de000a54788575849f8a2dd2dd37d1f  ./Ling-3.0-Flash-CIRU-int4-Strix-native.tar.gz
-7b77dda00cc6bd6d0ce15f7c055f9e997f56e1cf1709c61cca5a57283ce3f008  ./Ling-3.0-Flash-CIRU-int4-Strix-native/.gitattributes
-b3a12fee0f8e5187dcb389bbb8fc944b84e132b395a43edd8feee1c9e725a057  ./Ling-3.0-Flash-CIRU-int4-Strix-native/CHANGELOG.md
-95d15a4b46e2c38c1c2af5e098166d43bdd192653a12cc53ad7159420f81e711  ./Ling-3.0-Flash-CIRU-int4-Strix-native/MANIFEST.json
-9151f96f0a7322d759e1c2f9aa95530fa621f4a78a10f8e85e2fa04bf59e61bb  ./Ling-3.0-Flash-CIRU-int4-Strix-native/README.md
-5a7af736e6c1e1d51717f32cdb9b0331261f3b5d0c2491c474905ee8b1c6639c  ./Ling-3.0-Flash-CIRU-int4-Strix-native/SHA256SUMS
-411ac21b4849cb3bf65f84a55263550dcd658e0623c2b117233ba1fced1c17ff  ./Ling-3.0-Flash-CIRU-int4-Strix-native/assets/ling30int4.png
-dbf3f912d175e69d30b9d352bb01446f231d72112181be6ba3d5b34be741a869  ./Ling-3.0-Flash-CIRU-int4-Strix-native/config/experimental-yarn-1m.env
-725bb450e9df2f76bc34604ec6c08c55aa7e19034f244e76a6cc57d0b9ebcbaa  ./Ling-3.0-Flash-CIRU-int4-Strix-native/config/native-256k.env
-c9fb6ed33fa8f98e1c4969f5e06118836da733f719b24f7a95a5a48bcb85b3f6  ./Ling-3.0-Flash-CIRU-int4-Strix-native/docs/BENCHMARKS.md
-801506edabd1e1f3e15c41a3890084d8e15946123652d8677379699009866ace  ./Ling-3.0-Flash-CIRU-int4-Strix-native/docs/UBUNTU_BUILD.md
-cb071718556c99c46e7168e02a6ed645daaad0d078f96d9d948217e261a30e4d  ./Ling-3.0-Flash-CIRU-int4-Strix-native/docs/VALIDATED_ENVIRONMENT.md
-eb927bfb99e64911dbc0f6bc0b41f692a07f8d9aed4b551de2de3b1a1acbfd64  ./Ling-3.0-Flash-CIRU-int4-Strix-native/docs/WINDOWS_WSL2.md
-06c78a1ef6f5ee0c3571bd5d35a0ea0f32e2620d999d02f2c9e9f175141851e1  ./Ling-3.0-Flash-CIRU-int4-Strix-native/install.sh
-a14fcd3747829be98a73a453057bd451a492d87a236c2affcf57db1cbbf18386  ./Ling-3.0-Flash-CIRU-int4-Strix-native/runtime/COMMITS.txt
-9cbcbbef5e113e22b753801ee141bd877b20c84f25f15cc159d0ae508aaf4324  ./Ling-3.0-Flash-CIRU-int4-Strix-native/runtime/Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.bundle
-c0c1446ea2c7334ef8b888f3104ec660d2ab41d2cb08bb9d90a3f589dba040e8  ./Ling-3.0-Flash-CIRU-int4-Strix-native/runtime/Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.patch
-ecab16a7d189d48ff85942ebefd49f2c206445a4e4a85de440ebde19b6555551  ./Ling-3.0-Flash-CIRU-int4-Strix-native/runtime/SHA256SUMS.runtime
-0831d1f5c296525333323250227b20be8cee450c33a398d5f2629893b634e1ce  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/build-vllm-gfx1151.sh
-e41ff92b71b146a745161f6b6b09f1c85d4b828e68aa1e2a151311656c19a7d7  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/download-model.sh
-566b45b97266bdf215c2da2765b52465c515808223098819ac4086335e6759e4  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/install-host-deps.sh
-2ace002dc64d1ccd20df9ad02b8d3d0212c05c50ced8f26be9c24cf889c0f925  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/install-rocr-idle-fix.sh
-72f4024af2ad19ee58af201d4fc29f84481b521a80e36c88ae1ab0b6edf7e0e1  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/run-1m-yarn-experimental.sh
-f3fa5364ce194b6676bbe3566604f73d2df9ac381fe1937bf7abc465dde8fd2c  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/run-256k.sh
-581792ad19506e9db61fddcf1c077c8b81dc72e8e5a5ac72eba722597052dfb6  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/run-common.sh
+c4c88fb110c892da8069c59b370c2994f59ce968ce2baf8632b18b0aee9bdb2f  ./Ling-3.0-Flash-CIRU-int4-Strix-native.tar.gz
+46cf1b9e12bdc3a2efbcd762a98b55b2a2b0e30ade3eb03134e0b8c45e84049a  ./Ling-3.0-Flash-CIRU-int4-Strix-native/.gitattributes
+411ac21b4849cb3bf65f84a55263550dcd658e0623c2b117233ba1fced1c17ff  ./Ling-3.0-Flash-CIRU-int4-Strix-native/assets/ling30int4.png
+90b6bea03f33e6c0a9830ea4e43eb0c1ab9477241af0c42e2a7eb7da689e4a38  ./Ling-3.0-Flash-CIRU-int4-Strix-native/CHANGELOG.md
+dbf3f912d175e69d30b9d352bb01446f231d72112181be6ba3d5b34be741a869  ./Ling-3.0-Flash-CIRU-int4-Strix-native/config/experimental-yarn-1m.env
+725bb450e9df2f76bc34604ec6c08c55aa7e19034f244e76a6cc57d0b9ebcbaa  ./Ling-3.0-Flash-CIRU-int4-Strix-native/config/native-256k.env
+3f67af3f3acaf08815ece0d373f2a9edf7abfc4e3910bb7061e7b8f01070152c  ./Ling-3.0-Flash-CIRU-int4-Strix-native/docs/BENCHMARKS.md
+28fb88619cb4b51790dd267506410bf81530d9ad17c1cee290866d3c23c4c708  ./Ling-3.0-Flash-CIRU-int4-Strix-native/docs/UBUNTU_BUILD.md
+86501c16acd668d0e25613c60c61a395c31731836c09c37fafe11490d0eb2370  ./Ling-3.0-Flash-CIRU-int4-Strix-native/docs/VALIDATED_ENVIRONMENT.md
+eb927bfb99e64911dbc0f6bc0b41f692a07f8d9aed4b551de2de3b1a1acbfd64  ./Ling-3.0-Flash-CIRU-int4-Strix-native/docs/WINDOWS_WSL2.md
+06c78a1ef6f5ee0c3571bd5d35a0ea0f32e2620d999d02f2c9e9f175141851e1  ./Ling-3.0-Flash-CIRU-int4-Strix-native/install.sh
+c641ecff9c6ef45d00e2bda4d7995d4e25522b213fc838100babd8fac86121f0  ./Ling-3.0-Flash-CIRU-int4-Strix-native/MANIFEST.json
+49062288d0b8895baca666fc5d76559ae5ae1bedad7114e62000dc5b1538cbcb  ./Ling-3.0-Flash-CIRU-int4-Strix-native/README.md
+1bec28ea9c6bfa28aea0e0c7adf3d46b56eb399156680278fba0e5b5e3cc87b7  ./Ling-3.0-Flash-CIRU-int4-Strix-native/runtime/COMMITS.txt
+58dde46a772bedfaa7a2bd806a774db15352d5b53ad7c5c681b6857c273561b5  ./Ling-3.0-Flash-CIRU-int4-Strix-native/runtime/Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.bundle
+c6839a15d8250d7e9541f6a12b8cef0f9ccfbfdd825f095ee313048c56bdb0f4  ./Ling-3.0-Flash-CIRU-int4-Strix-native/runtime/Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.patch
+fc47eb458b4d8e4db52b5cb8d9dbd912ee16dbd63ade61861d196e300374c4ca  ./Ling-3.0-Flash-CIRU-int4-Strix-native/runtime/SHA256SUMS.runtime
+8541e877203c3954bf0df44b2a4027188ef694a0ee644e29ddcdfa0d4d2c21c0  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/build-vllm-gfx1151.sh
+e41ff92b71b146a745161f6b6b09f1c85d4b828e68aa1e2a151311656c19a7d7  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/download-model.sh
+37e5e506ce70b0388926456c59ed14b3565a6067ecdb19242e73252fb91b0792  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/hipcc-nixos-linker-helper.sh
+a16abc24cfcb590b191bf122aaf3df01549ea3baf6b5eaa8d089da064b15f043  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/install-host-deps.sh
+d2793fc18ee5438efa55b77ff0f4cfe090c52ea1541b82fa94cd8da5d128a7d6  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/install-rocr-idle-fix.sh
+881b565217b0881b78e0e9bec074ffd27ba013ec21f63d595de76b0693289067  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/rocm715-nixos-numa-target.cmake
+72f4024af2ad19ee58af201d4fc29f84481b521a80e36c88ae1ab0b6edf7e0e1  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/run-1m-yarn-experimental.sh
+f3fa5364ce194b6676bbe3566604f73d2df9ac381fe1937bf7abc465dde8fd2c  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/run-256k.sh
+e705d68ea20fc4dd07ead15111ace08f29b6ea7c60f3613690a111bdfd31b437  ./Ling-3.0-Flash-CIRU-int4-Strix-native/scripts/run-common.sh
+9b462200154d5951ced0bf2ea2e11c7aeeb76e4ad54769cfa1ac6af81de8038a  ./Ling-3.0-Flash-CIRU-int4-Strix-native/SHA256SUMS

docs/BENCHMARKS.md

@@ -18,7 +18,7 @@ The native row used the then-current `gpu_memory_utilization=0.75`, 262,144-cont
 
 ### Update status
 
-The native 60K row was measured at CIRU runtime commit `fabbc7e928dfa64c29dcdf0f795b05246555f4ae`, before the final exact-shape SiLU kernel and ROCm MLA LSE-layout commits. The released commit `91fab4e6dcaa683911655630dae8a5b140a7cb91` has not yet been rerun on this 60K protocol. The table is therefore a valid retained comparison, but not a claim that 19.92 tok/s is the final commit's maximum 60K speed. Replace the native row only after a matched rerun of all three stacks or a clearly labeled native-only refresh.
+The native 60K row was measured at CIRU runtime commit `fabbc7e928dfa64c29dcdf0f795b05246555f4ae`, before the final exact-shape SiLU kernel and ROCm MLA LSE-layout commits. The release branch now ends at `838616875c5dd4913d9f753221bf05f64cb7a7ed`; its last performance-affecting runtime commit is `91fab4e6dcaa683911655630dae8a5b140a7cb91`. That branch has not yet been rerun on this 60K protocol. The table is therefore a valid retained comparison, but not a claim that 19.92 tok/s is the release branch's maximum 60K speed. Replace the native row only after a matched rerun of all three stacks or a clearly labeled native-only refresh.
 
 ## Short decode and concurrent serving
 

docs/UBUNTU_BUILD.md

@@ -65,22 +65,29 @@ spaces.
 For non-interactive agents, see `bash install.sh --help`. The numbered steps
 below remain available for manual diagnosis and custom automation.
 
-### Existing installations: engine-only upgrade
+### Existing installations: full runtime update, model preserved
 
-After updating this package, upgrade an existing runtime in place with:
+After updating this package, rebuild the packaged fork and corrected ROCr
+runtime in place with:
 
 ```bash
-bash install.sh --upgrade \
+bash install.sh \
   --install-root "$HOME/ciru-ling-runtime" \
+  --model-path "/path/to/Ling-checkpoint" \
   --install-host-deps
 ```
 
-The install root is the parent of the existing `.venv`. This operation does
-not download, move, or alter the model, and it leaves `ling3-runtime.env`
-unchanged. It builds only the pinned ROCr userspace library, verifies the
-result, and enables it in the packaged launchers. Restart the running service
-afterward. `CIRU_DISABLE_ROCR_IDLE_FIX=1` temporarily disables the preload for
-rollback or diagnosis.
+The install root is the parent of the existing `.venv`; the model path points
+to the existing checkpoint. This operation does not download, move, or alter
+the model. It updates both the CIRU vLLM fork and the pinned ROCr userspace
+override that fixes the idle 100% CPU spin. Restart the service afterward.
+`install.sh --upgrade` remains a ROCr-only repair path for an installation whose
+vLLM source already matches the package. `CIRU_DISABLE_ROCR_IDLE_FIX=1`
+temporarily disables the preload for rollback or diagnosis.
+
+On NixOS, the build derives the active GCC/glibc store paths instead of using
+host-specific hashes. The ROCr step enters an ephemeral `nix-shell` for its
+host build dependencies; it does not add packages to the user's profile.
 
 ## 2. Configure unified-memory access
 
@@ -154,6 +161,15 @@ MODEL_PATH="$HOME/models/Ling-3.0-Flash-CIRU-int4-Strix-native" \
 bash scripts/run-256k.sh
 ```
 
+On a cold compiler cache, keep the launch terminal open for several minutes.
+The pinned stack can print `tl.make_block_ptr is deprecated`, `TypedStorage is
+deprecated`, `Autotune Choices Stats`, and `AUTOTUNE mm(...)` while selecting
+kernels. Those lines are nonfatal; readiness is the later `Application startup
+complete` line and a successful `/health` response. A traceback, `EngineCore
+failed`, process exit, or failed health check is an actual failure. Test the
+packaged launcher unchanged before removing optimization flags, because doing
+so changes both behavior and the performance profile.
+
 In another shell:
 
 ```bash

docs/VALIDATED_ENVIRONMENT.md

@@ -19,7 +19,7 @@
 - torchaudio `2.11.0.2+rocm7.15.0a20260728`
 - FlashAttention `2.8.3`, Dao-AILab commit `0e60e39473e8df549a20fb5353760f7a65b30e2d`, Python-only AMD Triton path
 - vLLM upstream base `d35eb6c44071ea806018841c490f0d2f3219c485`
-- CIRU runtime head `91fab4e6dcaa683911655630dae8a5b140a7cb91`
+- CIRU runtime head `838616875c5dd4913d9f753221bf05f64cb7a7ed`
 
 ## Build facts
 
@@ -27,6 +27,8 @@
 - Exact AMD multi-architecture wheel transaction installed in one resolver operation.
 - `rocm-sdk init` and all 27 SDK tests passed.
 - vLLM compiled for `gfx1151` only with 16 jobs.
+- The clean package derived the NixOS GCC/glibc bridge without fixed store
+  hashes and supplied ROCr host dependencies through an ephemeral `nix-shell`.
 - Clean native build completed in 92 seconds on the validation host.
 - Imports passed for `vllm._C`, `vllm._C_stable_libtorch`, `vllm._moe_C_stable_libtorch`, `vllm._rocm_C`, and `vllm.cumem_allocator`.
 

runtime/COMMITS.txt

@@ -14,3 +14,4 @@ abfff126e0698d98f1872f87f501d36a19382240  Optimize single-token MoE reduction
 fabbc7e928dfa64c29dcdf0f795b05246555f4ae  Extend MoE support fast path to K1 verification
 388d82de2abe418e73380ba250270d3abc62ac12  ROCm: optimize exact small WNA16 SiLU activation
 91fab4e6dcaa683911655630dae8a5b140a7cb91  [Bugfix][ROCm][MLA] Normalize upstream FlashAttention LSE layout
+838616875c5dd4913d9f753221bf05f64cb7a7ed  ROCm: register safe attention merge environment flag

runtime/Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.bundle

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cbcbbef5e113e22b753801ee141bd877b20c84f25f15cc159d0ae508aaf4324
-size 117890929
+oid sha256:58dde46a772bedfaa7a2bd806a774db15352d5b53ad7c5c681b6857c273561b5
+size 117557885

runtime/Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.patch

@@ -15,6 +15,26 @@ index 519e21328..847d8284a 100644
      vllm::topKPerRowDecode<kNumThreadsPerBlockMerge, true, false, true>
          <<<numRows, kNumThreadsPerBlockMerge, topK * sizeof(int32_t), stream>>>(
              outLogitsAux.const_data_ptr<float>(), seqLens.const_data_ptr<int>(),
+diff --git a/tests/config/test_config_generation.py b/tests/config/test_config_generation.py
+index c7edf2b97..7c9b21c24 100644
+--- a/tests/config/test_config_generation.py
++++ b/tests/config/test_config_generation.py
+@@ -109,3 +109,15 @@ def test_unrecognized_env(monkeypatch):
+         fail_on_environ_validation=True,
+     )
+     engine_args.create_engine_config()
++
++
++def test_rocm_safe_merge_env_is_registered(monkeypatch):
++    from vllm.envs import environment_variables
++
++    name = "VLLM_ROCM_SAFE_MERGE_ATTN_STATES"
++    assert name in environment_variables
++
++    monkeypatch.setenv(name, "1")
++    assert environment_variables[name]() is True
++    monkeypatch.setenv(name, "0")
++    assert environment_variables[name]() is False
 diff --git a/tests/v1/attention/test_mla_prefill_quant_output.py b/tests/v1/attention/test_mla_prefill_quant_output.py
 index d7659485a..93df32d38 100644
 --- a/tests/v1/attention/test_mla_prefill_quant_output.py
@@ -136,6 +156,31 @@ index d7659485a..93df32d38 100644
  @pytest.mark.parametrize(
      ("version", "is_vllm_fa", "dc_major", "quant_key", "expected"),
      [
+diff --git a/vllm/envs.py b/vllm/envs.py
+index 3f23fb615..3a15c5c93 100755
+--- a/vllm/envs.py
++++ b/vllm/envs.py
+@@ -143,6 +143,7 @@ if TYPE_CHECKING:
+     VLLM_ROCM_USE_AITER_FUSION_SHARED_EXPERTS: bool = False
+     VLLM_ROCM_USE_AITER_TRITON_GEMM: bool = True
+     VLLM_ROCM_USE_SKINNY_GEMM: bool = True
++    VLLM_ROCM_SAFE_MERGE_ATTN_STATES: bool = False
+     VLLM_ROCM_FP8_PADDING: bool = True
+     VLLM_ROCM_MOE_PADDING: bool = True
+     VLLM_ROCM_SHUFFLE_KV_CACHE_LAYOUT: bool = False
+@@ -1297,6 +1298,12 @@ environment_variables: dict[str, Callable[[], Any]] = {
+     "VLLM_ROCM_USE_SKINNY_GEMM": lambda: (
+         os.getenv("VLLM_ROCM_USE_SKINNY_GEMM", "True").lower() in ("true", "1")
+     ),
++    # Use the safe Torch attention-state merge on ROCm. This is an opt-in
++    # fallback for platforms where the Triton merge kernel is unstable.
++    "VLLM_ROCM_SAFE_MERGE_ATTN_STATES": lambda: (
++        os.getenv("VLLM_ROCM_SAFE_MERGE_ATTN_STATES", "False").lower()
++        in ("true", "1")
++    ),
+     # Pad the fp8 weights to 256 bytes for ROCm
+     "VLLM_ROCM_FP8_PADDING": lambda: bool(int(os.getenv("VLLM_ROCM_FP8_PADDING", "1"))),
+     # Pad the weights for the moe kernel
 diff --git a/vllm/model_executor/layers/fused_moe/experts/triton_moe.py b/vllm/model_executor/layers/fused_moe/experts/triton_moe.py
 index 9d93dfe54..dd96f6da4 100644
 --- a/vllm/model_executor/layers/fused_moe/experts/triton_moe.py
@@ -575,17 +620,14 @@ index 71a38e95d..641f68b16 100644
  
          # Run MQA — always pass layer scales. When KV cache is
 diff --git a/vllm/v1/attention/ops/merge_attn_states.py b/vllm/v1/attention/ops/merge_attn_states.py
-index 20c7503e9..cc860e1ab 100644
+index 20c7503e9..dc3ee0f97 100644
 --- a/vllm/v1/attention/ops/merge_attn_states.py
 +++ b/vllm/v1/attention/ops/merge_attn_states.py
-@@ -1,11 +1,87 @@
- # SPDX-License-Identifier: Apache-2.0
- # SPDX-FileCopyrightText: Copyright contributors to the vLLM project
+@@ -3,9 +3,84 @@
  
-+import os
-+
  import torch
  
++from vllm import envs
  from vllm.platforms import current_platform
  
  
@@ -666,13 +708,13 @@ index 20c7503e9..cc860e1ab 100644
  def merge_attn_states(
      output: torch.Tensor,
      prefix_output: torch.Tensor,
-@@ -46,6 +122,21 @@ def merge_attn_states(
+@@ -46,6 +121,21 @@ def merge_attn_states(
              When provided, output must be FP8 dtype.
      """
  
 +    if (
 +        current_platform.is_rocm()
-+        and os.getenv("VLLM_ROCM_SAFE_MERGE_ATTN_STATES", "0") == "1"
++        and envs.VLLM_ROCM_SAFE_MERGE_ATTN_STATES
 +        and output_scale is None
 +    ):
 +        return _merge_attn_states_torch(

runtime/SHA256SUMS.runtime

@@ -1,3 +1,3 @@
-a14fcd3747829be98a73a453057bd451a492d87a236c2affcf57db1cbbf18386  COMMITS.txt
-9cbcbbef5e113e22b753801ee141bd877b20c84f25f15cc159d0ae508aaf4324  Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.bundle
-c0c1446ea2c7334ef8b888f3104ec660d2ab41d2cb08bb9d90a3f589dba040e8  Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.patch
+1bec28ea9c6bfa28aea0e0c7adf3d46b56eb399156680278fba0e5b5e3cc87b7  COMMITS.txt
+58dde46a772bedfaa7a2bd806a774db15352d5b53ad7c5c681b6857c273561b5  Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.bundle
+c6839a15d8250d7e9541f6a12b8cef0f9ccfbfdd825f095ee313048c56bdb0f4  Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.patch

scripts/build-vllm-gfx1151.sh

@@ -52,7 +52,7 @@ venv="$install_root/.venv"
 source_dir="$install_root/vllm"
 index=https://rocm.nightlies.amd.com/whl-multi-arch/
 base=d35eb6c44071ea806018841c490f0d2f3219c485
-head=91fab4e6dcaa683911655630dae8a5b140a7cb91
+head=838616875c5dd4913d9f753221bf05f64cb7a7ed
 bundle="$package_root/runtime/Ling-3.0-Flash-CIRU-int4-Strix-native-vllm.bundle"
 flash_source="$install_root/flash-attention"
 flash_commit=0e60e39473e8df549a20fb5353760f7a65b30e2d
@@ -160,7 +160,63 @@ export CMAKE_PREFIX_PATH="$sdk/lib/cmake:$site/torch/share/cmake"
 export HIP_FORCE_DEV_KERNARG=1
 export MAX_JOBS="${MAX_JOBS:-16}"
 export CMAKE_BUILD_PARALLEL_LEVEL="$MAX_JOBS"
-export CMAKE_ARGS="-DROCM_PATH=$sdk -DCMAKE_HIP_ARCHITECTURES=gfx1151 ${CMAKE_ARGS:-}"
+nixos_cmake_args=
+host_id="$(
+  # Keep distro variables out of the installer environment.
+  # shellcheck disable=SC1091
+  source /etc/os-release 2>/dev/null || true
+  printf '%s\n' "${ID:-unknown}"
+)"
+if [ "$host_id" = nixos ]; then
+  # The SDK-wheel HIP compiler is intentionally self-contained and cannot
+  # discover Nix store C++ headers, CRT objects, libstdc++, or libnuma by
+  # following conventional /usr paths. Derive the active system toolchain
+  # paths instead of baking Ciru's store hashes into the public package.
+  command -v c++ >/dev/null || die 'NixOS build requires a C++ compiler in PATH'
+  command -v nix-store >/dev/null || die 'NixOS build requires nix-store in PATH'
+
+  crtbegin="$(c++ -print-file-name=crtbegin.o)"
+  libstdcpp="$(c++ -print-file-name=libstdc++.so)"
+  crt1="$(c++ -print-file-name=crt1.o)"
+  [ -f "$crtbegin" ] || die "cannot resolve the NixOS GCC toolchain: $crtbegin"
+  [ -f "$libstdcpp" ] || die "cannot resolve the NixOS libstdc++: $libstdcpp"
+  [ -f "$crt1" ] || die "cannot resolve the NixOS glibc runtime: $crt1"
+
+  gcc_toolchain="${crtbegin%%/lib/gcc/*}"
+  gcc_runtime_lib="$(dirname -- "$libstdcpp")"
+  gcc_crt_lib="$(dirname -- "$crtbegin")"
+  glibc_runtime_lib="$(dirname -- "$crt1")"
+  glibc_headers="$(
+    c++ -E -x c++ -v /dev/null 2>&1 |
+      awk '/^ \/nix\/store\/.*-glibc-.*-dev\/include\/?$/ && !found {
+        sub(/^ /, ""); found=$0
+      } END { print found }'
+  )"
+  [ -d "$glibc_headers" ] || \
+    die 'cannot resolve the NixOS glibc development headers from c++'
+
+  numactl_store="$(
+    nix-store -q --requisites /run/current-system |
+      awk '/\/nix\/store\/.*-numactl-[^/]+$/ && !found { found=$0 }
+           END { print found }'
+  )"
+  numa_lib="$numactl_store/lib"
+  [ -f "$numa_lib/libnuma.so" ] || \
+    die 'NixOS system closure does not provide libnuma; add pkgs.numactl'
+  dynamic_linker="$glibc_runtime_lib/ld-linux-x86-64.so.2"
+  [ -f "$dynamic_linker" ] || \
+    die "cannot resolve the NixOS dynamic linker: $dynamic_linker"
+
+  export LD_LIBRARY_PATH="$gcc_runtime_lib:$numa_lib:$LD_LIBRARY_PATH"
+  export CMAKE_LIBRARY_PATH="$numa_lib${CMAKE_LIBRARY_PATH:+:$CMAKE_LIBRARY_PATH}"
+  export HIPFLAGS="--rocm-path=$sdk --gcc-toolchain=$gcc_toolchain -idirafter $glibc_headers ${HIPFLAGS:-}"
+  export HIPCC_COMPILE_FLAGS_APPEND="--gcc-toolchain=$gcc_toolchain -idirafter $glibc_headers ${HIPCC_COMPILE_FLAGS_APPEND:-}"
+  export LDFLAGS="-B$glibc_runtime_lib -B$gcc_runtime_lib -L$glibc_runtime_lib -L$gcc_crt_lib -L$gcc_runtime_lib -Wl,--dynamic-linker=$dynamic_linker -Wl,-rpath,$gcc_runtime_lib -Wl,-rpath,$glibc_runtime_lib ${LDFLAGS:-}"
+  chmod +x "$script_dir/hipcc-nixos-linker-helper.sh"
+  nixos_cmake_args="-DHIP_HIPCC_CMAKE_LINKER_HELPER=$script_dir/hipcc-nixos-linker-helper.sh -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=$script_dir/rocm715-nixos-numa-target.cmake"
+  printf 'Enabled the derived NixOS HIP host-toolchain bridge.\n'
+fi
+export CMAKE_ARGS="-DROCM_PATH=$sdk -DCMAKE_HIP_ARCHITECTURES=gfx1151 $nixos_cmake_args ${CMAKE_ARGS:-}"
 
 # Run the SDK checks against this virtual environment's development root, not
 # an inherited system ROCm installation.

scripts/hipcc-nixos-linker-helper.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+# TheRock's generated helper uses /bin/bash, which NixOS intentionally omits.
+# Invoke it through the bash selected by the package instead; BASH_SOURCE in
+# the SDK helper still resolves HIP_PATH relative to the SDK.
+exec bash \
+  "${ROCM_PATH:?ROCM_PATH must identify the TheRock SDK}/bin/hipcc_cmake_linker_helper" \
+  "$@"

scripts/install-host-deps.sh

@@ -31,7 +31,14 @@ run_as_root() {
   fi
 }
 
-if [[ "$distro" =~ (ubuntu|debian) ]]; then
+if [[ "$distro" =~ (nixos) ]]; then
+  command -v nix-shell >/dev/null 2>&1 || {
+    echo 'NixOS requires nix-shell for the package build dependencies.' >&2
+    exit 2
+  }
+  nix-shell -p pkg-config xxd libdrm elfutils numactl openssl --run \
+    'command -v pkg-config >/dev/null && command -v xxd >/dev/null'
+elif [[ "$distro" =~ (ubuntu|debian) ]]; then
   run_as_root apt-get update
   run_as_root apt-get install -y \
     build-essential git curl ca-certificates pkg-config \
@@ -60,4 +67,9 @@ command -v uv >/dev/null || {
   exit 2
 }
 
-printf 'Host dependencies ready on %s.\n' "${PRETTY_NAME:-$distro}"
+if [[ "$distro" =~ (nixos) ]]; then
+  printf 'Host dependencies ready on demand through nix-shell on %s.\n' \
+    "${PRETTY_NAME:-$distro}"
+else
+  printf 'Host dependencies ready on %s.\n' "${PRETTY_NAME:-$distro}"
+fi

scripts/install-rocr-idle-fix.sh

@@ -84,6 +84,29 @@ if [ "$force" != "--force" ] && [ -r "$runtime_path" ] && \
   exit 0
 fi
 
+host_id="$(
+  # Keep distro variables out of the installer environment.
+  # shellcheck disable=SC1091
+  source /etc/os-release 2>/dev/null || true
+  printf '%s\n' "${ID:-unknown}"
+)"
+if [ "$host_id" = nixos ] && \
+   { ! command -v pkg-config >/dev/null 2>&1 || \
+     ! command -v xxd >/dev/null 2>&1; }; then
+  command -v nix-shell >/dev/null 2>&1 || \
+    die 'NixOS build needs nix-shell to provide pkg-config and xxd'
+  [ "${CIRU_NIX_ROCR_DEPS_ACTIVE:-0}" != 1 ] || \
+    die 'NixOS dependency shell did not provide pkg-config and xxd'
+  printf -v rerun_command '%q ' env CIRU_NIX_ROCR_DEPS_ACTIVE=1 \
+    bash "${BASH_SOURCE[0]}" "$install_root_arg"
+  if [ "$force" = --force ]; then
+    printf -v rerun_command '%s%q ' "$rerun_command" --force
+  fi
+  printf 'Entering an ephemeral Nix shell for ROCr host dependencies.\n'
+  exec nix-shell -p pkg-config xxd libdrm elfutils numactl openssl \
+    --run "$rerun_command"
+fi
+
 for command_name in git gcc g++ pkg-config sha256sum xxd; do
   command -v "$command_name" >/dev/null 2>&1 || \
     die "missing $command_name; run scripts/install-host-deps.sh"
@@ -164,6 +187,33 @@ host_cmake_prefix="${CMAKE_PREFIX_PATH:-}"
 host_cmake_prefix="${host_cmake_prefix//:/;}"
 cmake_prefix="$sdk;$core${host_cmake_prefix:+;$host_cmake_prefix}"
 
+if [ "$host_id" = nixos ]; then
+  # CMake's source-tree find_library/find_path calls do not understand the
+  # Nix compiler wrapper flags. Convert the ephemeral shell's -L/-isystem
+  # inputs into ordinary search variables and add glibc explicitly.
+  glibc_runtime_lib="$(dirname -- "$(gcc -print-file-name=crt1.o)")"
+  [ -f "$glibc_runtime_lib/libc.so" ] || \
+    die "cannot resolve the NixOS libc linker input: $glibc_runtime_lib/libc.so"
+  nix_library_path="$(
+    printf '%s\n' "${NIX_LDFLAGS:-}" | tr ' ' '\n' |
+      sed -n 's/^-L\(\/nix\/store\/.*\)$/\1/p' | paste -sd: -
+  )"
+  nix_include_path="$(
+    printf '%s\n' "${NIX_CFLAGS_COMPILE:-}" | tr ' ' '\n' |
+      awk 'previous == "-isystem" && /^\/nix\/store\// { print }
+           { previous=$0 }' | paste -sd: -
+  )"
+  [ -n "$nix_library_path" ] || \
+    die 'NixOS dependency shell did not expose library search paths'
+  [ -n "$nix_include_path" ] || \
+    die 'NixOS dependency shell did not expose include search paths'
+  export CMAKE_LIBRARY_PATH="$glibc_runtime_lib:$nix_library_path${CMAKE_LIBRARY_PATH:+:$CMAKE_LIBRARY_PATH}"
+  export CMAKE_INCLUDE_PATH="$nix_include_path${CMAKE_INCLUDE_PATH:+:$CMAKE_INCLUDE_PATH}"
+  export LIBRARY_PATH="$glibc_runtime_lib:$nix_library_path${LIBRARY_PATH:+:$LIBRARY_PATH}"
+  export CPATH="$nix_include_path${CPATH:+:$CPATH}"
+  export LD_LIBRARY_PATH="$glibc_runtime_lib:$nix_library_path:$LD_LIBRARY_PATH"
+fi
+
 printf 'Building pinned ROCr idle-runtime override\n'
 printf '  source: %s @ %s\n  compiler: %s / %s\n' \
   "$rocm_systems_repo" "$rocm_systems_commit" "$cc" "$cxx"

scripts/rocm715-nixos-numa-target.cmake

@@ -0,0 +1,6 @@
+if(NOT TARGET numa::numa)
+  find_library(NUMA_LIBRARY NAMES numa REQUIRED)
+  add_library(numa::numa UNKNOWN IMPORTED)
+  set_target_properties(numa::numa PROPERTIES
+    IMPORTED_LOCATION "${NUMA_LIBRARY}")
+endif()

scripts/run-common.sh

@@ -6,6 +6,8 @@ if [ "$#" -ne 0 ]; then
   exit 2
 fi
 
+script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+package_root="$(cd -- "$script_dir/.." && pwd)"
 release_name=Ling-3.0-Flash-CIRU-int4-Strix-native
 venv="${VENV:?Set VENV to the built runtime virtual environment}"
 model_path="${MODEL_PATH:?Set MODEL_PATH to the downloaded checkpoint directory}"
@@ -13,6 +15,21 @@ host="${HOST:-127.0.0.1}"
 port="${PORT:-18081}"
 cache_root="${CACHE_ROOT:-$HOME/.cache/ciru-ling3-vllm}"
 max_num_batched_tokens="${MAX_NUM_BATCHED_TOKENS:-8192}"
+inductor_max_autotune="${VLLM_ENABLE_INDUCTOR_MAX_AUTOTUNE:-1}"
+inductor_coordinate_descent="${VLLM_ENABLE_INDUCTOR_COORDINATE_DESCENT_TUNING:-1}"
+
+for setting in \
+  "VLLM_ENABLE_INDUCTOR_MAX_AUTOTUNE:$inductor_max_autotune" \
+  "VLLM_ENABLE_INDUCTOR_COORDINATE_DESCENT_TUNING:$inductor_coordinate_descent"; do
+  case "${setting#*:}" in
+    0|1) ;;
+    *)
+      printf '%s must be 0 or 1, got: %s\n' \
+        "${setting%%:*}" "${setting#*:}" >&2
+      exit 2
+      ;;
+  esac
+done
 
 case "$venv" in
   *[[:space:]:]*)
@@ -60,6 +77,14 @@ if [ ! -x "$sdk/bin/hipcc" ]; then
   exit 2
 fi
 install_root="$(cd -- "$(dirname -- "$venv")" && pwd -P)"
+package_head=unknown
+if [ -r "$package_root/runtime/COMMITS.txt" ]; then
+  package_head="$(tail -n 1 "$package_root/runtime/COMMITS.txt" | cut -d ' ' -f 1)"
+fi
+installed_head=unavailable
+if [ -d "$install_root/vllm/.git" ] && command -v git >/dev/null 2>&1; then
+  installed_head="$(git -C "$install_root/vllm" rev-parse HEAD 2>/dev/null || printf unavailable)"
+fi
 rocr_override_dir="${ROCR_IDLE_RUNTIME_DIR:-$install_root/runtime-overrides/rocr-7.15-gcc-idle}"
 case "$rocr_override_dir" in
   *[[:space:]:]*)
@@ -100,6 +125,8 @@ export HSA_NO_SCRATCH_RECLAIM=1
 export VLLM_ROCM_USE_AITER=0
 export VLLM_ROCM_USE_SKINNY_GEMM=0
 export VLLM_ROCM_SAFE_MERGE_ATTN_STATES=1
+export VLLM_ENABLE_INDUCTOR_MAX_AUTOTUNE="$inductor_max_autotune"
+export VLLM_ENABLE_INDUCTOR_COORDINATE_DESCENT_TUNING="$inductor_coordinate_descent"
 export VLLM_CACHE_ROOT="$cache_root/vllm"
 export TRITON_CACHE_DIR="$cache_root/triton"
 export HF_MODULES_CACHE="$cache_root/huggingface-modules"
@@ -149,4 +176,22 @@ fi
 printf 'Launching %s\n' "$release_name"
 printf '  vLLM: %s\n  model: %s\n  listen: %s:%s\n' \
   "$venv/bin/vllm" "$model_path" "$host" "$port"
+printf '  package runtime: %s\n  installed source: %s\n  max autotune: %s\n' \
+  "$package_head" "$installed_head" "$inductor_max_autotune"
+if [ "$package_head" != unknown ] && [ "$installed_head" != unavailable ] && \
+   [ "$package_head" != "$installed_head" ]; then
+  printf 'WARNING: the installed CIRU fork does not match this package.\n' >&2
+  printf 'Rebuild it without downloading the model:\n' >&2
+  printf '  bash %q --install-root %q --model-path %q\n' \
+    "$package_root/install.sh" "$install_root" "$model_path" >&2
+fi
+if [ "$inductor_max_autotune" = 1 ]; then
+  printf '%s\n' \
+    'Cold-cache startup compiles and benchmarks kernels for several minutes.' \
+    'The make_block_ptr/TypedStorage deprecations and AUTOTUNE tables are nonfatal.' \
+    'The server is ready only after: Application startup complete.'
+else
+  printf '%s\n' \
+    'NOTICE: Inductor max autotuning is disabled; this is not the benchmarked profile.'
+fi
 exec "$venv/bin/vllm" "${args[@]}"