Loop-free search of the next step/jump time in ClipStepSizeController - #777
Open
etiferrier wants to merge 1 commit into
Open
etiferrier wants to merge 1 commit into
etiferrier wants to merge 1 commit into
Conversation
`_find_idx_with_hint` walked from the hint with two `lax.while_loop`s. It runs on every step of an adaptive solve, and on GPU each `while_loop` iteration costs a device-to-host synchronisation, so the search added a fixed cost to every step. Use an unrolled binary search (`jnp.searchsorted(..., method="scan_unrolled")`) instead: O(log len(ts)) fused comparisons, no loop. Same result, same dtype. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #776.
_find_idx_with_hintruns on every step of a solve withClipStepSizeController(step_ts=..., jump_ts=...). It walked from the hint with twolax.while_loops. On GPU each iteration of awhile_loopcosts a device-to-host sync. This PR replaces the walk with an unrolled binary search:tsis already sorted (_none_or_sorted_array, andwrap), andinitalready usessearchsortedfor the first index. So the result is the same, and only the cost changes: O(log len(ts)) fused comparisons and no loop. The hint now only sets the dtype; I kept the signature so the call sites stay the same.Results (details and the benchmark script in #776): on an A100, a Tsit5 solve with 10–100
jump_tsis 17–30% faster. The steps andysare bit-identical. On CPU it is neutral (×0.95–×1.01).Independent of #773: it edits the neighbouring lines of
clip.py, and the two apply together cleanly.Tests (
test/test_adaptive_stepsize_controller.py):test_find_idx_with_hintalso coverstbelow, at and above the ends ofts;test_find_idx_with_hint_is_loop_free(new) checks that the jaxpr has nowhile, and that the result matches and keeps the hint's dtype.Checks:
diffrax/_misc.py:175(unnecessary# type: ignore), which unmodifiedmainalso reports with jax 0.11.2, unrelated to this change.pytest test/test_adaptive_stepsize_controller.py, 20 passed;ruff format --checkandruff checkpass, and pyright reports no new errors on the changed files.🤖 Generated with Claude Code