fix build

tensorpack/callbacks/inference_runner.py

@@ -13,7 +13,8 @@ import tqdm
 import six
 from six.moves import range
 
-from ..utils import logger, get_tqdm_kwargs
+from ..utils import logger
+from ..utils.utils import get_tqdm_kwargs
 from ..utils.develop import deprecated
 from ..dataflow import DataFlow
 

tensorpack/callbacks/steps.py

@@ -8,7 +8,8 @@ import tensorflow as tf
 from six.moves import zip
 import tqdm
 
-from ..utils import logger, get_tqdm_kwargs
+from ..utils import logger
+from ..utils.utils import get_tqdm_kwargs
 from ..utils.naming import GLOBAL_STEP_INCR_OP_NAME
 from ..tfutils.common import (
     get_op_tensor_name, get_global_step_var,

tensorpack/dataflow/common.py

@@ -10,7 +10,8 @@ from termcolor import colored
 from collections import deque, defaultdict
 from six.moves import range, map
 from .base import DataFlow, ProxyDataFlow, RNGDataFlow
-from ..utils import logger, get_tqdm, get_rng
+from ..utils import logger, get_rng
+from ..utils.utils import get_tqdm
 from ..utils.develop import log_deprecated
 
 __all__ = ['TestDataSpeed', 'PrintData', 'BatchData', 'BatchDataByShape', 'FixedSizeData', 'MapData',

tensorpack/dataflow/dftools.py

@@ -7,7 +7,8 @@ import multiprocessing as mp
 from six.moves import range
 
 from .base import DataFlow
-from ..utils import get_tqdm, logger
+from ..utils import logger
+from ..utils.utils import get_tqdm
 from ..utils.concurrency import DIE
 from ..utils.serialize import dumps
 

tensorpack/dataflow/format.py

@@ -7,7 +7,8 @@ import six
 from six.moves import range
 import os
 
-from ..utils import logger, get_tqdm
+from ..utils import logger
+from ..utils.utils import get_tqdm
 from ..utils.timer import timed_operation
 from ..utils.loadcaffe import get_caffe_pb
 from ..utils.serialize import loads

tensorpack/utils/utils.py

@@ -15,7 +15,7 @@ __all__ = ['change_env',
            'get_rng',
            'fix_rng_seed',
            # 'get_tqdm_kwargs',
-           # 'get_tqdm',
+           'get_tqdm',
            'execute_only_once',
            ]
 
@@ -122,6 +122,6 @@ def get_tqdm_kwargs(**kwargs):
 
 
 def get_tqdm(**kwargs):
-    """ Similar to :func:`get_tqdm_kwargs`, but returns the tqdm object
-    directly. """
+    """ Similar to :func:`get_tqdm_kwargs`,
+    but returns the tqdm object directly. """
     return tqdm(**get_tqdm_kwargs(**kwargs))