Explicit import under 'if False' to trick jedi (#656)

tensorpack/callbacks/__init__.py

@@ -2,6 +2,24 @@
 #  File: __init__.py
 
 
+if False:
+    from .base import *
+    from .concurrency import *
+    from .graph import *
+    from .group import *
+    from .hooks import *
+    from .inference import *
+    from .inference_runner import *
+    from .monitor import *
+    from .param import *
+    from .prof import *
+    from .saver import *
+    from .stats import *
+    from .steps import *
+    from .summary import *
+    from .trigger import *
+
+
 from pkgutil import iter_modules
 import os
 

tensorpack/dataflow/__init__.py

 #  -*- coding: UTF-8 -*-
 #  File: __init__.py
 
+if False:
+    from .base import *
+    from .common import *
+    from .format import *
+    from .image import *
+    from .parallel_map import *
+    from .parallel import *
+    from .raw import *
+    from .remote import *
+    from . import imgaug
+    from . import dataset
+    from . import dftools
+
 
 from pkgutil import iter_modules
 import os
@@ -33,8 +46,8 @@ for _, module_name, __ in iter_modules(
         _global_import(module_name)
 
 
-dataset = LazyLoader('dataset', globals(), 'tensorpack.dataflow.dataset')
-imgaug = LazyLoader('imgaug', globals(), 'tensorpack.dataflow.imgaug')
+globals()['dataset'] = LazyLoader('dataset', globals(), 'tensorpack.dataflow.dataset')
+globals()['imgaug'] = LazyLoader('imgaug', globals(), 'tensorpack.dataflow.imgaug')
 
 del LazyLoader
 

tensorpack/dataflow/dataset/__init__.py

 #  -*- coding: UTF-8 -*-
 #  File: __init__.py
 
+if False:
+    from .bsds500 import *
+    from .cifar import *
+    from .ilsvrc import *
+    from .mnist import *
+    from .svhn import *
 
 from pkgutil import iter_modules
 import os

tensorpack/dataflow/imgaug/__init__.py

 # -*- coding: UTF-8 -*-
 # File: __init__.py
 
+if False:
+    from .base import *
+    from .convert import *
+    from .crop import *
+    from .deform import *
+    from .geometry import *
+    from .imgproc import *
+    from .meta import *
+    from .misc import *
+    from .noise import *
+    from .paste import *
+    from .transform import *
+
 
 import os
 from pkgutil import iter_modules

tensorpack/graph_builder/__init__.py

 #  -*- coding: UTF-8 -*-
 #  File: __init__.py
 
+if False:
+    from .model_desc import *
+    from .training import *
+    from .distributed import *
+    from .predict import *
+    from .utils import *
 
 from pkgutil import iter_modules
 import os
@@ -8,7 +14,6 @@ import os.path
 
 __all__ = []
 
-
 def global_import(name):
     p = __import__(name, globals(), locals(), level=1)
     lst = p.__all__ if '__all__' in dir(p) else []

tensorpack/input_source/__init__.py

 #  -*- coding: UTF-8 -*-
 #  File: __init__.py
 
+if False:
+    from .input_source_base import *
+    from .input_source import *
 
 from pkgutil import iter_modules
 import os

tensorpack/models/__init__.py

 #  -*- coding: UTF-8 -*-
 #  File: __init__.py
 
+if False:
+    from .batch_norm import *
+    from .common import *
+    from .conv2d import *
+    from .fc import *
+    from .image_sample import *
+    from .layer_norm import *
+    from .linearwrap import *
+    from .nonlin import *
+    from .pool import *
+    from .regularize import *
+
 
 from pkgutil import iter_modules
 import os

tensorpack/predict/__init__.py

 #  -*- coding: UTF-8 -*-
 #  File: __init__.py
 
+if False:
+    from .base import *
+    from .concurrency import *
+    from .config import *
+    from .dataset import *
+    from .multigpu import *
+
 
 from pkgutil import iter_modules
 import os

tensorpack/tfutils/__init__.py

@@ -2,10 +2,14 @@
 #  File: __init__.py
 
 
-from pkgutil import iter_modules
-import os
-
 from .tower import get_current_tower_context, TowerContext
+
+if False:
+    from .common import *
+    from .sessinit import *
+    from .argscope import *
+
+
 # don't want to include everything from .tower
 __all__ = ['get_current_tower_context', 'TowerContext']
 
@@ -19,22 +23,19 @@ def _global_import(name):
             __all__.append(k)
 
 
-_TO_IMPORT = set([
+_TO_IMPORT = frozenset([
     'common',
     'sessinit',
     'argscope',
 ])
 
-_CURR_DIR = os.path.dirname(__file__)
-for _, module_name, _ in iter_modules(
-        [_CURR_DIR]):
-    srcpath = os.path.join(_CURR_DIR, module_name + '.py')
-    if not os.path.isfile(srcpath):
-        continue
-    if module_name.startswith('_'):
-        continue
-    if module_name in _TO_IMPORT:
-        _global_import(module_name)  # import the content to tfutils.*
-__all__.extend(['sessinit', 'summary', 'optimizer',
-                'sesscreate', 'gradproc', 'varreplace', 'symbolic_functions',
-                'distributed', 'tower'])
+for module_name in _TO_IMPORT:
+    _global_import(module_name)
+"""
+Here the goal is to keep submodule names (sesscreate, varmanip, etc) out of __all__,
+so that these names will be invisible under `tensorpack.` namespace.
+
+To use these utilities, users are expected to import them explicitly, e.g.:
+
+import tensorpack.tfutils.symbolic_functions as symbf
+"""

tensorpack/train/__init__.py

 #  -*- coding: UTF-8 -*-
 #  File: __init__.py
 
+if False:
+    from .base import *
+    from .config import *
+    from .interface import *
+    from .tower import *
+    from .trainers import *
+
 
 from pkgutil import iter_modules
 import os

tensorpack/utils/__init__.py

@@ -37,15 +37,5 @@ def get_rng(obj=None):
         "Please do `from tensorpack.utils.utils import get_rng`")
     return gr(obj)
 
-
-_CURR_DIR = os.path.dirname(__file__)
-for _, module_name, _ in iter_modules(
-        [_CURR_DIR]):
-    srcpath = os.path.join(_CURR_DIR, module_name + '.py')
-    if not os.path.isfile(srcpath):
-        continue
-    if module_name.startswith('_'):
-        continue
-__all__.extend([
-    'logger',
-    'get_nr_gpu', 'change_gpu', 'get_rng'])
+# Import no submodules. they are supposed to be explicitly imported by users.
+__all__.extend(['logger', 'get_nr_gpu', 'change_gpu', 'get_rng'])

tox.ini

@@ -2,7 +2,7 @@
 max-line-length = 120
 ignore = E265,E741,E742,E743
 exclude = .git,
-					tensorpack/__init__.py,
+					__init__.py,
 					setup.py,
 					docs,
 					examples,