Skip to content

kernel contract: tf_ctl_pocket_in_fmax's closing brace, lost when MOSS-Image's CUDA controls landed inside it - #1769

Closed
BobClawblaw wants to merge 1 commit into
ashhart:mainfrom
BobClawblaw:fix-moss-controls-place
Closed

BobClawblaw wants to merge 1 commit into
ashhart:mainfrom
BobClawblaw:fix-moss-controls-place

Conversation

@BobClawblaw

Copy link
Copy Markdown
Contributor

zig/kernels/cuda/contract_controls.cu hasn't compiled with nvcc since 12eaec9 (#1528), so every CUDA build of tf-cuda-test fails:

contract_controls.cu(368): error: namespace definition is not allowed
contract_controls.cu(400): error: linkage specification is not allowed

When #1528 landed, its MOSS-Image controls went in between the last two lines of tf_ctl_pocket_in_fmax, and the block's final } took the place of the function's own. #1528's pushed head (11cf033) had the block after the EXL3 controls and compiled. The macOS checks don't build this file, so CI stayed green.

This puts the brace back, one line. Nothing else changes: the MOSS block is byte for byte the one in #1528's head.

Checked on an RTX 5090 (sm_120, nvcc 13.3): main with this commit builds tf-cuda-test and tf-moss-image. The same commit on top of #1687 and #1632 builds too and passes test-cuda-host on both, and #1687's tf-moss-image gives MOSS-Image's 512 fox case latents byte-identical to main's. Mac: fmt and lean clean (0 new).

…S-Image's CUDA controls landed inside it

contract_controls.cu stopped compiling with nvcc at 12eaec9 (namespace definition is not allowed), so every CUDA build
of tf-cuda-test failed.
@BobClawblaw

Copy link
Copy Markdown
Contributor Author

Superseded by fbbc20d, which makes the same one-brace fix on main. Closing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant