Skip to content

fix(deepseek_v41): use std::numbers::pi, which MSVC defines - #141

Merged
iamwavecut merged 1 commit into
masterfrom
dev/deepseek-msvc-pi
Oct 25, 2026
Merged

iamwavecut merged 1 commit into
masterfrom
dev/deepseek-msvc-pi

Conversation

@iamwavecut

Copy link
Copy Markdown
Owner

Master's MSVC host-code checks and the Windows native release failed on src/models/deepseek_v41/executor.cpp: MSVC defines M_PI only with _USE_MATH_DEFINES, so the YaRN correction range did not compile (C2065, then C2665/C2737 from the lambda that lost its type). The C++20 constant std::numbers::pi has the same double value. The check had reported 377 of 378 translation units compiling; this was the only failure.

@iamwavecut
iamwavecut merged commit 9d99efe into master Oct 25, 2026
15 of 17 checks passed
13thblade added a commit to 13thblade/ninfer-all-nvfp4 that referenced this pull request Oct 25, 2026
Ten commits upstream since b3402a6, 33 files and 922/176 lines. Four are
substantive: 7cf5b2a fixes the M_PI build break in deepseek_v41 with
std::numbers::pi (PR iamwavecut#141), 710df20 reports the release tag as the version,
3f2b59c prefetches prompt spans' expert banks and keeps the lent slots a call
reads, and 6ab3e66 prefills DeepSeek prompts block by block in spans. The rest
are docs (What's New, DeepSeek across cards, one-host Strata comparison) and
three merge commits.

Two of those files overlap the fork's own change set. README.md merged on its
own: the fork's head stays byte-identical and everything from the mirror marker
on is upstream's README at a53a4f3 verbatim.

src/models/deepseek_v41/executor.cpp conflicted, on the one expression the fork
patched in 03b78d6. Upstream fixed the same defect, more idiomatically: the
standard C++20 constant plus its own include, where the fork had introduced a
local kPi. The merge takes upstream's side and the fork's fix retires with it;
the staged blob is upstream's 44e4c04, so the fork no longer modifies that file
at all.

The two review branches were rebased onto a53a4f3 in the same pass:
pr/nvfp4-w4a16 = b76d912 and pr/nvfp4-w4a8-int = 5dc9e11, both with the same
patch-id as before the sync and the same diffstats (73 files 1356/257 and 96
files 6939/98), so nothing of either nvfp4 commit moved.

Not rebuilt or re-gated here, deliberately: none of the ten commits touch a file
the fork changes, and the only conflict resolved to upstream's own fix. The last
gated build (61 passed, 2 skipped) still describes the nvfp4 code. Note that the
build tree now trails master: 3f2b59c's expert delivery fix and 6ab3e66 are in
master but not in the binaries, which matters before any host- or disk-resident
expert measurement.
@iamwavecut
iamwavecut deleted the dev/deepseek-msvc-pi branch October 26, 2026 02:50
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