Repository navigation
Merge upstream main - #44
Merged
Merged
Conversation
ashhart#2585 (dfd9ac5) put `try @import("env_validate.zig").startup();` at the top of the learn, prompt and compare mains. Each of those executables also imports the flashnext module, whose cuda_lanes_load.zig imports the same file, so Zig refuses the build: "file exists in modules 'root' and 'flashnext'". The nightly's compile-flashnext-learn (test-host-ci-linux- compile) failed on it; flashnext-prompt and flashnext-compare fail the same way but no CI step compiles them. cuda_launch.zig (the flashnext module's root) now exports env_validate, and the three mains call flash.env_validate.startup(), so the file belongs to the one module. The check itself and its place before any device work are unchanged.
…re first norm ashhart#2579 (4dd870b, a pipeline stage holds only its layer range) changed one pinned call in cuda_forward.zig: the input norm's add flag went from `i != 0` to `g.first + i != 0`, so a later stage's first layer adds the incoming residual as layer i of one engine does. One engine's geometry has first = 0, so its calls are the same; the commit states step, window and prompt logits equal the parent's bit for bit. The other eleven pinned calls are unchanged. The pin takes the new sequence's hash, with the change named beside it.
test-gradient-serving pins the bytes of the maintained serving kernels and launch wrappers; it stopped at the first changed file, cublaslt.zig, but fourteen differed: - ashhart#2585 (dfd9ac5, 52479d3) reads TF_FLASHNEXT_* through platform/environment.zig and refuses malformed text at startup; valid values keep their meaning (ten Flash Next files). - c274b45 on this branch takes that startup check through the flashnext module (cuda_launch.zig and the prompt and compare mains). - ashhart#2285 (52375ee) adds cuBLASLt layout and algo-config entries for Qwen3 embeddings to cublaslt.zig; existing entries are unchanged. - ashhart#2205 (c8ad987) lets tp_group.zig's RoCE gathers run at any world up to roce.max_world when every rank asks (TF_ROCE's default is unchanged), and ashhart#2789 (61a2651) ends a call failing after abort as Aborted. Each row takes its file's new hash, with the change named beside it.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges upstream
maininto my fork's line with a normal merge commit, so mymaincarries every upstream commit.env_validatethrough theflashnextmodule, dense serving's launch sequence takes fabric stage: pipelined rounds, rank 0 sends round r + 1 while the later stages run round r (RFC #2005) ashhart/TensorFold#2579's stage-aware first norm, fourteen serving sources are re-pinned, and tests, flashnext: fix main's three nightly failures ashhart/TensorFold#3002 is in the changelog.CHANGELOG.mdoverlapped, and the auto-merge kept upstream's entry above mine.zig build test test-goldenpasses on the merge; nothing else changed.