Skip to content

Merge master again (#2097, #2117) - #2

Open
nerln wants to merge 3 commits into
TBO22:apple-mps-backendfrom
nerln:apple-mps-backend-sync
Open

nerln wants to merge 3 commits into
TBO22:apple-mps-backendfrom
nerln:apple-mps-backend-sync

Conversation

@nerln

@nerln nerln commented Oct 19, 2026

Copy link
Copy Markdown

Master moved after you merged #1 (8c8cab2 Guard dim_t overflow in compute_size, reshape and grow OpenNMT#2097, 0495cfa Fix CPU Conv1D dilation and INT8 scale overflow OpenNMT#2117), so OpenNMT#2077 shows a conflict again.

One textual conflict, in tests/storage_view_test.cc: this branch's MPS instantiation of StorageViewDeviceTest and master's new overflow tests, both kept.

On an M4 (macOS 27), same flags as before (-DWITH_MPS=ON): C++ suite 427 tests, 427 passed. Conv1DDilation, which was skipped before, now runs on CPU and MPS and passes after OpenNMT#2117. CI for this head runs in my fork on push.

Thanks for the 8/16-slot TopK split, that was the cost I had left unmeasured.

🤖 Generated with Claude Code

kyo-zzz and others added 3 commits October 18, 2026 07:33
* Guard dim_t overflow in compute_size, reshape and grow

The model loader validates shapes with a per-multiplication overflow
check (since OpenNMT#2091), but the StorageView API paths still multiply dims
unchecked: compute_size() and StorageView::reshape() can wrap int64_t
(e.g. a shape of {2^62+1, 8} wraps to 8), yielding a view whose shape
claims far more elements than _size, and grow() can wrap its addition.

Apply the same per-multiplication guard used by the loader to
compute_size() and reshape(), add an overflow check to grow(), and
reject the overflowing cases with std::invalid_argument in two new unit
tests, mirroring the OpenNMT#2094 test style.

* Accept zero dimensions in the overflow guards

A zero dimension yields an empty tensor, which cannot overflow, but the
guards divided by it to compare with the running product: x86_64 raises
SIGFPE, while AArch64 division by zero returns 0 and made every later
check reject valid zero-dim shapes. Skip the division when the dimension
is zero.

* Check empty dimensions before multiplying the shape size

A zero dimension makes the size 0 whatever its position, so the other
dimensions are never multiplied and an overflowing prefix next to a zero
dimension is not an error. Skipping the division is not enough: the
prefix can overflow before the zero is reached, which made the result
depend on where the zero appeared in the shape.

The same ordering in reshape() also left the known size at 0 when the new
shape combined a zero dimension with an unknown one, and that 0 is the
divisor of the compatibility check below (crash on master today). The
unknown dimension is now rejected in that case.

* Cover the grow() guard with unit tests

Split the negative increment out of the overflow condition so it gets its own
message, and pin the three cases: a negative size (which used to silently shrink
the dimension), an overflowing addition (tested on {INT64_MAX, 0}, where the zero
dimension keeps the allocation empty), and normal growth.

---------

Co-authored-by: Jordi Mas <jmas@softcatala.org>
* Fix CPU Conv1D dilation in oneDNN and GEMM paths

* Keep INT8 quantization scales finite for tiny weight rows
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Copilot AI balanced review requested due to automatic review settings October 19, 2026 22:45

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

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.

4 participants