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.

Sign up for GitHub

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

Jump to bottom

refactor(framework) Run app with `flwr run` calling `flower-simulation` #3819

Merged

danieljanes merged 37 commits into main from make-native-flwr-run-use-flower-simulation

Jul 16, 2024

Contributor

jafermarq commented Jul 16, 2024 •

edited

Loading

Merge after #3810

jafermarq and others added 22 commits

July 15, 2024 23:01


          init

679a783


          Merge branch 'main' into support-fab-in-flower-simulation

29ae904


          fix args checks

6b7e88d


          basic functionality; no override; no from .fab

4d4b049


          feat(framework:skip) Add config function for fusing dicts

6d99d90


          simplify

8430e28


          Merge branch 'add-config-function-overrides' into support-fab-in-flow…

97c0614

…er-simulation


          using fused config -- but not in ClientApp yet

11086ba


          Merge branch 'main' into support-fab-in-flower-simulation

e709b08


          updates

46244de


          init

da0d8f1

fix

e2d2347


          Apply suggestions from code review

122cb31

Co-authored-by: Daniel J. Beutel <daniel@flower.ai>


          updates

307c29e


          Merge branch 'main' into register-context-using-fab-dir

952572c


          updates

3ec626d


          Merge branch 'register-context-using-fab-dir' into support-fab-in-flo…

f65dcbf

…wer-simulation


          clientapp gets runconfig from pyproject.toml

909d410


          Merge branch 'main' into support-fab-in-flower-simulation

07e4d3e


          Merge branch 'main' into support-fab-in-flower-simulation

7d1c429


          updates from review

f4a10ed


          init

1b09bb7

danieljanes reviewed

View reviewed changes

src/py/flwr/cli/run/run.py Outdated Show resolved Hide resolved

jafermarq and others added 3 commits

July 16, 2024 17:16


          Update src/py/flwr/cli/run/run.py

9bf5fa3

Co-authored-by: Daniel J. Beutel <daniel@flower.ai>


          w/ previous

1fbf1e0


          Merge branch 'main' into make-native-flwr-run-use-flower-simulation

a74894a

danieljanes reviewed

View reviewed changes

src/py/flwr/simulation/run_simulation.py Outdated Show resolved Hide resolved


          Update src/py/flwr/simulation/run_simulation.py

571b9ee

danieljanes reviewed

View reviewed changes

src/py/flwr/simulation/run_simulation.py Outdated Show resolved Hide resolved


          Update src/py/flwr/simulation/run_simulation.py

109f521

danieljanes reviewed

View reviewed changes

src/py/flwr/simulation/run_simulation.py Outdated Show resolved Hide resolved


          Update src/py/flwr/simulation/run_simulation.py

211d838

danieljanes reviewed

View reviewed changes

src/py/flwr/simulation/run_simulation.py Outdated Show resolved Hide resolved

danieljanes and others added 8 commits

July 16, 2024 21:19


          Update src/py/flwr/simulation/run_simulation.py

acc533c


          Merge branch 'main' into make-native-flwr-run-use-flower-simulation

241d1e6


          revert run_simulation.py changes

5cfe384


          basic run process

cb6924b


          check

587d1b7


          pass config-override to `flower-simulation

ff71787


          Add to

67d86a2


          Merge branch 'make-native-flwr-run-use-flower-simulation' of github.c…

ab7ca15

…om:adap/flower into make-native-flwr-run-use-flower-simulation

danieljanes previously approved these changes

View reviewed changes


          correct handling configs override

4b3199a

jafermarq dismissed danieljanes’s stale review via

4b3199a

July 16, 2024 20:30

danieljanes approved these changes

View reviewed changes

danieljanes marked this pull request as ready for review

July 16, 2024 20:31

danieljanes requested a review from tanertopal as a code owner

July 16, 2024 20:31

danieljanes enabled auto-merge (squash)

July 16, 2024 20:32

danieljanes merged commit 744e0e9 into main

28 checks passed

danieljanes deleted the make-native-flwr-run-use-flower-simulation branch

July 16, 2024 20:36

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet