Skip to content

Add fft grid and raz grid to test against master#2157

Open
unalmis wants to merge 31 commits intomasterfrom
ku/test
Open

Add fft grid and raz grid to test against master#2157
unalmis wants to merge 31 commits intomasterfrom
ku/test

Conversation

@unalmis
Copy link
Copy Markdown
Collaborator

@unalmis unalmis commented Apr 10, 2026

  • Adds FFT grids and field aligned grids to test_compute_everything. Should be merged before stuff that changes grids New Grid API #2053 or stuff that changes how the dependencies are ordered/selected for computation Switch compute from recursive to looped #1557 to ensure they do not cause bugs in the computations.
  • Deletes a bunch of files that are now not necessary and removes bounce objective docstring boilerplate
  • uses nondiff_argnums instead of nondiff_argnames so that the code works on old jax versions
  • Adds comments to explain per bounce_comments PR
  • Resolves nufft Error #2162 .

@unalmis unalmis self-assigned this Apr 10, 2026
@unalmis unalmis added easy Short and simple to code or review testing Adding a new test or fixing an existing one skip_changelog No need to update changelog on this PR labels Apr 10, 2026
@unalmis unalmis requested review from daniel-dudt and ddudt April 10, 2026 02:08
Comment thread tests/test_compute_funs.py
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 10, 2026

Memory benchmark result

|               Test Name                |      %Δ      |    Master (MB)     |      PR (MB)       |    Δ (MB)    |    Time PR (s)     |  Time Master (s)   |
| -------------------------------------- | ------------ | ------------------ | ------------------ | ------------ | ------------------ | ------------------ |
  test_objective_jac_w7x                 |   -1.20 %    |     4.126e+03      |     4.077e+03      |    -49.68    |       40.96        |       39.06        |
  test_proximal_jac_w7x_with_eq_update   |    0.81 %    |     6.514e+03      |     6.567e+03      |    52.91     |       157.93       |       160.36       |
  test_proximal_freeb_jac                |    0.15 %    |     1.340e+04      |     1.342e+04      |    20.38     |       88.62        |       85.92        |
  test_proximal_freeb_jac_blocked        |    0.09 %    |     7.746e+03      |     7.753e+03      |     6.81     |       77.91        |       76.08        |
  test_proximal_freeb_jac_batched        |    0.70 %    |     7.625e+03      |     7.678e+03      |    53.34     |       75.39        |       75.07        |
  test_proximal_jac_ripple               |   -1.62 %    |     3.660e+03      |     3.600e+03      |    -59.19    |       62.15        |       62.48        |
  test_proximal_jac_ripple_bounce1d      |    3.18 %    |     3.797e+03      |     3.918e+03      |    120.72    |       76.04        |       74.81        |
  test_eq_solve                          |    0.42 %    |     2.202e+03      |     2.212e+03      |     9.20     |       97.47        |       96.81        |

For the memory plots, go to the summary of Memory Benchmarks workflow and download the artifact.

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 10, 2026

Codecov Report

❌ Patch coverage is 92.47312% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 94.45%. Comparing base (03637dd) to head (c42a92b).

Files with missing lines Patch % Lines
desc/integrals/_interp_utils.py 44.44% 5 Missing ⚠️
desc/integrals/bounce_integral.py 96.07% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2157      +/-   ##
==========================================
- Coverage   94.45%   94.45%   -0.01%     
==========================================
  Files         101      101              
  Lines       28604    28626      +22     
==========================================
+ Hits        27018    27038      +20     
- Misses       1586     1588       +2     
Files with missing lines Coverage Δ
desc/compute/_fast_ion.py 100.00% <ø> (ø)
desc/compute/_neoclassical.py 100.00% <ø> (ø)
desc/equilibrium/equilibrium.py 96.12% <ø> (ø)
desc/integrals/__init__.py 100.00% <ø> (ø)
desc/integrals/_bounce_utils.py 94.26% <100.00%> (+0.12%) ⬆️
desc/objectives/_fast_ion.py 95.18% <100.00%> (ø)
desc/objectives/_neoclassical.py 95.00% <100.00%> (ø)
desc/objectives/objective_funs.py 94.85% <100.00%> (+<0.01%) ⬆️
desc/integrals/bounce_integral.py 98.03% <96.07%> (+0.07%) ⬆️
desc/integrals/_interp_utils.py 87.05% <44.44%> (-1.36%) ⬇️

... and 2 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@unalmis unalmis requested review from a team, YigitElma, dpanici, f0uriest and rahulgaur104 and removed request for a team April 10, 2026 05:55
Comment thread tests/test_compute_everything.py
@unalmis unalmis requested a review from f0uriest April 11, 2026 00:29
@unalmis
Copy link
Copy Markdown
Collaborator Author

unalmis commented Apr 11, 2026

someone else will need to cllick merge when ready

@unalmis unalmis linked an issue Apr 14, 2026 that may be closed by this pull request
@unalmis unalmis mentioned this pull request Apr 14, 2026
@unalmis unalmis added the stable Awaiting merge to master. Only updates will be merging from master. label Apr 14, 2026
@YigitElma
Copy link
Copy Markdown
Collaborator

@unalmis, if you make a new PR for the fix of #2162, we can merge it faster. People will be travelling/attending to ISHW, so this bigger PR can take a bit longer.

@unalmis
Copy link
Copy Markdown
Collaborator Author

unalmis commented Apr 15, 2026

i'll wait, feel free to click merge after its approved if i don't respond

@unalmis
Copy link
Copy Markdown
Collaborator Author

unalmis commented Apr 15, 2026

its mostly docstring deletion and addition btw

Comment thread desc/external/neo.py
Comment thread desc/external/neo.py
Comment thread desc/external/neo.py Outdated
Comment thread desc/external/neo.py
Comment thread desc/integrals/_bounce_utils.py Outdated
Comment thread desc/integrals/_interp_utils.py
Comment thread tests/test_fast_ion.py Outdated
Comment thread tests/test_neoclassical.py Outdated
Comment thread desc/objectives/objective_funs.py
Comment thread desc/integrals/bounce_integral.py Outdated
@unalmis unalmis requested a review from ddudt April 15, 2026 23:57
@unalmis
Copy link
Copy Markdown
Collaborator Author

unalmis commented Apr 16, 2026

can't do further requests, make new pr and merge that after if you want

Copy link
Copy Markdown
Collaborator Author

@unalmis unalmis left a comment

Choose a reason for hiding this comment

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

clarify docstring

Comment thread desc/objectives/objective_funs.py Outdated
Comment thread desc/objectives/objective_funs.py Outdated
@ddudt
Copy link
Copy Markdown
Collaborator

ddudt commented Apr 16, 2026

@unalmis Please do not mark comments as resolved unless they are addressed in the code or the discussion has concluded. Responding is not the same as resolving. Comments are helpful for everyone to read, but when they are resolved it makes them less visible for other reviewers to see and join the conversation.

I can show you how to enable GitHub notifications to see when there are new comments.

@unalmis
Copy link
Copy Markdown
Collaborator Author

unalmis commented Apr 16, 2026

@unalmis Please do not mark comments as resolved unless they are addressed in the code or the discussion has concluded. Responding is not the same as resolving. Comments are helpful for everyone to read, but when they are resolved it makes them less visible for other reviewers to see and join the conversation.

I can show you how to enable GitHub notifications to see when there are new comments.

You had reopened two which is outside scope of this PR as master already has them. Such discussion should be done in github issues. I think the effort it takes for a reviewer to click see comment button is much less than the increased effort for me, the maintainer, to track which issues are actually resolvable and which are just unactionable due to jax or cosmetic personal preference that should be resolved elsewhere as they don't need my input. Github notifications don't work selectively on a PR. i get notifs for all of desc or none of it.

@unalmis unalmis requested review from ddudt and removed request for ddudt April 17, 2026 00:12
@unalmis
Copy link
Copy Markdown
Collaborator Author

unalmis commented Apr 17, 2026

@ddudt consider https://github.com/pullpo-io/conventional-comments for comprimise

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Add documentation or better warnings etc. easy Short and simple to code or review skip_changelog No need to update changelog on this PR stable Awaiting merge to master. Only updates will be merging from master. testing Adding a new test or fixing an existing one

Projects

None yet

Development

Successfully merging this pull request may close these issues.

nufft Error

4 participants