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 FedNova baseline #2179

Merged
merged 57 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
264dc32
add README for FedNOVA baseline and create baseline directory structure
ashdtu Aug 1, 2023
f5b21f6
Merge branch 'main' into fedNova
ashdtu Aug 1, 2023
90e3260
add .idea to gitignore
ashdtu Aug 1, 2023
e86776a
add .idea to gitignore
ashdtu Aug 1, 2023
8818cea
clean up directory tree
ashdtu Aug 1, 2023
25618cc
Merge branch 'main' into fedNova
ashdtu Aug 4, 2023
5117f4f
Merge branch 'main' into fedNova
ashdtu Aug 19, 2023
c01d9cf
add baseline
ashdtu Aug 19, 2023
e0e960c
Add working baseline for FedNova in flower with optimizer parameter s…
ashdtu Oct 2, 2023
7bfc966
remove debug comments
ashdtu Oct 2, 2023
3e778a3
sync with main branch
ashdtu Oct 2, 2023
f787339
rename baseline directories from fedNova to fednova
ashdtu Oct 2, 2023
3eb1a9c
add model choice from config
ashdtu Oct 2, 2023
4861f78
1. get rid of model initialization from disk
ashdtu Oct 3, 2023
a10d54b
add seeds for reproducibility across all files
ashdtu Oct 3, 2023
fafe7ce
add logic for checkpointing of model parameters
ashdtu Oct 3, 2023
e8a47a6
add logic to evaluate an experiment using saved checkpoint
ashdtu Oct 4, 2023
37a2fff
Merge branch 'main' into fednova
ashdtu Oct 4, 2023
d952400
Merge branch 'main' into fedNova
ashdtu Oct 4, 2023
a6af8c5
edit readme
ashdtu Oct 4, 2023
da12765
Merge pull request #1 from ashdtu/fednova
ashdtu Oct 4, 2023
0d26dfb
edit project requirements
ashdtu Oct 5, 2023
149c6f0
edit pyproject
ashdtu Oct 5, 2023
77701f0
add centralized evaluation and saving of results
ashdtu Oct 8, 2023
4d786db
isort test passed
ashdtu Oct 9, 2023
2134529
add fedavg client and compatibility for running FedAvg and FedProx ba…
ashdtu Oct 9, 2023
beae4f6
edit readme
ashdtu Oct 9, 2023
ffb2543
add readme with tables
ashdtu Oct 11, 2023
7a1e81e
add readme with hyperparameter tables and model tables
ashdtu Oct 11, 2023
93d73a6
add table result
ashdtu Oct 17, 2023
f6e2345
1. remove metrics class from utils
ashdtu Oct 30, 2023
9ead968
1. add working fedavg client
ashdtu Dec 4, 2023
840e671
1. re-factor code to pass test cases: isort, black, ruff, flake8.
ashdtu Dec 4, 2023
ab3e23e
Merge branch 'adap:main' into fedNova
ashdtu Dec 4, 2023
81d7f2b
1. edit readme with table and plots
ashdtu Dec 8, 2023
2079194
using configs;formatting
jafermarq Dec 8, 2023
453303a
fix pylint tests
ashdtu Dec 8, 2023
4c83649
fix pylint
ashdtu Dec 8, 2023
7fcfa65
change config behaviour
ashdtu Dec 8, 2023
44a3aed
minor edits to readme
jafermarq Dec 10, 2023
70c8d5e
w/ previous
jafermarq Dec 10, 2023
f32d3a6
.
jafermarq Dec 10, 2023
cd98633
generate figures with bigger fonts
ashdtu Dec 18, 2023
cf15e6d
generate figures with bigger fonts v2
ashdtu Dec 18, 2023
2d5ba1a
add momentum plots
ashdtu Dec 19, 2023
4d9edeb
1. output path now uses hydra created directories.
ashdtu Dec 19, 2023
c901ab0
Merge branch 'adap:main' into fedNova
ashdtu Dec 19, 2023
0cf4bf3
remove ray init args and add comment
ashdtu Dec 19, 2023
99d150b
Merge branch 'fedNova' of https://github.com/ashdtu/flower into fedNova
ashdtu Dec 19, 2023
018e1a1
black formatting
ashdtu Dec 19, 2023
def32fa
edit defaults
ashdtu Dec 19, 2023
a7ac19a
edit defaults
ashdtu Dec 19, 2023
583c9c8
edits to README; to changelog
jafermarq Dec 20, 2023
5f9e290
revert torch/torchvision spec in pyproject.toml
jafermarq Dec 20, 2023
f700550
Merge branch 'main' into fedNova
jafermarq Dec 20, 2023
6f74ed4
Merge branch 'main' into fedNova
jafermarq Dec 20, 2023
ae120ee
Merge branch 'main' into fedNova
jafermarq Dec 20, 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
123 changes: 123 additions & 0 deletions baselines/fednova/EXTENDED_README.md
ashdtu marked this conversation as resolved.
Show resolved Hide resolved
ashdtu marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@

# Extended Readme

> The baselines are expected to run in a machine running Ubuntu 22.04

While `README.md` should include information about the baseline you implement and how to run it, this _extended_ readme provides info on what's the expected directory structure for a new baseline and more generally the instructions to follow before your baseline can be merged into the Flower repository. Please follow closely these instructions. It is likely that you have already completed steps 1-2.

1. Fork the Flower repository and clone it.
2. Navigate to the `baselines/` directory and from there run:
```bash
# This will create a new directory with the same structure as this `baseline_template` directory.
./dev/create-baseline.sh <baseline-name>
```
3. All your code and configs should go into a sub-directory with the same name as the name of your baseline.
* The sub-directory contains a series of Python scripts that you can edit. Please stick to these files and consult with us if you need additional ones.
* There is also a basic config structure in `<baseline-name>/conf` ready be parsed by [Hydra](https://hydra.cc/) when executing your `main.py`.
4. Therefore, the directory structure in your baseline should look like:
```bash
baselines/<baseline-name>
├── README.md # describes your baseline and everything needed to use it
├── EXTENDED_README.md # to remove before creating your PR
├── pyproject.toml # details your Python environment
└── <baseline-name>
├── *.py # several .py files including main.py and __init__.py
└── conf
└── *.yaml # one or more Hydra config files

```
> :warning: Make sure the variable `name` in `pyproject.toml` is set to the name of the sub-directory containing all your code.

5. Add your dependencies to the `pyproject.toml` (see below a few examples on how to do it). Read more about Poetry below in this `EXTENDED_README.md`.
6. Regularly check that your coding style and the documentation you add follow good coding practices. To test whether your code meets the requirements, please run the following:
```bash
# After activating your environment and from your baseline's directory
cd .. # to go to the top-level directory of all baselines
./dev/test-baseline.sh <baseline-name>
./dev/test-baseline-structure.sh <baseline-name>
```
Both `test-baseline.sh` and `test-baseline-structure.sh` will also be automatically run when you create a PR, and both tests need to pass for the baseline to be merged.
To automatically solve some formatting issues and apply easy fixes, please run the formatting script:
```bash
# After activating your environment and from your baseline's directory
cd .. # to go to the top-level directory of all baselines
./dev/format-baseline.sh <baseline-name>
```
7. Ensure that the Python environment for your baseline can be created without errors by simply running `poetry install` and that this is properly described later when you complete the `Environment Setup` section in `README.md`. This is specially important if your environment requires additional steps after doing `poetry install`.
8. Ensure that your baseline runs with default arguments by running `poetry run python -m <baseline-name>.main`. Then, describe this and other forms of running your code in the `Running the Experiments` section in `README.md`.
9. Once your code is ready and you have checked:
* that following the instructions in your `README.md` the Python environment can be created correctly

* that running the code following your instructions can reproduce the experiments in the paper

, then you just need to create a Pull Request (PR) to kickstart the process of merging your baseline into the Flower repository.

> Once you are happy to merge your baseline contribution, please delete this `EXTENDED_README.md` file.


## About Poetry

We use Poetry to manage the Python environment for each individual baseline. You can follow the instructions [here](https://python-poetry.org/docs/) to install Poetry in your machine.


### Specifying a Python Version (optional)
By default, Poetry will use the Python version in your system. In some settings, you might want to specify a particular version of Python to use inside your Poetry environment. You can do so with [`pyenv`](https://github.com/pyenv/pyenv). Check the documentation for the different ways of installing `pyenv`, but one easy way is using the [automatic installer](https://github.com/pyenv/pyenv-installer):
```bash
curl https://pyenv.run | bash # then, don't forget links to your .bashrc/.zshrc
```

You can then install any Python version with `pyenv install <python-version>` (e.g. `pyenv install 3.9.17`). Then, in order to use that version for your baseline, you'd do the following:

```bash
# cd to your baseline directory (i.e. where the `pyproject.toml` is)
pyenv local <python-version>

# set that version for poetry
poetry env use <python-version>

# then you can install your Poetry environment (see the next setp)
```

### Installing Your Environment
With the Poetry tool already installed, you can create an environment for this baseline with commands:
```bash
# run this from the same directory as the `pyproject.toml` file is
poetry install
```

This will create a basic Python environment with just Flower and additional packages, including those needed for simulation. Next, you should add the dependencies for your code. It is **critical** that you fix the version of the packages you use using a `=` not a `=^`. You can do so via [`poetry add`](https://python-poetry.org/docs/cli/#add). Below are some examples:

```bash
# For instance, if you want to install tqdm
poetry add tqdm==4.65.0

# If you already have a requirements.txt, you can add all those packages (but ensure you have fixed the version) in one go as follows:
poetry add $( cat requirements.txt )
```
With each `poetry add` command, the `pyproject.toml` gets automatically updated so you don't need to keep that `requirements.txt` as part of this baseline.


More critically however, is adding your ML framework of choice to the list of dependencies. For some frameworks you might be able to do so with the `poetry add` command. Check [the Poetry documentation](https://python-poetry.org/docs/cli/#add) for how to add packages in various ways. For instance, let's say you want to use PyTorch:

```bash
# with plain `pip` you'd run a command such as:
pip install torch==1.13.1+cu117 torchvision==0.14.1+cu117 torchaudio==0.13.1 --extra-index-url https://download.pytorch.org/whl/cu117

# to add the same 3 dependencies to your Poetry environment you'd need to add the URL to the wheel that the above pip command auto-resolves for you.
# You can find those wheels in `https://download.pytorch.org/whl/cu117`. Copy the link and paste it after the `poetry add` command.
# For instance to add `torch==1.13.1+cu117` and a x86 Linux system with Python3.8 you'd:
poetry add https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl
# you'll need to repeat this for both `torchvision` and `torchaudio`
```
The above is just an example of how you can add these dependencies. Please refer to the Poetry documentation to extra reference.

If all attempts fail, you can still install packages via standard `pip`. You'd first need to source/activate your Poetry environment.
```bash
# first ensure you have created your environment
# and installed the base packages provided in the template
poetry install

# then activate it
poetry shell
```
Now you are inside your environment (pretty much as when you use `virtualenv` or `conda`) so you can install further packages with `pip`. Please note that, unlike with `poetry add`, these extra requirements won't be captured by `pyproject.toml`. Therefore, please ensure that you provide all instructions needed to: (1) create the base environment with Poetry and (2) install any additional dependencies via `pip` when you complete your `README.md`.
202 changes: 202 additions & 0 deletions baselines/fednova/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Loading
Loading