修改Timeit名称

Author: Tongjilibo

setup.py

@@ -14,6 +14,6 @@
     license='Apache License',
     url='https://github.com/Tongjilibo/torch4keras',
     author='Tongjilibo',
-    install_requires=['numpy'],
+    install_requires=['numpy', 'packaging'],
     packages=find_packages()
 )

test/test_time.py

@@ -1,4 +1,4 @@
-from torch4keras.snippets import timeit, Timeit, Timeit2
+from torch4keras.snippets import timeit, TimeitContextManager, TimeitLogger
 import time
 
 
@@ -10,27 +10,27 @@ def func(n=10):
 func()
 
 # 上下文管理器 - 统计累计耗时
-with Timeit() as ti:
+with TimeitContextManager() as ti:
     for i in range(10):
         time.sleep(0.1)
         ti.lap(name=i, reset=False)  # 统计累计耗时
 
 # 上下文管理器 - 统计每段速度
-with Timeit() as ti:
+with TimeitContextManager() as ti:
     for i in range(10):
         time.sleep(0.1)
         ti.lap(count=10, name=i, reset=True)
     ti(10) # 统计速度
 
 
 # 上下文管理器 - 统计速度
-with Timeit() as ti:
+with TimeitContextManager() as ti:
     for i in range(10):
         time.sleep(0.1)
         ti.lap(name=i, reset=True)
     ti(10) # 统计速度
 
-ti = Timeit2()
+ti = TimeitLogger()
 for i in range(10):
     time.sleep(0.1)
     ti.lap(name=i)

torch4keras/snippets/log.py

@@ -54,6 +54,19 @@ def log_level(string:str, level:Union[int, str]=0, verbose:int=1):
 info_level_prefix = log_level
 
 
+def log_free(string:str, prefix:str, string_color:str=None, prefix_color:str='yellow', verbose:int=1):
+    '''自由log'''
+    if string_color:
+        string = colorful(string, color=string_color)
+    if prefix:
+        prefix = colorful(prefix, color=prefix_color)
+        string = prefix + ' ' + string
+    
+    if verbose != 0:
+        print(string)
+    return string
+
+
 def log_info(string:str, verbose:int=1):
     '''[INFO]: message, 绿色前缀'''
     res = colorful('[INFO]', color='green') + ' ' + string.strip()

torch4keras/snippets/misc.py

@@ -644,4 +644,15 @@ def docstring_decorator(fn):
         fn.__doc__ = (fn.__doc__ if fn.__doc__ is not None else "") + "".join(docstr)
         return fn
 
-    return docstring_decorator
+    return docstring_decorator
+
+
+class NoopContextManager:
+    '''无意义的上下文管理器占位'''
+    def __enter__(self):
+        # 不执行任何操作
+        return None
+ 
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        # 不执行任何操作，也不抑制异常
+        return False

torch4keras/snippets/monitor.py

@@ -83,13 +83,13 @@ def warpper(*args, **kwargs):
     return warpper
 
 
-class Timeit:
+class TimeitContextManager:
     '''上下文管理器, 记录耗时/平均耗时
 
     Examples:
     ```python
-    >>> from torch4keras.snippets import Timeit
-    >>> with Timeit() as ti:
+    >>> from torch4keras.snippets import TimeitContextManager
+    >>> with TimeitContextManager() as ti:
     ...     for i in range(10):
     ...         time.sleep(0.1)
     ...         # ti.lap(name=i, reset=False)  # 统计累计耗时
@@ -152,12 +152,12 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         self.lap(name='Total', reset=False)
 
 
-class Timeit2:
+class TimeitLogger:
     '''记录耗时
 
     Examples:
     ```python
-    >>> ti = Timeit2()
+    >>> ti = TimeitLogger()
     >>> for i in range(10):
     ...     time.sleep(0.1)
     ...     ti.lap(name=i)