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

Fix IDAKLU solver crash when running in multiple threads + when telemetry is prompted for #4583

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from

Conversation

agriyakhetarpal
Copy link
Member

@agriyakhetarpal agriyakhetarpal commented Nov 13, 2024

Description

This came up as an unrelated issue in #4582 when testing the wheels and apparently stems from #4441 where a thread was being used to check for the input. This caused the Linux wheel tests to fail: https://github.com/agriyakhetarpal/PyBaMM/actions/runs/11805727556/job/32890103930. This PR redoes that with a multi-platform approach and avoids the use of threads altogether by checking for different environments: Windows via msvcrt and Linux/macOS via termios.

A possible corner case for Jupyter Notebooks (running in VS Code versus Jupyter Notebook/JupyterLab) has also been fixed. I've resorted to a more rudimentary fix using the previous method for now, since this fix was erroneous and did not work intermittently.

Type of change

Please add a line in the relevant section of CHANGELOG.md to document the change (include PR #) - note reverse order of PR #s. If necessary, also add to the list of breaking changes.

  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)

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

noxfile.py Outdated Show resolved Hide resolved
@agriyakhetarpal
Copy link
Member Author

agriyakhetarpal commented Nov 13, 2024

This approach might seem overkill but this is what came to mind first and seems like the most robust way to me, so I'd like to test this a bit more – I've converted this to a draft for now. I triggered a wheel build here, let's see if it passes: https://github.com/agriyakhetarpal/PyBaMM/actions/runs/11808256997

I've confirmed the fix locally with a fresh PyBaMM installation (i.e., with the pybamm/config.yml file not present in my Application Support folder) every time before importing PyBaMM:

  • inside a terminal
  • in an IPython shell
  • in a notebook running in JupyterLab
  • in a notebook running in VS Code

across the following scenarios:

  • telemetry disabled
  • telemetry enabled (which should be the same thing)
  • a tim out (no input was given)

Copy link

codecov bot commented Nov 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.26%. Comparing base (cb50363) to head (083184b).
Report is 1 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #4583      +/-   ##
===========================================
- Coverage    99.26%   99.26%   -0.01%     
===========================================
  Files          302      302              
  Lines        22889    22866      -23     
===========================================
- Hits         22721    22698      -23     
  Misses         168      168              

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

@agriyakhetarpal
Copy link
Member Author

The buttons aren't working in the notebooks, actually – I'm quite sure they were working when I was testing earlier, so I guess I made some additional changes which made them break. I'll debug later in the day, and I'll consider dropping the buttons in favour of a simple input in case I don't get them to work.

@agriyakhetarpal
Copy link
Member Author

I switched to a more basic implementation for Jupyter notebooks, and I've seen bug reports about how inputs don't work properly with JupyterLab <4, but I don't think (too) many people are using version 3 now, so we should be good.

@agriyakhetarpal agriyakhetarpal changed the title Fix IDAKLU solver crash when running in multiple threads + telemetry is prompted for Fix IDAKLU solver crash when running in multiple threads + when telemetry is prompted for Nov 13, 2024
@agriyakhetarpal
Copy link
Member Author

agriyakhetarpal commented Nov 13, 2024

Additionally, I tested on Google Colab by installing PyBaMM in editable mode from my branch – we should be ready to go with this. Suggestions on cleaning up the code are welcome. The only place I haven't been able to test is Windows, because I don't have a Windows machine.

@agriyakhetarpal agriyakhetarpal marked this pull request as ready for review November 13, 2024 14:49
@agriyakhetarpal
Copy link
Member Author

@kratman
Copy link
Contributor

kratman commented Nov 13, 2024

Ok I will take a close look at this in an hour or so

src/pybamm/config.py Outdated Show resolved Hide resolved
Comment on lines 81 to 91
if is_notebook(): # pragma: no cover
try:
from IPython.display import clear_output

user_input = input("Do you want to enable telemetry? (Y/n): ")
clear_output()

return user_input

except Exception: # pragma: no cover
return None
Copy link
Contributor

Choose a reason for hiding this comment

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

Not a major issue, but this has no timeout so people notebooks will just hang if they don't realize this popped up

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, this is intentional. I opine that notebooks are meant to be used interactively by default – I expect this to be a one-time issue, since importing PyBaMM and choosing "yes" or "no" once would mean that the config gets saved and this never comes up again (until the config file gets deleted, of course).

Comment on lines +134 to +135
while time.time() - start_time < timeout:
rlist, _, _ = select.select([sys.stdin], [], [], 0.1)
Copy link
Contributor

Choose a reason for hiding this comment

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

If we are already using select, do we need the loop? The timeout isn't very long

import select

# Save terminal settings for later
old_settings = termios.tcgetattr(sys.stdin)
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems excessive that we need to change the terminal settings for this

src/pybamm/config.py Outdated Show resolved Hide resolved
Comment on lines 196 to 201
else:
print("Invalid input. Please enter 'Y/y' for yes or 'n/N' for no:")
user_input = get_input_or_timeout(timeout)
if user_input is None:
print("\nTimeout reached. Defaulting to not enabling telemetry.")
return False
Copy link
Contributor

Choose a reason for hiding this comment

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

I know I brought it up before, but if we just check for the yes options, we can skip having an infinite loop

Copy link
Member Author

Choose a reason for hiding this comment

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

If a person presses "Enter" in haste, that enables telemetry for them (because of your suggestion that I applied above), which might not be what they want – I'm trying to reduce the chance of that happening

Copy link
Member Author

Choose a reason for hiding this comment

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

So, should I keep it as "yes" if Enter is pressed or "no"? I feel the latter is the better option

src/pybamm/config.py Outdated Show resolved Hide resolved
src/pybamm/config.py Outdated Show resolved Hide resolved
src/pybamm/config.py Outdated Show resolved Hide resolved
Co-authored-by: Eric G. Kratz <[email protected]>
src/pybamm/config.py Outdated Show resolved Hide resolved
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