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

Jax windows restrictions #3955

Merged
merged 10 commits into from
Apr 2, 2024
Merged

Conversation

kratman
Copy link
Contributor

@kratman kratman commented Apr 1, 2024

Description

Restrictions on testing and installing Jax can be removed after #3550

Related: #3941

Key checklist:

  • No style issues: $ pre-commit run (or $ nox -s pre-commit) (see CONTRIBUTING.md for how to set this up to run automatically when committing locally, in just two lines of code)
  • All tests pass: $ python run-tests.py --all (or $ nox -s tests)
  • The documentation builds: $ python run-tests.py --doctest (or $ nox -s doctests)

You can run integration tests, unit tests, and doctests together at once, using $ python run-tests.py --quick (or $ nox -s quick).

Further checks:

  • Code is commented, particularly in hard-to-understand areas
  • Tests added that prove fix is effective or that feature works

@kratman
Copy link
Contributor Author

kratman commented Apr 1, 2024

@agriyakhetarpal This should be all of the jax stuff. Since I am waiting on #3954 I will do the coverage fixes in a third PR

agriyakhetarpal
agriyakhetarpal previously approved these changes Apr 1, 2024
Copy link
Member

@agriyakhetarpal agriyakhetarpal left a comment

Choose a reason for hiding this comment

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

Thanks!

@kratman
Copy link
Contributor Author

kratman commented Apr 1, 2024

Sorry pushed another change after your review

@kratman kratman requested a review from agriyakhetarpal April 1, 2024 21:17
@agriyakhetarpal agriyakhetarpal dismissed their stale review April 1, 2024 21:19

dismissing my earlier review

@kratman
Copy link
Contributor Author

kratman commented Apr 1, 2024

Coverage is still failing in #3954, so it will fail here too

agriyakhetarpal
agriyakhetarpal previously approved these changes Apr 1, 2024
Copy link
Member

@agriyakhetarpal agriyakhetarpal left a comment

Choose a reason for hiding this comment

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

I updated the branch, it should be good to go now. Please feel free to merge

Copy link

codecov bot commented Apr 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.58%. Comparing base (78b7d25) to head (685ea0f).

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #3955   +/-   ##
========================================
  Coverage    99.58%   99.58%           
========================================
  Files          257      257           
  Lines        21196    21196           
========================================
  Hits         21108    21108           
  Misses          88       88           

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

@agriyakhetarpal agriyakhetarpal dismissed their stale review April 2, 2024 00:34

There are some failing checks

@agriyakhetarpal
Copy link
Member

agriyakhetarpal commented Apr 2, 2024

Based on the failing tests, I think the long-standing issue of Homebrew's gcc not coming with gfortran is still not fixed. We should add them back again because we wouldn't want workflows like publish_pypi.yml to fail for unrelated reasons on releases.

We can remove OpenBLAS, though. It's not being used currently because we use Apple's Accelerate framework.

.github/workflows/publish_pypi.yml Show resolved Hide resolved
.github/workflows/publish_pypi.yml Show resolved Hide resolved
.github/workflows/run_periodic_tests.yml Show resolved Hide resolved
.github/workflows/test_on_push.yml Show resolved Hide resolved
.github/workflows/test_on_push.yml Show resolved Hide resolved
.github/workflows/publish_pypi.yml Outdated Show resolved Hide resolved
.github/workflows/publish_pypi.yml Outdated Show resolved Hide resolved
.github/workflows/run_periodic_tests.yml Outdated Show resolved Hide resolved
.github/workflows/test_on_push.yml Outdated Show resolved Hide resolved
.github/workflows/test_on_push.yml Outdated Show resolved Hide resolved
.github/workflows/publish_pypi.yml Show resolved Hide resolved
.github/workflows/publish_pypi.yml Outdated Show resolved Hide resolved
.github/workflows/run_periodic_tests.yml Outdated Show resolved Hide resolved
.github/workflows/test_on_push.yml Outdated Show resolved Hide resolved
.github/workflows/test_on_push.yml Outdated Show resolved Hide resolved
Copy link
Member

@agriyakhetarpal agriyakhetarpal left a comment

Choose a reason for hiding this comment

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

Had to trigger a re-run for some, but all tests pass now, we should be good to go. Thanks!

@agriyakhetarpal agriyakhetarpal merged commit 31527b7 into pybamm-team:develop Apr 2, 2024
46 checks passed
@agriyakhetarpal agriyakhetarpal deleted the feat/jaxWindows branch April 2, 2024 08:03
js1tr3 pushed a commit to js1tr3/PyBaMM that referenced this pull request Aug 12, 2024
* Fix coverage

* Remove windows Jax restrictions

* style: pre-commit fixes

* Update MacOS instructions

* Update docs/source/user_guide/installation/install-from-source.rst

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Agriya Khetarpal <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants