-
Notifications
You must be signed in to change notification settings - Fork 4
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
fix: handle sparse matrix reading for big-endian byte order #163
Merged
Merged
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 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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,9 @@ | ||
import numpy as np | ||
import pytest | ||
from jax.experimental.sparse import BCSR | ||
|
||
from elisa.data.grouping import significance_gv, significance_lima | ||
from elisa.data.ogip import Response, ResponseData | ||
from elisa.models import PowerLaw | ||
|
||
|
||
|
@@ -117,3 +120,41 @@ def test_data_grouping(): | |
data.spec_counts, data.back_counts, data.back_errors, data.back_ratio | ||
) | ||
assert np.all(sig >= scale) | ||
|
||
|
||
@pytest.mark.parametrize( | ||
'file', | ||
[ | ||
'docs/notebooks/data/P011160500104_LE.rsp', | ||
'docs/notebooks/data/P011160500104_ME.rsp', | ||
'docs/notebooks/data/P011160500104_HE.rsp', | ||
], | ||
) | ||
def test_load_response(file): | ||
# test Response against big-endian files | ||
rsp = Response(file) | ||
# test if the response matrix can be converted to a BCSR matrix in JAX | ||
assert np.all(rsp.channel_fwhm > 0) | ||
assert np.array_equal( | ||
rsp.matrix, | ||
BCSR.from_scipy_sparse(rsp.sparse_matrix).todense(), | ||
) | ||
|
||
|
||
def test_response(): | ||
# test ResponseData against different endianness | ||
photon_egrid = np.linspace(1.0, 100.0, 101) | ||
channel = np.arange(100) | ||
channel_emin = photon_egrid[:-1] | ||
channel_emax = photon_egrid[1:] | ||
mat1 = np.eye(100).astype('<f4') | ||
mat2 = np.eye(100).astype('>f4') | ||
Comment on lines
+150
to
+151
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. suggestion (testing): Consider testing non-identity matrices. Using identity matrices might not fully exercise the byte-swapping logic. Consider adding tests with more complex matrices to ensure all data is handled correctly. |
||
r1 = ResponseData(photon_egrid, channel_emin, channel_emax, mat1, channel) | ||
r2 = ResponseData(photon_egrid, channel_emin, channel_emax, mat2, channel) | ||
# test if the response matrix can be converted to a BCSR matrix in JAX | ||
for r in [r1, r2]: | ||
assert np.array_equal( | ||
r.matrix, BCSR.from_scipy_sparse(r.sparse_matrix).todense() | ||
) | ||
assert np.all(r1.channel == r2.channel) | ||
assert np.all(r1.channel_fwhm == r2.channel_fwhm) |
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.
question (bug_risk): Revisit the conditional conversion for response_matrix.
Currently, the conversion to native byte order is skipped if response_matrix is already an instance of sparray. Ensure that sparse matrices are always natively ordered or consider if they might also need conversion to avoid potential incompatibility issues with scipy.sparse.