update docs/logging/deprecation

docs/modules/utils.rst

@@ -18,14 +18,6 @@ tensorpack.utils.concurrency module
     :show-inheritance:
 
 
-tensorpack.utils.discretize module
-----------------------------------
-
-.. automodule:: tensorpack.utils.discretize
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 tensorpack.utils.fs module
 --------------------------
 
@@ -58,14 +50,6 @@ tensorpack.utils.logger module
     :undoc-members:
     :show-inheritance:
 
-tensorpack.utils.lut module
----------------------------
-
-.. automodule:: tensorpack.utils.lut
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 
 tensorpack.utils.rect module
 ----------------------------

examples/Char-RNN/char-rnn.py

@@ -14,7 +14,6 @@ from six.moves import map, range
 
 from tensorpack import *
 from tensorpack.tfutils.gradproc import GlobalNormClip
-from tensorpack.utils.lut import LookUpTable
 from tensorpack.utils.globvars import globalns as param
 
 import tensorflow as tf
@@ -50,16 +49,16 @@ class CharRNNData(RNGDataFlow):
         print(sorted(self.chars))
         self.vocab_size = len(self.chars)
         param.vocab_size = self.vocab_size
-        self.lut = LookUpTable(self.chars)
-        self.whole_seq = np.array(list(map(self.lut.get_idx, data)), dtype='int32')
+        char2idx = {c: i for i, c in enumerate(self.chars)}
+        self.whole_seq = np.array([char2idx[c] for c in data], dtype='int32')
         logger.info("Corpus loaded. Vocab size: {}".format(self.vocab_size))
 
     def size(self):
         return self._size
 
     def get_data(self):
-        random_starts = self.rng.randint(0,
-                                         self.whole_seq.shape[0] - self.seq_length - 1, (self._size,))
+        random_starts = self.rng.randint(
+            0, self.whole_seq.shape[0] - self.seq_length - 1, (self._size,))
         for st in random_starts:
             seq = self.whole_seq[st:st + self.seq_length + 1]
             yield [seq[:-1], seq[1:]]

examples/ResNet/imagenet-resnet.py

@@ -131,9 +131,7 @@ class Model(ModelDesc):
         return tf.train.MomentumOptimizer(lr, 0.9, use_nesterov=True)
 
 
-def get_data(train_or_test, fake=False):
-    if fake:
-        return FakeData([[64, 224, 224, 3], [64]], 1000, random=False, dtype='uint8')
+def get_data(train_or_test):
     isTrain = train_or_test == 'train'
 
     datadir = args.data
@@ -197,8 +195,12 @@ def get_data(train_or_test, fake=False):
 
 
 def get_config(fake=False, data_format='NCHW'):
-    dataset_train = get_data('train', fake=fake)
-    dataset_val = get_data('val', fake=fake)
+    if fake:
+        dataset_train = dataset_val = FakeData(
+            [[64, 224, 224, 3], [64]], 1000, random=False, dtype='uint8')
+    else:
+        dataset_train = get_data('train')
+        dataset_val = get_data('val')
 
     return TrainConfig(
         model=Model(data_format=data_format),
@@ -259,9 +261,11 @@ if __name__ == '__main__':
     NR_GPU = len(args.gpu.split(','))
     BATCH_SIZE = TOTAL_BATCH_SIZE // NR_GPU
 
-    logger.auto_set_dir()
+    logger.set_logger_dir(
+        os.path.join('train_log', 'imagenet-resnet-d' + str(DEPTH)))
+    logger.info("Batch size per GPU: " + str(BATCH_SIZE))
     config = get_config(fake=args.fake, data_format=args.data_format)
     if args.load:
         config.session_init = SaverRestore(args.load)
     config.nr_tower = NR_GPU
-    SyncMultiGPUTrainer(config).train()
+    SyncMultiGPUTrainerParameterServer(config).train()

tensorpack/dataflow/imgaug/deform.py

@@ -61,8 +61,9 @@ def np_sample(img, coords):
 
 class GaussianDeform(ImageAugmentor):
     """
-    Some kind of slow deformation.
+    Some kind of slow deformation I made up. Don't count on it.
     """
+
     # TODO input/output with different shape
 
     def __init__(self, anchors, shape, sigma=0.5, randrange=None):

tensorpack/train/multigpu.py

@@ -208,7 +208,8 @@ class SyncMultiGPUTrainerParameterServer(MultiGPUTrainerBase, SingleCostFeedfree
 def SyncMultiGPUTrainer(config):
     """
     Alias for ``SyncMultiGPUTrainerParameterServer(config, ps_device='gpu')``,
-    as this is the most commonly used synchronous multigpu trainer.
+    as this is the most commonly used synchronous multigpu trainer (but may
+    not be more efficient than the other).
     """
     return SyncMultiGPUTrainerParameterServer(config, ps_device='gpu')
 

tensorpack/utils/discretize.py

@@ -3,12 +3,14 @@
 # File: discretize.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
-from .argtools import log_once
 from abc import abstractmethod, ABCMeta
 import numpy as np
 import six
 from six.moves import range
 
+from .argtools import log_once
+from .develop import log_deprecated
+
 __all__ = ['UniformDiscretizer1D', 'UniformDiscretizerND']
 
 
@@ -40,6 +42,7 @@ class UniformDiscretizer1D(Discretizer1D):
         self.maxv = float(maxv)
         self.spacing = float(spacing)
         self.nr_bin = int(np.ceil((self.maxv - self.minv) / self.spacing))
+        log_deprecated("Discretizer", "It's not related to the library and I'd be surprised if you're using it..")
 
     def get_nr_bin(self):
         """

tensorpack/utils/lut.py

@@ -4,6 +4,7 @@
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 import six
+from .develop import log_deprecated
 
 __all__ = ['LookUpTable']
 
@@ -18,6 +19,7 @@ class LookUpTable(object):
         """
         self.idx2obj = dict(enumerate(objlist))
         self.obj2idx = {v: k for k, v in six.iteritems(self.idx2obj)}
+        log_deprecated("LookUpTable", "It's not related to the library and I'd be surprised if you're using it..")
 
     def size(self):
         return len(self.idx2obj)

tests/case_script.py

@@ -50,10 +50,11 @@ class PythonScript(threading.Thread):
             self.p.kill()  # kill -9
             self.join()
         else:
-            # something unexpected happend here, this script was supposed to survive at leat the timeout
+            # something unexpected happend here, this script was supposed to survive at least the timeout
             if len(self.err) is not 0:
-                stderr = u"\n\n\n\n\n" + self.err.decode('utf-8')
-                raise AssertionError(stderr)
+                output = u"STDOUT: \n\n\n" + self.out.decode('utf-8')
+                output += u"\n\n\n STDERR: \n\n\n" + self.err.decode('utf-8')
+                raise AssertionError(output)
 
 
 class TestPythonScript(unittest.TestCase):