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

Add FedAvgM baseline #2246

Merged
merged 138 commits into from
Dec 28, 2023
Merged
Changes from 1 commit
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
92e598c
Update sim.ipynb
gubertoli Mar 6, 2022
7d58b6f
Merge branch 'main' into main
danieljanes Mar 14, 2022
2311465
Merge branch 'main' into main
danieljanes Mar 14, 2022
b559f88
Merge branch 'adap:main' into main
gubertoli Mar 15, 2022
6372cc7
Merge branch 'adap:main' into main
gubertoli Jun 28, 2022
64c7124
Merge branch 'adap:main' into main
gubertoli Jul 12, 2022
0770547
Change to comply with .fit() tuple requirements
gubertoli Jul 12, 2022
6a9076f
Merge branch 'main' into main
danieljanes Jul 13, 2022
99645ef
Merge branch 'adap:main' into main
gubertoli Jul 13, 2022
6774045
Merge branch 'adap:main' into main
gubertoli Jun 22, 2023
1eefe76
custom metrics example
gubertoli Jun 22, 2023
3033b01
Merge branch 'adap:main' into main
gubertoli Jul 13, 2023
4174ccc
Merge branch 'main' of https://github.com/gubertoli/flower into extra…
gubertoli Jul 13, 2023
3d67013
fedavgm baseline
gubertoli Jul 13, 2023
3ff6383
initial
gubertoli Jul 13, 2023
d4d2153
Update README.md
gubertoli Aug 23, 2023
a0310b1
Update client.py
gubertoli Aug 23, 2023
4f14b4d
Update dataset_preparation.py
gubertoli Aug 23, 2023
3e35e34
Reference using Colab for Simulation
gubertoli Aug 23, 2023
d336727
Delete FedAvgM_Baseline.ipynb
gubertoli Aug 23, 2023
143ea68
Experiments using Colab
gubertoli Aug 23, 2023
f0a31ae
Update dataset_preparation.py
gubertoli Aug 23, 2023
8196db2
Update client.py
gubertoli Aug 23, 2023
75d684b
Update client.py
gubertoli Aug 23, 2023
0c11554
Update main.py
gubertoli Aug 23, 2023
daaaaeb
Update client.py
gubertoli Aug 23, 2023
0b5c374
Update main.py
gubertoli Aug 23, 2023
f24254b
Update client.py
gubertoli Aug 23, 2023
c55759d
Update base.yaml
gubertoli Aug 23, 2023
5a34f77
Update main.py
gubertoli Aug 23, 2023
e4a94f0
Update base.yaml
gubertoli Aug 23, 2023
8bf5d05
Update dataset.py
gubertoli Aug 23, 2023
1fd94ab
Update main.py
gubertoli Aug 23, 2023
72e04b1
Update client.py
gubertoli Aug 23, 2023
38307a0
Update base.yaml
gubertoli Aug 23, 2023
4d0c069
Update main.py
gubertoli Aug 23, 2023
0e34b27
Update client.py
gubertoli Aug 23, 2023
3f0b8a3
Update main.py
gubertoli Aug 23, 2023
3ccb5e3
Update dataset_preparation.py
gubertoli Aug 23, 2023
f28460e
Update client.py
gubertoli Aug 23, 2023
6ceaa77
Update dataset.py
gubertoli Aug 23, 2023
25b6fa2
Update base.yaml
gubertoli Aug 23, 2023
0aefb81
Update client.py
gubertoli Aug 23, 2023
a15120a
Update main.py
gubertoli Aug 23, 2023
2b7993c
Poetry with Python 3.9.12 and Tensorflow 2.10 working
gubertoli Aug 24, 2023
f9ba61a
Simulation running
gubertoli Aug 25, 2023
9c74c6d
Updates to the README and base.yaml
gubertoli Aug 25, 2023
69e6bfd
Update README.md
gubertoli Aug 25, 2023
cecdf6b
Passing dev tests
gubertoli Aug 25, 2023
913565d
removing client configurable lr and momentum
gubertoli Aug 25, 2023
3e5b8ea
Simulation running and Formatting ok
gubertoli Aug 26, 2023
7b35247
Delete FedAvgM_Baseline.ipynb
gubertoli Aug 26, 2023
1a76094
removing custom metrics example
gubertoli Aug 26, 2023
ae1e5e7
change to Python on pyproject.toml for numpy to work + minor changes
gubertoli Aug 26, 2023
f84b63b
Customize hydra usage
gubertoli Aug 26, 2023
cedb31e
hydra full configurable + simulation running
gubertoli Aug 27, 2023
f28d165
fix fedavg simulation + saving results
gubertoli Aug 27, 2023
d982c68
Passing ./dev/test-baseline.sh
gubertoli Aug 27, 2023
c2484f8
Set num_clients=100 (same as paper)
gubertoli Aug 28, 2023
a212b81
add fraction_evaluate, num_cpus, num_gpus as configurables
gubertoli Aug 28, 2023
d46ee4a
Update README.md
gubertoli Aug 29, 2023
3796d05
fix CNN architecture according to McMahan 2017
gubertoli Aug 29, 2023
afe0fa1
passing test-baseline
gubertoli Aug 29, 2023
e68af9d
minor fixes to cnn
gubertoli Aug 29, 2023
8c1a302
additional cnn model (based on TF v1.x example)
gubertoli Aug 30, 2023
f496658
Add illustration about concentration
gubertoli Aug 30, 2023
511181e
Add files via upload
gubertoli Aug 30, 2023
2ded66e
Update README.md
gubertoli Sep 1, 2023
4ff6f2d
Update common.py
gubertoli Sep 1, 2023
ffeb95f
Minor changes
gubertoli Sep 1, 2023
43ccfb3
Adding final accuracy as part of pickle filename
gubertoli Sep 2, 2023
3ed88ad
Fix for flwr[simulation]
gubertoli Sep 2, 2023
9c6c9e3
Minor changes
gubertoli Sep 20, 2023
3b1380b
Expected Results update
gubertoli Sep 22, 2023
6c82670
Update concentration plot
gubertoli Sep 22, 2023
0788c50
Update README.md
gubertoli Sep 22, 2023
a1ba38a
Update README.md
gubertoli Sep 22, 2023
9fe24b0
Update of the results
gubertoli Sep 23, 2023
03c5147
Update README.md
gubertoli Sep 23, 2023
a30d345
Update baselines/fedavgm/README.md
gubertoli Sep 24, 2023
83e39a4
Update baselines/fedavgm/README.md
gubertoli Sep 24, 2023
455cf5b
Update baselines/fedavgm/pyproject.toml
gubertoli Sep 24, 2023
4f5f55d
Update baselines/fedavgm/pyproject.toml
gubertoli Sep 24, 2023
cc8b122
Improvements suggested
gubertoli Sep 24, 2023
adbc4d3
Instruction to configure Google Colab
gubertoli Sep 24, 2023
501f2cf
lint
gubertoli Sep 24, 2023
e80bdbe
Custom FedAvgM strategy
gubertoli Sep 24, 2023
38d23a1
Closer to paper description
gubertoli Sep 24, 2023
763ebfa
minor fix
gubertoli Sep 24, 2023
ee0bf9a
Other fixes for Nesterov calculation
gubertoli Sep 24, 2023
2729ee9
client lr as configurable parameter
gubertoli Sep 26, 2023
3c53a0c
minor
gubertoli Sep 26, 2023
f1f7add
additional comment
gubertoli Sep 26, 2023
6cd6ebc
fix reference to _static
gubertoli Sep 26, 2023
245b85e
Additional info of current status
gubertoli Sep 26, 2023
5ccf13c
fix concentration implementation
gubertoli Sep 26, 2023
168b84e
updated distribution plot
gubertoli Sep 26, 2023
7b426f7
unnecessary files
gubertoli Sep 26, 2023
6a27920
Example of Figure6 from paper FedAvgM
gubertoli Sep 28, 2023
dff1fe0
Example of Figure 6 from FedAvgM paper
gubertoli Sep 28, 2023
1c9b978
Disclaimer about CNN model
gubertoli Sep 28, 2023
4c7115d
minor fix
gubertoli Sep 28, 2023
e041e6e
Update README.md
gubertoli Sep 29, 2023
9ebb213
minor changes
gubertoli Sep 29, 2023
ce95350
rewording
gubertoli Sep 29, 2023
109f702
fix commands
gubertoli Sep 29, 2023
e6db29a
fashion-mnist
gubertoli Sep 29, 2023
b825e00
Fashion-MNIST evaluation
gubertoli Sep 29, 2023
792f4de
remove note
gubertoli Sep 29, 2023
f9b7f11
tidy
gubertoli Sep 30, 2023
c7f6d13
update missing (best) params
gubertoli Sep 30, 2023
ed69f7a
fedavgm cifar10
gubertoli Oct 1, 2023
ecb00ea
Analysis of FedAvgM with and without Nesterov Momentum
gubertoli Oct 6, 2023
f2ad26c
minor fix
gubertoli Oct 6, 2023
334bc62
change y-axis limits
gubertoli Oct 6, 2023
509da62
change the custom-fedavgm color
gubertoli Oct 6, 2023
d689f4f
few notes about fedavgm
gubertoli Oct 6, 2023
d1a1eee
Including extreme case 1e-9
gubertoli Oct 6, 2023
5a2acd6
fix
gubertoli Oct 6, 2023
17acf20
Change point by comma for thousands
gubertoli Oct 8, 2023
617613b
Change point by comma for thousand
gubertoli Oct 8, 2023
b67607d
Change to description and authors
gubertoli Oct 8, 2023
cb3d226
Changes to FedAvgM with NAG description and restructure of Environmen…
gubertoli Oct 8, 2023
fef2874
Adding 1e-5 with 10000 rounds and note about lr and momentum values
gubertoli Oct 8, 2023
08082b7
format-baseline and fixing some test-baseline raised issued
gubertoli Nov 14, 2023
0308d31
fixing format
gubertoli Nov 21, 2023
9ba6741
Fixing initial_parameters definition
gubertoli Nov 21, 2023
d09a014
Fix output filename definition
gubertoli Nov 21, 2023
7f9ec32
Improved explanation for CustomFedAvgM strategy
gubertoli Nov 23, 2023
a4a2f27
Added assert for initial_parameters not None on CustomFedAvgM
gubertoli Nov 23, 2023
a32a858
Minor changes to improve test-baseline.sh metrics
gubertoli Nov 23, 2023
fed2ddf
Fixing hydra yaml learning_rate after pylint changes
gubertoli Nov 23, 2023
3db5ece
pylint
gubertoli Nov 23, 2023
8947482
Reordering setup
gubertoli Dec 11, 2023
5d12c7b
Merge branch 'main' into fedavgm-baseline
jafermarq Dec 18, 2023
eb90138
README tweaks
jafermarq Dec 28, 2023
115383e
Merge branch 'main' into fedavgm-baseline
jafermarq Dec 28, 2023
c7ff344
to changelog
jafermarq Dec 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix output filename definition
gubertoli committed Nov 21, 2023
commit d09a014ed1cdadc52e6b1d9cce344d149615f736
2 changes: 1 addition & 1 deletion baselines/fedavgm/fedavgm/main.py
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ def main(cfg: DictConfig) -> None:
dataset_type = "cifar10" if cfg.dataset.input_shape == [32, 32, 3] else "fmnist"

def format_variable(x):
return f"{x!r}" if isinstance(x, bytes) else f"{x}"
return f"{x!r}" if isinstance(x, bytes) else x

file_suffix: str = (
f"_{format_variable(strategy_name)}"