Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve handling of Assigning profiles to Equilibrium #1521

Merged
merged 5 commits into from
Jan 21, 2025

Conversation

dpanici
Copy link
Collaborator

@dpanici dpanici commented Jan 16, 2025

Improve handling of Assigning profiles to avoid equilibria having both iota and current assigned.

Resolves #1482

@dpanici dpanici added the easy Short and simple to code or review label Jan 16, 2025
@dpanici dpanici requested review from a team, rahulgaur104, f0uriest, ddudt, kianorr, sinaatalay, unalmis and YigitElma and removed request for a team January 16, 2025 20:29
Copy link
Contributor

github-actions bot commented Jan 16, 2025

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     +2.33 +/- 7.74     | +1.21e-02 +/- 4.01e-02 |  5.30e-01 +/- 3.1e-02  |  5.18e-01 +/- 2.6e-02  |
 test_equilibrium_init_medres            |     -0.23 +/- 3.65     | -9.59e-03 +/- 1.49e-01 |  4.08e+00 +/- 1.3e-01  |  4.09e+00 +/- 7.1e-02  |
 test_equilibrium_init_highres           |     +7.67 +/- 4.66     | +4.16e-01 +/- 2.53e-01 |  5.84e+00 +/- 1.2e-01  |  5.42e+00 +/- 2.2e-01  |
 test_objective_compile_dshape_current   |     +5.25 +/- 4.81     | +2.04e-01 +/- 1.87e-01 |  4.09e+00 +/- 1.8e-01  |  3.89e+00 +/- 3.1e-02  |
 test_objective_compute_dshape_current   |     +0.43 +/- 1.57     | +2.22e-05 +/- 8.07e-05 |  5.15e-03 +/- 5.9e-05  |  5.13e-03 +/- 5.5e-05  |
 test_objective_jac_dshape_current       |     +2.90 +/- 4.29     | +1.23e-03 +/- 1.82e-03 |  4.36e-02 +/- 1.1e-03  |  4.24e-02 +/- 1.4e-03  |
 test_perturb_2                          |     +6.87 +/- 3.74     | +1.34e+00 +/- 7.28e-01 |  2.08e+01 +/- 6.5e-01  |  1.95e+01 +/- 3.4e-01  |
 test_proximal_freeb_jac                 |     -0.95 +/- 1.17     | -7.09e-02 +/- 8.74e-02 |  7.38e+00 +/- 6.3e-02  |  7.45e+00 +/- 6.0e-02  |
 test_solve_fixed_iter                   |     -1.59 +/- 4.08     | -5.30e-01 +/- 1.36e+00 |  3.28e+01 +/- 9.5e-01  |  3.33e+01 +/- 9.7e-01  |
 test_LinearConstraintProjection_build   |     -5.88 +/- 2.97     | -6.37e-01 +/- 3.22e-01 |  1.02e+01 +/- 2.4e-01  |  1.08e+01 +/- 2.2e-01  |
 test_build_transform_fft_midres         |     +1.12 +/- 3.18     | +6.74e-03 +/- 1.92e-02 |  6.10e-01 +/- 1.7e-02  |  6.03e-01 +/- 8.1e-03  |
 test_build_transform_fft_highres        |     +1.76 +/- 1.50     | +1.69e-02 +/- 1.45e-02 |  9.80e-01 +/- 1.1e-02  |  9.63e-01 +/- 9.4e-03  |
 test_equilibrium_init_lowres            |     +1.81 +/- 1.72     | +6.85e-02 +/- 6.51e-02 |  3.85e+00 +/- 4.7e-02  |  3.78e+00 +/- 4.5e-02  |
 test_objective_compile_atf              |     -1.04 +/- 1.57     | -8.49e-02 +/- 1.28e-01 |  8.08e+00 +/- 9.2e-02  |  8.17e+00 +/- 8.8e-02  |
 test_objective_compute_atf              |     -1.91 +/- 3.81     | -3.08e-04 +/- 6.15e-04 |  1.58e-02 +/- 4.5e-04  |  1.61e-02 +/- 4.2e-04  |
 test_objective_jac_atf                  |     -0.43 +/- 3.16     | -8.73e-03 +/- 6.34e-02 |  2.00e+00 +/- 5.7e-02  |  2.01e+00 +/- 2.8e-02  |
 test_perturb_1                          |     +0.05 +/- 1.11     | +7.86e-03 +/- 1.63e-01 |  1.47e+01 +/- 7.8e-02  |  1.46e+01 +/- 1.4e-01  |
 test_proximal_jac_atf                   |     +0.90 +/- 0.75     | +7.42e-02 +/- 6.16e-02 |  8.29e+00 +/- 5.4e-02  |  8.22e+00 +/- 3.0e-02  |
 test_proximal_freeb_compute             |     +0.12 +/- 1.12     | +2.42e-04 +/- 2.23e-03 |  2.00e-01 +/- 1.9e-03  |  2.00e-01 +/- 1.2e-03  |
 test_solve_fixed_iter_compiled          |     -0.41 +/- 1.14     | -8.37e-02 +/- 2.33e-01 |  2.04e+01 +/- 1.4e-01  |  2.05e+01 +/- 1.8e-01  |

Copy link

codecov bot commented Jan 17, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.69%. Comparing base (41b57dd) to head (e2e4e06).
Report is 6 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1521   +/-   ##
=======================================
  Coverage   95.69%   95.69%           
=======================================
  Files         101      101           
  Lines       25601    25605    +4     
=======================================
+ Hits        24499    24503    +4     
  Misses       1102     1102           
Files with missing lines Coverage Δ
desc/equilibrium/equilibrium.py 96.09% <100.00%> (+0.02%) ⬆️

... and 2 files with indirect coverage changes

@dpanici dpanici added the skip_changelog No need to update changelog on this PR label Jan 20, 2025
@YigitElma YigitElma merged commit 923518c into master Jan 21, 2025
25 checks passed
@YigitElma YigitElma deleted the dp/iota-current-prof branch January 21, 2025 22:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
easy Short and simple to code or review skip_changelog No need to update changelog on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Better way to deal with an equilibrium having both an iota and current profile assigned to it
6 participants