Repository navigation
Merge main into feat/native_ad_split - #252
Open
rogeriojorge wants to merge 3 commits into
Open
rogeriojorge wants to merge 3 commits into
rogeriojorge wants to merge 3 commits into
Conversation
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.
Brings main and the conflict resolution of #189 into feat/native_ad_split so that #191 no longer conflicts.
This branch contains the old head of #189, so it merges the merge-main/native-split-collisions branch (main merged into #189, see the PR against feat/native_split_collisions). The merge itself had no textual conflicts. The conflict resolution in essos/dynamics.py and the rk.py
_vmec_radialparabola, which matches main's VMEC extrapolation, come from that branch.Checks, JAX_ENABLE_X64=1, pytest -n 2: tests/test_native_ad.py, tests/test_native_orbit.py, tests/test_native_split.py and tests/test_dynamics.py, 172 passed.
Merging this into feat/native_ad_split clears the conflict on #191. It is best taken after the PR for #189.