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

Update FedProx baseline #2286

Merged
merged 28 commits into from
Sep 13, 2023
Merged

Update FedProx baseline #2286

merged 28 commits into from
Sep 13, 2023

Conversation

jafermarq
Copy link
Contributor

@jafermarq jafermarq commented Sep 4, 2023

After the FedProx baseline was added in the SoR format, some formatting checks and tests were introduced. Those were never ran against FedProx. This PR ensures tests pass. To achieve this:

  • The pyproject.toml has been updated with the new content (that already is part of that in the EXTENDED_README.md in the template baseline)
  • Then, the formatting script and tests were run and pass (except one --> see comment below)
  • Fixed a few typos

Once this is merged, progress can continue with #2210 and get it merged.

@jafermarq
Copy link
Contributor Author

This line will trigger a mypy error since back in flwr=1.3 (the version pinned for SoR) start_simulation expected the client_fn callable to return a Client (not including NumpyClient). @danieljanes, what do you suggest doing here ? Should we bump flwr to 1.5 in pyproject.toml in a separate PR?

@jafermarq
Copy link
Contributor Author

Will update once #2301 is merged

@jafermarq
Copy link
Contributor Author

needs change from #2307

@jafermarq
Copy link
Contributor Author

needs #2327

@jafermarq jafermarq marked this pull request as ready for review September 11, 2023 08:24
charlesbvll
charlesbvll previously approved these changes Sep 11, 2023
Copy link
Member

@charlesbvll charlesbvll left a comment

Choose a reason for hiding this comment

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

LGTM!

baselines/fedprox/README.md Outdated Show resolved Hide resolved
baselines/fedprox/fedprox/main.py Show resolved Hide resolved
baselines/fedprox/fedprox/strategy.py Outdated Show resolved Hide resolved
baselines/fedprox/pyproject.toml Show resolved Hide resolved
doc/source/ref-changelog.md Outdated Show resolved Hide resolved
Co-authored-by: Daniel J. Beutel <daniel@flower.dev>
@danieljanes danieljanes merged commit 8aa4566 into main Sep 13, 2023
27 checks passed
@danieljanes danieljanes deleted the fedprox_format branch September 13, 2023 09:55
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