add position update to progress in .h5 #37
Merged
Conversation
This file contains hidden or 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
Contributor
Author
|
I'm also not a huge fan of default value of 0 |
hexane360
requested changes
Oct 31, 2025
Owner
hexane360
left a comment
hexane360
left a comment
There was a problem hiding this comment.
Looks pretty good, made a couple of notes. Why don't you rename the key to 'pos_update_mag' or 'pos_update_rms' to make clear it pertains to the position solver? Do we want 'tilt_update_mag'/'tilt_update_rms' as well?
phaser/engines/gradient/run.py
Outdated
| state, iter_solver_states[sol_i], filter_vars(iter_grads, solver.params), losses['total_loss'] | ||
| ) | ||
| state = apply_update(state, update) | ||
| update_mag = xp.linalg.norm(update['positions'], axis=-1) |
Owner
There was a problem hiding this comment.
What happens if no position solver is specified, and 'positions' is not in update?
Contributor
Author
There was a problem hiding this comment.
should be addressed now
phaser/engines/gradient/run.py
Outdated
Comment on lines
294
to
296
| for (k) in other_keys: | ||
| progress[k].iters.append(i + start_i) | ||
| progress[k].values.append(xp.mean(update_mag)) |
Owner
There was a problem hiding this comment.
The for loop seems redundant if you're special-casing 'update_mag' regardless
Contributor
Author
There was a problem hiding this comment.
yeah I realize it'll definitely break, hopefully fixed in newest commit
hexane360
approved these changes
Oct 31, 2025
phaser/engines/conventional/run.py
Outdated
| other_keys = ('positions_update_rms', ) if position_solver is not None else () | ||
| # populate missing keys in progress dictionary | ||
| for k in ('detector_loss', 'total_loss'): | ||
| for k in (*('detector_loss', 'total_loss'), *other_keys): |
Owner
There was a problem hiding this comment.
Suggested change
| for k in (*('detector_loss', 'total_loss'), *other_keys): | |
| for k in ('detector_loss', 'total_loss', *other_keys): |
phaser/engines/conventional/run.py
Outdated
|
|
||
| # check positions are at least overlapping object | ||
| sim.state.object.sampling.check_scan(sim.state.scan, sim.state.probe.sampling.extent / 2.) | ||
| # for k in ('update_mag', ): |
Owner
There was a problem hiding this comment.
Suggested change
| # for k in ('update_mag', ): |
phaser/engines/conventional/run.py
Outdated
Comment on lines
113
to
114
| pos_update_rms = xp.linalg.norm(pos_update, axis=-1, keepdims=True) | ||
| logger.info(f"Position update: mean {xp.mean(pos_update_rms)}") |
Owner
There was a problem hiding this comment.
Suggested change
| pos_update_rms = xp.linalg.norm(pos_update, axis=-1, keepdims=True) | |
| logger.info(f"Position update: mean {xp.mean(pos_update_rms)}") | |
| pos_update_rms = float(xp.mean(xp.linalg.norm(pos_update, axis=-1, keepdims=True))) | |
| logger.info(f"Position update: mean {pos_update_rms}") |
phaser/engines/conventional/run.py
Outdated
Comment on lines
121
to
122
| progress['positions_update_rms'].iters.append(i + start_i) | ||
| progress['positions_update_rms'].values.append(xp.mean(pos_update_rms)) |
Owner
There was a problem hiding this comment.
Suggested change
| progress['positions_update_rms'].iters.append(i + start_i) | |
| progress['positions_update_rms'].values.append(xp.mean(pos_update_rms)) | |
| progress['positions_update_rms'].iters.append(i + start_i) | |
| progress['positions_update_rms'].values.append(pos_update_rms) |
hexane360
requested changes
Oct 31, 2025
hexane360
force-pushed
the
pos_logging
branch
from
08da8b6 to
f6a989e
Compare
Co-authored-by: Colin Gilgenbach <colin@gilgenbach.net>
hexane360
approved these changes
Nov 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
working for conventional and gradient, but maybe not the most elegant for the gradient engine. open to suggestions