-
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
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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,36 @@ 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 | ||||||||||||||||||||||
BCSR.from_scipy_sparse(rsp.matrix) | ||||||||||||||||||||||
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 adding assertions on the content of the BCSR matrix. Converting to BCSR is good, but it doesn't confirm the content is correct. Add assertions to check specific values within the
Suggested change
|
||||||||||||||||||||||
assert np.all(rsp.channel_fwhm > 0) | ||||||||||||||||||||||
|
||||||||||||||||||||||
|
||||||||||||||||||||||
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 | ||||||||||||||||||||||
BCSR.from_scipy_sparse(r1.matrix) | ||||||||||||||||||||||
BCSR.from_scipy_sparse(r2.matrix) | ||||||||||||||||||||||
assert np.all(r1.matrix == r2.matrix) | ||||||||||||||||||||||
assert np.all(r1.channel_fwhm == r2.channel_fwhm) |
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.