warning about optional dependency

tensorpack/RL/gymenv.py

@@ -14,7 +14,7 @@ try:
     # not sure does it cause other problems
     __all__ = ['GymEnv']
 except ImportError:
-    logger.warn("Cannot import gym. GymEnv won't be available.")
+    logger.warn_dependency('GymEnv', 'gym')
     __all__ = []
 
 import threading

tensorpack/RL/simulator.py

@@ -30,7 +30,7 @@ __all__ = ['SimulatorProcess', 'SimulatorMaster',
 try:
     import zmq
 except ImportError:
-    logger.warn("Error in 'import zmq'. RL simulator won't be available.")
+    logger.warn_dependency('Simulator', 'zmq')
     __all__ = []
 
 class TransitionExperience(object):

tensorpack/dataflow/dataset/bsds500.py

@@ -15,7 +15,7 @@ try:
     from scipy.io import loadmat
     __all__ = ['BSDS500']
 except ImportError:
-    logger.warn("Cannot import scipy. BSDS500 dataset won't be available!")
+    logger.warn_dependency('BSDS500', 'scipy.io')
     __all__ = []
 
 DATA_URL = "http://www.eecs.berkeley.edu/Research/Projects/CS/vision/grouping/BSR/BSR_bsds500.tgz"

tensorpack/dataflow/dataset/svhn.py

@@ -15,7 +15,7 @@ try:
     import scipy.io
     __all__ = ['SVHNDigit']
 except ImportError:
-    logger.warn("Cannot import scipy. SVHNDigit dataset won't be available!")
+    logger.warn_dependency('SVHNDigit', 'scipy.io')
     __all__ = []
 
 SVHN_URL = "http://ufldl.stanford.edu/housenumbers/"

tensorpack/dataflow/format.py

@@ -13,7 +13,7 @@ from .base import RNGDataFlow
 try:
     import h5py
 except ImportError:
-    logger.warn("Error in 'import h5py'. HDF5Data won't be available.")
+    logger.warn_dependency("HDF5Data", 'h5py')
     __all__ = []
 else:
     __all__ = ['HDF5Data']
@@ -21,14 +21,14 @@ else:
 try:
     import lmdb
 except ImportError:
-    logger.warn("Error in 'import lmdb'. LMDBData won't be available.")
+    logger.warn_dependency("LMDBData", 'lmdb')
 else:
     __all__.extend(['LMDBData', 'CaffeLMDB', 'LMDBDataDecoder'])
 
 try:
     import sklearn.datasets
 except ImportError:
-    logger.warn("Error in 'import sklearn'. SVMLightData won't be available.")
+    logger.warn_dependency('SVMLightData', 'sklearn')
 else:
     __all__.extend(['SVMLightData'])
 

tensorpack/dataflow/prefetch.py

@@ -21,7 +21,7 @@ __all__ = ['PrefetchData', 'BlockParallel']
 try:
     import zmq
 except ImportError:
-    logger.warn("Error in 'import zmq'. PrefetchDataZMQ won't be available.")
+    logger.warn_dependency('PrefetchDataZMQ', 'zmq')
 else:
     __all__.extend(['PrefetchDataZMQ', 'PrefetchOnGPUs'])
 

tensorpack/dataflow/tf_func.py

@@ -9,7 +9,7 @@ from ..utils import logger
 try:
     import tensorflow as tf
 except ImportError:
-    logger.warn("Cannot import tensorflow. TFFuncMapper won't be available.")
+    logger.warn_dependency('TFFuncMapper', 'tensorflow')
     __all__ = []
 else:
     __all__ = ['TFFuncMapper']

tensorpack/models/conv2d.py

@@ -69,21 +69,12 @@ class StaticDynamicShape(object):
     def __init__(self, static, dynamic):
         self.static = static
         self.dynamic = dynamic
-
-    def apply_dynamic(self, f):
-        try:
-            return f(self.static)
-        except:
-            return f(self.dynamic)
-
-    def apply_static(self, f):
+    def apply(self, f):
         try:
-            return f(self.static)
+            st = f(self.static)
+            return StaticDynamicShape(st, st)
         except:
-            return None
-
-    def apply(self, f):
-        return StaticDynamicShape(self.apply_static(f), self.apply_dynamic(f))
+            return StaticDynamicShape(None, f(self.dynamic))
 
 @layer_register()
 def Deconv2D(x, out_shape, kernel_shape,

tensorpack/predict/concurrency.py

@@ -21,7 +21,7 @@ try:
     else:
         from concurrent.futures import Future
 except ImportError:
-    logger.warn("Cannot import Future in tornado.concurrent. MultiThreadAsyncPredictor won't be available.")
+    logger.warn_dependency('MultiThreadAsyncPredictor', 'tornado.concurrent')
     __all__ = ['MultiProcessPredictWorker', 'MultiProcessQueuePredictWorker']
 else:
     __all__ = ['MultiProcessPredictWorker', 'MultiProcessQueuePredictWorker',

tensorpack/utils/logger.py

@@ -115,3 +115,6 @@ def auto_set_dir(action=None, overwrite=False):
             os.path.join('train_log',
                 basename[:basename.rfind('.')]),
             action=action)
+
+def warn_dependency(name, dependencies):
+    warn("Failed to import '{}', {} won't be available'".format(dependencies, name))

tensorpack/utils/viz.py

@@ -200,7 +200,6 @@ def dump_dataflow_images(df, index=0, batched=True,
                     nr_row=viz[0], nr_col=viz[1], viz=True))
                 vizlist = vizlist[vizsize:]
 
-
 if __name__ == '__main__':
     import cv2
     imglist = []