update fl testing scripts

hasan7n · Sep 3, 2024 · dee5152 · dee5152
1 parent e2a4ddc
commit dee5152
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 23 deletions.
diff --git 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
@@ -6,13 +6,10 @@ aggregator:
     last_state_path: save/classification_last.pbuf
     rounds_to_train: 2
     write_logs: true
-    admins:
-      - [email protected]
-    allowed_admin_endpoints:
-      - GetExperimentStatus
-      - AddCollaborator
-      - RemoveCollaborator
-      - SetStragglerCuttoffTime
+    admins_endpoints_mapping:
+      [email protected]:
+        - 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
@@ -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
@@ -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
@@ -7,10 +7,9 @@ aggregator:
     rounds_to_train: 2
     write_logs: true
     admins_endpoints_mapping:
-      [email protected]: 
-      - GetExperimentStatus
-      - AddCollaborator
-      - SetStragglerCutoffTime
+      [email protected]:
+        - GetExperimentStatus
+        - SetStragglerCuttoffTime
 
   template: openfl.component.Aggregator
 assigner:

diff --git 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
@@ -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:
-      - [email protected]
-    allowed_admin_endpoints:
-      - GetExperimentStatus
-      - AddCollaborator
-      - RemoveCollaborator
+    rounds_to_train : 2
+    admins_endpoints_mapping:
+      [email protected]:
+        - 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
@@ -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