Skip to content

docs(state): reconcile the fork's open Netflix/vmaf pull requests #1631 to #1668 - #2404

Merged
lusoris merged 2 commits into
masterfrom
docs/upstream-reconcile-1631-1668
Oct 7, 2026
Merged

lusoris merged 2 commits into
masterfrom
docs/upstream-reconcile-1631-1668

Conversation

@lusoris

@lusoris lusoris commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

Summary

Extends the upstream reconciliation in docs/state.md from #1629 to the fork's remaining open Netflix/vmaf pull requests #1631 to #1668: 25 rows under "Confirmed not-affected", each naming the fork file, test or ADR that shows the fix is already carried, covered another way, or not applicable. #1634 (clip the integer AIM score) is recorded as closed on the maintainer's decision, because the fork keeps integer AIM unclipped (ADR-1417). Documentation only.

Type

  • docs — documentation only

Checklist

  • Commits follow Conventional Commits (the commit-msg hook enforces this).
  • make format && make lint is green locally. (Only docs/state.md, CHANGELOG.md and a changelog fragment changed; the commit hooks ran green with the repo's pinned praetorctl build, PRAETOR_REF 04cc813f.)
  • Unit tests pass: no code changed.
  • If I touched any SIMD/GPU code path, I ran /cross-backend-diff: no SIMD or GPU code touched.
  • If I added a new source file, it has the licence header: none added.
  • If this PR adds an ADR: it adds none.

Bug-status hygiene (ADR-0165)

  • docs/state.md updated in this PR with rows under "Confirmed not-affected" and one _Updated: line.

Netflix golden-data gate (ADR-0024)

  • I did not modify any assertAlmostEqual(...) score in the Netflix golden Python tests.

Deep-dive deliverables (ADR-0108)

  • Research digest — no digest needed: ledger update, no new analysis.
  • Decision matrix — no alternatives: only-one-way fix; records existing decisions (ADR-1417 and others) and adds none.
  • AGENTS.md invariant note — no rebase-sensitive invariants.
  • Reproducer / smoke-test command — pasted below under "Reproducer".
  • CHANGELOG fragment — changelog.d/changed/state-upstream-reconcile-1631-1668.md, rendered into CHANGELOG.md with scripts/release/concat-changelog-fragments.sh --write.
  • Rebase note — no rebase impact: documentation only.

Reproducer

git diff origin/master -- docs/state.md | grep -c '^+| \*\*Netflix/vmaf#'   # 25
scripts/release/concat-changelog-fragments.sh --check

Known follow-ups

@github-actions github-actions Bot added the type:docs Documentation updates label Oct 7, 2026
@lusoris
lusoris force-pushed the docs/upstream-reconcile-1631-1668 branch from 2ca054b to b9deabe Compare October 7, 2026 11:06
…keep the isa flags for icx-cl (#2408)

* fix(windows): pass _wsopen_s only the permission bits it accepts and keep the isa flags for icx-cl

The first Windows run after #2393 crashed test_path_utf8 and test_output and
made the vmaf CLI tests exit 127: _wsopen_s and _sopen_s abort on a permission
mode with bits other than _S_IREAD and _S_IWRITE, and the callers pass POSIX
modes such as 0644 (_wopen ignored the rest). The mode is masked. The -mavx2
family is withheld from cl.exe only: icx-cl needs it for the intrinsics
headers' target-feature check. sycl/common.cpp calls _strdup through
VMAF_STRDUP, test_cambi.c casts the last uint16 to uint8 store and replaces
CAMBI_TEST_NULL_POINTER with NULL under ADR-1138.
… to #1668 (#2404)

* docs(state): reconcile the fork's open Netflix/vmaf pull requests #1631 to #1668

Add a "Confirmed not-affected" row for each of the fork's open upstream pull
requests from #1631 to #1668 (25 rows), naming the fork file, test or ADR
that shows the fork already carries the fix, covers it another way or is not
affected. #1643 is the one open item (a test-only x87 comparison with the same
line in the fork). #1634 is recorded as closed: the fork keeps integer AIM
unclipped, as upstream defines it.

Also records that the ten pull requests that conflicted with upstream master
acdd9376e were rebased on 2026-10-07. Documentation only.

* docs: regenerate the indexes and the citation map after rebasing
@lusoris
lusoris force-pushed the docs/upstream-reconcile-1631-1668 branch from b9deabe to 1e20b61 Compare October 7, 2026 13:10
@lusoris
lusoris merged commit 1e20b61 into master Oct 7, 2026
11 of 66 checks passed
@lusoris
lusoris deleted the docs/upstream-reconcile-1631-1668 branch October 7, 2026 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type:docs Documentation updates

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant