Use PyConfig to initialize python #10342
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Isolate #10340 into it's own PR * remove blocks on python version (use PyConfig for 3.8 too), * Put back type_traits * Improve error messages via a fmt formatter for PyStatus * Replace C style casts with static_casts
… even if not LINK_WITH_PYTHON)
Myoldmopar
approved these changes
Dec 22, 2023
| } else { | ||
| // PyConfig_SetBytesString takes a `const char * str` and decodes str using Py_DecodeLocale() and set the result into *config_str | ||
| // But we want to avoid doing it three times, so we PyDecodeLocale manually | ||
| // Py_DecodeLocale can be called because Python has been PreInitialized. |
| #if LINK_WITH_PYTHON | ||
| void initPython(EnergyPlusData &state, fs::path const &pathToPythonPackages) | ||
| { | ||
| PyStatus status; |
There was a problem hiding this comment.
I do wish I had been able to use the PyConfig method a long time ago, but at the time I think I was still using 3.7 or earlier. This is so much nicer nowadays.
| @@ -379,6 +411,82 @@ void PluginManager::setupOutputVariables([[maybe_unused]] EnergyPlusData &state) | |||
| #endif | |||
| } | |||
|
|
|||
| #if LINK_WITH_PYTHON | |||
There was a problem hiding this comment.
Making this a standalone function is fine with me, given what it does.
| } | ||
| }; | ||
| } // namespace fmt | ||
| #endif |
There was a problem hiding this comment.
Wow, didn't expect this, but a dedicated formatter for PyStatus is pretty nice.
| @@ -174,6 +174,7 @@ endif() | |||
|
|
|||
| # we are making *a Python 3.6 Interpreter* a required dependency, so find it here | |||
| # If LINK_WITH_PYTHON, also request the Development (libs) at the same time, to ensure consistent version between interpreter and Development | |||
| # and ask for at least 3.8 (for the PyConfig stuff). | |||
There was a problem hiding this comment.
I'd be almost inclined to just require 3.8 all the time, considering 3.6 died a long time ago, and 3.8 is about to go to end-of-life next year. But this is clearly laying out the needs for our CPython uses. 👍
|
Everything is super happy on CI and locally. Thanks @jmarrec, merging this in! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request overview
Pull Request Author
Add to this list or remove from it as applicable. This is a simple templated set of guidelines.
Reviewer
This will not be exhaustively relevant to every PR.