fix(exp_manager): add log_name_formatter

Author: xionghuichen

.gitignore

@@ -11,5 +11,6 @@ RLA.egg-info**
 **/arc/**
 **/.ipynb_checkpoints/*
 **/.DS_Store
+test/test_data_root/*
 test/target_data_root/*
 **/private_config.py

RLA/easy_log/tester.py

@@ -524,6 +524,24 @@ def _copy_run_file(run_file, code_dir):
         else:
             raise NotImplementedError
 
+    def log_name_formatter(self, prefix, record_date):
+        """
+        return a unified and unique name for the experiment log.
+        :param prefix: prefix location to store the log data.
+        :param record_date: the timestamp of the experiment log.
+        :return: a unify and unique name
+        """
+        version_num = self.get_version_num()
+        if version_num is None:
+            name_format = '{prefix}/{date}/{timestep} {ip} {info}'
+        elif version_num == LOG_NAME_FORMAT_VERSION.V1:
+            name_format = '{prefix}/{date}/{timestep}_{ip}_{info}'
+        else:
+            raise RuntimeError("unknown version name", version_num)
+        date = record_date.strftime("%Y/%m/%d")
+        return name_format.format(prefix=prefix, date=date, timestep=self.record_date_to_str(record_date),
+                                                             ip=str(self.ipaddr), info=self.info)
+
     def record_date_to_str(self, record_date):
         return str(record_date.strftime("%H-%M-%S-%f"))
 
@@ -534,29 +552,14 @@ def get_version_num(self):
     def __create_file_directory(self, prefix, ext='', is_file=True, record_date=None):
         if record_date is None:
             record_date = self.record_date
+        name = self.log_name_formatter(prefix, record_date)
         directory = str(record_date.strftime("%Y/%m/%d"))
         directory = osp.join(prefix, directory)
-        version_num = self.get_version_num()
-
-        if version_num is None:
-            name_format = '{dir}/{timestep} {ip} {info}{ext}'
-        elif version_num == LOG_NAME_FORMAT_VERSION.V1:
-            name_format = '{dir}/{timestep}_{ip}_{info}{ext}'
-        else:
-            raise RuntimeError("unknown version name", version_num)
-
         if is_file:
             os.makedirs(directory, exist_ok=True)
-            file_name = name_format.format(dir=directory, timestep=self.record_date_to_str(record_date),
-                                                                 ip=str(self.ipaddr),
-                                                                 info=self.info,
-                                                                 ext=ext)
+            file_name = name + ext
         else:
-            directory = (name_format + '/').format(dir=directory,
-                                                                 timestep=self.record_date_to_str(record_date),
-                                                                 ip=str(self.ipaddr),
-                                                                 info=self.info,
-                                                                 ext=ext)
+            directory = name + '/'
             os.makedirs(directory, exist_ok=True)
             file_name = ''
         return directory, file_name

test/test_proj/proj/test_manager.py

@@ -15,6 +15,7 @@ def target_func(x):
 DATABASE_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 CODE_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+
 class ManagerTest(BaseTest):
 
     def _load_rla_config(self):
@@ -54,7 +55,6 @@ def test_log_tf(self):
 
         exp_manager.new_saver(var_prefix='', max_to_keep=1)
         # synthetic target function.
-
         for i in range(0, 100):
             exp_manager.time_step_holder.set_time(i)
             x_input = np.random.normal(0, 3, [64, kwargs["input_size"]])
@@ -66,8 +66,6 @@ def test_log_tf(self):
             if i % 20 == 0:
                 exp_manager.save_checkpoint()
             if i % 10 == 0:
-                logger.ma_record_tabular("perf/mse-long", np.mean(mse_loss.detach().cpu().numpy()), 10, freq=25)
-                logger.record_tabular("y_out-long", np.mean(y), freq=25)
                 def plot_func():
                     import matplotlib.pyplot as plt
                     testX = np.repeat(np.expand_dims(np.arange(-10, 10, 0.1), axis=-1), repeats=kwargs["input_size"], axis=-1)
@@ -139,7 +137,12 @@ def test_sent_to_master(self):
         exp_manager.set_hyper_param(**kwargs)
         exp_manager.add_record_param(['input_size'])
         yaml = self._load_rla_config()
-        from test.test_proj.proj import private_config
+        try:
+            from test.test_proj.proj import private_config
+        except ImportError as e:
+            print("[WARN] for this test, you should config your username, password, and the remote root firstly.")
+            return
+            # raise RuntimeError
         yaml['DL_FRAMEWORK'] = 'torch'
         yaml['SEND_LOG_FILE'] = True
         yaml['REMOTE_SETTING']['ftp_server'] = '127.0.0.1'