[MNT] Removing `tensorflow_addons` dependency #1421

MatthewMiddlehurst · 2024-04-14T10:24:45Z

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

aeon-actions-bot · 2024-04-14T10:25:06Z

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 · 2024-04-14T11:36:56Z

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 · 2024-04-16T14:47:30Z

@hadifawaz1999 feel free to do so

MatthewMiddlehurst

Could you update the primary PR message, thanks.

aeon/classification/deep_learning/_encoder.py

aeon/utils/networks/tensorflow_addons.py

aeon/networks/_encoder.py

pyproject.toml

MatthewMiddlehurst · 2024-04-29T16:34:10Z

Also there is a conflict

hadifawaz1999 · 2024-04-29T16:46:42Z

Also there is a conflict

resolving conflict is adding back tensorflow addons, not sure why

MatthewMiddlehurst · 2024-04-29T16:52:05Z

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

hadifawaz1999 · 2024-04-29T17:58:47Z

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

…ensorflow # Conflicts: # pyproject.toml

MatthewMiddlehurst · 2024-04-29T18:55:27Z

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

TonyBagnall · 2024-07-03T18:41:34Z

Bit confused by tags, but looks good to me. Probably change the title of the PR though

aeon/networks/_encoder.py

…into mm/tensorflow

hadifawaz1999 · 2024-07-04T09:31:28Z

finishing this off and then resuming later on with #1760

…ensorflow

…into mm/tensorflow

aeon/networks/tests/test_all_networks.py

* [BUG] fix padder fit_values (aeon-toolkit#1752) * fix padder * declare var * [DOC,MNT] Documentation updates and deprecation warning for `v1.0.0` (aeon-toolkit#1743) * forecasting docs * v1.0.0 mass deprecation message * index fix * installation * typos * [MNT] Unit testing revamp part 1: `check_estimator` (aeon-toolkit#1479) * remove no soft deps job and expand full no soft deps job * no PR testing flag * module soft deps * is this actually returning an empty list * import modules now * clear out module soft dep * check_estimator * check_estimator updates * import * more complete functions and tests * fix * coverage and paramterize function test * testing data start * testing data start * testing data cont * real partial * cont * testing data changes * examples revert * fourier features * Revert "fourier features" This reverts commit 567c5e1. * legacy skip * init * move to legacy * example data update * testing data * imports * examples * testing update * multiindex * multiindex fixes * multiindex returns * test * test * docs, tests and fixes * comments * last bits * refactor testing folder * imports * series generators * fixes * make_series legacy * merge * forecasting functions * fixes * fixes * fixes * testing * examples * convert checks * fixes * docs * ad datasets * more docs * forecasting compose * forecasting * delete forecasting api docs * docs * revert and comment init * imports * import test * uncomment * docstrings * no imports * package name * import * docstring * fixes * remove legacy and doc fix * [ENH] Channel selection rocket wrapper (aeon-toolkit#1504) * base channel selector * base channel selector * random channel selector * elbow class test * random channel selector * base channel selector * base channel selector * revert registry * draft channel selector * class method * test channel scorer * docstring * remove unnecessary ExponentTransform import * deprecate DateTime * Revert "deprecate DateTime" This reverts commit 98b29e6. * channel selection * remove dependency * move tests to fit * move tests to fit * channel scorer test * add to API * [DEP] Exclusion list (aeon-toolkit#1730) * remove dependency * excluded list * [MNT] Removing `tensorflow_addons` dependency (aeon-toolkit#1421) * tensorflow bound * add manually instance normalization * empty commit * fix doxs * fix bug * add maintainer * re arrange * dep on utils * fix comments * add version and file to header * re add conflict * remove addon * only adodn remove * add typeguard dep * remove addons from test * remove tag of python<3.12 from base class * edit pyptoject for test details * remove typeguard * remove addons * remove typeguard * fix bug in python version * remove config on python < 3.12 * remove python version from test * remove python version from base * use group norm * re-add 3.12 limit * remove tags and add python version * skip random state clr test * fix test all networks * set y for channel selection test * set y for channel selection test --------- Co-authored-by: hadifawaz1999 <hadifawaz2291999@gmail.com> Co-authored-by: Tony Bagnall <ajb@uea.ac.uk> * comment * Empty commit for CI * uncomment --------- Co-authored-by: Tony Bagnall <ajb@uea.ac.uk> Co-authored-by: hadifawaz1999 <hadifawaz2291999@gmail.com> Co-authored-by: MatthewMiddlehurst <MatthewMiddlehurst@users.noreply.github.com>

…ting CI (#1764) * [MNT] Bot to make empty commits (#15) * CI fun * comments and token * [MNT] empty commit PR 2 (#16) * CI fun * comments and token * comments * skip dirty check * Empty commit for CI * empty comment 3 (#17) * comment * prs only * comment * Empty commit for CI * empty commit 4 (#18) * comment * correct branch * Empty commit for CI * empty commit 5 (#19) * comment * branch * empty commit 6 (#20) * [BUG] fix padder fit_values (#1752) * fix padder * declare var * [DOC,MNT] Documentation updates and deprecation warning for `v1.0.0` (#1743) * forecasting docs * v1.0.0 mass deprecation message * index fix * installation * typos * comment * pushing to forks is crazy * dont create branches * [MNT] Unit testing revamp part 1: `check_estimator` (#1479) * remove no soft deps job and expand full no soft deps job * no PR testing flag * module soft deps * is this actually returning an empty list * import modules now * clear out module soft dep * check_estimator * check_estimator updates * import * more complete functions and tests * fix * coverage and paramterize function test * testing data start * testing data start * testing data cont * real partial * cont * testing data changes * examples revert * fourier features * Revert "fourier features" This reverts commit 567c5e1. * legacy skip * init * move to legacy * example data update * testing data * imports * examples * testing update * multiindex * multiindex fixes * multiindex returns * test * test * docs, tests and fixes * comments * last bits * refactor testing folder * imports * series generators * fixes * make_series legacy * merge * forecasting functions * fixes * fixes * fixes * testing * examples * convert checks * fixes * docs * ad datasets * more docs * forecasting compose * forecasting * delete forecasting api docs * docs * revert and comment init * imports * import test * uncomment * docstrings * no imports * package name * import * docstring * fixes * remove legacy and doc fix * [ENH] Channel selection rocket wrapper (#1504) * base channel selector * base channel selector * random channel selector * elbow class test * random channel selector * base channel selector * base channel selector * revert registry * draft channel selector * class method * test channel scorer * docstring * remove unnecessary ExponentTransform import * deprecate DateTime * Revert "deprecate DateTime" This reverts commit 98b29e6. * channel selection * remove dependency * move tests to fit * move tests to fit * channel scorer test * add to API * maint * maint --------- Co-authored-by: Tony Bagnall <ajb@uea.ac.uk> * empty commit 7 (#21) * comment * remove branch param * fixes * Empty commit for CI * empty commit 8 (#22) * comment * repo and branch * comment * empty commit 9 (#23) * [BUG] fix padder fit_values (#1752) * fix padder * declare var * [DOC,MNT] Documentation updates and deprecation warning for `v1.0.0` (#1743) * forecasting docs * v1.0.0 mass deprecation message * index fix * installation * typos * [MNT] Unit testing revamp part 1: `check_estimator` (#1479) * remove no soft deps job and expand full no soft deps job * no PR testing flag * module soft deps * is this actually returning an empty list * import modules now * clear out module soft dep * check_estimator * check_estimator updates * import * more complete functions and tests * fix * coverage and paramterize function test * testing data start * testing data start * testing data cont * real partial * cont * testing data changes * examples revert * fourier features * Revert "fourier features" This reverts commit 567c5e1. * legacy skip * init * move to legacy * example data update * testing data * imports * examples * testing update * multiindex * multiindex fixes * multiindex returns * test * test * docs, tests and fixes * comments * last bits * refactor testing folder * imports * series generators * fixes * make_series legacy * merge * forecasting functions * fixes * fixes * fixes * testing * examples * convert checks * fixes * docs * ad datasets * more docs * forecasting compose * forecasting * delete forecasting api docs * docs * revert and comment init * imports * import test * uncomment * docstrings * no imports * package name * import * docstring * fixes * remove legacy and doc fix * [ENH] Channel selection rocket wrapper (#1504) * base channel selector * base channel selector * random channel selector * elbow class test * random channel selector * base channel selector * base channel selector * revert registry * draft channel selector * class method * test channel scorer * docstring * remove unnecessary ExponentTransform import * deprecate DateTime * Revert "deprecate DateTime" This reverts commit 98b29e6. * channel selection * remove dependency * move tests to fit * move tests to fit * channel scorer test * add to API * [DEP] Exclusion list (#1730) * remove dependency * excluded list * [MNT] Removing `tensorflow_addons` dependency (#1421) * tensorflow bound * add manually instance normalization * empty commit * fix doxs * fix bug * add maintainer * re arrange * dep on utils * fix comments * add version and file to header * re add conflict * remove addon * only adodn remove * add typeguard dep * remove addons from test * remove tag of python<3.12 from base class * edit pyptoject for test details * remove typeguard * remove addons * remove typeguard * fix bug in python version * remove config on python < 3.12 * remove python version from test * remove python version from base * use group norm * re-add 3.12 limit * remove tags and add python version * skip random state clr test * fix test all networks * set y for channel selection test * set y for channel selection test --------- Co-authored-by: hadifawaz1999 <hadifawaz2291999@gmail.com> Co-authored-by: Tony Bagnall <ajb@uea.ac.uk> * comment * Empty commit for CI * uncomment --------- Co-authored-by: Tony Bagnall <ajb@uea.ac.uk> Co-authored-by: hadifawaz1999 <hadifawaz2291999@gmail.com> Co-authored-by: MatthewMiddlehurst <MatthewMiddlehurst@users.noreply.github.com> --------- Co-authored-by: MatthewMiddlehurst <MatthewMiddlehurst@users.noreply.github.com> Co-authored-by: Tony Bagnall <ajb@uea.ac.uk> Co-authored-by: hadifawaz1999 <hadifawaz2291999@gmail.com>

tensorflow bound

06cf993

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 bot added the maintenance Continuous integration, unit testing & package distribution label Apr 14, 2024

hadifawaz1999 added 7 commits April 26, 2024 09:00

add manually instance normalization

e296be4

empty commit

535376d

fix doxs

36bc067

fix bug

973f14f

add maintainer

b67eda7

re arrange

a1c78e6

dep on utils

c29cc5d

hadifawaz1999 marked this pull request as ready for review April 29, 2024 16:16

hadifawaz1999 requested review from hadifawaz1999, TonyBagnall and dguijo as code owners April 29, 2024 16:16

MatthewMiddlehurst commented Apr 29, 2024

View reviewed changes

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

fix comments

17c40aa

hadifawaz1999 added 4 commits April 29, 2024 19:54

add version and file to header

f23abc0

re add conflict

d5dbedb

remove addon

fc9af01

only adodn remove

bb83016

Merge branch 'main' of https://github.com/aeon-toolkit/aeon into mm/t…

a3467e6

…ensorflow # Conflicts: # pyproject.toml

hadifawaz1999 added 2 commits July 3, 2024 15:16

use group norm

ac1ae61

re-add 3.12 limit

6e9217c

TonyBagnall added full pytest actions Run the full pytest suite on a PR codecov actions Run the codecov action on a PR labels Jul 3, 2024

Merge branch 'main' into mm/tensorflow

83356d8

TonyBagnall reviewed Jul 3, 2024

View reviewed changes

aeon/networks/_encoder.py Outdated Show resolved Hide resolved

hadifawaz1999 added 2 commits July 4, 2024 11:23

remove tags and add python version

e47e3d8

Merge branch 'mm/tensorflow' of https://github.com/aeon-toolkit/aeon …

40281c3

…into mm/tensorflow

hadifawaz1999 requested a review from TonyBagnall July 4, 2024 09:26

hadifawaz1999 changed the title ~~[MNT] Tensorflow Python 12~~ [MNT] Removing tensorflow_addons dependency Jul 4, 2024

TonyBagnall removed full pytest actions Run the full pytest suite on a PR codecov actions Run the codecov action on a PR labels Jul 4, 2024

hadifawaz1999 and others added 4 commits July 4, 2024 13:38

skip random state clr test

09c35a5

Merge branch 'main' into mm/tensorflow

5e67887

Merge branch 'main' of https://github.com/aeon-toolkit/aeon into mm/t…

9db7f73

…ensorflow

Merge branch 'mm/tensorflow' of https://github.com/aeon-toolkit/aeon …

61dd6db

…into mm/tensorflow

MatthewMiddlehurst commented Jul 4, 2024

View reviewed changes

aeon/networks/tests/test_all_networks.py Outdated Show resolved Hide resolved

hadifawaz1999 and others added 2 commits July 4, 2024 13:52

fix test all networks

2bef940

set y for channel selection test

da619e4

TonyBagnall requested a review from aiwalter as a code owner July 4, 2024 12:25

TonyBagnall added 2 commits July 4, 2024 13:26

Merge branch 'main' into mm/tensorflow

d03e5bd

set y for channel selection test

fff9488

TonyBagnall approved these changes Jul 4, 2024

View reviewed changes

TonyBagnall merged commit 1e08b19 into main Jul 4, 2024
14 checks passed

TonyBagnall deleted the mm/tensorflow branch July 4, 2024 13:34

Cyril-Meyer mentioned this pull request Jul 30, 2024

[MNT] tensorflow-addons dependency in networks /_encoder.py #1868

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MNT] Removing `tensorflow_addons` dependency #1421

[MNT] Removing `tensorflow_addons` dependency #1421

MatthewMiddlehurst commented Apr 14, 2024 •

edited by hadifawaz1999

Loading

aeon-actions-bot bot commented Apr 14, 2024

hadifawaz1999 commented Apr 14, 2024

MatthewMiddlehurst commented Apr 16, 2024

MatthewMiddlehurst left a comment

MatthewMiddlehurst commented Apr 29, 2024

hadifawaz1999 commented Apr 29, 2024

MatthewMiddlehurst commented Apr 29, 2024

hadifawaz1999 commented Apr 29, 2024

MatthewMiddlehurst commented Apr 29, 2024

TonyBagnall commented Jul 3, 2024

hadifawaz1999 commented Jul 4, 2024

[MNT] Removing tensorflow_addons dependency #1421

[MNT] Removing tensorflow_addons dependency #1421

Conversation

MatthewMiddlehurst commented Apr 14, 2024 • edited by hadifawaz1999 Loading

aeon-actions-bot bot commented Apr 14, 2024

Thank you for contributing to aeon

hadifawaz1999 commented Apr 14, 2024

MatthewMiddlehurst commented Apr 16, 2024

MatthewMiddlehurst left a comment

Choose a reason for hiding this comment

MatthewMiddlehurst commented Apr 29, 2024

hadifawaz1999 commented Apr 29, 2024

MatthewMiddlehurst commented Apr 29, 2024

hadifawaz1999 commented Apr 29, 2024

MatthewMiddlehurst commented Apr 29, 2024

TonyBagnall commented Jul 3, 2024

hadifawaz1999 commented Jul 4, 2024

[MNT] Removing `tensorflow_addons` dependency #1421

[MNT] Removing `tensorflow_addons` dependency #1421

MatthewMiddlehurst commented Apr 14, 2024 •

edited by hadifawaz1999

Loading

Thank you for contributing to `aeon`