From: zhengxq <zhengxq@google.com>
Date: Sat, 19 May 2018 00:05:40 +0000 (-0700)
Subject: Merge commit for internal changes
X-Git-Tag: upstream/v1.9.0_rc1~94^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=068fd9c936dbf8c9ace9edae9e7bb9e64256d381;p=platform%2Fupstream%2Ftensorflow.git

Merge commit for internal changes
---

068fd9c936dbf8c9ace9edae9e7bb9e64256d381
diff --cc tensorflow/python/keras/utils/__init__.py
index 9d924c8,7b5eecc..69337b6
--- a/tensorflow/python/keras/utils/__init__.py
+++ b/tensorflow/python/keras/utils/__init__.py
@@@ -18,23 -18,22 +18,23 @@@ from __future__ import absolute_impor
  from __future__ import division
  from __future__ import print_function
  
- from tensorflow.python.keras._impl.keras.utils.data_utils import GeneratorEnqueuer
- from tensorflow.python.keras._impl.keras.utils.data_utils import get_file
- from tensorflow.python.keras._impl.keras.utils.data_utils import OrderedEnqueuer
- from tensorflow.python.keras._impl.keras.utils.data_utils import Sequence
- from tensorflow.python.keras._impl.keras.utils.data_utils import SequenceEnqueuer
- from tensorflow.python.keras._impl.keras.utils.generic_utils import custom_object_scope
- from tensorflow.python.keras._impl.keras.utils.generic_utils import CustomObjectScope
- from tensorflow.python.keras._impl.keras.utils.generic_utils import deserialize_keras_object
- from tensorflow.python.keras._impl.keras.utils.generic_utils import get_custom_objects
- from tensorflow.python.keras._impl.keras.utils.generic_utils import Progbar
- from tensorflow.python.keras._impl.keras.utils.generic_utils import serialize_keras_object
- from tensorflow.python.keras._impl.keras.utils.io_utils import HDF5Matrix
- from tensorflow.python.keras._impl.keras.utils.layer_utils import convert_all_kernels_in_model
- from tensorflow.python.keras._impl.keras.utils.multi_gpu_utils import multi_gpu_model
- from tensorflow.python.keras._impl.keras.utils.np_utils import normalize
- from tensorflow.python.keras._impl.keras.utils.np_utils import to_categorical
- from tensorflow.python.keras._impl.keras.utils.vis_utils import plot_model
+ from tensorflow.python.keras.utils.data_utils import GeneratorEnqueuer
+ from tensorflow.python.keras.utils.data_utils import get_file
++from tensorflow.python.keras.utils.data_utils import OrderedEnqueuer
+ from tensorflow.python.keras.utils.data_utils import Sequence
+ from tensorflow.python.keras.utils.data_utils import SequenceEnqueuer
+ from tensorflow.python.keras.utils.generic_utils import custom_object_scope
+ from tensorflow.python.keras.utils.generic_utils import CustomObjectScope
+ from tensorflow.python.keras.utils.generic_utils import deserialize_keras_object
+ from tensorflow.python.keras.utils.generic_utils import get_custom_objects
+ from tensorflow.python.keras.utils.generic_utils import Progbar
+ from tensorflow.python.keras.utils.generic_utils import serialize_keras_object
+ from tensorflow.python.keras.utils.io_utils import HDF5Matrix
+ from tensorflow.python.keras.utils.layer_utils import convert_all_kernels_in_model
+ from tensorflow.python.keras.utils.multi_gpu_utils import multi_gpu_model
+ from tensorflow.python.keras.utils.np_utils import normalize
+ from tensorflow.python.keras.utils.np_utils import to_categorical
+ from tensorflow.python.keras.utils.vis_utils import plot_model
  
  del absolute_import
  del division