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

Resolves #1240 #1241

Merged
merged 10 commits into from
Sep 5, 2024
Merged

Resolves #1240 #1241

merged 10 commits into from
Sep 5, 2024

Conversation

unalmis
Copy link
Collaborator

@unalmis unalmis commented Sep 2, 2024

No description provided.

Copy link
Contributor

github-actions bot commented Sep 2, 2024

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     +1.53 +/- 8.43     | +7.87e-03 +/- 4.33e-02 |  5.22e-01 +/- 4.2e-02  |  5.14e-01 +/- 1.1e-02  |
 test_equilibrium_init_medres            |     +1.32 +/- 0.65     | +5.36e-02 +/- 2.62e-02 |  4.10e+00 +/- 1.7e-02  |  4.04e+00 +/- 2.0e-02  |
 test_equilibrium_init_highres           |     +1.43 +/- 0.83     | +7.64e-02 +/- 4.47e-02 |  5.44e+00 +/- 2.1e-02  |  5.36e+00 +/- 3.9e-02  |
 test_objective_compile_dshape_current   |     +0.93 +/- 1.00     | +3.52e-02 +/- 3.80e-02 |  3.82e+00 +/- 2.6e-02  |  3.78e+00 +/- 2.8e-02  |
 test_objective_compute_dshape_current   |     -0.56 +/- 1.95     | -1.94e-05 +/- 6.72e-05 |  3.43e-03 +/- 4.8e-05  |  3.45e-03 +/- 4.7e-05  |
 test_objective_jac_dshape_current       |     +3.04 +/- 6.13     | +1.21e-03 +/- 2.44e-03 |  4.10e-02 +/- 1.9e-03  |  3.98e-02 +/- 1.5e-03  |
 test_perturb_2                          |     +0.94 +/- 1.32     | +1.60e-01 +/- 2.24e-01 |  1.72e+01 +/- 1.7e-01  |  1.70e+01 +/- 1.4e-01  |
 test_proximal_freeb_jac                 |     +1.20 +/- 1.04     | +8.85e-02 +/- 7.61e-02 |  7.44e+00 +/- 6.4e-02  |  7.35e+00 +/- 4.1e-02  |
 test_solve_fixed_iter                   |     +1.50 +/- 61.08    | +7.33e-02 +/- 2.98e+00 |  4.96e+00 +/- 2.1e+00  |  4.88e+00 +/- 2.2e+00  |

@unalmis unalmis marked this pull request as ready for review September 2, 2024 21:39
@unalmis unalmis requested review from a team, rahulgaur104, f0uriest, ddudt, dpanici, kianorr, sinaatalay and YigitElma and removed request for a team September 2, 2024 21:39
@unalmis unalmis linked an issue Sep 2, 2024 that may be closed by this pull request
@unalmis unalmis added the easy Short and simple to code or review label Sep 2, 2024
Copy link

codecov bot commented Sep 2, 2024

Codecov Report

Attention: Patch coverage is 90.90909% with 6 lines in your changes missing coverage. Please review.

Project coverage is 95.45%. Comparing base (d2deffa) to head (d217334).
Report is 11 commits behind head on master.

Files with missing lines Patch % Lines
desc/utils.py 88.00% 6 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1241      +/-   ##
==========================================
- Coverage   95.45%   95.45%   -0.01%     
==========================================
  Files          95       95              
  Lines       23406    23402       -4     
==========================================
- Hits        22342    22338       -4     
  Misses       1064     1064              
Files with missing lines Coverage Δ
desc/backend.py 90.12% <100.00%> (ø)
desc/coils.py 97.46% <100.00%> (-0.01%) ⬇️
desc/compute/_basis_vectors.py 100.00% <100.00%> (ø)
desc/compute/_curve.py 100.00% <100.00%> (ø)
desc/compute/_equil.py 100.00% <100.00%> (ø)
desc/compute/_field.py 100.00% <100.00%> (ø)
desc/compute/_geometry.py 99.02% <100.00%> (-0.49%) ⬇️
desc/compute/_metric.py 100.00% <100.00%> (ø)
desc/compute/_omnigenity.py 100.00% <100.00%> (+0.62%) ⬆️
desc/compute/_profiles.py 99.19% <100.00%> (ø)
... and 8 more

@unalmis unalmis marked this pull request as draft September 3, 2024 05:38
@unalmis unalmis marked this pull request as ready for review September 4, 2024 03:19
@@ -11,8 +11,8 @@

from desc.backend import jnp

from ..utils import cross, dot, safediv
Copy link
Collaborator

Choose a reason for hiding this comment

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

why do we not do desc.utils here? or is this equivalent?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

it's equivalent. this is what Pycharm's automated refactoring chose.

@dpanici dpanici merged commit 6ab8327 into master Sep 5, 2024
23 of 24 checks passed
@dpanici dpanici deleted the utils branch September 5, 2024 19:56
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

circular imports with compute utils
3 participants