Fixed relative path problems mentioned in Issue #1

SamuelGong · Mar 6, 2023 · 834c834 · 834c834
1 parent f8b21b9
commit 834c834
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/plato/config.py b/plato/config.py
@@ -130,10 +130,6 @@ def __new__(cls):
             # A run ID is unique to each client in an experiment
             Config.params['run_id'] = os.getpid()
 
-            # Pretrained models
-            Config.params['model_dir'] = "./models/pretrained/"
-            Config.params['pretrained_model_dir'] = "./models/pretrained/"
-
         return cls._instance
 
     @staticmethod

diff --git a/plato/trainers/base.py b/plato/trainers/base.py
@@ -59,7 +59,7 @@ def load_model(self, filename=None):
     @staticmethod
     def save_accuracy(accuracy, filename=None):
         """Saving the test accuracy to a file."""
-        model_dir = Config().params['model_dir']
+        model_dir = Config().result_dir
         model_name = Config().trainer.model_name
 
         if not os.path.exists(model_dir):
@@ -76,7 +76,7 @@ def save_accuracy(accuracy, filename=None):
     @staticmethod
     def load_accuracy(filename=None):
         """Loading the test accuracy from a file."""
-        model_dir = Config().params['model_dir']
+        model_dir = Config().result_dir
         model_name = Config().trainer.model_name
 
         if filename is not None:
@@ -110,7 +110,7 @@ def pause_training(self):
                                   (self.client_id, ))
 
         model_name = Config().trainer.model_name
-        model_dir = Config().params['model_dir']
+        model_dir = Config().result_dir
         model_file = f"{model_dir}{model_name}_{self.client_id}_{Config().params['run_id']}.pth"
         accuracy_file = f"{model_dir}{model_name}_{self.client_id}_{Config().params['run_id']}.acc"
 

diff --git a/plato/trainers/basic.py b/plato/trainers/basic.py
@@ -75,7 +75,7 @@ def zeros(self, shape):
     def save_model(self, filename=None):
         """Saving the model to a file."""
         model_name = Config().trainer.model_name
-        model_dir = Config().params['model_dir']
+        model_dir = Config().result_dir
 
         if not os.path.exists(model_dir):
             os.makedirs(model_dir)
@@ -96,7 +96,7 @@ def save_model(self, filename=None):
 
     def load_model(self, filename=None):
         """Loading pre-trained model weights from a file."""
-        model_dir = Config().params['pretrained_model_dir']
+        model_dir = Config().result_dir
         model_name = Config().trainer.model_name
 
         if filename is not None:

diff --git a/plato/trainers/mindspore/basic.py b/plato/trainers/mindspore/basic.py
@@ -66,7 +66,7 @@ def zeros(self, shape):
     def save_model(self, filename=None):
         """Saving the model to a file."""
         model_name = Config().trainer.model_name
-        model_dir = Config().params['model_dir']
+        model_dir = Config().result_dir
 
         if not os.path.exists(model_dir):
             os.makedirs(model_dir)
@@ -88,7 +88,7 @@ def save_model(self, filename=None):
     def load_model(self, filename=None):
         """Loading pre-trained model weights from a file."""
         model_name = Config().trainer.model_name
-        model_dir = Config().params['pretrained_model_dir']
+        model_dir = Config().result_dir
 
         if filename is not None:
             model_path = f'{model_dir}{filename}'

diff --git a/plato/trainers/tensorflow/basic.py b/plato/trainers/tensorflow/basic.py
@@ -40,7 +40,7 @@ def zeros(self, shape):
     def save_model(self, filename=None):
         """Saving the model to a file."""
         model_name = Config().trainer.model_name
-        model_dir = Config().params['model_dir']
+        model_dir = Config().result_dir
 
         if not os.path.exists(model_dir):
             os.makedirs(model_dir)
@@ -62,7 +62,7 @@ def save_model(self, filename=None):
     def load_model(self, filename=None):
         """Loading pre-trained model weights from a file."""
         model_name = Config().trainer.model_name
-        model_dir = Config().params['pretrained_model_dir']
+        model_dir = Config().result_dir
 
         if filename is not None:
             model_path = f'{model_dir}{filename}'