-
Notifications
You must be signed in to change notification settings - Fork 941
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into add-flower-datasets-glossary-entry
- Loading branch information
Showing
3 changed files
with
172 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,3 +18,4 @@ subjectAltName = @alt_names | |
| DNS.1 = localhost | ||
| IP.1 = ::1 | ||
| IP.2 = 127.0.0.1 | ||
| IP.3 = 0.0.0.0 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| #!/bin/bash | ||
| set -e | ||
|
|
||
| # Set connectivity parameters | ||
| case "$1" in | ||
| secure) | ||
| ./generate.sh | ||
| server_arg='--ssl-ca-certfile ../certificates/ca.crt | ||
| --ssl-certfile ../certificates/server.pem | ||
| --ssl-keyfile ../certificates/server.key' | ||
| client_arg='--root-certificates ../certificates/ca.crt' | ||
| # For $superexec_arg, note special ordering of single- and double-quotes | ||
| superexec_arg='--executor-config 'root-certificates=\"../certificates/ca.crt\"'' | ||
| superexec_arg="$server_arg $superexec_arg" | ||
| ;; | ||
| insecure) | ||
| server_arg='--insecure' | ||
| client_arg=$server_arg | ||
| superexec_arg=$server_arg | ||
| ;; | ||
| esac | ||
|
|
||
| # Set authentication parameters | ||
| case "$2" in | ||
| client-auth) | ||
| server_auth='--auth-list-public-keys ../keys/client_public_keys.csv | ||
| --auth-superlink-private-key ../keys/server_credentials | ||
| --auth-superlink-public-key ../keys/server_credentials.pub' | ||
| client_auth_1='--auth-supernode-private-key ../keys/client_credentials_1 | ||
| --auth-supernode-public-key ../keys/client_credentials_1.pub' | ||
| client_auth_2='--auth-supernode-private-key ../keys/client_credentials_2 | ||
| --auth-supernode-public-key ../keys/client_credentials_2.pub' | ||
| server_address='127.0.0.1:9092' | ||
| ;; | ||
| *) | ||
| server_auth='' | ||
| client_auth_1='' | ||
| client_auth_2='' | ||
| server_address='127.0.0.1:9092' | ||
| ;; | ||
| esac | ||
|
|
||
| # Set engine | ||
| case "$3" in | ||
| deployment-engine) | ||
| superexec_engine_arg='--executor flwr.superexec.deployment:executor' | ||
| ;; | ||
| simulation-engine) | ||
| superexec_engine_arg='--executor flwr.superexec.simulation:executor | ||
| --executor-config 'num-supernodes=10'' | ||
| ;; | ||
| esac | ||
|
|
||
|
|
||
| # Create and install Flower app | ||
| flwr new e2e-tmp-test --framework numpy --username flwrlabs | ||
| cd e2e-tmp-test | ||
| # Remove flwr dependency from `pyproject.toml`. Seems necessary so that it does | ||
| # not override the wheel dependency | ||
| if [[ "$OSTYPE" == "darwin"* ]]; then | ||
| # macOS (Darwin) system | ||
| sed -i '' '/flwr\[simulation\]/d' pyproject.toml | ||
| else | ||
| # Non-macOS system (Linux) | ||
| sed -i '/flwr\[simulation\]/d' pyproject.toml | ||
| fi | ||
| pip install -e . --no-deps | ||
|
|
||
| # Check if the first argument is 'insecure' | ||
| if [ "$1" == "insecure" ]; then | ||
| # If $1 is 'insecure', append the first line | ||
| echo -e $"\n[tool.flwr.federations.superexec]\naddress = \"127.0.0.1:9093\"\ninsecure = true" >> pyproject.toml | ||
| else | ||
| # Otherwise, append the second line | ||
| echo -e $"\n[tool.flwr.federations.superexec]\naddress = \"127.0.0.1:9093\"\nroot-certificates = \"../certificates/ca.crt\"" >> pyproject.toml | ||
| fi | ||
|
|
||
| timeout 2m flower-superlink $server_arg $server_auth & | ||
| sl_pid=$! | ||
| sleep 2 | ||
|
|
||
| timeout 2m flower-supernode ./ $client_arg \ | ||
| --superlink $server_address $client_auth_1 \ | ||
| --node-config "partition-id=0 num-partitions=2" --max-retries 0 & | ||
| cl1_pid=$! | ||
| sleep 2 | ||
|
|
||
| timeout 2m flower-supernode ./ $client_arg \ | ||
| --superlink $server_address $client_auth_2 \ | ||
| --node-config "partition-id=1 num-partitions=2" --max-retries 0 & | ||
| cl2_pid=$! | ||
| sleep 2 | ||
|
|
||
| timeout 2m flower-superexec $superexec_arg $superexec_engine_arg 2>&1 | tee flwr_output.log & | ||
| se_pid=$(pgrep -f "flower-superexec") | ||
| sleep 2 | ||
|
|
||
| timeout 1m flwr run --run-config num-server-rounds=1 ../e2e-tmp-test superexec | ||
|
|
||
| # Initialize a flag to track if training is successful | ||
| found_success=false | ||
| timeout=120 # Timeout after 120 seconds | ||
| elapsed=0 | ||
|
|
||
| # Check for "Success" in a loop with a timeout | ||
| while [ "$found_success" = false ] && [ $elapsed -lt $timeout ]; do | ||
| if grep -q "Run finished" flwr_output.log; then | ||
| echo "Training worked correctly!" | ||
| found_success=true | ||
| kill $cl1_pid; kill $cl2_pid; sleep 1; kill $sl_pid; kill $se_pid; | ||
| else | ||
| echo "Waiting for training ... ($elapsed seconds elapsed)" | ||
| fi | ||
| # Sleep for a short period and increment the elapsed time | ||
| sleep 2 | ||
| elapsed=$((elapsed + 2)) | ||
| done | ||
|
|
||
| if [ "$found_success" = false ]; then | ||
| echo "Training had an issue and timed out." | ||
| kill $cl1_pid; kill $cl2_pid; kill $sl_pid; kill $se_pid; | ||
| fi |