Rename io directory to learn_io because non-absolute import can confuse this with the standard io module.

Change: 127385608

17 files changed, 45 insertions, 46 deletions

diff --git a/tensorflow/contrib/factorization/python/ops/kmeans.py b/tensorflow/contrib/factorization/python/ops/kmeans.py
index 7f9fb2ed14..c979f05e6a 100644
--- a/tensorflow/contrib/factorization/python/ops/kmeans.py
+++ b/tensorflow/contrib/factorization/python/ops/kmeans.py
@@ -26,7 +26,7 @@ import tensorflow as tf
 from tensorflow.contrib.factorization.python.ops import clustering_ops
 from tensorflow.contrib.learn.python.learn.estimators import estimator
 from tensorflow.contrib.learn.python.learn.estimators._sklearn import TransformerMixin
-from tensorflow.contrib.learn.python.learn.io import data_feeder
+from tensorflow.contrib.learn.python.learn.learn_io import data_feeder
 from tensorflow.contrib.learn.python.learn.utils import checkpoints
 from tensorflow.python.ops.control_flow_ops import with_dependencies
 
diff --git a/tensorflow/contrib/learn/BUILD b/tensorflow/contrib/learn/BUILD
index 7a4523e575..6ba4766be0 100644
--- a/tensorflow/contrib/learn/BUILD
+++ b/tensorflow/contrib/learn/BUILD
@@ -613,7 +613,7 @@ py_test(
 py_test(
     name = "graph_io_test",
     size = "small",
-    srcs = ["python/learn/io/graph_io_test.py"],
+    srcs = ["python/learn/learn_io/graph_io_test.py"],
     srcs_version = "PY2AND3",
     tags = ["manual"],  # http://b/29229547
     deps = [
diff --git a/tensorflow/contrib/learn/python/learn/__init__.py b/tensorflow/contrib/learn/python/learn/__init__.py
index 375d90960d..9b7a31ede4 100644
--- a/tensorflow/contrib/learn/python/learn/__init__.py
+++ b/tensorflow/contrib/learn/python/learn/__init__.py
@@ -25,7 +25,7 @@ import numpy as np
 from tensorflow.contrib.learn.python.learn import datasets
 from tensorflow.contrib.learn.python.learn import estimators
 from tensorflow.contrib.learn.python.learn import graph_actions
-from tensorflow.contrib.learn.python.learn import io
+from tensorflow.contrib.learn.python.learn import learn_io as io
 from tensorflow.contrib.learn.python.learn import models
 from tensorflow.contrib.learn.python.learn import monitors
 from tensorflow.contrib.learn.python.learn import ops
@@ -40,5 +40,5 @@ from tensorflow.contrib.learn.python.learn.graph_actions import NanLossDuringTra
 from tensorflow.contrib.learn.python.learn.graph_actions import run_feeds
 from tensorflow.contrib.learn.python.learn.graph_actions import run_n
 from tensorflow.contrib.learn.python.learn.graph_actions import train
-from tensorflow.contrib.learn.python.learn.io import *
+from tensorflow.contrib.learn.python.learn.learn_io import *
 # pylint: enable=wildcard-import
diff --git a/tensorflow/contrib/learn/python/learn/estimators/base.py b/tensorflow/contrib/learn/python/learn/estimators/base.py
index 3ea4e3673c..05d1915cc1 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/base.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/base.py
@@ -33,7 +33,7 @@ from tensorflow.contrib import layers
 from tensorflow.contrib.learn.python.learn.estimators import _sklearn
 from tensorflow.contrib.learn.python.learn.estimators import estimator
 from tensorflow.contrib.learn.python.learn.estimators._sklearn import NotFittedError
-from tensorflow.contrib.learn.python.learn.io.data_feeder import setup_train_data_feeder
+from tensorflow.contrib.learn.python.learn.learn_io.data_feeder import setup_train_data_feeder
 
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import ops
diff --git a/tensorflow/contrib/learn/python/learn/estimators/estimator.py b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
index 5afcd3dbbe..5e5d880a76 100644
--- a/tensorflow/contrib/learn/python/learn/estimators/estimator.py
+++ b/tensorflow/contrib/learn/python/learn/estimators/estimator.py
@@ -36,7 +36,7 @@ from tensorflow.contrib.learn.python.learn.estimators import _sklearn as sklearn
 from tensorflow.contrib.learn.python.learn.estimators import run_config
 from tensorflow.contrib.learn.python.learn.estimators import tensor_signature
 from tensorflow.contrib.learn.python.learn.estimators._sklearn import NotFittedError
-from tensorflow.contrib.learn.python.learn.io import data_feeder
+from tensorflow.contrib.learn.python.learn.learn_io import data_feeder
 from tensorflow.contrib.learn.python.learn.utils import checkpoints
 
 from tensorflow.python.framework import ops
diff --git a/tensorflow/contrib/learn/python/learn/io/__init__.py b/tensorflow/contrib/learn/python/learn/io/__init__.py
deleted file mode 100644
index ce43264cc2..0000000000
--- a/tensorflow/contrib/learn/python/learn/io/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2016 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.
-# ==============================================================================
-
-"""Tools to allow different io formats."""
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-from tensorflow.contrib.learn.python.learn.io.dask_io import extract_dask_data
-from tensorflow.contrib.learn.python.learn.io.dask_io import extract_dask_labels
-from tensorflow.contrib.learn.python.learn.io.dask_io import HAS_DASK
-from tensorflow.contrib.learn.python.learn.io.graph_io import read_batch_examples
-from tensorflow.contrib.learn.python.learn.io.graph_io import read_batch_features
-from tensorflow.contrib.learn.python.learn.io.graph_io import read_batch_record_features
-from tensorflow.contrib.learn.python.learn.io.graph_io import read_keyed_batch_examples
-from tensorflow.contrib.learn.python.learn.io.graph_io import read_keyed_batch_features
-from tensorflow.contrib.learn.python.learn.io.pandas_io import extract_pandas_data
-from tensorflow.contrib.learn.python.learn.io.pandas_io import extract_pandas_labels
-from tensorflow.contrib.learn.python.learn.io.pandas_io import extract_pandas_matrix
-from tensorflow.contrib.learn.python.learn.io.pandas_io import HAS_PANDAS
diff --git a/tensorflow/contrib/learn/python/learn/learn_io/__init__.py b/tensorflow/contrib/learn/python/learn/learn_io/__init__.py
new file mode 100644
index 0000000000..ddd05752d6
--- /dev/null
+++ b/tensorflow/contrib/learn/python/learn/learn_io/__init__.py
@@ -0,0 +1,33 @@
+# Copyright 2016 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.
+# ==============================================================================
+
+"""Tools to allow different io formats."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.contrib.learn.python.learn.learn_io.dask_io import extract_dask_data
+from tensorflow.contrib.learn.python.learn.learn_io.dask_io import extract_dask_labels
+from tensorflow.contrib.learn.python.learn.learn_io.dask_io import HAS_DASK
+from tensorflow.contrib.learn.python.learn.learn_io.graph_io import read_batch_examples
+from tensorflow.contrib.learn.python.learn.learn_io.graph_io import read_batch_features
+from tensorflow.contrib.learn.python.learn.learn_io.graph_io import read_batch_record_features
+from tensorflow.contrib.learn.python.learn.learn_io.graph_io import read_keyed_batch_examples
+from tensorflow.contrib.learn.python.learn.learn_io.graph_io import read_keyed_batch_features
+from tensorflow.contrib.learn.python.learn.learn_io.pandas_io import extract_pandas_data
+from tensorflow.contrib.learn.python.learn.learn_io.pandas_io import extract_pandas_labels
+from tensorflow.contrib.learn.python.learn.learn_io.pandas_io import extract_pandas_matrix
+from tensorflow.contrib.learn.python.learn.learn_io.pandas_io import HAS_PANDAS
diff --git a/tensorflow/contrib/learn/python/learn/io/dask_io.py b/tensorflow/contrib/learn/python/learn/learn_io/dask_io.py
index c435d6e27e..c435d6e27e 100644
--- a/tensorflow/contrib/learn/python/learn/io/dask_io.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/dask_io.py
diff --git a/tensorflow/contrib/learn/python/learn/io/data_feeder.py b/tensorflow/contrib/learn/python/learn/learn_io/data_feeder.py
index 8c9790b6a6..8c9790b6a6 100644
--- a/tensorflow/contrib/learn/python/learn/io/data_feeder.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/data_feeder.py
diff --git a/tensorflow/contrib/learn/python/learn/io/graph_io.py b/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py
index eee1b88353..eee1b88353 100644
--- a/tensorflow/contrib/learn/python/learn/io/graph_io.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/graph_io.py
diff --git a/tensorflow/contrib/learn/python/learn/io/graph_io_test.py b/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py
index 334ef425ef..334ef425ef 100644
--- a/tensorflow/contrib/learn/python/learn/io/graph_io_test.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/graph_io_test.py
diff --git a/tensorflow/contrib/learn/python/learn/io/pandas_io.py b/tensorflow/contrib/learn/python/learn/learn_io/pandas_io.py
index de295aae68..de295aae68 100644
--- a/tensorflow/contrib/learn/python/learn/io/pandas_io.py
+++ b/tensorflow/contrib/learn/python/learn/learn_io/pandas_io.py
diff --git a/tensorflow/contrib/learn/python/learn/preprocessing/categorical.py b/tensorflow/contrib/learn/python/learn/preprocessing/categorical.py
index e90d95e135..154739d497 100644
--- a/tensorflow/contrib/learn/python/learn/preprocessing/categorical.py
+++ b/tensorflow/contrib/learn/python/learn/preprocessing/categorical.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 # ==============================================================================
 
-"""Implements preprocesing transformers for categorical variables."""
+"""Implements preprocessing transformers for categorical variables."""
 
 from __future__ import absolute_import
 from __future__ import division
@@ -24,7 +24,7 @@ import numpy as np
 
 # pylint: disable=g-bad-import-order
 from . import categorical_vocabulary
-from ..io.data_feeder import setup_processor_data_feeder
+from ..learn_io.data_feeder import setup_processor_data_feeder
 # pylint: enable=g-bad-import-order
 
 
diff --git a/tensorflow/contrib/learn/python/learn/preprocessing/tests/categorical_test.py b/tensorflow/contrib/learn/python/learn/preprocessing/tests/categorical_test.py
index 0a6603c79b..300bdf07ea 100644
--- a/tensorflow/contrib/learn/python/learn/preprocessing/tests/categorical_test.py
+++ b/tensorflow/contrib/learn/python/learn/preprocessing/tests/categorical_test.py
@@ -23,7 +23,7 @@ from __future__ import print_function
 import numpy as np
 import tensorflow as tf
 
-from tensorflow.contrib.learn.python.learn.io import HAS_PANDAS
+from tensorflow.contrib.learn.python.learn.learn_io import HAS_PANDAS
 from tensorflow.contrib.learn.python.learn.preprocessing import categorical
 
 
diff --git a/tensorflow/contrib/learn/python/learn/tests/data_feeder_test.py b/tensorflow/contrib/learn/python/learn/tests/data_feeder_test.py
index 55fe99a687..89e4186e25 100644
--- a/tensorflow/contrib/learn/python/learn/tests/data_feeder_test.py
+++ b/tensorflow/contrib/learn/python/learn/tests/data_feeder_test.py
@@ -23,7 +23,7 @@ import six
 
 import tensorflow as tf
 # pylint: disable=wildcard-import
-from tensorflow.contrib.learn.python.learn.io import *
+from tensorflow.contrib.learn.python.learn.learn_io import *
 # pylint: enable=wildcard-import
 
 
diff --git a/tensorflow/contrib/learn/python/learn/tests/io_test.py b/tensorflow/contrib/learn/python/learn/tests/io_test.py
index 205faf614f..0806728e3d 100644
--- a/tensorflow/contrib/learn/python/learn/tests/io_test.py
+++ b/tensorflow/contrib/learn/python/learn/tests/io_test.py
@@ -26,8 +26,7 @@ from tensorflow.contrib.learn.python import learn
 from tensorflow.contrib.learn.python.learn import datasets
 from tensorflow.contrib.learn.python.learn.estimators._sklearn import accuracy_score
 # pylint: disable=wildcard-import
-from tensorflow.contrib.learn.python.learn.io import *
-
+from tensorflow.contrib.learn.python.learn.learn_io import *
 # pylint: enable=wildcard-import
 
 
diff --git a/tensorflow/contrib/learn/python/learn/tests/stability_test.py b/tensorflow/contrib/learn/python/learn/tests/stability_test.py
index f970dec53d..a594af43f2 100644
--- a/tensorflow/contrib/learn/python/learn/tests/stability_test.py
+++ b/tensorflow/contrib/learn/python/learn/tests/stability_test.py
@@ -20,7 +20,7 @@ from __future__ import division
 from __future__ import print_function
 import random
 import tensorflow as tf
-from tensorflow.contrib.learn.python.learn.io import data_feeder
+from tensorflow.contrib.learn.python.learn.learn_io import data_feeder
 
 
 def _get_input_fn(x, y, batch_size=None):