TST: Use meson for testing f2py
#25111
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
HaoZeke
commented
Nov 11, 2023
508490a to
ac6cc34
Compare
meson for testing f2pymeson for testing f2py
This was referenced Nov 12, 2023
|
Could we do the merging the other way around: get this PR to work first and then revisit #25114? |
This was referenced Nov 18, 2023
Unfortunately not, see #25181 (comment) |
mattip
reviewed
Nov 19, 2023
numpy/f2py/__init__.py
Outdated
| @@ -92,17 +92,16 @@ def compile(source, | |||
| with open(fname, 'w') as f: | |||
| f.write(source) | |||
|
|
|||
| args = ['-c', '-m', modulename, f.name] | |||
| args = ['-c', '--backend', 'meson', '-m', | |||
| modulename, f.name] | |||
There was a problem hiding this comment.
shouldn't meson be made the default?
There was a problem hiding this comment.
Not yet, for python<3.12 the default (with a warning) is still distutils. >=3.12 it automatically (and noisily) switches to meson
There was a problem hiding this comment.
However, in terms of the testing infrastructure, there's no point keeping the distutils build and test routines, so we just default to using meson explicitly here.
c411a21 to
687d8ce
Compare
|
Please squash this when it gets merged. |
The version is too old to be of use
|
@HaoZeke and I just discussed that we plan to fix the speed issue in stages: add some slow markers in this PR, merge this PR, switch to pytest fixtures to speed up the tests after, and then deal with some CI sanitation to run compile tests less often. |
Should finish in around a minute now
rgommers
approved these changes
Nov 24, 2023
stefanor
added a commit
to stefanor/numpy
that referenced
this pull request
Dec 6, 2023
The user of this import was removed in the cleanup in numpy#25111, post-2.26.
charris
pushed a commit
to charris/numpy
that referenced
this pull request
Dec 19, 2023
* MAINT,TST: Use meson for compiler checks [f2py] * MAINT: Cache the compiler checks [f2py] * MAINT,TST: Always use meson [f2py] * TST: Rework to have a build_meson [f2py] * MAINT,TST: Simplify the meson backend [f2py] * TST: Use the build_meson function [f2py] * MAINT,TST: Minor cleanup [f2py] * TST: Ensure TestDocAdvanced runs with spin [f2py] * TST: Use cleanup meson backend [f2py] * MAINT,TST: Generalize build_meson [f2py] * TST: Use a helper for spin tests [f2py] * MAINT: Simplify meson backend [f2py] * TST: Handle unsupported compilers [f2py] * TST: Fix gibberish in [f2py] documentation test * CI: Add meson for cygwin runs * TST: Skips for 32-bit errors [f2py] * TST: Skip for cygwin since meson is old [f2py] * CI: Revert grabbing meson on cygwin The version is too old to be of use * TST: Cleanup old distutils builder [f2py] * TST: Skip cygwin better [f2py] * TST: Don't touch distutils * MAINT: Vendor in distutils testing requirement * TST: Try removing cygwin restrictions * MAINT: Cleanup some tests [f2py] * TST: Try to use concurrency for i/o bounds [f2py] * TST: Mark slow tests [f2py] Should finish in around a minute now
meson for testing f2pymeson for testing f2py
7 tasks
charris
pushed a commit
to charris/numpy
that referenced
this pull request
Dec 23, 2023
* MAINT,TST: Use meson for compiler checks [f2py] * MAINT: Cache the compiler checks [f2py] * MAINT,TST: Always use meson [f2py] * TST: Rework to have a build_meson [f2py] * MAINT,TST: Simplify the meson backend [f2py] * TST: Use the build_meson function [f2py] * MAINT,TST: Minor cleanup [f2py] * TST: Ensure TestDocAdvanced runs with spin [f2py] * TST: Use cleanup meson backend [f2py] * MAINT,TST: Generalize build_meson [f2py] * TST: Use a helper for spin tests [f2py] * MAINT: Simplify meson backend [f2py] * TST: Handle unsupported compilers [f2py] * TST: Fix gibberish in [f2py] documentation test * CI: Add meson for cygwin runs * TST: Skips for 32-bit errors [f2py] * TST: Skip for cygwin since meson is old [f2py] * CI: Revert grabbing meson on cygwin The version is too old to be of use * TST: Cleanup old distutils builder [f2py] * TST: Skip cygwin better [f2py] * TST: Don't touch distutils * MAINT: Vendor in distutils testing requirement * TST: Try removing cygwin restrictions * MAINT: Cleanup some tests [f2py] * TST: Try to use concurrency for i/o bounds [f2py] * TST: Mark slow tests [f2py] Should finish in around a minute now
charris
pushed a commit
to charris/numpy
that referenced
this pull request
Dec 24, 2023
* MAINT,TST: Use meson for compiler checks [f2py] * MAINT: Cache the compiler checks [f2py] * MAINT,TST: Always use meson [f2py] * TST: Rework to have a build_meson [f2py] * MAINT,TST: Simplify the meson backend [f2py] * TST: Use the build_meson function [f2py] * MAINT,TST: Minor cleanup [f2py] * TST: Ensure TestDocAdvanced runs with spin [f2py] * TST: Use cleanup meson backend [f2py] * MAINT,TST: Generalize build_meson [f2py] * TST: Use a helper for spin tests [f2py] * MAINT: Simplify meson backend [f2py] * TST: Handle unsupported compilers [f2py] * TST: Fix gibberish in [f2py] documentation test * CI: Add meson for cygwin runs * TST: Skips for 32-bit errors [f2py] * TST: Skip for cygwin since meson is old [f2py] * CI: Revert grabbing meson on cygwin The version is too old to be of use * TST: Cleanup old distutils builder [f2py] * TST: Skip cygwin better [f2py] * TST: Don't touch distutils * MAINT: Vendor in distutils testing requirement * TST: Try removing cygwin restrictions * MAINT: Cleanup some tests [f2py] * TST: Try to use concurrency for i/o bounds [f2py] * TST: Mark slow tests [f2py] Should finish in around a minute now
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.
Do not merge before #25073 and #25181.
Closes #25109.
Essentially:
mesonbackendmeson(blocked by the.pyf+-minteraction currently)WindowsSee CI, TST: have a f2py-specific CI run and properly skip f2py tests elsewhere #25134Also reworked
test_docsto run withspin.Additionally (features added):
compile()call will now use themesonbackend as wellNote: It is now the users' responsibility to ensure a compatible toolchain is present. However, this does mean that on the CI there are more failure modes e.g. without
distutilsit is hard to figure out if the CI hasmsvcor not, so conditional skipping is harder than it used to be. Conversely, GFortran and MSVC simply do not mix in themesonworld-view. So, there is a catch-all skip for those. However, the tests are run fully on the CI as well, just not all flavors, e.g. FreeBSD fails thefortrancompiler check, some of the Windows CI variants only findclby default.Note II: It is worth remembering that most (compiled) Windows tests were skipped even under
distutilssince 2017 due to #9673, perhaps with the notable exception of the (non-Fortran)test_array_from_pyobj. This is more of a status quo PR, to ensure F2PY is tested beyond its parser on Linux and MacOS (and to whatever extent Windows was tested before as well).