Implement task_group filtering for FedEval #1226
Open
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
ishaileshpant
force-pushed
the
poc-mode-assigner
branch
19 times, most recently
from
f1fcdcf to
93248b8
Compare
ishaileshpant
force-pushed
the
poc-mode-assigner
branch
from
93248b8 to
baeae12
Compare
ishaileshpant
changed the title
ishaileshpant
force-pushed
the
poc-mode-assigner
branch
4 times, most recently
from
d63c561 to
2331f75
Compare
ishaileshpant
force-pushed
the
poc-mode-assigner
branch
2 times, most recently
from
ddaa348 to
858b2ce
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
ishaileshpant
force-pushed
the
poc-mode-assigner
branch
3 times, most recently
from
5d77eb7 to
9ab44a0
Compare
ishaileshpant
changed the title
ishaileshpant
force-pushed
the
poc-mode-assigner
branch
5 times, most recently
from
d811ab5 to
1a0ef16
Compare
ishaileshpant
force-pushed
the
poc-mode-assigner
branch
from
1a0ef16 to
af5de55
Compare
ishaileshpant
force-pushed
the
poc-mode-assigner
branch
3 times, most recently
from
9aba086 to
e8ca274
Compare
ishaileshpant
force-pushed
the
poc-mode-assigner
branch
4 times, most recently
from
193ddf7 to
d2b46f0
Compare
ishaileshpant
force-pushed
the
poc-mode-assigner
branch
from
d2b46f0 to
57f5094
Compare
tests/openfl/component/assigner/test_random_grouped_assigner.py
Dismissed
Show dismissed
Hide dismissed
tests/openfl/component/assigner/test_random_grouped_assigner.py
Dismissed
Show dismissed
Hide dismissed
tests/openfl/component/assigner/test_random_grouped_assigner.py
Dismissed
Show dismissed
Hide dismissed
- update all the sub-classes that use task_groups to use the decorator - update fedeval sample workspace to use default assigner, tasks and aggregator - use of federated-evaluation/aggregator.yaml for FedEval specific workspace example to use round_number as 1 - removed assigner and tasks yaml from defaults/federated-evaluation, superseded by default assigner/tasks - added additional checks for assigner sub-classes that might not have task_groups - Addressing review comments - Updated existing test cases for Assigner sub-classes - Remove hard-coded setting in assigner for torch_cnn_mnist ws, refer to default as in other Workspaces - Use aggregator supplied --task_group to override the assinger selected_task_group - update existing test cases of aggregator cli - add test cases for the decorator - rebased 23-Jan.2 Signed-off-by: Shailesh Pant <shailesh.pant@intel.com>
ishaileshpant
force-pushed
the
poc-mode-assigner
branch
from
57f5094 to
10b6993
Compare
teoparvanov
approved these changes
Jan 24, 2025
There was a problem hiding this comment.
Nice work, @ishaileshpant, I think it's looking good at this stage!
I just have a couple of minor remaining comments:
Comment on lines
+72
to
+80
| # @pytest.mark.parametrize('round_number', range(ROUNDS_TO_TRAIN)) | ||
| # def test_get_filtered_tasks_for_collaborator(assigner, task_groups, | ||
| # authorized_cols, round_number): | ||
| # """Test that assigner tasks correspond to task groups defined.""" | ||
| # assigner.selected_task_group=task_groups[1]['name'] | ||
| # assigner.define_task_assignments() | ||
| # tasks = assigner.get_tasks_for_collaborator( | ||
| # authorized_cols[0], round_number) | ||
| # assert tasks == task_groups[1]['tasks'] |
There was a problem hiding this comment.
Is this test disabled on purpose?
Comment on lines
+51
to
+54
| def test_default_task_group(assigner): | ||
| """Assert that by default learning task_group is assigned.""" | ||
| assigner = Assigner(None,None,None) | ||
| assert assigner.selected_task_group == 'learning' |
There was a problem hiding this comment.
For completeness, could you also add a unit test where assigner.selected_task_group == 'evaluation'?
Comment on lines
+47
to
48
| @task_group_filtering | ||
| def define_task_assignments(self): |
There was a problem hiding this comment.
I suggest renaming the decorator to @with_selected_task_groups. This way the code "reads" almost like in English: "With the selected task groups, define the task assignments...". WDYT?
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.
implement a new task_group filtering decorator in Assigner class
update all the sub-classes that use task_groups to use the decorator
update fedeval sample workspace to use default assigner, tasks and aggregator
use of federated-evaluation/aggregator.yaml for FedEval specific workspace example to use round_number as 1
removed assigner and tasks yaml from defaults/federated-evaluation, superseded by default assigner/tasks
Rebase 21-Jan-2025.2
added additional checks for assigner sub-classes that might not have task_groups
Addressing review comments
Updated existing test cases for Assigner sub-classes
Remove hard-coded setting in assigner for torch_cnn_mnist ws, refer to default as in other Workspaces
Use aggregator supplied --task_group to override the assinger selected_task_group
update existing test cases of aggregator cli
add test cases for the decorator
Signed-off-by: Shailesh Pant shailesh.pant@intel.com
Testcases for task_group_filtering decorator
Testing for all existing workspaces
we shouldn't be saving any new models if running in evaluation mode.
Change all workspaces to use new Assigner [Not needed as defaults ensure all workspace, by default use new assigner]