Commit b5702366 authored by Yuxin Wu's avatar Yuxin Wu

fix missing import of 2nd-level modules in tfutils

parent 0012fa2b
...@@ -13,7 +13,7 @@ import argparse ...@@ -13,7 +13,7 @@ import argparse
from tensorpack import * from tensorpack import *
from tensorpack.utils import viz from tensorpack.utils import viz
from tensorpack.tfutils.scope_utils import auto_reuse_variable_scope, under_name_scope from tensorpack.tfutils.scope_utils import auto_reuse_variable_scope, under_name_scope
from tensorpack.tfutils import optimizer, summary from tensorpack.tfutils import optimizer, summary, gradproc
from tensorpack.dataflow import dataset from tensorpack.dataflow import dataset
from GAN import GANTrainer, GANModelDesc from GAN import GANTrainer, GANModelDesc
......
...@@ -13,7 +13,7 @@ import os ...@@ -13,7 +13,7 @@ import os
from tensorpack import * from tensorpack import *
from tensorpack.dataflow import dataset from tensorpack.dataflow import dataset
from tensorpack.utils.gpu import get_nr_gpu from tensorpack.utils.gpu import get_nr_gpu
from tensorpack.tfutils import optimizer from tensorpack.tfutils import optimizer, gradproc
from tensorpack.tfutils.summary import add_moving_summary, add_param_summary from tensorpack.tfutils.summary import add_moving_summary, add_param_summary
......
...@@ -13,7 +13,7 @@ import multiprocessing ...@@ -13,7 +13,7 @@ import multiprocessing
import tensorflow as tf import tensorflow as tf
from tensorpack import * from tensorpack import *
from tensorpack.dataflow import dataset from tensorpack.dataflow import dataset
from tensorpack.tfutils import optimizer from tensorpack.tfutils import optimizer, gradproc
from tensorpack.tfutils.symbolic_functions import * from tensorpack.tfutils.symbolic_functions import *
from tensorpack.tfutils.summary import * from tensorpack.tfutils.summary import *
from tensorpack.utils.gpu import get_nr_gpu from tensorpack.utils.gpu import get_nr_gpu
......
...@@ -12,7 +12,7 @@ import argparse ...@@ -12,7 +12,7 @@ import argparse
from tensorpack import * from tensorpack import *
from tensorpack.dataflow import dataset from tensorpack.dataflow import dataset
from tensorpack.tfutils import sesscreate, optimizer, summary from tensorpack.tfutils import sesscreate, optimizer, summary, gradproc
IMAGE_SIZE = 42 IMAGE_SIZE = 42
WARP_TARGET_SIZE = 28 WARP_TARGET_SIZE = 28
......
...@@ -31,11 +31,16 @@ _TO_IMPORT = frozenset([ ...@@ -31,11 +31,16 @@ _TO_IMPORT = frozenset([
for module_name in _TO_IMPORT: for module_name in _TO_IMPORT:
_global_import(module_name) _global_import(module_name)
""" """
Here the goal is to keep submodule names (sesscreate, varmanip, etc) out of __all__, TODO remove this line in the future.
Better to keep submodule names (sesscreate, varmanip, etc) out of __all__,
so that these names will be invisible under `tensorpack.` namespace. so that these names will be invisible under `tensorpack.` namespace.
To use these utilities, users are expected to import them explicitly, e.g.: To use these utilities, users are expected to import them explicitly, e.g.:
import tensorpack.tfutils.symbolic_functions as symbf import tensorpack.tfutils.symbolic_functions as symbf
""" """
__all__.extend(['sessinit', 'summary', 'optimizer',
'sesscreate', 'gradproc', 'varreplace', 'symbolic_functions',
'distributed', 'tower'])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment