Skip to content

Don't test numpy prerelease on azure#6996

Merged
stefanv merged 1 commit intoscikit-image:mainfrom
jarrodmillman:azuere-pre
Jun 5, 2023
Merged

Don't test numpy prerelease on azure#6996
stefanv merged 1 commit intoscikit-image:mainfrom
jarrodmillman:azuere-pre

Conversation

@jarrodmillman
Copy link
Contributor

@jarrodmillman jarrodmillman commented Jun 4, 2023

Followup to #6969 and #6973; will fix in #6970.

Description

Checklist

  • Docstrings for all functions
  • Gallery example in ./doc/examples (new features only)
  • Benchmark in ./benchmarks, if your changes aren't covered by an
    existing benchmark
  • Unit tests
  • Clean style in the spirit of PEP8
  • Descriptive commit messages (see below)

For reviewers

  • Check that the PR title is short, concise, and will make sense 1 year
    later.
  • Check that new functions are imported in corresponding __init__.py.
  • Check that new features, API changes, and deprecations are mentioned in
    doc/release/release_dev.rst.
  • There is a bot to help automate backporting a PR to an older branch. For
    example, to backport to v0.19.x after merging, add the following in a PR
    comment: @meeseeksdev backport to v0.19.x
  • To run benchmarks on a PR, add the run-benchmark label. To rerun, the label
    can be removed and then added again. The benchmark output can be checked in
    the "Actions" tab.

@jarrodmillman jarrodmillman added the 🔧 type: Maintenance Refactoring and maintenance of internals label Jun 4, 2023
@stefanv stefanv merged commit e57c23d into scikit-image:main Jun 5, 2023
@stefanv stefanv added this to the 0.22 milestone Jun 5, 2023
jarrodmillman added a commit to jarrodmillman/scikit-image that referenced this pull request Jun 26, 2023
jarrodmillman added a commit to jarrodmillman/scikit-image that referenced this pull request Jun 28, 2023
jarrodmillman added a commit to jarrodmillman/scikit-image that referenced this pull request Jun 30, 2023
jarrodmillman added a commit to jarrodmillman/scikit-image that referenced this pull request Jul 8, 2023
jarrodmillman added a commit to jarrodmillman/scikit-image that referenced this pull request Jul 9, 2023
jarrodmillman added a commit to jarrodmillman/scikit-image that referenced this pull request Jul 9, 2023
jarrodmillman added a commit to jarrodmillman/scikit-image that referenced this pull request Aug 1, 2023
jarrodmillman added a commit to jarrodmillman/scikit-image that referenced this pull request Aug 14, 2023
jarrodmillman added a commit that referenced this pull request Aug 17, 2023
* Fix for NumPy 1.25

* Revert #6973

* Revert "Don't test numpy prerelease on azure (#6996)"

This reverts commit e57c23d.

* Skip warning check on older, noisier versions of NumPy

* Remove upperpin

* Use stable sort in _raveled_offsets_and_distances

NumPy enabled optimizations for quicksort on AVX-512 enabled
processors [1]. We sort based on neighbor distances which can be equal.
The default quicksort is not stable and could have different behavior on
AVX-512. Test this assumption.

[1] https://numpy.org/devdocs/release/1.25.0-notes.html#faster-np-argsort-on-avx-512-enabled-processors

* Fix forgotten doctest in _offsets_to_raveled_neighbors

after updating to stable sort internally.

* Fix for NumPy 1.25

* Revert #6973

* Revert "Don't test numpy prerelease on azure (#6996)"

This reverts commit e57c23d.

* Skip warning check on older, noisier versions of NumPy

* Remove upperpin

* Use stable sort in _raveled_offsets_and_distances

NumPy enabled optimizations for quicksort on AVX-512 enabled
processors [1]. We sort based on neighbor distances which can be equal.
The default quicksort is not stable and could have different behavior on
AVX-512. Test this assumption.

[1] https://numpy.org/devdocs/release/1.25.0-notes.html#faster-np-argsort-on-avx-512-enabled-processors

* Fix forgotten doctest in _offsets_to_raveled_neighbors

after updating to stable sort internally.

* Handle rank>0 scalar arrays

numpy/numpy#10404

* Use stable sort

* Use stable sort in max_tree (debug)

See if it does anything.

* Use stable sort in _get_high_intensity_peaks (debug)

See if it does anything.

* Upper pin numpy<1.26 for tests

---------

Co-authored-by: Stefan van der Walt <stefanv@berkeley.edu>
Co-authored-by: Lars Grüter <lagru@mailbox.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🔧 type: Maintenance Refactoring and maintenance of internals

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants