BLD Fix more build dependencies in meson build #28821
Merged
Conversation
This file contains hidden or 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
thomasjpfan
reviewed
Apr 12, 2024
sklearn/tree/meson.build
Outdated
| @@ -16,7 +16,7 @@ tree_extension_metadata = { | |||
| foreach ext_name, ext_dict : tree_extension_metadata | |||
| py.extension_module( | |||
| ext_name, | |||
| ext_dict.get('sources'), | |||
| ext_dict.get('sources') + utils_cython_tree, | |||
There was a problem hiding this comment.
From looking at the other changes, py.extension_module accepts a list of list. If that's the case, can we keep how we call py.extension_module consistent:
Suggested change
| ext_dict.get('sources') + utils_cython_tree, | |
| [ext_dict.get('sources'), utils_cython_tree], |
There was a problem hiding this comment.
OK I followed your suggestion.
I actually learned very recently that there was such a thing as argument flattening Meson, so you can do a variety of different syntaxes that should do the same including some complicated ones with arbitrary nesting like this:
['some-file.pyx'], [['some-file.pxd'], [[utils_cython_tree]]]]see https://mesonbuild.com/Syntax.html#argument-flattening for more details.
thomasjpfan
approved these changes
Apr 12, 2024
|
Thanks, let me know if you see variations of these build errors happen again! |
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.
Improves the situation for #28820. Since I am not able to reproduce the issue, I guess we will just have to wait and see if this kind of issues happen again after this is merged ...
I tested it for the cases that have been seen in the CI by running this kind of commands from an empty Meson build dir:
I also added
utils_cython_treein all the places that cimport something fromutils.You can also check inputs are defined correctly by looking at the
ninja.buildfile or with this kind ofninjacommands:Here you can check that cythonizing
sklearn/cluster/_hdbscan/_linkage.pyxdoes depend onsklearn/__init__.py,sklearn/utils/__init__.py,sklearn/metrics/__init__.pyandutils+metrics.pxdfiles.