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

MAINT: 1.9.1 backports #16901

Merged

Commits on Aug 25, 2022

  1. BLD: install missing .pxd files, and update TODOs/FIXMEs in meson.b…

    …uild files (scipy#16749)
    
    * BLD: remove a warning suppression flag for HiGHS extension
    
    This is no longer necessary, the PR linked in the removed comment
    is included in our `highs` git submodule now.
    
    * BLD: remove an outdated FIXME from the scipy/integrate/meson.build
    
    This was fixed I believe (there are no skipped or xfailed tests either),
    and the comment isn't very informative.
    
    * BLD: remove another FIXME in `cython_optimize/meson.build`, it's not broken
    
    The code can be simplified once the upstream feature is added, but
    that's not a FIXME.
    
    * BLD: remove comments about c++14/c++11 support
    
    We can rely on C++14 unconditionally since 2021, see
    http://scipy.github.io/devdocs/dev/toolchain.html#c-language-standards
    
    * BLD: update info on including all license files as separate files
    
    * BLD: install missing `scipy/*.pxd` files
    
    No tests were failing, so something is fairly badly wrong in
    the test suite.
    
    Also add `optimize.cython_optimize` to the list of submodules that are
    public API.
    
    * BLD: remove FIXME about version string generation
    
    This was fixed when adding `--git-dir` to the git invocation,
    that made the result independent from the current directory
    when invoking the build.
    
    * BLD: remove TODO about `-fallow-argument-mismatch`
    
    This flag is added implicitly via 'fortran_std=legacy' in the
    top-level `meson.build`. Warnings that show up are silenced
    in multiple modules, so there's no need for a separate TODO here.
    
    * BLD: remove TODO for UNU.RAN version string
    
    This isn't a very useful today, given that we don't use this
    version string. The corresponding `setup.py` file also does the
    same and doesn't have a TODO.
    
    * BLD: update FIXME to a TODO in `linalg/meson.build`
    rgommers authored and tylerjereddy committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    bcba22a View commit details
    Browse the repository at this point in the history
  2. BLD: make OpenBLAS detection work with CMake (scipy#16750)

    This is a fallback detection path, in case pkg-config fails to find `openblas`.
    CMake uses the camelcase version of the name.
    
    If CMake is installed and it finds OpenBLAS, the result looks like:
    ```
    Determining dependency 'OpenBLAS' with pkg-config executable '/home/rgommers/anaconda3/envs/scipy-dev/bin/pkg-config'
    env[PKG_CONFIG_PATH]:
    Called `/home/rgommers/anaconda3/envs/scipy-dev/bin/pkg-config --modversion OpenBLAS` -> 1
    
    CMake binary for 1 is cached.
    
    Determining dependency 'OpenBLAS' with CMake executable '/home/rgommers/anaconda3/envs/scipy-dev/bin/cmake'
    Try CMake generator: auto
    Calling CMake (['/home/rgommers/anaconda3/envs/scipy-dev/bin/cmake']) in /home/rgommers/code/scipy/build/meson-private/cmake_OpenBLAS with:
      - "-DNAME=OpenBLAS"
      - "-DARCHS=libpyldb-util.cpython-310-x86-64-linux-gnu.so;libpyldb-util.cpython-310-x86-64-linux-gnu.so.2;libpyldb-util.cpython-310-x86-64-linux-gnu.so.2.5.0;libpytalloc-util.cpython-310-x86-64-linux-gnu.so;libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2;libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2.3.3;libsamba-policy.cpython-310-x86-64-linux-gnu.so;libsamba-policy.cpython-310-x86-64-linux-gnu.so.0;libsamba-policy.cpython-310-x86-64-linux-gnu.so.0.0.1"
      - "-DVERSION="
      - "-DCOMPS="
      - "--trace-expand"
      - "--trace-format=json-v1"
      - "--no-warn-unused-cli"
      - "--trace-redirect=cmake_trace.txt"
      - "-DCMAKE_TOOLCHAIN_FILE=/home/rgommers/code/scipy/build/meson-private/cmake_OpenBLAS/CMakeMesonToolchainFile.cmake"
      - "."
      - "-DCMAKE_PREFIX_PATH=/home/rgommers/anaconda3/envs/scipy-dev;/home/rgommers/anaconda3/envs/scipy-dev/x86_64-conda-linux-gnu/sysroot/usr"
    using old-style CMake variables for dependency OpenBLAS
    Include Dirs:         ['/home/rgommers/anaconda3/envs/scipy-dev/include']
    Compiler Definitions: []
    Libraries:            ['/home/rgommers/anaconda3/envs/scipy-dev/lib/libopenblas.so']
    Run-time dependency openblas found: YES 0.3.20
    ```
    
    This follows up on comments in scipygh-16308
    rgommers authored and tylerjereddy committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    3b61601 View commit details
    Browse the repository at this point in the history
  3. BLD: use a bit more idiomatic approach to constructing paths in meson

    Instead of string concatenation, use Meson's path operator, which was
    designed based on the same concept as pathlib.Path and uses the /
    operator overload (but effectively using .as_posix() for consistency).
    This guarantees consistent handling, and also avoids e.g. introspection
    files containing duplicated path separators such as
    `.../site-packages//scipy/...`
    
    This is also required in order for Meson to internally track when an
    install_dir string comes from py3.get_install_dir() after path-based
    joining semantics, which is needed for improvements to the mesonpy build
    backend.
    eli-schwartz authored and tylerjereddy committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    6ca618a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    12d1358 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5fa16e6 View commit details
    Browse the repository at this point in the history
  6. BLD: add Python 3.11 numpy version to pyproject.toml

    This mirrors the change in scipy/oldest-supported-numpy#61
    NumPy 1.23.3 is the first numpy version with 3.11 wheels on PyPI.
    rgommers authored and tylerjereddy committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    b4122a3 View commit details
    Browse the repository at this point in the history
  7. BUG/TST: linalg: Check the results of 'schur' more carefully.

    The Schur decomposition is not unique, so testing the result
    of linalg.schur against hard-coded matrices is not reliable.
    The updated tests check that the desired properties of the
    result are satisfied, and that the order of the diagonal
    elements of the triangular matrix agrees with the given
    'sort' parameter.
    
    Closes scipygh-14517
    WarrenWeckesser authored and tylerjereddy committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    630c04a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    42b4660 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    e8bb60a View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    eb31881 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    3e9c15d View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2022

  1. Configuration menu
    Copy the full SHA
    ec9b0ad View commit details
    Browse the repository at this point in the history
  2. BLD: cp310 needs numpy==1.22.3

    andyfaff authored and rgommers committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    c055c31 View commit details
    Browse the repository at this point in the history
  3. TST: sparse.linalg: Loosen tolerance for the lobpcg test 'test_tolera…

    …nce_float32' (scipy#16755)
    
    This test has been failing occasionally in CI, with errors slightly greater than
    the requested tolerances.
    
    (cherry picked from commit f71e7fa)
    WarrenWeckesser authored and rgommers committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    cc0a2bf View commit details
    Browse the repository at this point in the history
  4. BLD: make the way we count commits for version numbering more robust

    I think this will fix the issue with commit count being zero reported
    in scipygh-16702.
    
    (cherry picked from commit 97ee16d)
    rgommers committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    8b97528 View commit details
    Browse the repository at this point in the history