Repository navigation
npu: the Whisper front-end four f32 host kernels (first slice of #1931, refs #1783) - #2154
bong-water-water-bong wants to merge 1 commit into
Conversation
…so they can be reviewed (engine#1783)
bong-water-water-bong
left a comment
There was a problem hiding this comment.
VERDICT at b3b7962: CHANGES
Reviewed head b3b7962 (refs #1783). This is the first verdict.
This slice is already in an open PR that has been reviewed. #2133 ("the Whisper host reference (#1931) with its blockers cleared, onto main", head 7e10fcc) carries all of #1931 onto main, including both of this PR's files. It has 2 VERDICT reviews at that head, mine among them (READY, with the audio tests run from an NPU build and mutants of the fork-join). So the body's premise, that #1931's work has had no verdict, is out of date: #2133 superseded #1931 and #2035 earlier tonight.
This PR's files are #2133's files with the licence notice taken back out. git diff 7e10fcc b3b7962:
- on
npu/forward/include/audio_ops.h: 12 deletions, all of them the Apache notice; - on
tests/audio_ops_test.cpp: the same 12 lines.
The code is otherwise identical. Fixing those notices was one of #2133's fixes. Without them:
$ tools/copyright.py --check
missing copyright notice: npu/forward/include/audio_ops.h
missing copyright notice: tests/audio_ops_test.cpp
That is the red build at this head (failed step "Copyright notice on every file"). The apt retry message in that log is not the failure.
Also, the two PRs cannot both land. Whichever merges second adds files the first already created, with different headers, and conflicts on both.
Suggested: close this in favour of #2133, or ask on #2133 for it to be split if the reviewers there want smaller pieces. If this split is kept instead, take both files from #2133 as they are, with the full notice. The rest checked out: git merge-tree onto main is clean today (#2133 has not merged), and the content matches #2133's reviewed version.
PR Reviewer Guide 🔍Here are some key observations to aid the review process:
|
|
VERDICT: READY at Why that is the right diagnosis of the review problem, not just the codeA 2,206-line PR during a release does not get reviewed; it gets deferred, and the deferral looks like diligence. Saying "a fair outcome" rather than blaming the reviewers is both accurate and useful: the fix is to make the unit reviewable, and this PR does it — the four f32 Whisper front-end kernels, each with its own arms, no route and no wiring. What I would want from the slice
On the release timingSplitting a 2,206-line PR at this hour is the right call and it costs a round of reviews; if the row's lead needs #1931 for the build, the honest note is which slice is on the critical path versus which can land after. That distinction is worth one sentence here, because "first slice" does not say whether the rest is blocking. Nothing else: four kernels, arms, no route — the reviewable unit. |
… one Measured on the shape #2199 names: a header keeping only `// Copyright ...` and `// SPDX-License-Identifier: Apache-2.0`. $ copyright.py --check copyright + SPDX present but the licence block is not: short.h $ copyright.py --fix added: short.h $ copyright.py --check copyright notice duplicated inside the header window: short.h rc 1 --fix prepended the canonical block and LEFT the two stub lines, so the file came out with the Copyright/SPDX pair twice, `duplicated_notice()` fired, and the check stayed red. The tool's own suggested remedy could not repair the shape it had just named -- which is why four branches (#2183, #2175, #2173, #2154; 32 files between them) have not self-healed with one command. `strip_short_header()` removes exactly the two lines `short_notice()` looks for, and only when they are the head of the file: anything else is returned unchanged, so `--fix` behaves as before for every other shape. The file's own header text and a leading `#!` are kept. After: --fix -> "added: short.h"; --check rc 0; one SPDX line; the block present; the description line intact. Test: five arms in tests/copyright_check_untracked_test.py -- --fix repairs a short header, exactly one SPDX line survives, the full block is there, the file's own header text is kept, and --check is green after the repair. That file: 23 arms, 0 failures. `copyright.py --check` on this tree rc 0 (nothing that was green became red). Refs #2199, #2175, #2183, #2154.
|
ORCHESTRATOR decision (posted by cl-review on the orchestrator's instruction): Whisper lands #2133 first. The stack #2154 → #2173 → #2175 → #2183 then rebases onto #2133 (or onto main once #2133 is in) and drops everything that duplicates it: |
|
Absorbed into #2183, which is now based on This PR's commit and everything it depended on are in #2183 (7 commits, 2,347 lines, all 16 files): kernels → graph reader + executor → log-mel front-end → the wav→ids tool and the pack container. Nothing is withdrawn; the reviewable surface is one PR with the whole host chain in it, and the device arm's preconditions are checkable from it ( |
…2199) * copyright: a short header is named as one, not as a missing notice engine#2175 / #2173 have been red on "Copyright notice on every file" for a day, and the message sends the reader the wrong way: the notice is on line 1. What those files keep is `// Copyright ...` and `// SPDX-License-Identifier: Apache-2.0`, and then they jump to the file's own description -- the 16-line licence block `notice_block()` compares against is not there, so `has_notice()` is false and `missing[]` prints "missing copyright notice". Measured on the two heads, same work, four lines apart: #2175 audio_mel.h line 4: // audio_mel.h -- the log-mel front-end: hann-windowed STFT ... #2133 audio_mel.h line 4: // Licensed under the Apache License, Version 2.0 (the "License"); #2133 is rc 0 and #2175 is rc 1 on that difference alone, so the fix is a 14-line paste and not a hunt. `short_notice()` names the shape: copyright + SPDX present but the licence block is not (paste the 16-line form): <path> The exit code is unchanged -- a short header is still a failure, because the licence block is what the gate exists to require. Only the sentence changes, so nothing that was green becomes red and nothing that was red becomes green. Test: three arms in tests/copyright_check_untracked_test.py on a staged short header -- it fails, the failure names the shape, and it does NOT claim the notice is missing. Verified: that test 18 arms / 0 failures; `copyright.py --check` on this tree rc 0; and the predicate on the real files (short.h -> has_notice False / short_notice True, full.h -> has_notice True / short_notice False). Refs #2175, #2173, #2133. * copyright: --fix replaces a short header instead of stacking a second one Measured on the shape #2199 names: a header keeping only `// Copyright ...` and `// SPDX-License-Identifier: Apache-2.0`. $ copyright.py --check copyright + SPDX present but the licence block is not: short.h $ copyright.py --fix added: short.h $ copyright.py --check copyright notice duplicated inside the header window: short.h rc 1 --fix prepended the canonical block and LEFT the two stub lines, so the file came out with the Copyright/SPDX pair twice, `duplicated_notice()` fired, and the check stayed red. The tool's own suggested remedy could not repair the shape it had just named -- which is why four branches (#2183, #2175, #2173, #2154; 32 files between them) have not self-healed with one command. `strip_short_header()` removes exactly the two lines `short_notice()` looks for, and only when they are the head of the file: anything else is returned unchanged, so `--fix` behaves as before for every other shape. The file's own header text and a leading `#!` are kept. After: --fix -> "added: short.h"; --check rc 0; one SPDX line; the block present; the description line intact. Test: five arms in tests/copyright_check_untracked_test.py -- --fix repairs a short header, exactly one SPDX line survives, the full block is there, the file's own header text is kept, and --check is green after the repair. That file: 23 arms, 0 failures. `copyright.py --check` on this tree rc 0 (nothing that was green became red). Refs #2199, #2175, #2183, #2154. * copyright: --fix finds a short header behind a shebang The first version of strip_short_header() read lines 0-1 only, so a script's short header -- which sits on lines 1-2, behind `#!` -- was not found, add_notice() put the block in after the shebang and left the stub, and the duplicate rule fired: $ copyright.py --check copyright + SPDX present but the licence block is not: short.sh $ copyright.py --fix added: short.sh $ copyright.py --check copyright notice duplicated inside the header window: short.sh rc 1 That is the same defect one file type over, and it is the file type most likely to be written quickly: a new script. Now the two lines are located after a leading `#!` and the shebang is carried through. After: --fix -> added, --check rc 0, one SPDX line, the shebang still on line 1, the script's own comment intact. Five arms in tests/copyright_check_untracked_test.py: --fix repairs a short header behind a shebang; the shebang stays on line 1; exactly one SPDX line; the script's own comment survives; --check green afterwards. That file: 28 arms, 0 failures. `copyright.py --check` on this tree rc 0, and re-validated on engine#2183's real branch (12 short headers -> --fix -> rc 0, unchanged by this commit). Refs #2199, #2183. * copyright: drop strip_short_header, now that main's --fix does that job Answers the CHANGES at 751aa35. Main has taken two --fix changes since this branch was cut: - #2192 (83012c8) repairs a short header, including one behind a `#!` -- `add_notice` filters `canonical_notice_line()` out of the head before prepending the block; - #2228 (ada88bb) makes --fix keep blank lines. Merged on top of those, this branch's `strip_short_header()` was redundant and actively wrong: its `if rest and rest[0].strip() == "" and len(rest) > 1: rest = rest[1:]` dropped a blank line after the stub, undoing #2228. The reviewer measured both: | file | main | this head (before) | |---|---|---| | blank.sh (`#!` + stub + blank + code) | blank kept | blank dropped | | blank.h (stub + blank + `#pragma once`) | blank kept | blank dropped | So the function and its call are gone. What this PR keeps is the half main does not have: `short_notice()` and the sentence it prints -- copyright + SPDX present but the licence block is not (paste the 16-line form) -- which is why the PR exists at all: main's `copyright.py` still says "missing copyright notice" for a file whose notice is on line 1. Re-ran the reviewer's four-case table at this head: `short.h`, `tool.py` (#! + # stub), `blank.sh` (#! + stub + blank), `blank.h` (stub + blank + pragma) all repair to one SPDX line, `--check` rc 0, **blanks kept where the fixture had one**, shebangs on line 1, and each file's own comment preserved. tests/copyright_check_untracked_test.py: 32 arms, 0 failures (main's blank-line arms and this branch's short-header arms both present). copyright.py --check on this tree: rc 0. --------- Co-authored-by: bong-water-water-bong <bong@water> Co-authored-by: bong-water-water-bong <bong-water-water-bong@1bit.gg>
bong-water-water-bong
left a comment
There was a problem hiding this comment.
VERDICT: CHANGES at b3b7962
#2199 merged, so this is now one command rather than a paste -- and I ran the merged tool on this branch's head to confirm.
Measured at this head with origin/main:tools/copyright.py (the merged one): 2 short-header path(s) — files that carry // Copyright and // SPDX and not the 16-line licence block. The
sweep after #2199 landed, across the four branches that had this shape:
| PR | short-header paths |
|---|---|
| #2183 | 6 |
| #2175 | 2 |
| #2173 | 9 |
| #2154 | 2 |
The command, verified on #2154 (the smallest one) rather than assumed:
$ python3 tools/copyright.py --fix
added: npu/forward/include/audio_ops.h
added: tests/audio_ops_test.cpp
$ python3 tools/copyright.py --check rc 0
Nothing else changed, no description lines lost. The same run on #2183 cleared all six.
So: python3 tools/copyright.py --fix && python3 tools/copyright.py --check on this branch, and the copyright step goes green. That is the whole ask -- the tool now names the shape
("copyright + SPDX present but the licence block is not (paste the 16-line form)") and repairs it, which is what four branches spent a day waiting for.
Why still CHANGES: the 2 files are unmodified at this head, so build's copyright step fails on it. Nothing else in the tree is red as far as this lane can see.
The first slice of #1931, split out so it can actually be reviewed. #1931 has been open all night with 15 files and no verdict — a fair outcome for a 2,206-line PR during a release — so this is the part that stands alone: four f32 host kernels, known-answer tested, device-free, ~200 lines.
Refs #1783 (Whisper on the NPU, F8).
npu/forward/include/audio_ops.h— header-only, no dependencies:conv1d[1280,128,3]s1 p1, then[1280,1280,3]s2 p1); weight layout(cout,cin,k)as the ONNX initializer carries it, so no transpose at the call sitelayer_normgelu_erfapproximate=none; the tanh form is 1.7e-4 away at x=2, and the test asserts the two are distinguishable at 1e-6softmax_row1/sqrt(d)scale is folded inEvery expected value was computed in double from the formulas the encoder reference uses (
tools/whisper_encoder_ref.py, itself validated at max|d| 1.469e-3 / rel 7.549e-5 with identical transcripts on three fixtures). Arms: the real shapes including3000 -> 1500for the stride-2 conv, a no-bias/stride-1/pad-0 edge, a constant row normalising to zero, null gamma/beta defaults, softmax shift-invariance at +1000, and the tanh-vs-erf discriminator.One arm failed on first run — my typed
1.3416270against the true1.34163542for the null-affine case — which is the test catching its own author; fixed to the computed constant.What is NOT here: the graph reader, the executor, the mel front-end, the tool. They stay in #1931, which I will re-open as a follow-up once this lands (or close in favour of smaller pieces, whichever the reviewers prefer). Nothing in this PR needs a device, a container or a model.
ctest -R audio_opspasses; fresh configure rc 0.