TST Complete test for `pairwise_distance_{argmin,argmin_min}` #22371

jjerphan · 2022-02-04T10:11:11Z

Reference Issues/PRs

Loss of coverage observed in #22288.

What does this implement/fix? Explain your changes.

The behavior of pairwise_distance_{argmin,argmin_min} regarding the axis argument is currently untested.

This PR completes test_pairwise_distances_argmin_min to test it.

thomasjpfan

LGTM

sklearn/metrics/tests/test_pairwise.py

jeremiedbb

I'd rather put that in a dedicated test. This one is already way too big.
You could even parametrize it over the 2 dist functions.

Other than that, looks good.

sklearn/metrics/tests/test_pairwise.py

Co-authored-by: Jérémie du Boisberranger <[email protected]> Co-authored-by: Thomas J. Fan <[email protected]>

ogrisel

LGTM. +0 for merging without parametrization.

sklearn/metrics/tests/test_pairwise.py

ogrisel · 2022-02-04T21:52:18Z

The stalled tests should be fixed by pinning pytest when merging main.

Co-authored-by: Olivier Grisel <[email protected]>

jjerphan · 2022-02-08T20:38:26Z

I think a separate PR to refactor and parametrize the tests would be more appropriate.

jeremiedbb · 2022-02-08T21:49:44Z

I didn't mean to refactor this test. I just meant to put your addition in a dedicated test for the tests to be more unitary. But it's not a big deal and it's fine as is.

jeremiedbb · 2022-02-08T21:50:51Z

Thanks @jjerphan !

jjerphan · 2022-02-09T08:30:19Z

You're welcome.

I didn't mean to refactor this test. I just meant to put your addition in a dedicated test for the tests to be more unitary. But it's not a big deal and it's fine as is.

Ah yes, I agree ; I just also think that such a test can be improved. :)

…-learn#22371)

* Forward pairwise_dist_chunk_size in the configuration * Flip finalized results for PairwiseDistancesArgKmin The previous would have made the code more complex by introducing some boilerplate for the interface plugs. Having it this way actually simplifies the code. This also removes the haversine branch for test_pairwise_distances_argkmin Co-authored-by: Olivier Grisel <[email protected]> * Plug PairwiseDistancesArgKmin as a back-end * Adapt test accordingly * Add whats_new entry * Change input validation order for kneighbors * Remove duplicated test_neighbors_distance_metric_deprecation Co-authored-by: Thomas J. Fan <[email protected]> * Adapt the documentation Co-authored-by: Thomas J. Fan <[email protected]> * Add mahalanobis case to test fixtures * Correct whats_new entry * CLN Remove unneeded private metric attribute This was needed when 'fast_sqeuclidean' and 'fast_euclidean' were present to choose the best implementation based on the user specification. Those metric have been removed since then, making this attribute useless. Co-authored-by: Thomas J. Fan <[email protected]> * TST Assert FutureWarning instead of DeprecationWarning in test_neighbors_metrics * MAINT Add use_pairwise_dist_activate to scikit-learn config * TST Add a test for the 'brute' backends' results' consistency Co-authored-by: Thomas J. Fan <[email protected]> * fixup! MAINT Add use_pairwise_dist_activate to scikit-learn config * fixup! fixup! MAINT Add use_pairwise_dist_activate to scikit-learn config * TST Filter FutureWarning for WMinkowskiDistance * MAINT pin numpydoc in arm for now (#22292) * fixup! TST Filter FutureWarning for WMinkowskiDistance * Revert keywords arguments removal for the GEMM trick for 'euclidean' * MAINT pin max numpydoc for now (#22286) * Add 'haversine' to CDIST_PAIRWISE_DISTANCES_REDUCTION_COMMON_METRICS Co-authored-by: Olivier Grisel <[email protected]> * fixup! Add 'haversine' to CDIST_PAIRWISE_DISTANCES_REDUCTION_COMMON_METRICS * Apply suggestions from code review Co-authored-by: Olivier Grisel <[email protected]> * MAINT Document some config parameters for maintenance Also rename one of them. Co-authored-by: Thomas J. Fan <[email protected]> Co-authored-by: Olivier Grisel <[email protected]> * FIX Support and test one of 'sqeuclidean' specification Co-authored-by: Olivier Grisel <[email protected]> * FIX Various typos fix and correct haversine 'haversine' is not supported by cdist. * Directly use get_config * CLN Apply comments from review Co-authored-by: Christian Lorentzen <[email protected]> Co-authored-by: Jérémie du Boisberranger <[email protected]> * Motivate swapped returned values Co-authored-by: Jérémie du Boisberranger <[email protected]> Co-authored-by: Thomas J. Fan <[email protected]> * TST Remove mahalanobis from test fixtures Co-authored-by: Jérémie du Boisberranger <[email protected]> * MNT Add comment regaduction functions' signatures Co-authored-by: Christian Lorentzen <[email protected]> Co-authored-by: Olivier Grisel <[email protected]> * TST Complete test for `pairwise_distance_{argmin,argmin_min}` (#22371) * DOC Add sub-pull requests to the whats_new entry

…min` (feature branch) (#22134) * MAINT Introduce Pairwise Distances Reductions private submodule (#22064) * MAINT Introduce FastEuclideanPairwiseArgKmin (#22065) * fixup! Merge branch 'main' into pairwise-distances-argkmin Remove duplicated Bunch * MAINT Plug `PairwiseDistancesArgKmin` as a back-end (#22288) * Forward pairwise_dist_chunk_size in the configuration * Flip finalized results for PairwiseDistancesArgKmin The previous would have made the code more complex by introducing some boilerplate for the interface plugs. Having it this way actually simplifies the code. This also removes the haversine branch for test_pairwise_distances_argkmin * Plug PairwiseDistancesArgKmin as a back-end * Adapt test accordingly * Add whats_new entry * Change input validation order for kneighbors * Remove duplicated test_neighbors_distance_metric_deprecation * Adapt the documentation * Add mahalanobis case to test fixtures * Correct whats_new entry * CLN Remove unneeded private metric attribute This was needed when 'fast_sqeuclidean' and 'fast_euclidean' were present to choose the best implementation based on the user specification. Those metric have been removed since then, making this attribute useless. * TST Assert FutureWarning instead of DeprecationWarning in test_neighbors_metrics * MAINT Add use_pairwise_dist_activate to scikit-learn config * TST Add a test for the 'brute' backends' results' consistency Co-authored-by: Thomas J. Fan <[email protected]> * fixup! MAINT Add use_pairwise_dist_activate to scikit-learn config * fixup! fixup! MAINT Add use_pairwise_dist_activate to scikit-learn config * TST Filter FutureWarning for WMinkowskiDistance * MAINT pin numpydoc in arm for now (#22292) * fixup! TST Filter FutureWarning for WMinkowskiDistance * Revert keywords arguments removal for the GEMM trick for 'euclidean' * MAINT pin max numpydoc for now (#22286) * Add 'haversine' to CDIST_PAIRWISE_DISTANCES_REDUCTION_COMMON_METRICS * fixup! Add 'haversine' to CDIST_PAIRWISE_DISTANCES_REDUCTION_COMMON_METRICS * Apply suggestions from code review * MAINT Document some config parameters for maintenance Also rename one of them. * FIX Support and test one of 'sqeuclidean' specification Co-authored-by: Olivier Grisel <[email protected]> * FIX Various typos fix and correct haversine 'haversine' is not supported by cdist. * Directly use get_config * CLN Apply comments from review * Motivate swapped returned values * TST Remove mahalanobis from test fixtures * MNT Add comment regaduction functions' signatures * TST Complete test for `pairwise_distance_{argmin,argmin_min}` (#22371) * DOC Add sub-pull requests to the whats_new entry * DOC place comment inside functions * DOC move up whatsnew entry Co-authored-by: Thomas J. Fan <[email protected]> Co-authored-by: Christian Lorentzen <[email protected]> Co-authored-by: Olivier Grisel <[email protected]> Co-authored-by: Jérémie du Boisberranger <[email protected]>

…-learn#22371)

…min` (feature branch) (scikit-learn#22134) * MAINT Introduce Pairwise Distances Reductions private submodule (scikit-learn#22064) * MAINT Introduce FastEuclideanPairwiseArgKmin (scikit-learn#22065) * fixup! Merge branch 'main' into pairwise-distances-argkmin Remove duplicated Bunch * MAINT Plug `PairwiseDistancesArgKmin` as a back-end (scikit-learn#22288) * Forward pairwise_dist_chunk_size in the configuration * Flip finalized results for PairwiseDistancesArgKmin The previous would have made the code more complex by introducing some boilerplate for the interface plugs. Having it this way actually simplifies the code. This also removes the haversine branch for test_pairwise_distances_argkmin * Plug PairwiseDistancesArgKmin as a back-end * Adapt test accordingly * Add whats_new entry * Change input validation order for kneighbors * Remove duplicated test_neighbors_distance_metric_deprecation * Adapt the documentation * Add mahalanobis case to test fixtures * Correct whats_new entry * CLN Remove unneeded private metric attribute This was needed when 'fast_sqeuclidean' and 'fast_euclidean' were present to choose the best implementation based on the user specification. Those metric have been removed since then, making this attribute useless. * TST Assert FutureWarning instead of DeprecationWarning in test_neighbors_metrics * MAINT Add use_pairwise_dist_activate to scikit-learn config * TST Add a test for the 'brute' backends' results' consistency Co-authored-by: Thomas J. Fan <[email protected]> * fixup! MAINT Add use_pairwise_dist_activate to scikit-learn config * fixup! fixup! MAINT Add use_pairwise_dist_activate to scikit-learn config * TST Filter FutureWarning for WMinkowskiDistance * MAINT pin numpydoc in arm for now (scikit-learn#22292) * fixup! TST Filter FutureWarning for WMinkowskiDistance * Revert keywords arguments removal for the GEMM trick for 'euclidean' * MAINT pin max numpydoc for now (scikit-learn#22286) * Add 'haversine' to CDIST_PAIRWISE_DISTANCES_REDUCTION_COMMON_METRICS * fixup! Add 'haversine' to CDIST_PAIRWISE_DISTANCES_REDUCTION_COMMON_METRICS * Apply suggestions from code review * MAINT Document some config parameters for maintenance Also rename one of them. * FIX Support and test one of 'sqeuclidean' specification Co-authored-by: Olivier Grisel <[email protected]> * FIX Various typos fix and correct haversine 'haversine' is not supported by cdist. * Directly use get_config * CLN Apply comments from review * Motivate swapped returned values * TST Remove mahalanobis from test fixtures * MNT Add comment regaduction functions' signatures * TST Complete test for `pairwise_distance_{argmin,argmin_min}` (scikit-learn#22371) * DOC Add sub-pull requests to the whats_new entry * DOC place comment inside functions * DOC move up whatsnew entry Co-authored-by: Thomas J. Fan <[email protected]> Co-authored-by: Christian Lorentzen <[email protected]> Co-authored-by: Olivier Grisel <[email protected]> Co-authored-by: Jérémie du Boisberranger <[email protected]>

TST Complete tests for pairwise_distance_{argmin,argmin_min}

c9a8723

github-actions bot added the module:metrics label Feb 4, 2022

jjerphan added the No Changelog Needed label Feb 4, 2022

jjerphan marked this pull request as ready for review February 4, 2022 10:47

jjerphan mentioned this pull request Feb 4, 2022

MAINT Plug PairwiseDistancesArgKmin as a back-end #22288

Merged

thomasjpfan approved these changes Feb 4, 2022

View reviewed changes

sklearn/metrics/tests/test_pairwise.py Outdated Show resolved Hide resolved

sklearn/metrics/tests/test_pairwise.py Outdated Show resolved Hide resolved

jeremiedbb approved these changes Feb 4, 2022

View reviewed changes

sklearn/metrics/tests/test_pairwise.py Outdated Show resolved Hide resolved

CLN Address review comments

f6caee0

Co-authored-by: Jérémie du Boisberranger <[email protected]> Co-authored-by: Thomas J. Fan <[email protected]>

ogrisel approved these changes Feb 4, 2022

View reviewed changes

sklearn/metrics/tests/test_pairwise.py Outdated Show resolved Hide resolved

jjerphan and others added 2 commits February 8, 2022 13:13

Use appropriate function to test

6679d86

Co-authored-by: Olivier Grisel <[email protected]>

Merge branch 'main' into tst/pairwise_distances_argmin_min-axis

08476fa

jeremiedbb merged commit 34f4465 into scikit-learn:main Feb 8, 2022

jjerphan deleted the tst/pairwise_distances_argmin_min-axis branch February 9, 2022 08:30

jjerphan added a commit to jjerphan/scikit-learn that referenced this pull request Feb 9, 2022

TST Complete test for pairwise_distance_{argmin,argmin_min} (scikit…

5ea0427

…-learn#22371)

glemaitre pushed a commit to glemaitre/scikit-learn that referenced this pull request Feb 9, 2022

TST Complete test for pairwise_distance_{argmin,argmin_min} (scikit…

8145cf1

…-learn#22371)

ilivans pushed a commit to ilivans/scikit-learn that referenced this pull request Feb 10, 2022

TST Complete test for pairwise_distance_{argmin,argmin_min} (scikit…

a29195e

…-learn#22371)

thomasjpfan pushed a commit to thomasjpfan/scikit-learn that referenced this pull request Mar 1, 2022

TST Complete test for pairwise_distance_{argmin,argmin_min} (scikit…

eacf43a

…-learn#22371)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

TST Complete test for `pairwise_distance_{argmin,argmin_min}` #22371

TST Complete test for `pairwise_distance_{argmin,argmin_min}` #22371

Uh oh!

jjerphan commented Feb 4, 2022

Uh oh!

thomasjpfan left a comment

Uh oh!

Uh oh!

Uh oh!

jeremiedbb left a comment

Uh oh!

Uh oh!

ogrisel left a comment

Uh oh!

Uh oh!

ogrisel commented Feb 4, 2022

Uh oh!

jjerphan commented Feb 8, 2022

Uh oh!

jeremiedbb commented Feb 8, 2022 •

edited

Loading

Uh oh!

jeremiedbb commented Feb 8, 2022

Uh oh!

jjerphan commented Feb 9, 2022 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

TST Complete test for pairwise_distance_{argmin,argmin_min} #22371

TST Complete test for pairwise_distance_{argmin,argmin_min} #22371

Uh oh!

Conversation

jjerphan commented Feb 4, 2022

Reference Issues/PRs

What does this implement/fix? Explain your changes.

Uh oh!

thomasjpfan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jeremiedbb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ogrisel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ogrisel commented Feb 4, 2022

Uh oh!

jjerphan commented Feb 8, 2022

Uh oh!

jeremiedbb commented Feb 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jeremiedbb commented Feb 8, 2022

Uh oh!

jjerphan commented Feb 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

TST Complete test for `pairwise_distance_{argmin,argmin_min}` #22371

TST Complete test for `pairwise_distance_{argmin,argmin_min}` #22371

jeremiedbb commented Feb 8, 2022 •

edited

Loading

jjerphan commented Feb 9, 2022 •

edited

Loading