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

Proposed changes to #541 #543

Merged
merged 53 commits into from
Jul 24, 2024
Merged

Conversation

bwohlberg
Copy link
Collaborator

Proposed changes to #541:

  • Miscellaneous clean up
  • Simplify flax data generation options to reduce maintenance difficulties and resolve test failures with GPU devices

@bwohlberg bwohlberg added bug Something isn't working tests Pertaining to SCICO tests labels Jul 18, 2024
@bwohlberg bwohlberg merged commit bf9c1d0 into cristina/issue535 Jul 24, 2024
4 checks passed
@bwohlberg bwohlberg deleted the brendt/issue535_extended branch July 24, 2024 17:22
bwohlberg added a commit that referenced this pull request Jul 24, 2024
* Change np random generation to jax np

* Bump supported jaxlib/jax versions

* Avoid doctest errors resulting from unimportable astra or svmbir

* Avoid doctest failure due to changes in numpy 2.0

* Address FutureWarning in 2D x-ray

* Update submodule

* Proposed changes to #541 (#543)

* Add type annotation

* Remove jax distributed data generation option

* Clean up

* Extend docs

* Add additional test for exception state

* Tracer conversion error fix from Cristina

* Omitted import

* Clean up

* Consistent phrasing

* Clean up some f-strings

* Add missing ray init

* Set dtype

* Fix indentation error

* Update module docstring

* Experimental solution to ray/jax failure

* Bug fix

* Improve docstring

* Implement hack to resolve jax/ray conflict

* Debug attempt

* New solution attempt

* Debug attempt

* Return to earlier approach

* Extend comment

* Clean up and improve function logic

* Address some problems

* Clean up

* Rename function for consistency with related functions

* Bug fix

* Clean up

* Bug fix

* Address pylint complaint

* Revert unworkable structure

* Error message fix

* Address mypy errors

---------

Co-authored-by: Brendt Wohlberg <brendt@ieee.org>
Co-authored-by: Michael-T-McCann <michael.thompson.mccann@gmail.com>
Co-authored-by: Brendt Wohlberg <bwohlberg@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working tests Pertaining to SCICO tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants