Skip to content

Merge main into feat/native_ad_split - #252

Open
rogeriojorge wants to merge 3 commits into
feat/native_ad_splitfrom
merge-main/native-ad-split
Open

rogeriojorge wants to merge 3 commits into
feat/native_ad_splitfrom
merge-main/native-ad-split

Conversation

@rogeriojorge

Copy link
Copy Markdown
Member

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_radial parabola, 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.

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.

1 participant