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

Simplify setup #1187

Conversation

MasterSkepticista
Copy link
Collaborator

@MasterSkepticista MasterSkepticista commented Dec 3, 2024

About this PR:

  • 6191d82 Removes traces of log_metric, log_metric_callback and write_metric as they are not used throughout, and not defined as per python best practices.
  • e17172e Populates all subpackages automatically using setuptools find_packages.
  • 6017900 Shrinks requirement footprint significantly by removing unused packages, or those not required as a bare minimum by openfl.
  • Interactive API CI tests have been disabled here

@MasterSkepticista MasterSkepticista marked this pull request as ready for review December 3, 2024 08:45
@MasterSkepticista MasterSkepticista force-pushed the karansh1/simplify_setup_file branch 2 times, most recently from 0024c4e to 32815d6 Compare December 3, 2024 10:09
@MasterSkepticista MasterSkepticista changed the title Simplify setup.py Simplify setup Dec 3, 2024
@MasterSkepticista MasterSkepticista force-pushed the karansh1/simplify_setup_file branch from 32815d6 to 6017900 Compare December 3, 2024 10:37
Signed-off-by: Shah, Karan <[email protected]>
description='Federated Learning for the Edge',
long_description=long_description,
long_description=open("README.md", encoding="utf-8").read(),
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

Copy link
Contributor

@psfoley psfoley left a comment

Choose a reason for hiding this comment

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

The change of removing log_metric, log_metric_callback and write_metric should be reverted. This would remove our ability to publish metrics to Tensorboard:

Writing logs in the tensorboard format for later analysis is the default in many (1,2,3) of the existing TaskRunner API examples. This capability should not be removed unless there is a plan to replace it.

@MasterSkepticista MasterSkepticista force-pushed the karansh1/simplify_setup_file branch 2 times, most recently from 42621d8 to 51df6d6 Compare December 4, 2024 05:11
@MasterSkepticista
Copy link
Collaborator Author

MasterSkepticista commented Dec 4, 2024

Turns out I confused log_metric and log.metric in one of the previous PRs, which led to it being removed, giving an impression of dead code.

I have restored TB support and added missing function calls. With this, gramine-based runs fail, likely because python multiprocessing is not supported gramineproject/gramine#1156.

Edit: Tensorboard logging is disabled for gramine CI test. This issue is known internally, with no fixes on the horizon.

setup.py Show resolved Hide resolved
@MasterSkepticista MasterSkepticista merged commit 60c9195 into securefederatedai:develop Dec 4, 2024
25 of 26 checks passed
@MasterSkepticista MasterSkepticista deleted the karansh1/simplify_setup_file branch December 4, 2024 17:03
payalcha pushed a commit to payalcha/openfl that referenced this pull request Dec 10, 2024
* Simplify setup.py

Signed-off-by: Shah, Karan <[email protected]>

* Remove tensorboardX and never-used log_metric code

Signed-off-by: Shah, Karan <[email protected]>

* Test reducing requirements

Signed-off-by: Shah, Karan <[email protected]>

* Revert "Remove tensorboardX and never-used log_metric code" and add fn calls

Signed-off-by: Shah, Karan <[email protected]>

* Revert tb removal

Signed-off-by: Shah, Karan <[email protected]>

* Disable tensorboard logging for gramine CI test

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>
theakshaypant added a commit that referenced this pull request Dec 10, 2024
* Typo fix

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Add memory logs test

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Add memory test in e2e

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Add memory test in e2e

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Simplify setup (#1187)

* Simplify setup.py

Signed-off-by: Shah, Karan <[email protected]>

* Remove tensorboardX and never-used log_metric code

Signed-off-by: Shah, Karan <[email protected]>

* Test reducing requirements

Signed-off-by: Shah, Karan <[email protected]>

* Revert "Remove tensorboardX and never-used log_metric code" and add fn calls

Signed-off-by: Shah, Karan <[email protected]>

* Revert tb removal

Signed-off-by: Shah, Karan <[email protected]>

* Disable tensorboard logging for gramine CI test

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Fix for TF (2.13) cnn histology workspace 'Adam' object has no attribute 'weights' issue (#1194)

Signed-off-by: yes <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* fix(deps): requests min version set to 2.32.0 (#1198)

Signed-off-by: Pant, Akshay <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Pin GaNDLF version to 0.1.1 (#1179)

* fix(gandlf ci): pinned torchaudio version

Signed-off-by: Pant, Akshay <[email protected]>

* fix(gandlf ci): install torch without cache

Signed-off-by: Pant, Akshay <[email protected]>

* fix(gandlf ci): upgrade torch to 2.5.0

Signed-off-by: Pant, Akshay <[email protected]>

* fix(gandlf ci): pin gandlf to 0.1.1

Signed-off-by: Pant, Akshay <[email protected]>

---------

Signed-off-by: Pant, Akshay <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Migrate `shell/*` to `scripts/*` (#1193)

* Update distribution scripts

Signed-off-by: Shah, Karan <[email protected]>

* Migrate shell/ to scripts/

Signed-off-by: Shah, Karan <[email protected]>

* Remove lint test from ubuntu CI

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Set timeouts for all CI workflows (#1200)

* Set timeouts for all CI workflows

Signed-off-by: Shah, Karan <[email protected]>

* forgot to add this too

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Review comments

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Add details in file for further use

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Fix for tf_3dunet_barts workspace (#1197)

Signed-off-by: yes <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Update task_runner_e2e.yml

Signed-off-by: Chaurasiya, Payal <[email protected]>

* OpenFL roadmap update (#1196)

* OpenFL 1.7 roadmap update

Signed-off-by: Teodor Parvanov <[email protected]>

* Addressing review comments

Signed-off-by: Teodor Parvanov <[email protected]>

---------

Signed-off-by: Teodor Parvanov <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Update log verbosity (#1202)

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Restore `openfl-tutorials` as installable package (#1203)

* Add openfl-tutorials as package

Signed-off-by: Shah, Karan <[email protected]>

* Add __init__.py

Signed-off-by: Shah, Karan <[email protected]>

* Add nbformat pkg

Signed-off-by: Shah, Karan <[email protected]>

* Try localhost

Signed-off-by: Shah, Karan <[email protected]>

* Revert "Try localhost"

This reverts commit 44b8304.

Signed-off-by: Shah, Karan <[email protected]>

* Try python3.10

Signed-off-by: Shah, Karan <[email protected]>

* Try localhost

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Fix for ubuntu

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Writing memory details in json

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Update task_runner_e2e.yml

Signed-off-by: Chaurasiya, Payal <[email protected]>

* E501 fix

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Lint changes

Signed-off-by: Chaurasiya, Payal <[email protected]>

---------

Signed-off-by: Chaurasiya, Payal <[email protected]>
Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: yes <[email protected]>
Signed-off-by: Pant, Akshay <[email protected]>
Signed-off-by: Teodor Parvanov <[email protected]>
Co-authored-by: Karan Shah <[email protected]>
Co-authored-by: Shailesh Tanwar <[email protected]>
Co-authored-by: Akshay Pant <[email protected]>
Co-authored-by: teoparvanov <[email protected]>
payalcha added a commit to payalcha/openfl that referenced this pull request Dec 11, 2024
* Typo fix

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Add memory logs test

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Add memory test in e2e

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Add memory test in e2e

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Simplify setup (securefederatedai#1187)

* Simplify setup.py

Signed-off-by: Shah, Karan <[email protected]>

* Remove tensorboardX and never-used log_metric code

Signed-off-by: Shah, Karan <[email protected]>

* Test reducing requirements

Signed-off-by: Shah, Karan <[email protected]>

* Revert "Remove tensorboardX and never-used log_metric code" and add fn calls

Signed-off-by: Shah, Karan <[email protected]>

* Revert tb removal

Signed-off-by: Shah, Karan <[email protected]>

* Disable tensorboard logging for gramine CI test

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Fix for TF (2.13) cnn histology workspace 'Adam' object has no attribute 'weights' issue (securefederatedai#1194)

Signed-off-by: yes <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* fix(deps): requests min version set to 2.32.0 (securefederatedai#1198)

Signed-off-by: Pant, Akshay <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Pin GaNDLF version to 0.1.1 (securefederatedai#1179)

* fix(gandlf ci): pinned torchaudio version

Signed-off-by: Pant, Akshay <[email protected]>

* fix(gandlf ci): install torch without cache

Signed-off-by: Pant, Akshay <[email protected]>

* fix(gandlf ci): upgrade torch to 2.5.0

Signed-off-by: Pant, Akshay <[email protected]>

* fix(gandlf ci): pin gandlf to 0.1.1

Signed-off-by: Pant, Akshay <[email protected]>

---------

Signed-off-by: Pant, Akshay <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Migrate `shell/*` to `scripts/*` (securefederatedai#1193)

* Update distribution scripts

Signed-off-by: Shah, Karan <[email protected]>

* Migrate shell/ to scripts/

Signed-off-by: Shah, Karan <[email protected]>

* Remove lint test from ubuntu CI

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Set timeouts for all CI workflows (securefederatedai#1200)

* Set timeouts for all CI workflows

Signed-off-by: Shah, Karan <[email protected]>

* forgot to add this too

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Review comments

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Add details in file for further use

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Fix for tf_3dunet_barts workspace (securefederatedai#1197)

Signed-off-by: yes <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Update task_runner_e2e.yml

Signed-off-by: Chaurasiya, Payal <[email protected]>

* OpenFL roadmap update (securefederatedai#1196)

* OpenFL 1.7 roadmap update

Signed-off-by: Teodor Parvanov <[email protected]>

* Addressing review comments

Signed-off-by: Teodor Parvanov <[email protected]>

---------

Signed-off-by: Teodor Parvanov <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Update log verbosity (securefederatedai#1202)

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Restore `openfl-tutorials` as installable package (securefederatedai#1203)

* Add openfl-tutorials as package

Signed-off-by: Shah, Karan <[email protected]>

* Add __init__.py

Signed-off-by: Shah, Karan <[email protected]>

* Add nbformat pkg

Signed-off-by: Shah, Karan <[email protected]>

* Try localhost

Signed-off-by: Shah, Karan <[email protected]>

* Revert "Try localhost"

This reverts commit 44b8304.

Signed-off-by: Shah, Karan <[email protected]>

* Try python3.10

Signed-off-by: Shah, Karan <[email protected]>

* Try localhost

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Fix for ubuntu

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Writing memory details in json

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Update task_runner_e2e.yml

Signed-off-by: Chaurasiya, Payal <[email protected]>

* E501 fix

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Lint changes

Signed-off-by: Chaurasiya, Payal <[email protected]>

---------

Signed-off-by: Chaurasiya, Payal <[email protected]>
Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: yes <[email protected]>
Signed-off-by: Pant, Akshay <[email protected]>
Signed-off-by: Teodor Parvanov <[email protected]>
Co-authored-by: Karan Shah <[email protected]>
Co-authored-by: Shailesh Tanwar <[email protected]>
Co-authored-by: Akshay Pant <[email protected]>
Co-authored-by: teoparvanov <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>
yontyon pushed a commit to yontyon/openfl that referenced this pull request Dec 11, 2024
* Typo fix

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Add memory logs test

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Add memory test in e2e

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Add memory test in e2e

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Simplify setup (securefederatedai#1187)

* Simplify setup.py

Signed-off-by: Shah, Karan <[email protected]>

* Remove tensorboardX and never-used log_metric code

Signed-off-by: Shah, Karan <[email protected]>

* Test reducing requirements

Signed-off-by: Shah, Karan <[email protected]>

* Revert "Remove tensorboardX and never-used log_metric code" and add fn calls

Signed-off-by: Shah, Karan <[email protected]>

* Revert tb removal

Signed-off-by: Shah, Karan <[email protected]>

* Disable tensorboard logging for gramine CI test

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Fix for TF (2.13) cnn histology workspace 'Adam' object has no attribute 'weights' issue (securefederatedai#1194)

Signed-off-by: yes <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* fix(deps): requests min version set to 2.32.0 (securefederatedai#1198)

Signed-off-by: Pant, Akshay <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Pin GaNDLF version to 0.1.1 (securefederatedai#1179)

* fix(gandlf ci): pinned torchaudio version

Signed-off-by: Pant, Akshay <[email protected]>

* fix(gandlf ci): install torch without cache

Signed-off-by: Pant, Akshay <[email protected]>

* fix(gandlf ci): upgrade torch to 2.5.0

Signed-off-by: Pant, Akshay <[email protected]>

* fix(gandlf ci): pin gandlf to 0.1.1

Signed-off-by: Pant, Akshay <[email protected]>

---------

Signed-off-by: Pant, Akshay <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Migrate `shell/*` to `scripts/*` (securefederatedai#1193)

* Update distribution scripts

Signed-off-by: Shah, Karan <[email protected]>

* Migrate shell/ to scripts/

Signed-off-by: Shah, Karan <[email protected]>

* Remove lint test from ubuntu CI

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Set timeouts for all CI workflows (securefederatedai#1200)

* Set timeouts for all CI workflows

Signed-off-by: Shah, Karan <[email protected]>

* forgot to add this too

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Review comments

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Add details in file for further use

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Fix for tf_3dunet_barts workspace (securefederatedai#1197)

Signed-off-by: yes <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Update task_runner_e2e.yml

Signed-off-by: Chaurasiya, Payal <[email protected]>

* OpenFL roadmap update (securefederatedai#1196)

* OpenFL 1.7 roadmap update

Signed-off-by: Teodor Parvanov <[email protected]>

* Addressing review comments

Signed-off-by: Teodor Parvanov <[email protected]>

---------

Signed-off-by: Teodor Parvanov <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Update log verbosity (securefederatedai#1202)

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Restore `openfl-tutorials` as installable package (securefederatedai#1203)

* Add openfl-tutorials as package

Signed-off-by: Shah, Karan <[email protected]>

* Add __init__.py

Signed-off-by: Shah, Karan <[email protected]>

* Add nbformat pkg

Signed-off-by: Shah, Karan <[email protected]>

* Try localhost

Signed-off-by: Shah, Karan <[email protected]>

* Revert "Try localhost"

This reverts commit 44b8304.

Signed-off-by: Shah, Karan <[email protected]>

* Try python3.10

Signed-off-by: Shah, Karan <[email protected]>

* Try localhost

Signed-off-by: Shah, Karan <[email protected]>

---------

Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: Chaurasiya, Payal <[email protected]>

* Fix for ubuntu

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Writing memory details in json

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Update task_runner_e2e.yml

Signed-off-by: Chaurasiya, Payal <[email protected]>

* E501 fix

Signed-off-by: Chaurasiya, Payal <[email protected]>

* Lint changes

Signed-off-by: Chaurasiya, Payal <[email protected]>

---------

Signed-off-by: Chaurasiya, Payal <[email protected]>
Signed-off-by: Shah, Karan <[email protected]>
Signed-off-by: yes <[email protected]>
Signed-off-by: Pant, Akshay <[email protected]>
Signed-off-by: Teodor Parvanov <[email protected]>
Co-authored-by: Karan Shah <[email protected]>
Co-authored-by: Shailesh Tanwar <[email protected]>
Co-authored-by: Akshay Pant <[email protected]>
Co-authored-by: teoparvanov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants