-
Notifications
You must be signed in to change notification settings - Fork 6
1d light curve collation utility function #951
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
SamSandwich07
wants to merge
4
commits into
main
Choose a base branch
from
collate-utils
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.
+68
−0
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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 |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| import numpy as np | ||
|
|
||
|
|
||
| def collate_as_1d_light_curve(samples: list[dict], field: str) -> dict: | ||
| """Collate the given field in the samples as if it were a light curve | ||
|
|
||
| Parameters | ||
| ---------- | ||
| samples | ||
| List of dicts; each dict is expected to have the | ||
| key passed in for the `field` argument | ||
| field | ||
| The field to collate | ||
|
|
||
| Returns | ||
| -------- | ||
| dict | ||
| Contains three keys: `<field>`, `<field>_length`, and `<field>_mask` | ||
| `field` - float32 array (batch, max_len) containing the padded light curves | ||
| `<field>_length` - int64 array (batch) of true light curve lengths | ||
| `<field>_mask` - int64 array (batch, max_len) of masks denoting light-curve data vs. padding | ||
| """ | ||
|
|
||
| result = {} | ||
|
|
||
| vals = [s[field] for s in samples] | ||
| lengths = np.array([len(s) for s in vals], dtype=np.int64) | ||
| max_len = int(lengths.max()) | ||
|
|
||
| padded = np.zeros((len(vals), max_len), dtype=np.float32) | ||
| mask = np.zeros((len(vals), max_len), dtype=np.int64) | ||
| for i, s in enumerate(vals): | ||
| padded[i, : lengths[i]] = s | ||
| mask[i, : lengths[i]] = 1 | ||
|
|
||
| result[field] = padded | ||
| result[field + "_lengths"] = lengths | ||
| result[field + "_mask"] = mask | ||
|
|
||
| return result | ||
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 |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import numpy as np | ||
|
|
||
| from hyrax.datasets.collate_utils import collate_as_1d_light_curve | ||
|
|
||
|
|
||
| def test_collate_as_1d_light_curve(): | ||
| """Test that the utility function to collate raw one-dimensional light-curves""" | ||
| samples = [{"A": [0, 1, 2]}, {"A": [0, 1, 2]}, {"A": [0, 1, 2]}] | ||
|
|
||
| expected_after_collate = { | ||
| "A": np.array([[0, 1, 2], [0, 1, 2], [0, 1, 2]]), | ||
| "A_lengths": np.array([3, 3, 3]), | ||
| "A_mask": np.array([[1, 1, 1], [1, 1, 1], [1, 1, 1]]), | ||
| } | ||
|
|
||
| results = collate_as_1d_light_curve(samples, "A") | ||
| np.testing.assert_equal(results, expected_after_collate) | ||
|
|
||
| samples = [{"A": [0, 1, 2]}, {"A": [0, 1]}, {"A": [0]}] | ||
|
|
||
| expected_after_collate = { | ||
| "A": np.array([[0, 1, 2], [0, 1, 0], [0, 0, 0]]), | ||
| "A_lengths": np.array([3, 2, 1]), | ||
| "A_mask": np.array([[1, 1, 1], [1, 1, 0], [1, 0, 0]]), | ||
| } | ||
|
|
||
| results = collate_as_1d_light_curve(samples, "A") | ||
| np.testing.assert_equal(results, expected_after_collate) |
Oops, something went wrong.
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.