update TF models (beta version)

lib/log_utils/__init__.py

@@ -1,7 +1,8 @@
 ##################################################
 # Copyright (c) Xuanyi Dong [GitHub D-X-Y], 2019 #
 ##################################################
-from .logger       import Logger
-from .print_logger import PrintLogger
+# every package does not rely on pytorch or tensorflow
+# I tried to list all dependency here: os, sys, time, numpy, (possibly) matplotlib
+from .logger       import Logger, PrintLogger
 from .meter        import AverageMeter
-from .time_utils   import time_for_file, time_string, time_string_short, time_print, convert_size2str, convert_secs2time
+from .time_utils   import time_for_file, time_string, time_string_short, time_print, convert_secs2time

lib/log_utils/logger.py

@@ -1,9 +1,6 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-# All rights reserved.
-#
-# This source code is licensed under the license found in the
-# LICENSE file in the root directory of this source tree.
-#
+##################################################
+# Copyright (c) Xuanyi Dong [GitHub D-X-Y], 2019 #
+##################################################
 from pathlib import Path
 import importlib, warnings
 import os, sys, time, numpy as np
@@ -16,6 +13,19 @@ if importlib.util.find_spec('tensorflow'):
   import tensorflow as tf
 
 
+class PrintLogger(object):
+  
+  def __init__(self):
+    """Create a summary writer logging to log_dir."""
+    self.name = 'PrintLogger'
+
+  def log(self, string):
+    print (string)
+
+  def close(self):
+    print ('-'*30 + ' close printer ' + '-'*30)
+
+
 class Logger(object):
   
   def __init__(self, log_dir, seed, create_model_dir=True, use_tf=False):

lib/log_utils/meter.py

@@ -1,4 +1,3 @@
-import time, sys
 import numpy as np
 
 

lib/log_utils/print_logger.py

@@ -1,14 +0,0 @@
-import os, sys, time
-
-
-class PrintLogger(object):
-  
-  def __init__(self):
-    """Create a summary writer logging to log_dir."""
-    self.name = 'PrintLogger'
-
-  def log(self, string):
-    print (string)
-
-  def close(self):
-    print ('-'*30 + ' close printer ' + '-'*30)

lib/log_utils/time_utils.py

@@ -1,37 +1,27 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-# All rights reserved.
-#
-# This source code is licensed under the license found in the
-# LICENSE file in the root directory of this source tree.
-#
+##################################################
+# Copyright (c) Xuanyi Dong [GitHub D-X-Y], 2019 #
+##################################################
 import time, sys
 import numpy as np
 
 def time_for_file():
   ISOTIMEFORMAT='%d-%h-at-%H-%M-%S'
-  return '{}'.format(time.strftime( ISOTIMEFORMAT, time.gmtime(time.time()) ))
+  return '{:}'.format(time.strftime( ISOTIMEFORMAT, time.gmtime(time.time()) ))
 
 def time_string():
   ISOTIMEFORMAT='%Y-%m-%d %X'
-  string = '[{}]'.format(time.strftime( ISOTIMEFORMAT, time.gmtime(time.time()) ))
+  string = '[{:}]'.format(time.strftime( ISOTIMEFORMAT, time.gmtime(time.time()) ))
   return string
 
 def time_string_short():
   ISOTIMEFORMAT='%Y%m%d'
-  string = '{}'.format(time.strftime( ISOTIMEFORMAT, time.gmtime(time.time()) ))
+  string = '{:}'.format(time.strftime( ISOTIMEFORMAT, time.gmtime(time.time()) ))
   return string
 
 def time_print(string, is_print=True):
   if (is_print):
     print('{} : {}'.format(time_string(), string))
 
-def convert_size2str(torch_size):
-  dims = len(torch_size)
-  string = '['
-  for idim in range(dims):
-    string = string + ' {}'.format(torch_size[idim])
-  return string + ']'
-  
 def convert_secs2time(epoch_time, return_str=False):    
   need_hour = int(epoch_time / 3600)
   need_mins = int((epoch_time - 3600*need_hour) / 60)