Make choice of aggregator dynamic at session level and additional aggregators (FedOpt) #498
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 8 commits
December 14, 2023 10:50
…plot validation results
added 18 commits
January 2, 2024 22:22
added 2 commits
January 24, 2024 11:26
Wrede
requested changes
Jan 24, 2024
| command: /venv/bin/python entrypoint validate $ENTRYPOINT_OPTS | ||
| helper: pytorchhelper |
There was a problem hiding this comment.
Ah, it sneakt in. I was thinking about a new way to specify the helper. Will remove for now.
examples/notebooks/API_Example.ipynb
Outdated
There was a problem hiding this comment.
I would add this to gitignore after it has been commited
There was a problem hiding this comment.
Done. I also moved it into the mnist-pytorch example
| @@ -134,7 +134,7 @@ def __init__(self, config): | |||
| self.server = Server(self, self.modelservice, grpc_config) | |||
|
|
|||
| # Set up round controller | |||
| self.control = RoundController(config['aggregator'], self.repository, self, self.modelservice) | |||
| self.control = RoundController(self.repository, self, self.modelservice) | |||
There was a problem hiding this comment.
to avoid confusion with controller I think it should be called round_control
There was a problem hiding this comment.
Agree, it is confusing. I changed it the RoundHandler (which is a more appropriate name)
added 6 commits
January 24, 2024 22:54
Wrede
approved these changes
Jan 25, 2024
| @@ -20,14 +20,14 @@ class Aggregator(AggregatorBase): | |||
| :type server: class: `fedn.network.combiner.Combiner` | |||
| :param modelservice: A handle to the model service :class: `fedn.network.combiner.modelservice.ModelService` | |||
| :type modelservice: class: `fedn.network.combiner.modelservice.ModelService` | |||
| :param control: A handle to the :class: `fedn.network.combiner.round.RoundController` | |||
| :type control: class: `fedn.network.combiner.round.RoundController` | |||
| :param control: A handle to the :class: `fedn.network.combiner.round.RoundHandler` | |||
| @@ -14,15 +14,15 @@ class Aggregator(AggregatorBase): | |||
| :type server: class: `fedn.network.combiner.Combiner` | |||
| :param modelservice: A handle to the model service :class: `fedn.network.combiner.modelservice.ModelService` | |||
| :type modelservice: class: `fedn.network.combiner.modelservice.ModelService` | |||
| :param control: A handle to the :class: `fedn.network.combiner.round.RoundController` | |||
| :type control: class: `fedn.network.combiner.round.RoundController` | |||
| :param control: A handle to the :class: `fedn.network.combiner.round.RoundHandler` | |||
| @@ -141,8 +141,8 @@ def get_aggregator(aggregator_module_name, storage, server, modelservice, contro | |||
| :type server: class: `fedn.network.combiner.Combiner` | |||
| :param modelservice: A handle to the model service :class: `fedn.network.combiner.modelservice.ModelService` | |||
| :type modelservice: class: `fedn.network.combiner.modelservice.ModelService` | |||
| :param control: A handle to the :class: `fedn.network.combiner.round.RoundController` | |||
| :type control: class: `fedn.network.combiner.round.RoundController` | |||
| :param control: A handle to the :class: `fedn.network.combiner.round.RoundHandler` | |||
| @@ -19,18 +19,18 @@ class AggregatorBase(ABC): | |||
| :type server: class: `fedn.network.combiner.Combiner` | |||
| :param modelservice: A handle to the model service :class: `fedn.network.combiner.modelservice.ModelService` | |||
| :type modelservice: class: `fedn.network.combiner.modelservice.ModelService` | |||
| :param control: A handle to the :class: `fedn.network.combiner.round.RoundController` | |||
| :type control: class: `fedn.network.combiner.round.RoundController` | |||
| :param control: A handle to the :class: `fedn.network.combiner.round.RoundHandler` | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This pull request implements the foundation for more flexible experimentation with different optimization algorithms by making the aggregator used dynamically configurable on session level. Also introduces a scaffold for aggregators from the FedOpt family with an implementation of FedAdam.
New features:
Major changes: