Skip to content

Merge main into coil-distance-values - #253

Open
rogeriojorge wants to merge 2 commits into
coil-distance-valuesfrom
merge-main/coil-distance-values
Open

rogeriojorge wants to merge 2 commits into
coil-distance-valuesfrom
merge-main/coil-distance-values

Conversation

@rogeriojorge

Copy link
Copy Markdown
Member

Merges current main into coil-distance-values. The only conflict was in tests/test_coils.py: both sides appended a test at the end of the file, and both are kept (test_curve_derivatives_are_the_spectral_derivatives_of_gamma from this branch, test_zero_currents_give_finite_dofs from main). No source changes beyond the merge.

Checked with JAX_ENABLE_X64=1 pytest -n 2: tests/test_coils.py 34 passed; tests/test_coil_design.py and tests/test_objective_functions.py 27 passed.

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