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] Tensorflow Python 12 #1421

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

[MNT] Tensorflow Python 12 #1421

wants to merge 17 commits into from

Conversation

MatthewMiddlehurst
Copy link
Member

@MatthewMiddlehurst MatthewMiddlehurst commented Apr 14, 2024

Manually adding the InstanceNormalization layer in aeon given the deprecation of the tensorflow_addons package in May 2024.
Fix #1144

@MatthewMiddlehurst MatthewMiddlehurst added deep learning Deep learning related dependencies This issue or PR is related to dependencies of aeon labels Apr 14, 2024
@aeon-actions-bot aeon-actions-bot bot added the maintenance Continuous integration, unit testing & package distribution label Apr 14, 2024
@aeon-actions-bot
Copy link
Contributor

Thank you for contributing to aeon

I have added the following labels to this PR based on the title: [ $\color{#EC843A}{\textsf{maintenance}}$ ].

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.

@hadifawaz1999
Copy link
Contributor

Just need to copy paste the InstanceNormalization code https://github.com/tensorflow/addons/blob/v0.20.0/tensorflow_addons/layers/normalizations.py#L296-L338
from tensorflow-addons and add it manually for EncoderNetwork and remove tensorflow-addons from dependencies
if you want i can push it on this branch

@MatthewMiddlehurst
Copy link
Member Author

@hadifawaz1999 feel free to do so

@hadifawaz1999 hadifawaz1999 marked this pull request as ready for review April 29, 2024 16:16
Copy link
Member Author

@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.

Could you update the primary PR message, thanks.

aeon/classification/deep_learning/_encoder.py Outdated Show resolved Hide resolved
aeon/utils/networks/tensorflow_addons.py Outdated Show resolved Hide resolved
aeon/networks/_encoder.py Outdated Show resolved Hide resolved
pyproject.toml Outdated Show resolved Hide resolved
@MatthewMiddlehurst
Copy link
Member Author

Also there is a conflict

@hadifawaz1999
Copy link
Contributor

Also there is a conflict

resolving conflict is adding back tensorflow addons, not sure why

@MatthewMiddlehurst
Copy link
Member Author

just remove it again in the merge, cant get around merging with main.

@hadifawaz1999
Copy link
Contributor

just remove it again in the merge, cant get around merging with main.

nothing is working :) tried even to change only the addon, but still conflict exist as long as the file is changed...

@MatthewMiddlehurst
Copy link
Member Author

you have to pull the main branch. done so above.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deep learning Deep learning related dependencies This issue or PR is related to dependencies of aeon maintenance Continuous integration, unit testing & package distribution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] EncoderClassifier produces end of life warning
2 participants