Fix estimator tests when running against the installed pip package.

This change allows the importing from tensorflow.python.estimator.* for usage in tests.
Change: 150356830

tensorflow/python/__init__.py

@@ -74,7 +74,7 @@ from tensorflow.python.ops.standard_ops import *
 # pylint: enable=wildcard-import
 
 # Bring in subpackages.
-from tensorflow.python import estimator
+from tensorflow.python.estimator import estimator_lib as estimator
 from tensorflow.python.layers import layers
 from tensorflow.python.ops import image_ops as image
 from tensorflow.python.ops import metrics

tensorflow/python/estimator/BUILD

@@ -14,7 +14,7 @@ load("//tensorflow:tensorflow.bzl", "py_test")
 
 py_library(
     name = "estimator_py",
-    srcs = ["__init__.py"],
+    srcs = ["estimator_lib.py"],
     srcs_version = "PY2AND3",
     deps = [
         ":checkpoint_utils",

tensorflow/python/estimator/__init__.py

-# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""Estimator: High level tools for working with models."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-from tensorflow.python.estimator import export
-from tensorflow.python.estimator import inputs
-
-from tensorflow.python.estimator.estimator import Estimator
-
-from tensorflow.python.estimator.model_fn import EstimatorSpec
-from tensorflow.python.estimator.model_fn import ModeKeys
-
-from tensorflow.python.estimator.run_config import RunConfig
-
-from tensorflow.python.util.all_util import remove_undocumented
-
-_allowed_symbols = [
-    'inputs',
-    'export',
-    'Estimator',
-    'EstimatorSpec',
-    'ModeKeys',
-    'RunConfig',
-]
-
-remove_undocumented(__name__, allowed_exception_list=_allowed_symbols)

tensorflow/python/estimator/estimator_lib.py

+# Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Estimator: High level tools for working with models."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+# pylint: disable=unused-import,line-too-long
+from tensorflow.python.estimator import export
+from tensorflow.python.estimator import inputs
+
+from tensorflow.python.estimator.estimator import Estimator
+
+from tensorflow.python.estimator.model_fn import EstimatorSpec
+from tensorflow.python.estimator.model_fn import ModeKeys
+
+from tensorflow.python.estimator.run_config import RunConfig
+
+from tensorflow.python.util.all_util import remove_undocumented
+# pylint: enable=unused-import,line-too-long
+
+_allowed_symbols = [
+    'inputs',
+    'export',
+    'Estimator',
+    'EstimatorSpec',
+    'ModeKeys',
+    'RunConfig',
+]
+
+remove_undocumented(__name__, allowed_exception_list=_allowed_symbols)