remove redundant imports

dataset/utils/HAR_utils.py

@@ -17,7 +17,6 @@
 
 # https://github.com/jindongwang/Deep-learning-activity-recognition/blob/master/pytorch/data_preprocess.py
 import numpy as np
-import os
 import ujson
 import numpy as np
 import gc

system/flcore/clients/clientala.py

@@ -15,8 +15,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import torch
-import torch.nn as nn
 import numpy as np
 import time
 from flcore.clients.clientbase import Client

system/flcore/clients/clientamp.py

@@ -16,7 +16,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import torch
-import torch.nn as nn
 import numpy as np
 import time
 import copy

system/flcore/clients/clientapfl.py

@@ -17,7 +17,6 @@
 
 import copy
 import torch
-import torch.nn as nn
 import numpy as np
 import time
 from flcore.clients.clientbase import Client

system/flcore/clients/clientapple.py

@@ -18,7 +18,6 @@
 import copy
 import math
 import torch
-import torch.nn as nn
 import numpy as np
 import time
 from flcore.clients.clientbase import Client

system/flcore/clients/clientavg.py

@@ -17,7 +17,6 @@
 
 import copy
 import torch
-import torch.nn as nn
 import numpy as np
 import time
 from flcore.clients.clientbase import Client

system/flcore/clients/clientbabu.py

@@ -15,9 +15,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import copy
-import torch
-import torch.nn as nn
 import numpy as np
 import time
 from flcore.clients.clientbase import Client

system/flcore/clients/clientbase.py

@@ -20,7 +20,6 @@
 import torch.nn as nn
 import numpy as np
 import os
-import torch.nn.functional as F
 from torch.utils.data import DataLoader
 from sklearn.preprocessing import label_binarize
 from sklearn import metrics

system/flcore/clients/clientbn.py

@@ -15,8 +15,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import torch
-import torch.nn as nn
 import numpy as np
 import time
 from flcore.clients.clientbase import Client

system/flcore/clients/clientditto.py

@@ -19,7 +19,6 @@
 import numpy as np
 import time
 import copy
-import torch.nn as nn
 from flcore.optimizers.fedoptimizer import PerturbedGradientDescent
 from flcore.clients.clientbase import Client
 import torch.nn.functional as F

system/flcore/clients/clientdyn.py

@@ -17,7 +17,6 @@
 
 import copy
 import torch
-import torch.nn as nn
 import numpy as np
 import time
 from flcore.clients.clientbase import Client

system/flcore/clients/clientfomo.py

@@ -16,7 +16,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import torch
-import torch.nn as nn
 import numpy as np
 import time
 import copy

system/flcore/clients/clientgen.py

@@ -16,7 +16,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import torch
-import torch.nn as nn
 import numpy as np
 import time
 from flcore.clients.clientbase import Client

system/flcore/clients/clientlg.py

@@ -15,8 +15,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import torch
-import torch.nn as nn
 import numpy as np
 import time
 from flcore.clients.clientbase import Client

system/flcore/clients/clientmoon.py

@@ -17,7 +17,6 @@
 
 import copy
 import torch
-import torch.nn as nn
 import numpy as np
 import time
 import torch.nn.functional as F

system/flcore/clients/clientmtl.py

@@ -16,7 +16,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import torch
-import torch.nn as nn
 import numpy as np
 import time
 import math

system/flcore/clients/clientpFedMe.py

@@ -19,7 +19,6 @@
 import time
 import copy
 import torch
-import torch.nn as nn
 from flcore.optimizers.fedoptimizer import pFedMeOptimizer
 from flcore.clients.clientbase import Client
 

system/flcore/clients/clientpcl.py

@@ -15,10 +15,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import torch.nn.functional as F
-import copy
 import torch
-import torch.nn as nn
+import torch.nn.functional as F
 import numpy as np
 import time
 from collections import defaultdict

system/flcore/clients/clientper.py

@@ -15,9 +15,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import copy
-import torch
-import torch.nn as nn
 import numpy as np
 import time
 from flcore.clients.clientbase import Client

system/flcore/clients/clientperavg.py

@@ -19,7 +19,6 @@
 import torch
 import time
 import copy
-import torch.nn as nn
 from flcore.optimizers.fedoptimizer import PerAvgOptimizer
 from flcore.clients.clientbase import Client
 

system/flcore/clients/clientphp.py

@@ -17,7 +17,6 @@
 
 import copy
 import torch
-import torch.nn as nn
 import numpy as np
 import time
 from flcore.clients.clientbase import Client

system/flcore/clients/clientrep.py

@@ -16,7 +16,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import torch
-import torch.nn as nn
 import numpy as np
 import time
 from flcore.clients.clientbase import Client

system/flcore/clients/clientrod.py

@@ -17,7 +17,6 @@
 
 import copy
 import torch
-import torch.nn as nn
 import numpy as np
 import time
 import torch.nn.functional as F

system/flcore/clients/clientscaffold.py

@@ -16,10 +16,8 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import torch
-import torch.nn as nn
 import numpy as np
 import time
-import copy
 from flcore.clients.clientbase import Client
 from flcore.optimizers.fedoptimizer import SCAFFOLDOptimizer
 

system/flcore/servers/serveramp.py

@@ -39,9 +39,12 @@ def __init__(self, args, times):
 
         print(f"\nJoin ratio / total clients: {self.join_ratio} / {self.num_clients}")
         print("Finished creating server and clients.")
+        self.Budget = []
+
 
     def train(self):
         for i in range(self.global_rounds+1):
+            s_t = time.time()
             self.selected_clients = self.select_clients()
             self.send_models()
 
@@ -66,13 +69,18 @@ def train(self):
                 self.call_dlg(i)
             self.receive_models()
 
+            self.Budget.append(time.time() - s_t)
+            print('-'*25, 'time cost', '-'*25, self.Budget[-1])
+
             if self.auto_break and self.check_done(acc_lss=[self.rs_test_acc], top_cnt=self.top_cnt):
                 break
 
         print("\nBest accuracy.")
         # self.print_(max(self.rs_test_acc), max(
         #     self.rs_train_acc), min(self.rs_train_loss))
         print(max(self.rs_test_acc))
+        print("\nAverage time cost per round.")
+        print(sum(self.Budget[1:])/len(self.Budget[1:]))
 
         self.save_results()
 

system/flcore/servers/serverapfl.py

@@ -15,6 +15,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+import time
 from flcore.clients.clientapfl import clientAPFL
 from flcore.servers.serverbase import Server
 from threading import Thread
@@ -32,10 +33,12 @@ def __init__(self, args, times):
         print("Finished creating server and clients.")
 
         # self.load_model()
+        self.Budget = []
 
 
     def train(self):
         for i in range(self.global_rounds+1):
+            s_t = time.time()
             self.selected_clients = self.select_clients()
             self.send_models()
 
@@ -57,13 +60,18 @@ def train(self):
                 self.call_dlg(i)
             self.aggregate_parameters()
 
+            self.Budget.append(time.time() - s_t)
+            print('-'*25, 'time cost', '-'*25, self.Budget[-1])
+
             if self.auto_break and self.check_done(acc_lss=[self.rs_test_acc], top_cnt=self.top_cnt):
                 break
 
         print("\nBest accuracy.")
         # self.print_(max(self.rs_test_acc), max(
         #     self.rs_train_acc), min(self.rs_train_loss))
         print(max(self.rs_test_acc))
+        print("\nAverage time cost per round.")
+        print(sum(self.Budget[1:])/len(self.Budget[1:]))
 
         self.save_results()
 

system/flcore/servers/serverapple.py

@@ -16,8 +16,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import torch
-import copy
-import random
 import time
 from flcore.clients.clientapple import clientAPPLE
 from flcore.servers.serverbase import Server

system/flcore/servers/serverbabu.py

@@ -15,6 +15,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+import time
 import random
 from flcore.clients.clientbabu import clientBABU
 from flcore.servers.serverbase import Server
@@ -33,10 +34,12 @@ def __init__(self, args, times):
         print("Finished creating server and clients.")
 
         # self.load_model()
+        self.Budget = []
 
 
     def train(self):
         for i in range(self.global_rounds+1):
+            s_t = time.time()
             self.selected_clients = self.select_clients()
             self.send_models()
 
@@ -58,13 +61,18 @@ def train(self):
                 self.call_dlg(i)
             self.aggregate_parameters()
 
+            self.Budget.append(time.time() - s_t)
+            print('-'*25, 'time cost', '-'*25, self.Budget[-1])
+
             if self.auto_break and self.check_done(acc_lss=[self.rs_test_acc], top_cnt=self.top_cnt):
                 break
 
         print("\nBest accuracy.")
         # self.print_(max(self.rs_test_acc), max(
         #     self.rs_train_acc), min(self.rs_train_loss))
         print(max(self.rs_test_acc))
+        print("\nAverage time cost per round.")
+        print(sum(self.Budget[1:])/len(self.Budget[1:]))
 
         for client in self.clients:
             client.fine_tune()

system/flcore/servers/serverbase.py

@@ -22,7 +22,6 @@
 import copy
 import time
 import random
-
 from utils.data_utils import read_client_data
 from utils.dlg import DLG
 

system/flcore/servers/serverbn.py

@@ -15,11 +15,11 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+import time
 from flcore.clients.clientbn import clientBN
 from flcore.servers.serverbase import Server
 from utils.data_utils import read_client_data
 from threading import Thread
-import time
 
 
 class FedBN(Server):
@@ -34,10 +34,12 @@ def __init__(self, args, times):
         print("Finished creating server and clients.")
 
         # self.load_model()
+        self.Budget = []
 
 
     def train(self):
         for i in range(self.global_rounds+1):
+            s_t = time.time()
             self.selected_clients = self.select_clients()
             self.send_models()
 
@@ -57,13 +59,18 @@ def train(self):
             self.receive_models()
             self.aggregate_parameters()
 
+            self.Budget.append(time.time() - s_t)
+            print('-'*25, 'time cost', '-'*25, self.Budget[-1])
+
             if self.auto_break and self.check_done(acc_lss=[self.rs_test_acc], top_cnt=self.top_cnt):
                 break
 
         print("\nBest accuracy.")
         # self.print_(max(self.rs_test_acc), max(
         #     self.rs_train_acc), min(self.rs_train_loss))
         print(max(self.rs_test_acc))
+        print("\nAverage time cost per round.")
+        print(sum(self.Budget[1:])/len(self.Budget[1:]))
 
         self.save_results()
 

system/flcore/servers/servercp.py

@@ -114,6 +114,7 @@ def train(self):
 
         print("\nBest global accuracy.")
         print(max(self.rs_test_acc))
+        print("\nAverage time cost per round.")
         print(sum(self.Budget[1:])/len(self.Budget[1:]))