Skip to content
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

JP-3483: fix atoca failures due to sparse matrix solver #8273

Merged
merged 8 commits into from
Feb 16, 2024

Conversation

emolter
Copy link
Collaborator

@emolter emolter commented Feb 13, 2024

Resolves JP-3483

Closes #8110

This PR addresses a bug where the ATOCA algorithm's matrix solver would sometimes fail on good data, likely because the approximations in spsolve were inappropriate. The fix allows the code to try using a least-squares solver instead when these failures occur.

Checklist for maintainers

  • added entry in CHANGES.rst within the relevant release section
  • updated or added relevant tests
  • updated relevant documentation
  • added relevant milestone
  • added relevant label(s)
  • ran regression tests, post a link to the Jenkins job below.
    How to run regression tests on a PR
  • Make sure the JIRA ticket is resolved properly

Jenkins run here. I don't think the failures have anything to do with this change.

Copy link

codecov bot commented Feb 13, 2024

Codecov Report

Attention: 7 lines in your changes are missing coverage. Please review.

Comparison is base (7386db3) 75.15% compared to head (354bfd0) 75.14%.
Report is 1 commits behind head on master.

Files Patch % Lines
jwst/extract_1d/soss_extract/atoca.py 22.22% 7 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8273      +/-   ##
==========================================
- Coverage   75.15%   75.14%   -0.02%     
==========================================
  Files         470      470              
  Lines       38604    38611       +7     
==========================================
  Hits        29013    29013              
- Misses       9591     9598       +7     
Flag Coverage Δ *Carryforward flag
nightly 77.38% <ø> (-0.01%) ⬇️ Carriedforward from 7386db3

*This pull request uses carry forward flags. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@emolter emolter marked this pull request as ready for review February 13, 2024 22:00
@emolter emolter requested a review from a team as a code owner February 13, 2024 22:00
@hbushouse hbushouse requested a review from tapastro February 15, 2024 16:52
@hbushouse hbushouse added this to the Build 10.2 milestone Feb 15, 2024
Copy link
Contributor

@tapastro tapastro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One python version issue, I'm testing the regressions locally on py3.9 but I think my suggestion should work.

Copy link
Collaborator

@hbushouse hbushouse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, other than the issue with having it work with py 3.9.

@hbushouse
Copy link
Collaborator

@emolter Need to resolve conflicts so that the CI tests can run. At that point another regtest run would be good.

@emolter
Copy link
Collaborator Author

emolter commented Feb 16, 2024

New Jenkins regression tests are here

Copy link
Collaborator

@hbushouse hbushouse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@hbushouse hbushouse merged commit 0352cbf into spacetelescope:master Feb 16, 2024
28 of 29 checks passed
@emolter emolter deleted the JP-3483 branch February 16, 2024 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

spec2 crashing on nis_soss jw04098-o007_20230923t230916_tso-spec2_00003
3 participants