aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/__init__.py
diff options
context:
space:
mode:
authorGravatar Anna R <annarev@google.com>2018-04-08 15:42:16 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-04-08 15:44:25 -0700
commit1eea5ad3f9a622411117f7208d308055b0707d0f (patch)
tree585a1f61fad6e09d0932de595c62e0679b30da55 /tensorflow/__init__.py
parent8fd805fc79ca585fe90ec9fd7c9e0feef89f798e (diff)
Automated g4 rollback of changelist 191360905
PiperOrigin-RevId: 192065431
Diffstat (limited to 'tensorflow/__init__.py')
-rw-r--r--tensorflow/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tensorflow/__init__.py b/tensorflow/__init__.py
index 78ad6aec19..c8683e3976 100644
--- a/tensorflow/__init__.py
+++ b/tensorflow/__init__.py
@@ -20,14 +20,19 @@ from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
+# pylint: disable=g-bad-import-order
+from tensorflow.python import pywrap_tensorflow # pylint: disable=unused-import
# pylint: disable=wildcard-import
-from tensorflow.python import * # pylint: disable=redefined-builtin
+from tensorflow.tools.api.generator.api import * # pylint: disable=redefined-builtin
# pylint: enable=wildcard-import
from tensorflow.python.util.lazy_loader import LazyLoader
contrib = LazyLoader('contrib', globals(), 'tensorflow.contrib')
del LazyLoader
+from tensorflow.python.platform import flags # pylint: disable=g-import-not-at-top
+app.flags = flags # pylint: disable=undefined-variable
+
del absolute_import
del division
del print_function