Merge pull request #512 from FedML-AI/test/v0.7.0

Test/v0.7.0

.github/workflows/smoke_test_cross_silo_fedavg_defense_linux.yml

@@ -68,4 +68,20 @@ jobs:
           run_id=cross-silo-defense-${{ format('{0}{1}{2}{3}', github.run_id, matrix.os, matrix.arch, matrix.python-version) }}
           echo run_id
           bash run_client.sh 2 $run_id
-        if: ${{ matrix.client-index == '2' }}
+        if: ${{ matrix.client-index == '2' }}
+
+      - name: client 3 - cross-silo - defense
+        run: |
+          cd examples/cross_silo/mqtt_s3_fedavg_defense_mnist_lr_example
+          run_id=cross-silo-defense-${{ format('{0}{1}{2}{3}', github.run_id, matrix.os, matrix.arch, matrix.python-version) }}
+          echo run_id
+          bash run_client.sh 3 $run_id
+        if: ${{ matrix.client-index == '3' }}
+
+      - name: client 4 - cross-silo - defense
+        run: |
+          cd examples/cross_silo/mqtt_s3_fedavg_defense_mnist_lr_example
+          run_id=cross-silo-defense-${{ format('{0}{1}{2}{3}', github.run_id, matrix.os, matrix.arch, matrix.python-version) }}
+          echo run_id
+          bash run_client.sh 4 $run_id
+        if: ${{ matrix.client-index == '4' }}

python/examples/cross_silo/grpc_fedavg_mnist_lr_example/one_line/config/fedml_config.yaml

@@ -21,7 +21,7 @@ model_args:
 train_args:
   federated_optimizer: "FedAvg"
   client_id_list:
-  client_num_in_total: 100
+  client_num_in_total: 1000
   client_num_per_round: 2
   comm_round: 50
   epochs: 1

python/examples/cross_silo/mqtt_s3_fedavg_attack_mnist_lr_example/config/foolsgold/fedml_config.yaml

@@ -24,7 +24,7 @@ train_args:
   # for CLI running, this can be None; in MLOps deployment, `client_id_list` will be replaced with real-time selected devices
   client_id_list:
   # for FoolsGold Defense, if use_memory is true, then client_num_in_total should be equal to client_number_per_round
-  client_num_in_total: 2
+  client_num_in_total: 1000
   client_num_per_round: 2
   comm_round: 10
   epochs: 1

python/examples/cross_silo/mqtt_s3_fedavg_attack_mnist_lr_example/config/slsgd/fedml_config.yaml

@@ -23,7 +23,7 @@ train_args:
   federated_optimizer: "FedAvg"
   # for CLI running, this can be None; in MLOps deployment, `client_id_list` will be replaced with real-time selected devices
   client_id_list:
-  client_num_in_total: 4
+  client_num_in_total: 1000
   client_num_per_round: 4
   comm_round: 10
   epochs: 1

python/examples/cross_silo/mqtt_s3_fedavg_central_dp_mnist_lr_example/config/fedml_config.yaml

@@ -3,7 +3,6 @@ common_args:
   scenario: "horizontal"
   using_mlops: false
   random_seed: 0
-  config_version: release
 
 environment_args:
   bootstrap: config/bootstrap.sh
@@ -23,17 +22,17 @@ train_args:
   federated_optimizer: "FedAvg"
   # for CLI running, this can be None; in MLOps deployment, `client_id_list` will be replaced with real-time selected devices
   client_id_list:
-  client_num_in_total: 4
-  client_num_per_round: 4
-  comm_round: 10
+  client_num_in_total: 1000
+  client_num_per_round: 2
+  comm_round: 50
   epochs: 1
   batch_size: 10
   client_optimizer: sgd
   learning_rate: 0.03
   weight_decay: 0.001
 
 validation_args:
-  frequency_of_the_test: 1
+  frequency_of_the_test: 5
 
 device_args:
   using_gpu: false
@@ -42,9 +41,8 @@ device_args:
 
 comm_args:
   backend: "MQTT_S3"
-  mqtt_config_path:
-  s3_config_path:
-  grpc_ipconfig_path: ./config/grpc_ipconfig.csv
+  mqtt_config_path: config/mqtt_config.yaml
+  s3_config_path: config/s3_config.yaml
 
 tracking_args:
   # the default log path is at ~/fedml-client/fedml/logs/ and ~/fedml-server/fedml/logs/

python/examples/cross_silo/mqtt_s3_fedavg_defense_mnist_lr_example/config/foolsgold/fedml_config.yaml

@@ -24,7 +24,7 @@ train_args:
   # for CLI running, this can be None; in MLOps deployment, `client_id_list` will be replaced with real-time selected devices
   client_id_list:
   # for FoolsGold Defense, if use_memory is true, then client_num_in_total should be equal to client_number_per_round
-  client_num_in_total: 4
+  client_num_in_total: 1000
   client_num_per_round: 4
   comm_round: 10
   epochs: 1

python/examples/cross_silo/mqtt_s3_fedavg_defense_mnist_lr_example/config/slsgd/fedml_config.yaml

@@ -23,7 +23,7 @@ train_args:
   federated_optimizer: "FedAvg"
   # for CLI running, this can be None; in MLOps deployment, `client_id_list` will be replaced with real-time selected devices
   client_id_list:
-  client_num_in_total: 4
+  client_num_in_total: 1000
   client_num_per_round: 4
   comm_round: 10
   epochs: 1

python/examples/cross_silo/mqtt_s3_fedavg_hierarchical_manual_mnist_lr_example/README.md

@@ -102,7 +102,7 @@ model_args:
 train_args:
   federated_optimizer: "FedAvg"
   client_id_list:
-  client_num_in_total: 2
+  client_num_in_total: 1000
   client_num_per_round: 2
   comm_round: 50
   epochs: 1

python/examples/cross_silo/mqtt_s3_fedavg_hierarchical_manual_mnist_lr_example/one_line/config/fedml_config.yaml

@@ -21,7 +21,7 @@ model_args:
 train_args:
   federated_optimizer: "FedAvg"
   client_id_list:
-  client_num_in_total: 2
+  client_num_in_total: 1000
   client_num_per_round: 2
   comm_round: 50
   epochs: 1

python/examples/cross_silo/mqtt_s3_fedavg_hierarchical_mnist_lr_example/config/fedml_config.yaml

@@ -21,7 +21,7 @@ model_args:
 train_args:
   federated_optimizer: "FedAvg"
   client_id_list:
-  client_num_in_total: 2
+  client_num_in_total: 1000
   client_num_per_round: 2
   comm_round: 50
   epochs: 1

python/examples/cross_silo/mqtt_s3_fedavg_horizontal_mnist_lr_example/README.md

@@ -99,7 +99,7 @@ model_args:
 train_args:
   federated_optimizer: "FedAvg"
   client_id_list:
-  client_num_in_total: 2
+  client_num_in_total: 1000
   client_num_per_round: 2
   comm_round: 50
   epochs: 1

python/examples/cross_silo/mqtt_s3_fedavg_horizontal_mnist_lr_example/one_line/config/fedml_config.yaml

@@ -21,7 +21,7 @@ model_args:
 train_args:
   federated_optimizer: "FedAvg"
   client_id_list:
-  client_num_in_total: 2
+  client_num_in_total: 1000
   client_num_per_round: 2
   comm_round: 50
   epochs: 1

python/examples/cross_silo/mqtt_s3_fedavg_local_dp_mnist_lr_example/one_line/config/fedml_config.yaml

@@ -23,7 +23,7 @@ train_args:
   federated_optimizer: "FedAvg"
   # for CLI running, this can be None; in MLOps deployment, `client_id_list` will be replaced with real-time selected devices
   client_id_list:
-  client_num_in_total: 2
+  client_num_in_total: 1000
   client_num_per_round: 2
   comm_round: 10
   epochs: 1