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

[MNT] Purging similarity search from distance as argument numba functions #2176

Merged

Conversation

baraline
Copy link
Member

@baraline baraline commented Oct 10, 2024

Reference Issues/PRs

Fixes #2071, #2163, #2250

What does this implement/fix? Explain your changes.

  • Removes the naive distance and matrix profiles functions that were using a numba function (distance) as argument and some associated components in utils.
  • Move some functions from RDST to general numba utils as I reuse them in similarity search to define a "naive" distance Euclidean profile to replace the old one, which was used in testing
  • Add tests for squared distance profile
  • Uncomment tests that were commented because of [MNT] Similarity search and RDST test failures in CI #2071, and add some test exclusion due to issue with the estimator checking function giving wrong input shape for predict function of similarity search (3D fit, 2D predict).
  • Remove some unused functions in numba utils
  • Remove the fact that distance profiles were returned per channel, and then summed in QuerySearch estimator, now they are computed directly in the distance profile functions.
  • Update similarity search image on docs
  • Change normalize (US) to normalise (UK) to have the same spelling as the other files in aeon (both were sometime used in the same file).

@baraline baraline linked an issue Oct 10, 2024 that may be closed by this pull request
@aeon-actions-bot aeon-actions-bot bot added bug Something isn't working maintenance Continuous integration, unit testing & package distribution similarity search Similarity search package transformations Transformations package labels Oct 10, 2024
@aeon-actions-bot
Copy link
Contributor

aeon-actions-bot bot commented Oct 10, 2024

Thank you for contributing to aeon

I have added the following labels to this PR based on the title: [ $\color{#d73a4a}{\textsf{bug}}$, $\color{#EC843A}{\textsf{maintenance}}$ ].
I have added the following labels to this PR based on the changes made: [ $\color{#006b75}{\textsf{similarity search}}$, $\color{#41A8F6}{\textsf{transformations}}$ ]. Feel free to change these if they do not properly represent the PR.

The Checks tab will show the status of our automated tests. You can click on individual test runs in the tab or "Details" in the panel below to see more information if there is a failure.

If our pre-commit code quality check fails, any trivial fixes will automatically be pushed to your PR unless it is a draft.

Don't hesitate to ask questions on the aeon Slack channel if you have any.

PR CI actions

These checkboxes will add labels to enable/disable CI functionality for this PR. This may not take effect immediately, and a new commit may be required to run the new configuration.

  • Run pre-commit checks for all files
  • Run mypy typecheck tests
  • Run all pytest tests and configurations
  • Run all notebook example tests
  • Run numba-disabled codecov tests
  • Stop automatic pre-commit fixes (always disabled for drafts)
  • Disable numba cache loading
  • Push an empty commit to re-run CI checks

@baraline baraline changed the title [BUG, MNT] Purging similarity search from distance as argument numba functions [MNT] Purging similarity search from distance as argument numba functions Oct 11, 2024
@baraline baraline removed the bug Something isn't working label Oct 11, 2024
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@baraline baraline added the full pytest actions Run the full pytest suite on a PR label Oct 21, 2024
@baraline baraline requested a review from dguijo as a code owner November 1, 2024 21:38
@baraline
Copy link
Member Author

baraline commented Nov 1, 2024

@MatthewMiddlehurst added data generation and test for the similarity search estimators, removed the non-deterministic tags from RDST regressor and classifier and added some check against expected results for the classifier.
Only issue arise for RDST Regressor on covid3month specifically. See #2290 for details. Do you get the same results locally with the function described in there ?

Copy link
Member

@MatthewMiddlehurst MatthewMiddlehurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be fine to let this through after the docs are merged. I will add the testing labels just in-case.

aeon/testing/utils/estimator_checks.py Show resolved Hide resolved
@aeon-actions-bot aeon-actions-bot bot added codecov actions Run the codecov action on a PR no numba cache Disable numba cache loading on a PR labels Nov 5, 2024
Copy link
Member

@MatthewMiddlehurst MatthewMiddlehurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will leave RDST for now

@baraline
Copy link
Member Author

baraline commented Nov 6, 2024

Deal, i'll take a look at the conflicts and we should be good to go then.

@MatthewMiddlehurst
Copy link
Member

If you are up for it, i think we are giving in the American spelling also 🙂

@baraline
Copy link
Member Author

baraline commented Nov 7, 2024

@MatthewMiddlehurst answred comment and fixed tests that were causing failures (I implemented these test wrong). Concerning language, I would prefer to delay it to another PR, this one is big enough.

@aeon-actions-bot aeon-actions-bot bot removed the no numba cache Disable numba cache loading on a PR label Nov 9, 2024
@aeon-actions-bot aeon-actions-bot bot added the no numba cache Disable numba cache loading on a PR label Nov 9, 2024
Copy link
Member

@MatthewMiddlehurst MatthewMiddlehurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whats the worst its going to do, break everything?

@MatthewMiddlehurst MatthewMiddlehurst merged commit 01495e7 into main Nov 9, 2024
17 of 20 checks passed
@MatthewMiddlehurst MatthewMiddlehurst deleted the 2071-mnt-similarity-search-test-failures-in-ci branch November 9, 2024 17:12
@baraline
Copy link
Member Author

Well it seems that it run fines on main, sooooo all good I guess ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
codecov actions Run the codecov action on a PR full pytest actions Run the full pytest suite on a PR maintenance Continuous integration, unit testing & package distribution no numba cache Disable numba cache loading on a PR similarity search Similarity search package transformations Transformations package
Projects
None yet
2 participants