[revision] conflicts resolved

Author: dunzeng

.gitignore

@@ -181,4 +181,5 @@ unit_test.ipynb
 /datasets/mnist/*mnist
 /datasets/mnist/fedmnist*
 test_client.py
-test_server.py
+test_server.py
+unit_test*

codecov.yml

@@ -4,7 +4,6 @@ codecov:
   require_ci_to_pass: yes
 
 ignore:
-  - "fedlab/core/hierarchical"
   - "fedlab/contrib"
   - "fedlab/models"
 

fedlab/contrib/algorithm/fedprox.py

@@ -56,8 +56,6 @@ def train(self, model_parameters, train_loader, mu) -> None:
                     l2 += torch.sum(torch.pow(w - w0, 2))
 
                 loss = l1 + 0.5 * mu * l2
-                outputs = self._model(data)
-                loss = self.criterion(outputs, target)
 
                 self.optimizer.zero_grad()
                 loss.backward()
@@ -105,4 +103,4 @@ def train(self, model_parameters, train_loader, mu) -> None:
                 loss.backward()
                 self.optimizer.step()
 
-        return [self.model_parameters]
+        return [self.model_parameters]

fedlab/core/server/manager.py

@@ -178,9 +178,6 @@ def __init__(self,
 
         self.message_queue = Queue()
 
-    def setup(self):
-        return super().setup()
-
     def main_loop(self):
         """Communication agreements of asynchronous FL.