Skip to content

Conversation

@f0uriest
Copy link
Member

Refactors some stuff to use JAX loops for creating initial guess and changing resolution, reduces equilibrium init time substantially at high resolution.

Resolves #342

@f0uriest f0uriest added the run_benchmarks Run timing benchmarks on this PR against current master branch label Aug 24, 2023
@github-actions
Copy link
Contributor

|             benchmark_name             |        dt(%)        |        dt(s)        |      t_new(s)      |      t_old(s)      | 
| ------------------------------- | ------------------- | ------------------- | ------------------ | ------------------ |
 test_build_transform_fft_lowres        | -2.13+/-2.85 | -3.17e-04+/-4.2e-04 | 1.45e-02+/-3.4e-04 | 1.48e-02+/-2.5e-04 |
 test_build_transform_fft_midres        | +0.01+/-2.42 | +1.89e-05+/-3.1e-03 | 1.26e-01+/-6.3e-04 | 1.26e-01+/-3.0e-03 |
 test_build_transform_fft_highres       | +0.68+/-1.64 | +4.03e-03+/-9.7e-03 | 5.97e-01+/-2.6e-03 | 5.93e-01+/-9.4e-03 |
-test_equilibrium_init_lowres           | +64.01+/-8.47 | +2.18e-01+/-2.9e-02 | 5.59e-01+/-2.9e-02 | 3.41e-01+/-3.7e-03 |
+test_equilibrium_init_medres           | -74.86+/-1.85 | -2.09e+00+/-5.1e-02 | 7.01e-01+/-3.6e-02 | 2.79e+00+/-3.7e-02 |
+test_equilibrium_init_highres          | -86.95+/-1.93 | -8.09e+00+/-1.8e-01 | 1.21e+00+/-4.0e-02 | 9.30e+00+/-1.8e-01 |
 test_objective_compile_heliotron       | +1.69+/-2.49 | +2.59e-01+/-3.8e-01 | 1.56e+01+/-1.8e-01 | 1.53e+01+/-3.4e-01 |
 test_objective_compile_dshape_current  | +2.00+/-5.26 | +1.04e-01+/-2.7e-01 | 5.33e+00+/-2.3e-01 | 5.22e+00+/-1.5e-01 |
 test_objective_compile_atf             | -0.02+/-3.07 | -3.82e-03+/-5.0e-01 | 1.62e+01+/-4.1e-01 | 1.62e+01+/-2.8e-01 |
 test_objective_compute_heliotron       | +1.58+/-261.44 | +7.11e-04+/-1.2e-01 | 4.56e-02+/-8.3e-02 | 4.49e-02+/-8.3e-02 |
 test_objective_compute_dshape_current  | -0.18+/-318.50 | -3.76e-05+/-6.5e-02 | 2.03e-02+/-4.6e-02 | 2.04e-02+/-4.6e-02 |
 test_objective_compute_atf             | -3.06+/-262.56 | -1.39e-03+/-1.2e-01 | 4.40e-02+/-8.3e-02 | 4.54e-02+/-8.6e-02 |
+test_objective_jac_heliotron           | -5.06+/-1.38 | -3.72e-01+/-1.0e-01 | 6.99e+00+/-9.1e-02 | 7.36e+00+/-4.5e-02 |
 test_objective_jac_dshape_current      | -2.43+/-3.84 | -3.94e-03+/-6.2e-03 | 1.58e-01+/-4.8e-03 | 1.62e-01+/-4.0e-03 |
+test_objective_jac_atf                 | -0.80+/-0.70 | -5.77e-02+/-5.0e-02 | 7.14e+00+/-3.0e-02 | 7.19e+00+/-4.0e-02 |
 test_perturb_1                         | -5.62+/-44.64 | -5.80e-01+/-4.6e+00 | 9.74e+00+/-3.3e+00 | 1.03e+01+/-3.2e+00 |
+test_perturb_2                         | -4.05+/-3.07 | -7.01e-01+/-5.3e-01 | 1.66e+01+/-3.0e-01 | 1.73e+01+/-4.4e-01 |

@codecov
Copy link

codecov bot commented Aug 24, 2023

Codecov Report

Merging #633 (166b2dd) into master (6a7e07e) will decrease coverage by 0.04%.
The diff coverage is 88.23%.

❗ Current head 166b2dd differs from pull request most recent head 501a114. Consider uploading reports for the commit 501a114 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #633      +/-   ##
==========================================
- Coverage   94.27%   94.24%   -0.04%     
==========================================
  Files          78       78              
  Lines       18152    18126      -26     
==========================================
- Hits        17113    17083      -30     
- Misses       1039     1043       +4     
Files Changed Coverage Δ
desc/equilibrium/initial_guess.py 93.23% <80.00%> (-1.77%) ⬇️
desc/equilibrium/equilibrium.py 96.33% <100.00%> (+0.03%) ⬆️
desc/utils.py 90.40% <100.00%> (+0.19%) ⬆️

... and 6 files with indirect coverage changes

@f0uriest f0uriest merged commit a2fe711 into master Aug 25, 2023
@f0uriest f0uriest deleted the rc/eqinit branch August 25, 2023 19:38
dpanici added a commit that referenced this pull request Apr 8, 2025
…#1673)

Updates the requirements on
[pytest-cov](https://github.com/pytest-dev/pytest-cov) to permit the
latest version.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst">pytest-cov's
changelog</a>.</em></p>
<blockquote>
<h2>6.1.1 (2025-04-05)</h2>
<ul>
<li>Fixed breakage that occurs when <code>--cov-context</code> and the
<code>no_cover</code> marker are used together.</li>
</ul>
<h2>6.1.0 (2025-04-01)</h2>
<ul>
<li>Change terminal output to use full width lines for the coverage
header.
Contributed by Tsvika Shapira in
<code>[#678](pytest-dev/pytest-cov#678)
&lt;https://github.com/pytest-dev/pytest-cov/pull/678&gt;</code>_.</li>
<li>Removed unnecessary CovFailUnderWarning. Fixes
<code>[#675](pytest-dev/pytest-cov#675)
&lt;https://github.com/pytest-dev/pytest-cov/issues/675&gt;</code>_.</li>
<li>Fixed the term report not using the precision specified via
<code>--cov-precision</code>.</li>
</ul>
<h2>6.0.0 (2024-10-29)</h2>
<ul>
<li>Updated various documentation inaccuracies, especially on subprocess
handling.</li>
<li>Changed fail under checks to use the precision set in the coverage
configuration.
Now it will perform the check just like <code>coverage report</code>
would.</li>
<li>Added a <code>--cov-precision</code> cli option that can override
the value set in your coverage configuration.</li>
<li>Dropped support for now EOL Python 3.8.</li>
</ul>
<h2>5.0.0 (2024-03-24)</h2>
<ul>
<li>Removed support for xdist rsync (now deprecated).
Contributed by Matthias Reichenbach in
<code>[#623](pytest-dev/pytest-cov#623)
&lt;https://github.com/pytest-dev/pytest-cov/pull/623&gt;</code>_.</li>
<li>Switched docs theme to Furo.</li>
<li>Various legacy Python cleanup and CI improvements.
Contributed by Christian Clauss and Hugo van Kemenade in
<code>[#630](pytest-dev/pytest-cov#630)
&lt;https://github.com/pytest-dev/pytest-cov/pull/630&gt;</code><em>,
<code>[#631](pytest-dev/pytest-cov#631)
&lt;https://github.com/pytest-dev/pytest-cov/pull/631&gt;</code></em>,
<code>[#632](pytest-dev/pytest-cov#632)
&lt;https://github.com/pytest-dev/pytest-cov/pull/632&gt;</code>_ and
<code>[#633](pytest-dev/pytest-cov#633)
&lt;https://github.com/pytest-dev/pytest-cov/pull/633&gt;</code>_.</li>
<li>Added a <code>pyproject.toml</code> example in the docs.
Contributed by Dawn James in
<code>[#626](pytest-dev/pytest-cov#626)
&lt;https://github.com/pytest-dev/pytest-cov/pull/626&gt;</code>_.</li>
<li>Modernized project's pre-commit hooks to use ruff. Initial POC
contributed by
Christian Clauss in
<code>[#584](pytest-dev/pytest-cov#584)
&lt;https://github.com/pytest-dev/pytest-cov/pull/584&gt;</code>_.</li>
<li>Dropped support for Python 3.7.</li>
</ul>
<h2>4.1.0 (2023-05-24)</h2>
<ul>
<li>Updated CI with new Pythons and dependencies.</li>
<li>Removed rsyncdir support. This makes pytest-cov compatible with
xdist 3.0.
Contributed by Sorin Sbarnea in
<code>[#558](pytest-dev/pytest-cov#558)
&lt;https://github.com/pytest-dev/pytest-cov/pull/558&gt;</code>_.</li>
<li>Optimized summary generation to not be performed if no reporting is
active (for example,
when <code>--cov-report=''</code> is used without
<code>--cov-fail-under</code>).
Contributed by Jonathan Stewmon in
<code>[#589](pytest-dev/pytest-cov#589)
&lt;https://github.com/pytest-dev/pytest-cov/pull/589&gt;</code>_.</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/pytest-dev/pytest-cov/commit/9463242e3a7bc18a56b8f18c01b4dfb50087e5ed"><code>9463242</code></a>
Bump version: 6.1.0 → 6.1.1</li>
<li><a
href="https://github.com/pytest-dev/pytest-cov/commit/7f2781b47fc9bd4a8e94ff86b4f69f5959c3d907"><code>7f2781b</code></a>
Update changelog.</li>
<li><a
href="https://github.com/pytest-dev/pytest-cov/commit/a59548f3adcb757ea8afcb40d8d849af49f6e925"><code>a59548f</code></a>
Allow the context plugin to check if the controller is running or not.
Fixes ...</li>
<li><a
href="https://github.com/pytest-dev/pytest-cov/commit/10f8cde38c3b0aaf2c75d9ed62d4f333d8809d96"><code>10f8cde</code></a>
Bump version: 6.0.0 → 6.1.0</li>
<li><a
href="https://github.com/pytest-dev/pytest-cov/commit/10b14afffcd53b19967785c0b3e8b35ebac70b6f"><code>10b14af</code></a>
Update changelog.</li>
<li><a
href="https://github.com/pytest-dev/pytest-cov/commit/aa57aed273475b4f9975cc9a8a1662b336718662"><code>aa57aed</code></a>
Refactor a bit the internals to be a bit less boilerplatey and have more
clar...</li>
<li><a
href="https://github.com/pytest-dev/pytest-cov/commit/e760099a7fd5f49c235dc798bf7f222c0372b7e3"><code>e760099</code></a>
Make sure the CLI precision is used when creating report. Fixes <a
href="https://redirect.github.com/pytest-dev/pytest-cov/issues/674">#674</a>.</li>
<li><a
href="https://github.com/pytest-dev/pytest-cov/commit/44540e1e9f02f3b69b62834636cf3057edc960d6"><code>44540e1</code></a>
Remove unnecessary CovFailUnderWarning. Closes <a
href="https://redirect.github.com/pytest-dev/pytest-cov/issues/675">#675</a>.</li>
<li><a
href="https://github.com/pytest-dev/pytest-cov/commit/204af146f8f4ff03076825a693ee6aef587deb6b"><code>204af14</code></a>
Update changelog.</li>
<li><a
href="https://github.com/pytest-dev/pytest-cov/commit/089e7bb5c16dcfdedd54f27fda094ccb3eeaae2c"><code>089e7bb</code></a>
Upgrade ruff.</li>
<li>Additional commits viewable in <a
href="https://github.com/pytest-dev/pytest-cov/compare/v2.6.0...v6.1.1">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


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

Labels

run_benchmarks Run timing benchmarks on this PR against current master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Profile Equilibrium init and try to speed it up

4 participants