-
Notifications
You must be signed in to change notification settings - Fork 1
Convert pickled RegularGridInterpolator objects to numpy saved files
#3
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
Open
scottstanie
wants to merge
2
commits into
isce-framework:main
Choose a base branch
from
scottstanie:convert-pkl-to-npz
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| import importlib.resources | ||
| import pickle | ||
| from pathlib import Path | ||
|
|
||
| import numpy as np | ||
| import scipy.ndimage | ||
| from scipy.interpolate import RegularGridInterpolator | ||
|
|
||
| __all__ = [ | ||
| "calc_smooth_phase_gradients", | ||
|
|
@@ -29,14 +30,26 @@ def calc_smooth_phase_gradients(igram): | |
| return phase_dy_smooth, phase_dx_smooth | ||
|
|
||
|
|
||
| def _load_rgi(path: Path | str) -> RegularGridInterpolator: | ||
| """Reconstruct RegularGridInterpolator from saved data.""" | ||
| data = np.load(path, allow_pickle=False) | ||
| return RegularGridInterpolator( | ||
| points=tuple(data["grid"]), | ||
| values=data["values"], | ||
| method=str(data["method"]), | ||
| bounds_error=bool(data["bounds_error"]), | ||
| fill_value=float(data["fill_value"]) | ||
| if data["fill_value"] is not None | ||
| else None, | ||
|
Comment on lines
+41
to
+43
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like your formatter barfed here. Can we fit this on a single line for readability? Maybe something like fill_value = float(data["fill_value"]) if data["fill_value"] is not None else None
return RegularGridInterpolator(
...,
fill_value=fill_value,
) |
||
| ) | ||
|
|
||
|
|
||
| def load_carballo_pdf_splines(): | ||
| """ """ | ||
| files = importlib.resources.files(__package__) | ||
|
|
||
| with files.joinpath("carballo-pdf-0-spline.pkl").open("rb") as f: | ||
| spline_pdf0 = pickle.load(f) | ||
| with files.joinpath("carballo-pdf-1-spline.pkl").open("rb") as f: | ||
| spline_pdf1 = pickle.load(f) | ||
| with importlib.resources.path(__package__, "carballo-pdf-0-spline.npz") as p: | ||
| spline_pdf0 = _load_rgi(p) | ||
| with importlib.resources.path(__package__, "carballo-pdf-1-spline.npz") as p: | ||
| spline_pdf1 = _load_rgi(p) | ||
|
|
||
| return spline_pdf0, spline_pdf1 | ||
|
|
||
|
|
||
Binary file renamed
BIN
+30.1 KB
src/whirlwind/carballo-pdf-0-spline.pkl → src/whirlwind/carballo-pdf-0-spline.npz
Binary file not shown.
Binary file renamed
BIN
+30.1 KB
src/whirlwind/carballo-pdf-1-spline.pkl → src/whirlwind/carballo-pdf-1-spline.npz
Binary file not shown.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using numpy=2.3.5 and the latest commit
I'm getting the following error: