From dee5152ce358e9588dc9694a1bf3ca1e2a3b6679 Mon Sep 17 00:00:00 2001 From: hasan7n Date: Tue, 3 Sep 2024 09:35:37 +0000 Subject: [PATCH] update fl testing scripts --- examples/fl/fl/build.sh | 2 +- examples/fl/fl/mlcube/workspace/training_config.yaml | 11 ++++------- examples/fl/fl/setup_test_no_docker.sh | 2 +- examples/fl/fl_admin/build.sh | 2 +- examples/fl/fl_admin/mlcube/workspace/plan.yaml | 7 +++---- examples/fl_post/fl/build.sh | 2 +- .../fl_post/fl/mlcube/workspace/training_config.yaml | 12 +++++------- examples/fl_post/fl/setup_test_no_docker.sh | 2 +- 8 files changed, 17 insertions(+), 23 deletions(-) diff --git a/examples/fl/fl/build.sh b/examples/fl/fl/build.sh index 96b4c9216..08cdbb20c 100644 --- a/examples/fl/fl/build.sh +++ b/examples/fl/fl/build.sh @@ -8,7 +8,7 @@ BUILD_BASE="${BUILD_BASE:-false}" if ${BUILD_BASE}; then git clone https://github.com/hasan7n/openfl.git cd openfl - git checkout 8c75ddb252930dd6306885a55d0bb9bd0462c333 + git checkout 7c9d4e7039f51014a4f7b3bedf5e2c7f1d353e68 docker build -t local/openfl:local -f openfl-docker/Dockerfile.base . cd .. rm -rf openfl diff --git a/examples/fl/fl/mlcube/workspace/training_config.yaml b/examples/fl/fl/mlcube/workspace/training_config.yaml index 9400964d0..0b7c17aa5 100644 --- a/examples/fl/fl/mlcube/workspace/training_config.yaml +++ b/examples/fl/fl/mlcube/workspace/training_config.yaml @@ -6,13 +6,10 @@ aggregator: last_state_path: save/classification_last.pbuf rounds_to_train: 2 write_logs: true - admins: - - admin@example.com - allowed_admin_endpoints: - - GetExperimentStatus - - AddCollaborator - - RemoveCollaborator - - SetStragglerCuttoffTime + admins_endpoints_mapping: + testfladmin@example.com: + - GetExperimentStatus + - SetStragglerCuttoffTime template: openfl.component.Aggregator assigner: settings: diff --git a/examples/fl/fl/setup_test_no_docker.sh b/examples/fl/fl/setup_test_no_docker.sh index e7625e60d..606847a54 100644 --- a/examples/fl/fl/setup_test_no_docker.sh +++ b/examples/fl/fl/setup_test_no_docker.sh @@ -124,7 +124,7 @@ rm init_weights_miccai.tar.gz cd ../../.. # for admin -ADMIN_CN="admin@example.com" +ADMIN_CN="testfladmin@example.com" mkdir ./for_admin mkdir ./for_admin/node_cert diff --git a/examples/fl/fl_admin/build.sh b/examples/fl/fl_admin/build.sh index 0100f8319..08cdbb20c 100644 --- a/examples/fl/fl_admin/build.sh +++ b/examples/fl/fl_admin/build.sh @@ -8,7 +8,7 @@ BUILD_BASE="${BUILD_BASE:-false}" if ${BUILD_BASE}; then git clone https://github.com/hasan7n/openfl.git cd openfl - git checkout 84819a5d28abff9c196df61cb931342464c0868d + git checkout 7c9d4e7039f51014a4f7b3bedf5e2c7f1d353e68 docker build -t local/openfl:local -f openfl-docker/Dockerfile.base . cd .. rm -rf openfl diff --git a/examples/fl/fl_admin/mlcube/workspace/plan.yaml b/examples/fl/fl_admin/mlcube/workspace/plan.yaml index 2905f2f18..202a615ff 100644 --- a/examples/fl/fl_admin/mlcube/workspace/plan.yaml +++ b/examples/fl/fl_admin/mlcube/workspace/plan.yaml @@ -7,10 +7,9 @@ aggregator: rounds_to_train: 2 write_logs: true admins_endpoints_mapping: - admin@example.com: - - GetExperimentStatus - - AddCollaborator - - SetStragglerCutoffTime + testfladmin@example.com: + - GetExperimentStatus + - SetStragglerCuttoffTime template: openfl.component.Aggregator assigner: diff --git a/examples/fl_post/fl/build.sh b/examples/fl_post/fl/build.sh index 0100f8319..08cdbb20c 100755 --- a/examples/fl_post/fl/build.sh +++ b/examples/fl_post/fl/build.sh @@ -8,7 +8,7 @@ BUILD_BASE="${BUILD_BASE:-false}" if ${BUILD_BASE}; then git clone https://github.com/hasan7n/openfl.git cd openfl - git checkout 84819a5d28abff9c196df61cb931342464c0868d + git checkout 7c9d4e7039f51014a4f7b3bedf5e2c7f1d353e68 docker build -t local/openfl:local -f openfl-docker/Dockerfile.base . cd .. rm -rf openfl diff --git a/examples/fl_post/fl/mlcube/workspace/training_config.yaml b/examples/fl_post/fl/mlcube/workspace/training_config.yaml index 43c1de6a7..d8478a921 100644 --- a/examples/fl_post/fl/mlcube/workspace/training_config.yaml +++ b/examples/fl_post/fl/mlcube/workspace/training_config.yaml @@ -5,13 +5,11 @@ aggregator : init_state_path : save/fl_post_two_init.pbuf best_state_path : save/fl_post_two_best.pbuf last_state_path : save/fl_post_two_last.pbuf - rounds_to_train : 10 - admins: - - col1@example.com - allowed_admin_endpoints: - - GetExperimentStatus - - AddCollaborator - - RemoveCollaborator + rounds_to_train : 2 + admins_endpoints_mapping: + testfladmin@example.com: + - GetExperimentStatus + - SetStragglerCuttoffTime collaborator : defaults : plan/defaults/collaborator.yaml diff --git a/examples/fl_post/fl/setup_test_no_docker.sh b/examples/fl_post/fl/setup_test_no_docker.sh index 745dffc47..91ea21ec7 100644 --- a/examples/fl_post/fl/setup_test_no_docker.sh +++ b/examples/fl_post/fl/setup_test_no_docker.sh @@ -98,7 +98,7 @@ echo "$COL2_LABEL: $COL2_CN" >>mlcube_agg/workspace/cols.yaml echo "$COL3_LABEL: $COL3_CN" >>mlcube_agg/workspace/cols.yaml # for admin -ADMIN_CN="admin@example.com" +ADMIN_CN="testfladmin@example.com" mkdir ./for_admin mkdir ./for_admin/node_cert