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

Use delvewheel to repair wheels on Windows, add MSVCRT DLLs #4105

Merged
merged 3 commits into from
May 21, 2024

Conversation

agriyakhetarpal
Copy link
Member

@agriyakhetarpal agriyakhetarpal commented May 20, 2024

Description

Adds what was missing to be done in #3783 – this should ensure that we get some extra non-UCRT DLLs in a wheel.libs folder inside the Windows wheel. This is not required but would be good to have because we use MSVC (Visual Studio 17 2022) as our compiler and not Clang/MinGW (which use UCRT) and therefore we should provide DLLs like MSVCP140.dll that have a tendency of not being present on many systems, in order to boost compatibility (this is mostly because of the absence of the MSVC Redistributable runtime components on quite a few systems). For most systems running Windows 10 and above, these files are generally present.

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.

  • 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

@agriyakhetarpal
Copy link
Member Author

agriyakhetarpal commented May 20, 2024

Triggered a run at https://github.com/agriyakhetarpal/PyBaMM/actions/runs/9164767682/job/25196752840, which passed, and MSVC140.dll plus VCOMP140.dll were subsequently mangled and copied.

Copy link

codecov bot commented May 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.54%. Comparing base (8823b40) to head (26f6941).
Report is 216 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #4105      +/-   ##
===========================================
- Coverage    99.56%   99.54%   -0.02%     
===========================================
  Files          287      287              
  Lines        21744    21744              
===========================================
- Hits         21649    21646       -3     
- Misses          95       98       +3     

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

@agriyakhetarpal agriyakhetarpal changed the title Use delvewheel to repair wheels on Windows Use delvewheel to repair wheels on Windows, add MSVCRT DLLs May 20, 2024
Copy link
Member

@arjxn-py arjxn-py left a comment

Choose a reason for hiding this comment

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

Thanks @agriyakhetarpal, coverage failure seems to be unrelated (i.e. related with #4103)

@arjxn-py arjxn-py merged commit 1692ffb into pybamm-team:develop May 21, 2024
41 of 42 checks passed
@agriyakhetarpal agriyakhetarpal deleted the repair-windows-wheel branch May 21, 2024 20:20
js1tr3 pushed a commit to js1tr3/PyBaMM that referenced this pull request Aug 12, 2024
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