Refactor single stage #317
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## rj/single_stage_PR #317 +/- ##
======================================================
- Coverage 90.78% 90.37% -0.41%
======================================================
Files 63 63
Lines 10719 10724 +5
======================================================
- Hits 9731 9692 -39
- Misses 988 1032 +44
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
rogeriojorge
approved these changes
May 29, 2023
Comment on lines
+16
to
+18
| #from simsopt.util.mpi import log | ||
| #log() | ||
|
|
There was a problem hiding this comment.
Should these comments stay?
|
@mbkumar are you ok with merging this into rj/single_stage_PR and then master? |
mbkumar
approved these changes
Jun 1, 2023
| @@ -1639,7 +1639,6 @@ class TempOptimizable(Optimizable): | |||
| def __init__(self, func, *args, dof_indicators=None, **kwargs): | |||
|
|
|||
| self.func = func | |||
| args = np.ravel(args) # The user may pass a tuple or list | |||
There was a problem hiding this comment.
I think that line was present only in the rj/single_stage_PR branch, and not in the master branch. Therefore, its removal makes ml/single_stage_PR even simpler.
rogeriojorge
approved these changes
Jun 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In #301, we've discussed how it is awkward that
finite_difference.pyhad to be modified to manipulate thenon_dofsattribute, which most Optimizable objects do not have. This PR shows one way things could be refactored to avoid this, sonon_dofsis never mentioned. Here the changes tofinite_difference.pyandoptimizable.pyin #301 are reverted to master, and instead theMPIFiniteDifferenceclass is extended to allow extra data besides.xto be broadcast among the worker groups. The examplesingle_stage_optimization_finite_beta.pyis refactored correspondingly. This example gives identical values for all quantities at the end of the optimization and uses fewer calls toVirtualCasing.from_vmec()in this branch compared to #301.I'm not wedded to the approach here, but wanted to put it on the table. @rogeriojorge @mbkumar what do you think?