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

ci(*:skip) Add flower-simulation e2e tests #3747

Open
wants to merge 56 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
8fb2462
Rename e2e scripts and change to flower-supernode
danielnugraha Jul 8, 2024
67481b1
Rename e2e scripts and change to flower-supernode
danielnugraha Jul 8, 2024
9364932
Merge branch 'main' into update-e2e-tests-next
danielnugraha Jul 8, 2024
f0c45a8
Add flower-simulation e2e tests
danielnugraha Jul 8, 2024
93c0806
Merge branch 'main' into flower-simulation-e2e-next
danielnugraha Jul 8, 2024
ea0ff9e
Change client_fn signature
danielnugraha Jul 8, 2024
f785778
Merge remote-tracking branch 'refs/remotes/origin/flower-simulation-e…
danielnugraha Jul 8, 2024
c3bd01a
Format
danielnugraha Jul 8, 2024
120b809
Format
danielnugraha Jul 8, 2024
dfa7fb2
Format
danielnugraha Jul 8, 2024
74e5db0
Format
danielnugraha Jul 8, 2024
b0f5299
Merge branch 'main' into flower-simulation-e2e-next
danielnugraha Jul 8, 2024
c4e9bb0
Format
danielnugraha Jul 8, 2024
af5261d
Merge remote-tracking branch 'refs/remotes/origin/flower-simulation-e…
danielnugraha Jul 8, 2024
0af60c7
Format
danielnugraha Jul 8, 2024
d2b870c
Format
danielnugraha Jul 8, 2024
d947fe1
Format
danielnugraha Jul 9, 2024
ddb53fe
Format
danielnugraha Jul 9, 2024
814298e
Merge branch 'main' into flower-simulation-e2e-next
danielnugraha Jul 9, 2024
e977831
Merge branch 'main' into flower-simulation-e2e-next
danielnugraha Jul 11, 2024
d7cd24f
Fix merge conflict
danielnugraha Jul 11, 2024
e38a8f0
Revert client_fn args changes
danielnugraha Jul 11, 2024
9eabb4d
Revert client_fn args changes
danielnugraha Jul 11, 2024
efcda1b
Revert client_fn args changes
danielnugraha Jul 11, 2024
a13a055
Revert client_fn args changes
danielnugraha Jul 11, 2024
93b6914
omit pandas
danielnugraha Jul 11, 2024
455dc46
Merge branch 'main' into flower-simulation-e2e-next
danielnugraha Jul 11, 2024
b33d9e6
omit pandas
danielnugraha Jul 11, 2024
002a1cc
Merge remote-tracking branch 'refs/remotes/origin/flower-simulation-e…
danielnugraha Jul 11, 2024
975179e
omit pandas
danielnugraha Jul 11, 2024
2c609dd
omit pandas
danielnugraha Jul 11, 2024
62be2f4
omit pandas
danielnugraha Jul 11, 2024
24e76a9
omit pandas
danielnugraha Jul 11, 2024
f11b864
omit pandas
danielnugraha Jul 11, 2024
c97811f
omit pandas
danielnugraha Jul 11, 2024
3d1b66b
omit pandas
danielnugraha Jul 11, 2024
7127b9a
omit pandas
danielnugraha Jul 11, 2024
11eb0cb
omit pandas
danielnugraha Jul 11, 2024
b24a40f
omit pandas
danielnugraha Jul 11, 2024
6f80430
Use absolute path for pandas
danielnugraha Jul 12, 2024
6e49639
Merge remote-tracking branch 'origin' into flower-simulation-e2e-next
danielnugraha Jul 12, 2024
d669637
Revert omission for pandas
danielnugraha Jul 12, 2024
2198d0b
Merge branch 'main' into flower-simulation-e2e-next
danieljanes Jul 12, 2024
dbe2ac0
Merge branch 'main' into flower-simulation-e2e-next
danieljanes Jul 15, 2024
1088b87
Merge branch 'main' into flower-simulation-e2e-next
danieljanes Jul 17, 2024
fef2af7
Merge branch 'main' into flower-simulation-e2e-next
danieljanes Jul 17, 2024
4f216bc
Print runtime_env
danielnugraha Jul 22, 2024
241d7d9
Format
danielnugraha Jul 22, 2024
779c738
Make path relative
danielnugraha Jul 22, 2024
fa02496
Format
danielnugraha Jul 22, 2024
772ebe6
Format
danielnugraha Jul 22, 2024
48df95e
Format
danielnugraha Jul 22, 2024
944fbba
Format
danielnugraha Jul 22, 2024
5131473
Merge branch 'main' into flower-simulation-e2e-next
danielnugraha Jul 22, 2024
86af841
Merge remote-tracking branch 'origin' into flower-simulation-e2e-next
danielnugraha Aug 8, 2024
c82e2f6
Add relative path
danielnugraha Aug 8, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ jobs:
if: ${{ matrix.dataset }}
run: python -c "${{ matrix.dataset }}"
- name: Run edge client test
if: ${{ matrix.directory != 'bare-client-auth' }}
if: ${{ matrix.directory != 'bare-client-auth'}}
run: ./../test_legacy.sh "${{ matrix.directory }}"
- name: Run virtual client test
if: ${{ matrix.directory != 'bare-client-auth' }}
run: python simulation.py
if: ${{ matrix.directory != 'bare-client-auth' && matrix.directory != 'bare-https'}}
run: ./../test_simulation.sh "${{ matrix.directory }}"
- name: Run simulation engine test
if: ${{ matrix.directory == 'pytorch' || matrix.directory == 'tensorflow'}}
run: python simulation_next.py
Expand Down
2 changes: 1 addition & 1 deletion e2e/framework-pandas/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import flwr as fl

df = pd.read_csv("./data/client.csv")
df = pd.read_csv("/home/runner/work/flower/flower/e2e/framework-pandas/data/client.csv")

column_names = ["sepal length (cm)", "sepal width (cm)"]

Expand Down
35 changes: 35 additions & 0 deletions e2e/test_simulation.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#!/bin/bash
set -e

if [ -z "$1" ]; then
echo "Usage: $0 <framework>"
exit 1
fi

framework=$1

case "$framework" in
framework-pandas)
server_app="server:app"
client_app="client:app"
app_dir="./"
;;
*)
server_app="server:app"
client_app="${framework}.client:app"
app_dir="./.."
;;
esac

echo flower-simulation --server-app $server_app --client-app $client_app --num-supernodes 2 --app-dir $app_dir

timeout 2m flower-simulation --server-app $server_app --client-app $client_app --num-supernodes 2 --app-dir $app_dir &
pid=$!

wait $pid
res=$?

if [[ "$res" = "0" ]];
then echo "Training worked correctly";
else echo "Training had an issue" && exit 1;
fi