fedops 0.2.1__tar.gz → 0.2.2__tar.gz

{fedops-0.2.1 → fedops-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fedops
-Version: 0.2.1
+Version: 0.2.2
 Summary: FL Lifecycle Operations Management Platform
 Home-page: https://github.com/gachon-CCLab/FedOps.git
 Author: Semo Yang

{fedops-0.2.1 → fedops-0.2.2}/fedops/client/app.py

@@ -10,10 +10,11 @@ from . import client_fl
 from . import client_wandb
 from . import client_api
 
+
 class FLClientTask():
     def __init__(self, config, fl_task):
         self.app = FastAPI()
-        
+
         self.x_train = fl_task[0]
         self.x_test = fl_task[1]
         self.y_train = fl_task[2]
@@ -27,7 +28,7 @@ class FLClientTask():
         self.validation_split = config['data']['validation_split']
         self.wandb_key = config['wandb']['api_key']
         self.wandb_account = config['wandb']['account']
-        
+
         self.status = client_utils.FLClientStatus()
 
     async def fl_client_start(self):
@@ -85,6 +86,9 @@ class FLClientTask():
             wandb_run.log({"operation_time": fl_end_time, "next_gl_model_v": self.status.FL_next_gl_model},
                           step=self.status.FL_next_gl_model)
 
+            # close wandb
+            wandb_run.finish()
+
             client_all_time_result = {"fl_task_id": self.task_id, "client_mac": self.status.FL_client_mac,
                                       "operation_time": fl_end_time,
                                       "next_gl_model_v": self.status.FL_next_gl_model, "wandb_name": wandb_name}
@@ -154,7 +158,7 @@ class FLClientTask():
             background_tasks.add_task(self.fl_client_start)
 
             return self.status
-        
+
         try:
             # create client api => to connect client manager
             uvicorn.run(self.app, host='0.0.0.0', port=8002)
@@ -167,5 +171,5 @@ class FLClientTask():
             # FL client out
             client_api.ClientMangerAPI().get_client_out()
             logging.info(f'{self.status.FL_client_mac}-client close')
-            
+
 

{fedops-0.2.1 → fedops-0.2.2}/fedops/client/client_wandb.py

@@ -35,8 +35,7 @@ def client_system_wandb(fl_task_id, client_mac, next_gl_model_v, wandb_name, wan
 
         sys_df = runs[0].history(stream="system")
 
-        col = ['system.network.sent', 'system.network.recv', 'system.disk', '_runtime', 'system.proc.memory.rssMB','system.proc.memory.availableMB', 'system.cpu', 'system.proc.cpu.threads', 'system.memory', 'system.proc.memory.percent', '_timestamp']
-        cols = [c.replace('\n', '') for c in col]
+        cols = ['system.network.sent', 'system.network.recv', 'system.disk', '_runtime', 'system.proc.memory.rssMB','system.proc.memory.availableMB', 'system.cpu', 'system.proc.cpu.threads', 'system.memory', 'system.proc.memory.percent', '_timestamp']
 
         sys_df = sys_df[cols]
 
@@ -67,9 +66,6 @@ def client_system_wandb(fl_task_id, client_mac, next_gl_model_v, wandb_name, wan
             # send client_system  to client_performance pod
             client_api.ClientServerAPI(fl_task_id).put_client_system(sys_df_row_json)
 
-        # close wandb
-        wandb.finish()
-
     except Exception as e:
         logging.error(f'wandb system load error: {e}')
-        wandb.finish() # close wandb
+

{fedops-0.2.1 → fedops-0.2.2}/fedops.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fedops
-Version: 0.2.1
+Version: 0.2.2
 Summary: FL Lifecycle Operations Management Platform
 Home-page: https://github.com/gachon-CCLab/FedOps.git
 Author: Semo Yang

{fedops-0.2.1 → fedops-0.2.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='fedops',
-    version='0.2.1',
+    version='0.2.2',
     author='Semo Yang',
     author_email='tpah20@gmail.com',
     description='FL Lifecycle Operations Management Platform',