From 609b2ce3fe8ebecf4031670b8c2186468369b0ba Mon Sep 17 00:00:00 2001 From: Pavithra Vijay Date: Thu, 17 May 2018 21:36:39 -0700 Subject: [PATCH] Move Keras code out of _impl folder and remove API files. PiperOrigin-RevId: 197097430 --- .../contrib/autograph/impl/conversion_test.py | 2 +- .../contrib/checkpoint/python/visualize_test.py | 4 +- tensorflow/contrib/cmake/python_modules.txt | 40 +-- .../coder/python/layers/entropybottleneck.py | 2 +- .../contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py | 2 +- tensorflow/contrib/eager/python/network.py | 2 +- .../keras/api/keras/activations/__init__.py | 26 +- .../keras/applications/inception_v3/__init__.py | 6 +- .../api/keras/applications/mobilenet/__init__.py | 6 +- .../api/keras/applications/resnet50/__init__.py | 6 +- .../keras/api/keras/applications/vgg16/__init__.py | 6 +- .../keras/api/keras/applications/vgg19/__init__.py | 6 +- .../api/keras/applications/xception/__init__.py | 6 +- .../contrib/keras/api/keras/backend/__init__.py | 276 ++++++++++---------- .../contrib/keras/api/keras/callbacks/__init__.py | 26 +- .../keras/api/keras/constraints/__init__.py | 24 +- .../api/keras/datasets/boston_housing/__init__.py | 2 +- .../keras/api/keras/datasets/cifar10/__init__.py | 2 +- .../keras/api/keras/datasets/cifar100/__init__.py | 2 +- .../keras/api/keras/datasets/imdb/__init__.py | 4 +- .../keras/api/keras/datasets/mnist/__init__.py | 2 +- .../keras/api/keras/datasets/reuters/__init__.py | 4 +- .../keras/api/keras/initializers/__init__.py | 38 +-- .../contrib/keras/api/keras/layers/__init__.py | 184 +++++++------- .../contrib/keras/api/keras/losses/__init__.py | 34 +-- .../contrib/keras/api/keras/metrics/__init__.py | 38 +-- .../contrib/keras/api/keras/models/__init__.py | 14 +- .../contrib/keras/api/keras/optimizers/__init__.py | 22 +- .../api/keras/preprocessing/image/__init__.py | 28 +- .../api/keras/preprocessing/sequence/__init__.py | 6 +- .../keras/api/keras/preprocessing/text/__init__.py | 6 +- .../keras/api/keras/regularizers/__init__.py | 16 +- .../contrib/keras/api/keras/utils/__init__.py | 30 +-- .../api/keras/wrappers/scikit_learn/__init__.py | 4 +- .../optimizer_v2/checkpointable_utils_test.py | 4 +- .../timeseries/python/timeseries/ar_model.py | 6 +- tensorflow/contrib/tpu/python/tpu/keras_support.py | 12 +- tensorflow/python/estimator/keras.py | 12 +- tensorflow/python/estimator/keras_test.py | 10 +- tensorflow/python/feature_column/feature_column.py | 2 +- tensorflow/python/keras/BUILD | 281 +++++++++------------ tensorflow/python/keras/__init__.py | 5 +- tensorflow/python/keras/_impl/keras/__init__.py | 42 --- .../keras/_impl/keras/applications/__init__.py | 32 --- .../python/keras/_impl/keras/datasets/__init__.py | 28 -- .../python/keras/_impl/keras/layers/__init__.py | 40 --- .../keras/_impl/keras/preprocessing/__init__.py | 24 -- .../python/keras/_impl/keras/utils/__init__.py | 38 --- .../python/keras/_impl/keras/wrappers/__init__.py | 22 -- .../python/keras/{_impl/keras => }/activations.py | 4 +- tensorflow/python/keras/activations/__init__.py | 41 --- .../keras/{_impl/keras => }/activations_test.py | 2 +- tensorflow/python/keras/applications/__init__.py | 9 - .../{_impl/keras => }/applications/densenet.py | 36 +-- .../python/keras/applications/densenet/__init__.py | 29 --- .../keras => }/applications/densenet_test.py | 2 +- .../keras => }/applications/imagenet_utils.py | 4 +- .../keras => }/applications/imagenet_utils_test.py | 5 +- .../keras => }/applications/inception_resnet_v2.py | 36 +-- .../applications/inception_resnet_v2/__init__.py | 27 -- .../applications/inception_resnet_v2_test.py | 2 +- .../{_impl/keras => }/applications/inception_v3.py | 34 +-- .../keras/applications/inception_v3/__init__.py | 27 -- .../keras => }/applications/inception_v3_test.py | 2 +- .../{_impl/keras => }/applications/mobilenet.py | 44 ++-- .../keras/applications/mobilenet/__init__.py | 27 -- .../keras => }/applications/mobilenet_test.py | 2 +- .../keras/{_impl/keras => }/applications/nasnet.py | 42 +-- .../python/keras/applications/nasnet/__init__.py | 28 -- .../{_impl/keras => }/applications/nasnet_test.py | 2 +- .../{_impl/keras => }/applications/resnet50.py | 40 +-- .../python/keras/applications/resnet50/__init__.py | 27 -- .../keras => }/applications/resnet50_test.py | 2 +- .../keras/{_impl/keras => }/applications/vgg16.py | 30 +-- .../python/keras/applications/vgg16/__init__.py | 27 -- .../{_impl/keras => }/applications/vgg16_test.py | 2 +- .../keras/{_impl/keras => }/applications/vgg19.py | 30 +-- .../python/keras/applications/vgg19/__init__.py | 27 -- .../{_impl/keras => }/applications/vgg19_test.py | 2 +- .../{_impl/keras => }/applications/xception.py | 34 +-- .../python/keras/applications/xception/__init__.py | 27 -- .../keras => }/applications/xception_test.py | 2 +- .../python/keras/{_impl/keras => }/backend.py | 0 tensorflow/python/keras/backend/__init__.py | 163 ------------ .../python/keras/{_impl/keras => }/backend_test.py | 2 +- .../python/keras/{_impl/keras => }/callbacks.py | 4 +- tensorflow/python/keras/callbacks/__init__.py | 37 --- .../keras/{_impl/keras => }/callbacks_test.py | 4 +- .../python/keras/{_impl/keras => }/constraints.py | 6 +- tensorflow/python/keras/constraints/__init__.py | 40 --- .../keras/{_impl/keras => }/constraints_test.py | 2 +- .../{_impl/keras => }/datasets/boston_housing.py | 2 +- .../keras/datasets/boston_housing/__init__.py | 25 -- .../keras/{_impl/keras => }/datasets/cifar.py | 0 .../keras/{_impl/keras => }/datasets/cifar10.py | 6 +- .../python/keras/datasets/cifar10/__init__.py | 25 -- .../keras/{_impl/keras => }/datasets/cifar100.py | 6 +- .../python/keras/datasets/cifar100/__init__.py | 25 -- .../{_impl/keras => }/datasets/fashion_mnist.py | 2 +- .../keras/datasets/fashion_mnist/__init__.py | 25 -- .../keras/{_impl/keras => }/datasets/imdb.py | 4 +- tensorflow/python/keras/datasets/imdb/__init__.py | 26 -- .../keras/{_impl/keras => }/datasets/mnist.py | 2 +- tensorflow/python/keras/datasets/mnist/__init__.py | 25 -- .../keras/{_impl/keras => }/datasets/reuters.py | 4 +- .../python/keras/datasets/reuters/__init__.py | 26 -- .../keras/{_impl/keras => }/engine/__init__.py | 18 +- .../keras/{_impl/keras => }/engine/base_layer.py | 18 +- .../keras/{_impl/keras => }/engine/input_layer.py | 4 +- .../keras/{_impl/keras => }/engine/network.py | 20 +- .../keras/{_impl/keras => }/engine/saving.py | 18 +- .../keras/{_impl/keras => }/engine/saving_test.py | 4 +- .../keras/{_impl/keras => }/engine/sequential.py | 14 +- .../{_impl/keras => }/engine/sequential_test.py | 2 +- .../{_impl/keras => }/engine/topology_test.py | 4 +- .../keras/{_impl/keras => }/engine/training.py | 24 +- .../{_impl/keras => }/engine/training_arrays.py | 12 +- .../{_impl/keras => }/engine/training_eager.py | 22 +- .../keras => }/engine/training_eager_test.py | 76 +----- .../{_impl/keras => }/engine/training_generator.py | 12 +- .../{_impl/keras => }/engine/training_test.py | 8 +- .../{_impl/keras => }/engine/training_utils.py | 6 +- .../python/keras/{_impl/keras => }/initializers.py | 4 +- tensorflow/python/keras/initializers/__init__.py | 49 ---- .../keras/{_impl/keras => }/initializers_test.py | 2 +- .../keras/{_impl/keras => }/integration_test.py | 4 +- tensorflow/python/keras/layers/__init__.py | 212 ++++++++-------- .../keras => }/layers/advanced_activations.py | 16 +- .../keras => }/layers/advanced_activations_test.py | 4 +- .../{_impl/keras => }/layers/convolutional.py | 30 +-- .../keras => }/layers/convolutional_recurrent.py | 26 +- .../layers/convolutional_recurrent_test.py | 4 +- .../{_impl/keras => }/layers/convolutional_test.py | 4 +- .../python/keras/{_impl/keras => }/layers/core.py | 20 +- .../keras/{_impl/keras => }/layers/core_test.py | 4 +- .../{_impl/keras => }/layers/cudnn_recurrent.py | 12 +- .../keras => }/layers/cudnn_recurrent_test.py | 4 +- .../keras/{_impl/keras => }/layers/embeddings.py | 12 +- .../{_impl/keras => }/layers/embeddings_test.py | 4 +- .../keras/{_impl/keras => }/layers/gru_test.py | 4 +- .../python/keras/{_impl/keras => }/layers/local.py | 18 +- .../keras/{_impl/keras => }/layers/local_test.py | 4 +- .../keras/{_impl/keras => }/layers/lstm_test.py | 4 +- .../python/keras/{_impl/keras => }/layers/merge.py | 6 +- .../keras/{_impl/keras => }/layers/merge_test.py | 2 +- .../python/keras/{_impl/keras => }/layers/noise.py | 6 +- .../keras/{_impl/keras => }/layers/noise_test.py | 4 +- .../{_impl/keras => }/layers/normalization.py | 14 +- .../{_impl/keras => }/layers/normalization_test.py | 4 +- .../keras/{_impl/keras => }/layers/pooling.py | 8 +- .../keras/{_impl/keras => }/layers/pooling_test.py | 4 +- .../keras/{_impl/keras => }/layers/recurrent.py | 22 +- .../{_impl/keras => }/layers/recurrent_test.py | 2 +- .../{_impl/keras => }/layers/serialization.py | 34 +-- .../{_impl/keras => }/layers/serialization_test.py | 2 +- .../{_impl/keras => }/layers/simplernn_test.py | 4 +- .../keras/{_impl/keras => }/layers/wrappers.py | 14 +- .../{_impl/keras => }/layers/wrappers_test.py | 2 +- .../python/keras/{_impl/keras => }/losses.py | 6 +- tensorflow/python/keras/losses/__init__.py | 45 ---- .../python/keras/{_impl/keras => }/losses_test.py | 2 +- .../python/keras/{_impl/keras => }/metrics.py | 32 +-- tensorflow/python/keras/metrics/__init__.py | 47 ---- .../python/keras/{_impl/keras => }/metrics_test.py | 2 +- .../{_impl/keras => }/model_subclassing_test.py | 2 +- .../python/keras/{_impl/keras => }/models.py | 16 +- tensorflow/python/keras/models/__init__.py | 31 --- .../python/keras/{_impl/keras => }/models_test.py | 2 +- .../python/keras/{_impl/keras => }/optimizers.py | 6 +- tensorflow/python/keras/optimizers/__init__.py | 39 --- .../keras/{_impl/keras => }/optimizers_test.py | 4 +- tensorflow/python/keras/preprocessing/__init__.py | 1 - .../keras/{_impl/keras => }/preprocessing/image.py | 4 +- .../python/keras/preprocessing/image/__init__.py | 39 --- .../{_impl/keras => }/preprocessing/image_test.py | 2 +- .../{_impl/keras => }/preprocessing/sequence.py | 2 +- .../keras/preprocessing/sequence/__init__.py | 28 -- .../keras => }/preprocessing/sequence_test.py | 2 +- .../keras/{_impl/keras => }/preprocessing/text.py | 0 .../python/keras/preprocessing/text/__init__.py | 28 -- .../{_impl/keras => }/preprocessing/text_test.py | 2 +- .../python/keras/{_impl/keras => }/regularizers.py | 6 +- tensorflow/python/keras/regularizers/__init__.py | 38 --- .../keras/{_impl/keras => }/regularizers_test.py | 4 +- .../keras/{_impl/keras => }/testing_utils.py | 2 +- tensorflow/python/keras/utils/__init__.py | 32 +-- .../keras/{_impl/keras => }/utils/conv_utils.py | 2 +- .../keras/{_impl/keras => }/utils/data_utils.py | 2 +- .../{_impl/keras => }/utils/data_utils_test.py | 2 +- .../keras/{_impl/keras => }/utils/generic_utils.py | 0 .../{_impl/keras => }/utils/generic_utils_test.py | 2 +- .../keras/{_impl/keras => }/utils/io_utils.py | 0 .../keras/{_impl/keras => }/utils/io_utils_test.py | 2 +- .../keras/{_impl/keras => }/utils/layer_utils.py | 4 +- .../{_impl/keras => }/utils/multi_gpu_utils.py | 10 +- .../keras => }/utils/multi_gpu_utils_test.py | 2 +- .../keras/{_impl/keras => }/utils/np_utils.py | 0 .../keras/{_impl/keras => }/utils/np_utils_test.py | 2 +- .../keras/{_impl/keras => }/utils/tf_utils.py | 0 .../keras/{_impl/keras => }/utils/vis_utils.py | 4 +- .../{_impl/keras => }/wrappers/scikit_learn.py | 6 +- .../python/keras/wrappers/scikit_learn/__init__.py | 26 -- .../keras => }/wrappers/scikit_learn_test.py | 4 +- tensorflow/python/layers/base.py | 2 +- tensorflow/python/layers/convolutional.py | 2 +- tensorflow/python/layers/core.py | 2 +- tensorflow/python/layers/normalization.py | 2 +- tensorflow/python/layers/pooling.py | 2 +- .../python/training/checkpointable/util_test.py | 6 +- tensorflow/python/training/saver_test.py | 4 +- tensorflow/python/util/serialization_test.py | 8 +- .../tools/api/golden/tensorflow.keras.-model.pbtxt | 8 +- .../api/golden/tensorflow.keras.-sequential.pbtxt | 8 +- .../tensorflow.keras.callbacks.-base-logger.pbtxt | 4 +- .../tensorflow.keras.callbacks.-c-s-v-logger.pbtxt | 4 +- .../tensorflow.keras.callbacks.-callback.pbtxt | 2 +- ...ensorflow.keras.callbacks.-early-stopping.pbtxt | 4 +- .../tensorflow.keras.callbacks.-history.pbtxt | 4 +- ...nsorflow.keras.callbacks.-lambda-callback.pbtxt | 4 +- ....keras.callbacks.-learning-rate-scheduler.pbtxt | 4 +- ...sorflow.keras.callbacks.-model-checkpoint.pbtxt | 4 +- ...ensorflow.keras.callbacks.-progbar-logger.pbtxt | 4 +- ...ow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt | 4 +- ...ensorflow.keras.callbacks.-remote-monitor.pbtxt | 4 +- .../tensorflow.keras.callbacks.-tensor-board.pbtxt | 4 +- ...orflow.keras.callbacks.-terminate-on-na-n.pbtxt | 4 +- .../tensorflow.keras.constraints.-constraint.pbtxt | 2 +- .../tensorflow.keras.constraints.-max-norm.pbtxt | 4 +- ...ensorflow.keras.constraints.-min-max-norm.pbtxt | 4 +- .../tensorflow.keras.constraints.-non-neg.pbtxt | 4 +- .../tensorflow.keras.constraints.-unit-norm.pbtxt | 4 +- .../tensorflow.keras.constraints.max_norm.pbtxt | 4 +- ...tensorflow.keras.constraints.min_max_norm.pbtxt | 4 +- .../tensorflow.keras.constraints.non_neg.pbtxt | 4 +- .../tensorflow.keras.constraints.unit_norm.pbtxt | 4 +- .../tensorflow.keras.layers.-activation.pbtxt | 6 +- ...low.keras.layers.-activity-regularization.pbtxt | 6 +- .../api/golden/tensorflow.keras.layers.-add.pbtxt | 6 +- .../tensorflow.keras.layers.-alpha-dropout.pbtxt | 6 +- ...nsorflow.keras.layers.-average-pooling1-d.pbtxt | 8 +- ...nsorflow.keras.layers.-average-pooling2-d.pbtxt | 8 +- ...nsorflow.keras.layers.-average-pooling3-d.pbtxt | 8 +- .../golden/tensorflow.keras.layers.-average.pbtxt | 6 +- .../tensorflow.keras.layers.-avg-pool1-d.pbtxt | 8 +- .../tensorflow.keras.layers.-avg-pool2-d.pbtxt | 8 +- .../tensorflow.keras.layers.-avg-pool3-d.pbtxt | 8 +- ...sorflow.keras.layers.-batch-normalization.pbtxt | 4 +- .../tensorflow.keras.layers.-bidirectional.pbtxt | 6 +- .../tensorflow.keras.layers.-concatenate.pbtxt | 6 +- .../tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt | 8 +- .../golden/tensorflow.keras.layers.-conv1-d.pbtxt | 6 +- ...ensorflow.keras.layers.-conv2-d-transpose.pbtxt | 8 +- .../golden/tensorflow.keras.layers.-conv2-d.pbtxt | 6 +- ...ensorflow.keras.layers.-conv3-d-transpose.pbtxt | 8 +- .../golden/tensorflow.keras.layers.-conv3-d.pbtxt | 6 +- .../tensorflow.keras.layers.-convolution1-d.pbtxt | 6 +- ...ow.keras.layers.-convolution2-d-transpose.pbtxt | 8 +- .../tensorflow.keras.layers.-convolution2-d.pbtxt | 6 +- ...ow.keras.layers.-convolution3-d-transpose.pbtxt | 8 +- .../tensorflow.keras.layers.-convolution3-d.pbtxt | 6 +- .../tensorflow.keras.layers.-cropping1-d.pbtxt | 6 +- .../tensorflow.keras.layers.-cropping2-d.pbtxt | 6 +- .../tensorflow.keras.layers.-cropping3-d.pbtxt | 6 +- .../tensorflow.keras.layers.-cu-d-n-n-g-r-u.pbtxt | 8 +- ...tensorflow.keras.layers.-cu-d-n-n-l-s-t-m.pbtxt | 8 +- .../golden/tensorflow.keras.layers.-dense.pbtxt | 4 +- ...ensorflow.keras.layers.-depthwise-conv2-d.pbtxt | 8 +- .../api/golden/tensorflow.keras.layers.-dot.pbtxt | 6 +- .../golden/tensorflow.keras.layers.-dropout.pbtxt | 6 +- .../golden/tensorflow.keras.layers.-e-l-u.pbtxt | 6 +- .../tensorflow.keras.layers.-embedding.pbtxt | 4 +- .../golden/tensorflow.keras.layers.-flatten.pbtxt | 6 +- .../tensorflow.keras.layers.-g-r-u-cell.pbtxt | 4 +- .../golden/tensorflow.keras.layers.-g-r-u.pbtxt | 6 +- ...tensorflow.keras.layers.-gaussian-dropout.pbtxt | 6 +- .../tensorflow.keras.layers.-gaussian-noise.pbtxt | 6 +- ...w.keras.layers.-global-average-pooling1-d.pbtxt | 8 +- ...w.keras.layers.-global-average-pooling2-d.pbtxt | 8 +- ...w.keras.layers.-global-average-pooling3-d.pbtxt | 8 +- ...nsorflow.keras.layers.-global-avg-pool1-d.pbtxt | 8 +- ...nsorflow.keras.layers.-global-avg-pool2-d.pbtxt | 8 +- ...nsorflow.keras.layers.-global-avg-pool3-d.pbtxt | 8 +- ...nsorflow.keras.layers.-global-max-pool1-d.pbtxt | 8 +- ...nsorflow.keras.layers.-global-max-pool2-d.pbtxt | 8 +- ...nsorflow.keras.layers.-global-max-pool3-d.pbtxt | 8 +- ...rflow.keras.layers.-global-max-pooling1-d.pbtxt | 8 +- ...rflow.keras.layers.-global-max-pooling2-d.pbtxt | 8 +- ...rflow.keras.layers.-global-max-pooling3-d.pbtxt | 8 +- .../tensorflow.keras.layers.-input-layer.pbtxt | 6 +- .../tensorflow.keras.layers.-input-spec.pbtxt | 2 +- .../tensorflow.keras.layers.-l-s-t-m-cell.pbtxt | 4 +- .../golden/tensorflow.keras.layers.-l-s-t-m.pbtxt | 6 +- .../golden/tensorflow.keras.layers.-lambda.pbtxt | 6 +- .../golden/tensorflow.keras.layers.-layer.pbtxt | 4 +- .../tensorflow.keras.layers.-leaky-re-l-u.pbtxt | 6 +- ...orflow.keras.layers.-locally-connected1-d.pbtxt | 4 +- ...orflow.keras.layers.-locally-connected2-d.pbtxt | 4 +- .../golden/tensorflow.keras.layers.-masking.pbtxt | 6 +- .../tensorflow.keras.layers.-max-pool1-d.pbtxt | 8 +- .../tensorflow.keras.layers.-max-pool2-d.pbtxt | 8 +- .../tensorflow.keras.layers.-max-pool3-d.pbtxt | 8 +- .../tensorflow.keras.layers.-max-pooling1-d.pbtxt | 8 +- .../tensorflow.keras.layers.-max-pooling2-d.pbtxt | 8 +- .../tensorflow.keras.layers.-max-pooling3-d.pbtxt | 8 +- .../golden/tensorflow.keras.layers.-maximum.pbtxt | 6 +- .../golden/tensorflow.keras.layers.-multiply.pbtxt | 6 +- .../golden/tensorflow.keras.layers.-p-re-l-u.pbtxt | 4 +- .../golden/tensorflow.keras.layers.-permute.pbtxt | 6 +- .../golden/tensorflow.keras.layers.-r-n-n.pbtxt | 4 +- .../tensorflow.keras.layers.-repeat-vector.pbtxt | 6 +- .../golden/tensorflow.keras.layers.-reshape.pbtxt | 6 +- ...ensorflow.keras.layers.-separable-conv1-d.pbtxt | 8 +- ...ensorflow.keras.layers.-separable-conv2-d.pbtxt | 8 +- ...ow.keras.layers.-separable-convolution1-d.pbtxt | 8 +- ...ow.keras.layers.-separable-convolution2-d.pbtxt | 8 +- ...ensorflow.keras.layers.-simple-r-n-n-cell.pbtxt | 4 +- .../tensorflow.keras.layers.-simple-r-n-n.pbtxt | 6 +- .../golden/tensorflow.keras.layers.-softmax.pbtxt | 6 +- ...nsorflow.keras.layers.-spatial-dropout1-d.pbtxt | 8 +- ...nsorflow.keras.layers.-spatial-dropout2-d.pbtxt | 8 +- ...nsorflow.keras.layers.-spatial-dropout3-d.pbtxt | 8 +- ...sorflow.keras.layers.-stacked-r-n-n-cells.pbtxt | 4 +- ...nsorflow.keras.layers.-thresholded-re-l-u.pbtxt | 6 +- ...tensorflow.keras.layers.-time-distributed.pbtxt | 6 +- .../tensorflow.keras.layers.-up-sampling1-d.pbtxt | 6 +- .../tensorflow.keras.layers.-up-sampling2-d.pbtxt | 6 +- .../tensorflow.keras.layers.-up-sampling3-d.pbtxt | 6 +- .../golden/tensorflow.keras.layers.-wrapper.pbtxt | 4 +- .../tensorflow.keras.layers.-zero-padding1-d.pbtxt | 6 +- .../tensorflow.keras.layers.-zero-padding2-d.pbtxt | 6 +- .../tensorflow.keras.layers.-zero-padding3-d.pbtxt | 6 +- .../golden/tensorflow.keras.models.-model.pbtxt | 8 +- .../tensorflow.keras.models.-sequential.pbtxt | 8 +- .../tensorflow.keras.optimizers.-adadelta.pbtxt | 4 +- .../tensorflow.keras.optimizers.-adagrad.pbtxt | 4 +- .../golden/tensorflow.keras.optimizers.-adam.pbtxt | 4 +- .../tensorflow.keras.optimizers.-adamax.pbtxt | 4 +- .../tensorflow.keras.optimizers.-nadam.pbtxt | 4 +- .../tensorflow.keras.optimizers.-optimizer.pbtxt | 2 +- .../tensorflow.keras.optimizers.-r-m-sprop.pbtxt | 4 +- .../tensorflow.keras.optimizers.-s-g-d.pbtxt | 4 +- ...s.preprocessing.image.-directory-iterator.pbtxt | 6 +- ...preprocessing.image.-image-data-generator.pbtxt | 2 +- ...rflow.keras.preprocessing.image.-iterator.pbtxt | 4 +- ...preprocessing.image.-numpy-array-iterator.pbtxt | 6 +- ...processing.sequence.-timeseries-generator.pbtxt | 4 +- ...rflow.keras.preprocessing.text.-tokenizer.pbtxt | 2 +- .../tensorflow.keras.regularizers.-l1-l2.pbtxt | 4 +- ...ensorflow.keras.regularizers.-regularizer.pbtxt | 2 +- ...nsorflow.keras.utils.-custom-object-scope.pbtxt | 2 +- ...ensorflow.keras.utils.-generator-enqueuer.pbtxt | 4 +- .../tensorflow.keras.utils.-h-d-f5-matrix.pbtxt | 2 +- .../golden/tensorflow.keras.utils.-progbar.pbtxt | 2 +- ...tensorflow.keras.utils.-sequence-enqueuer.pbtxt | 2 +- .../golden/tensorflow.keras.utils.-sequence.pbtxt | 2 +- ...s.wrappers.scikit_learn.-keras-classifier.pbtxt | 4 +- ...as.wrappers.scikit_learn.-keras-regressor.pbtxt | 4 +- .../tensorflow.layers.-average-pooling1-d.pbtxt | 8 +- .../tensorflow.layers.-average-pooling2-d.pbtxt | 8 +- .../tensorflow.layers.-average-pooling3-d.pbtxt | 8 +- .../tensorflow.layers.-batch-normalization.pbtxt | 4 +- .../api/golden/tensorflow.layers.-conv1-d.pbtxt | 6 +- .../tensorflow.layers.-conv2-d-transpose.pbtxt | 8 +- .../api/golden/tensorflow.layers.-conv2-d.pbtxt | 6 +- .../tensorflow.layers.-conv3-d-transpose.pbtxt | 8 +- .../api/golden/tensorflow.layers.-conv3-d.pbtxt | 6 +- .../api/golden/tensorflow.layers.-dense.pbtxt | 4 +- .../api/golden/tensorflow.layers.-dropout.pbtxt | 6 +- .../api/golden/tensorflow.layers.-flatten.pbtxt | 6 +- .../api/golden/tensorflow.layers.-input-spec.pbtxt | 2 +- .../api/golden/tensorflow.layers.-layer.pbtxt | 4 +- .../golden/tensorflow.layers.-max-pooling1-d.pbtxt | 8 +- .../golden/tensorflow.layers.-max-pooling2-d.pbtxt | 8 +- .../golden/tensorflow.layers.-max-pooling3-d.pbtxt | 8 +- .../tensorflow.layers.-separable-conv1-d.pbtxt | 8 +- .../tensorflow.layers.-separable-conv2-d.pbtxt | 8 +- ...ensorflow.nn.rnn_cell.-basic-l-s-t-m-cell.pbtxt | 2 +- .../tensorflow.nn.rnn_cell.-basic-r-n-n-cell.pbtxt | 2 +- .../tensorflow.nn.rnn_cell.-device-wrapper.pbtxt | 2 +- .../tensorflow.nn.rnn_cell.-dropout-wrapper.pbtxt | 2 +- .../tensorflow.nn.rnn_cell.-g-r-u-cell.pbtxt | 2 +- .../tensorflow.nn.rnn_cell.-l-s-t-m-cell.pbtxt | 2 +- .../tensorflow.nn.rnn_cell.-multi-r-n-n-cell.pbtxt | 2 +- .../tensorflow.nn.rnn_cell.-r-n-n-cell.pbtxt | 2 +- .../tensorflow.nn.rnn_cell.-residual-wrapper.pbtxt | 2 +- tensorflow/tools/ci_build/ci_sanity.sh | 6 +- 386 files changed, 1711 insertions(+), 3160 deletions(-) delete mode 100644 tensorflow/python/keras/_impl/keras/__init__.py delete mode 100644 tensorflow/python/keras/_impl/keras/applications/__init__.py delete mode 100644 tensorflow/python/keras/_impl/keras/datasets/__init__.py delete mode 100644 tensorflow/python/keras/_impl/keras/layers/__init__.py delete mode 100644 tensorflow/python/keras/_impl/keras/preprocessing/__init__.py delete mode 100644 tensorflow/python/keras/_impl/keras/utils/__init__.py delete mode 100644 tensorflow/python/keras/_impl/keras/wrappers/__init__.py rename tensorflow/python/keras/{_impl/keras => }/activations.py (95%) delete mode 100644 tensorflow/python/keras/activations/__init__.py rename tensorflow/python/keras/{_impl/keras => }/activations_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/applications/densenet.py (90%) delete mode 100644 tensorflow/python/keras/applications/densenet/__init__.py rename tensorflow/python/keras/{_impl/keras => }/applications/densenet_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/applications/imagenet_utils.py (98%) rename tensorflow/python/keras/{_impl/keras => }/applications/imagenet_utils_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/applications/inception_resnet_v2.py (91%) delete mode 100644 tensorflow/python/keras/applications/inception_resnet_v2/__init__.py rename tensorflow/python/keras/{_impl/keras => }/applications/inception_resnet_v2_test.py (97%) rename tensorflow/python/keras/{_impl/keras => }/applications/inception_v3.py (92%) delete mode 100644 tensorflow/python/keras/applications/inception_v3/__init__.py rename tensorflow/python/keras/{_impl/keras => }/applications/inception_v3_test.py (97%) rename tensorflow/python/keras/{_impl/keras => }/applications/mobilenet.py (92%) delete mode 100644 tensorflow/python/keras/applications/mobilenet/__init__.py rename tensorflow/python/keras/{_impl/keras => }/applications/mobilenet_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/applications/nasnet.py (94%) delete mode 100644 tensorflow/python/keras/applications/nasnet/__init__.py rename tensorflow/python/keras/{_impl/keras => }/applications/nasnet_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/applications/resnet50.py (88%) delete mode 100644 tensorflow/python/keras/applications/resnet50/__init__.py rename tensorflow/python/keras/{_impl/keras => }/applications/resnet50_test.py (97%) rename tensorflow/python/keras/{_impl/keras => }/applications/vgg16.py (87%) delete mode 100644 tensorflow/python/keras/applications/vgg16/__init__.py rename tensorflow/python/keras/{_impl/keras => }/applications/vgg16_test.py (97%) rename tensorflow/python/keras/{_impl/keras => }/applications/vgg19.py (88%) delete mode 100644 tensorflow/python/keras/applications/vgg19/__init__.py rename tensorflow/python/keras/{_impl/keras => }/applications/vgg19_test.py (97%) rename tensorflow/python/keras/{_impl/keras => }/applications/xception.py (90%) delete mode 100644 tensorflow/python/keras/applications/xception/__init__.py rename tensorflow/python/keras/{_impl/keras => }/applications/xception_test.py (97%) rename tensorflow/python/keras/{_impl/keras => }/backend.py (100%) delete mode 100644 tensorflow/python/keras/backend/__init__.py rename tensorflow/python/keras/{_impl/keras => }/backend_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/callbacks.py (99%) delete mode 100644 tensorflow/python/keras/callbacks/__init__.py rename tensorflow/python/keras/{_impl/keras => }/callbacks_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/constraints.py (96%) delete mode 100644 tensorflow/python/keras/constraints/__init__.py rename tensorflow/python/keras/{_impl/keras => }/constraints_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/datasets/boston_housing.py (96%) delete mode 100644 tensorflow/python/keras/datasets/boston_housing/__init__.py rename tensorflow/python/keras/{_impl/keras => }/datasets/cifar.py (100%) rename tensorflow/python/keras/{_impl/keras => }/datasets/cifar10.py (90%) delete mode 100644 tensorflow/python/keras/datasets/cifar10/__init__.py rename tensorflow/python/keras/{_impl/keras => }/datasets/cifar100.py (90%) delete mode 100644 tensorflow/python/keras/datasets/cifar100/__init__.py rename tensorflow/python/keras/{_impl/keras => }/datasets/fashion_mnist.py (96%) delete mode 100644 tensorflow/python/keras/datasets/fashion_mnist/__init__.py rename tensorflow/python/keras/{_impl/keras => }/datasets/imdb.py (96%) delete mode 100644 tensorflow/python/keras/datasets/imdb/__init__.py rename tensorflow/python/keras/{_impl/keras => }/datasets/mnist.py (95%) delete mode 100644 tensorflow/python/keras/datasets/mnist/__init__.py rename tensorflow/python/keras/{_impl/keras => }/datasets/reuters.py (96%) delete mode 100644 tensorflow/python/keras/datasets/reuters/__init__.py rename tensorflow/python/keras/{_impl/keras => }/engine/__init__.py (62%) rename tensorflow/python/keras/{_impl/keras => }/engine/base_layer.py (99%) rename tensorflow/python/keras/{_impl/keras => }/engine/input_layer.py (98%) rename tensorflow/python/keras/{_impl/keras => }/engine/network.py (98%) rename tensorflow/python/keras/{_impl/keras => }/engine/saving.py (97%) rename tensorflow/python/keras/{_impl/keras => }/engine/saving_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/engine/sequential.py (95%) rename tensorflow/python/keras/{_impl/keras => }/engine/sequential_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/engine/topology_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/engine/training.py (98%) rename tensorflow/python/keras/{_impl/keras => }/engine/training_arrays.py (97%) rename tensorflow/python/keras/{_impl/keras => }/engine/training_eager.py (98%) rename tensorflow/python/keras/{_impl/keras => }/engine/training_eager_test.py (88%) rename tensorflow/python/keras/{_impl/keras => }/engine/training_generator.py (97%) rename tensorflow/python/keras/{_impl/keras => }/engine/training_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/engine/training_utils.py (99%) rename tensorflow/python/keras/{_impl/keras => }/initializers.py (97%) delete mode 100644 tensorflow/python/keras/initializers/__init__.py rename tensorflow/python/keras/{_impl/keras => }/initializers_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/integration_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/layers/advanced_activations.py (94%) rename tensorflow/python/keras/{_impl/keras => }/layers/advanced_activations_test.py (95%) rename tensorflow/python/keras/{_impl/keras => }/layers/convolutional.py (99%) rename tensorflow/python/keras/{_impl/keras => }/layers/convolutional_recurrent.py (98%) rename tensorflow/python/keras/{_impl/keras => }/layers/convolutional_recurrent_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/layers/convolutional_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/layers/core.py (98%) rename tensorflow/python/keras/{_impl/keras => }/layers/core_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/layers/cudnn_recurrent.py (98%) rename tensorflow/python/keras/{_impl/keras => }/layers/cudnn_recurrent_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/layers/embeddings.py (94%) rename tensorflow/python/keras/{_impl/keras => }/layers/embeddings_test.py (96%) rename tensorflow/python/keras/{_impl/keras => }/layers/gru_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/layers/local.py (96%) rename tensorflow/python/keras/{_impl/keras => }/layers/local_test.py (97%) rename tensorflow/python/keras/{_impl/keras => }/layers/lstm_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/layers/merge.py (99%) rename tensorflow/python/keras/{_impl/keras => }/layers/merge_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/layers/noise.py (97%) rename tensorflow/python/keras/{_impl/keras => }/layers/noise_test.py (93%) rename tensorflow/python/keras/{_impl/keras => }/layers/normalization.py (98%) rename tensorflow/python/keras/{_impl/keras => }/layers/normalization_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/layers/pooling.py (99%) rename tensorflow/python/keras/{_impl/keras => }/layers/pooling_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/layers/recurrent.py (99%) rename tensorflow/python/keras/{_impl/keras => }/layers/recurrent_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/layers/serialization.py (58%) rename tensorflow/python/keras/{_impl/keras => }/layers/serialization_test.py (96%) rename tensorflow/python/keras/{_impl/keras => }/layers/simplernn_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/layers/wrappers.py (97%) rename tensorflow/python/keras/{_impl/keras => }/layers/wrappers_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/losses.py (95%) delete mode 100644 tensorflow/python/keras/losses/__init__.py rename tensorflow/python/keras/{_impl/keras => }/losses_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/metrics.py (72%) delete mode 100644 tensorflow/python/keras/metrics/__init__.py rename tensorflow/python/keras/{_impl/keras => }/metrics_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/model_subclassing_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/models.py (94%) delete mode 100644 tensorflow/python/keras/models/__init__.py rename tensorflow/python/keras/{_impl/keras => }/models_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/optimizers.py (99%) delete mode 100644 tensorflow/python/keras/optimizers/__init__.py rename tensorflow/python/keras/{_impl/keras => }/optimizers_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/preprocessing/image.py (99%) delete mode 100644 tensorflow/python/keras/preprocessing/image/__init__.py rename tensorflow/python/keras/{_impl/keras => }/preprocessing/image_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/preprocessing/sequence.py (99%) delete mode 100644 tensorflow/python/keras/preprocessing/sequence/__init__.py rename tensorflow/python/keras/{_impl/keras => }/preprocessing/sequence_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/preprocessing/text.py (100%) delete mode 100644 tensorflow/python/keras/preprocessing/text/__init__.py rename tensorflow/python/keras/{_impl/keras => }/preprocessing/text_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/regularizers.py (92%) delete mode 100644 tensorflow/python/keras/regularizers/__init__.py rename tensorflow/python/keras/{_impl/keras => }/regularizers_test.py (96%) rename tensorflow/python/keras/{_impl/keras => }/testing_utils.py (99%) rename tensorflow/python/keras/{_impl/keras => }/utils/conv_utils.py (99%) rename tensorflow/python/keras/{_impl/keras => }/utils/data_utils.py (99%) rename tensorflow/python/keras/{_impl/keras => }/utils/data_utils_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/utils/generic_utils.py (100%) rename tensorflow/python/keras/{_impl/keras => }/utils/generic_utils_test.py (97%) rename tensorflow/python/keras/{_impl/keras => }/utils/io_utils.py (100%) rename tensorflow/python/keras/{_impl/keras => }/utils/io_utils_test.py (98%) rename tensorflow/python/keras/{_impl/keras => }/utils/layer_utils.py (98%) rename tensorflow/python/keras/{_impl/keras => }/utils/multi_gpu_utils.py (95%) rename tensorflow/python/keras/{_impl/keras => }/utils/multi_gpu_utils_test.py (99%) rename tensorflow/python/keras/{_impl/keras => }/utils/np_utils.py (100%) rename tensorflow/python/keras/{_impl/keras => }/utils/np_utils_test.py (97%) rename tensorflow/python/keras/{_impl/keras => }/utils/tf_utils.py (100%) rename tensorflow/python/keras/{_impl/keras => }/utils/vis_utils.py (97%) rename tensorflow/python/keras/{_impl/keras => }/wrappers/scikit_learn.py (98%) delete mode 100644 tensorflow/python/keras/wrappers/scikit_learn/__init__.py rename tensorflow/python/keras/{_impl/keras => }/wrappers/scikit_learn_test.py (98%) diff --git a/tensorflow/contrib/autograph/impl/conversion_test.py b/tensorflow/contrib/autograph/impl/conversion_test.py index 5edd8e7..bc61498 100644 --- a/tensorflow/contrib/autograph/impl/conversion_test.py +++ b/tensorflow/contrib/autograph/impl/conversion_test.py @@ -24,7 +24,7 @@ from tensorflow.contrib.autograph import utils from tensorflow.contrib.autograph.impl import api from tensorflow.contrib.autograph.impl import conversion from tensorflow.python.framework import constant_op -from tensorflow.python.keras._impl.keras.engine import training +from tensorflow.python.keras.engine import training from tensorflow.python.platform import test diff --git a/tensorflow/contrib/checkpoint/python/visualize_test.py b/tensorflow/contrib/checkpoint/python/visualize_test.py index a72a78b..583e3bc 100644 --- a/tensorflow/contrib/checkpoint/python/visualize_test.py +++ b/tensorflow/contrib/checkpoint/python/visualize_test.py @@ -24,8 +24,8 @@ from tensorflow.contrib.checkpoint.python import visualize from tensorflow.python.eager import context from tensorflow.python.eager import test from tensorflow.python.framework import constant_op -from tensorflow.python.keras._impl.keras.engine import training -from tensorflow.python.keras._impl.keras.layers import core +from tensorflow.python.keras.engine import training +from tensorflow.python.keras.layers import core from tensorflow.python.ops import resource_variable_ops from tensorflow.python.training import adam from tensorflow.python.training.checkpointable import util as checkpointable_utils diff --git a/tensorflow/contrib/cmake/python_modules.txt b/tensorflow/contrib/cmake/python_modules.txt index a9fd298..fece56c 100644 --- a/tensorflow/contrib/cmake/python_modules.txt +++ b/tensorflow/contrib/cmake/python_modules.txt @@ -32,51 +32,13 @@ tensorflow/python/feature_column tensorflow/python/framework tensorflow/python/grappler tensorflow/python/keras -tensorflow/python/keras/activations tensorflow/python/keras/applications -tensorflow/python/keras/applications/densenet -tensorflow/python/keras/applications/inception_resnet_v2 -tensorflow/python/keras/applications/inception_v3 -tensorflow/python/keras/applications/mobilenet -tensorflow/python/keras/applications/nasnet -tensorflow/python/keras/applications/resnet50 -tensorflow/python/keras/applications/vgg16 -tensorflow/python/keras/applications/vgg19 -tensorflow/python/keras/applications/xception -tensorflow/python/keras/backend -tensorflow/python/keras/callbacks -tensorflow/python/keras/constraints tensorflow/python/keras/datasets -tensorflow/python/keras/datasets/boston_housing -tensorflow/python/keras/datasets/cifar10 -tensorflow/python/keras/datasets/cifar100 -tensorflow/python/keras/datasets/fashion_mnist -tensorflow/python/keras/datasets/imdb -tensorflow/python/keras/datasets/mnist -tensorflow/python/keras/datasets/reuters -tensorflow/python/keras/initializers +tensorflow/python/keras/engine tensorflow/python/keras/layers -tensorflow/python/keras/losses -tensorflow/python/keras/metrics -tensorflow/python/keras/models -tensorflow/python/keras/optimizers tensorflow/python/keras/preprocessing -tensorflow/python/keras/preprocessing/image -tensorflow/python/keras/preprocessing/sequence -tensorflow/python/keras/preprocessing/text -tensorflow/python/keras/regularizers tensorflow/python/keras/utils tensorflow/python/keras/wrappers -tensorflow/python/keras/wrappers/scikit_learn -tensorflow/python/keras/_impl -tensorflow/python/keras/_impl/keras -tensorflow/python/keras/_impl/keras/applications -tensorflow/python/keras/_impl/keras/datasets -tensorflow/python/keras/_impl/keras/engine -tensorflow/python/keras/_impl/keras/layers -tensorflow/python/keras/_impl/keras/preprocessing -tensorflow/python/keras/_impl/keras/utils -tensorflow/python/keras/_impl/keras/wrappers tensorflow/python/kernel_tests tensorflow/python/kernel_tests/boosted_trees tensorflow/python/kernel_tests/distributions diff --git a/tensorflow/contrib/coder/python/layers/entropybottleneck.py b/tensorflow/contrib/coder/python/layers/entropybottleneck.py index f039cb0..0fbe308 100644 --- a/tensorflow/contrib/coder/python/layers/entropybottleneck.py +++ b/tensorflow/contrib/coder/python/layers/entropybottleneck.py @@ -28,7 +28,7 @@ from tensorflow.python.framework import constant_op from tensorflow.python.framework import dtypes from tensorflow.python.framework import ops from tensorflow.python.framework import tensor_shape -from tensorflow.python.keras._impl.keras import engine +from tensorflow.python.keras import engine from tensorflow.python.ops import array_ops from tensorflow.python.ops import functional_ops from tensorflow.python.ops import init_ops diff --git a/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py b/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py index 125da7d..ed0a26b 100644 --- a/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py +++ b/tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py @@ -24,7 +24,7 @@ from tensorflow.python.framework import common_shapes from tensorflow.python.framework import dtypes from tensorflow.python.framework import ops from tensorflow.python.framework import random_seed -from tensorflow.python.keras._impl.keras.engine import base_layer +from tensorflow.python.keras.engine import base_layer from tensorflow.python.ops import array_ops from tensorflow.python.ops import gen_cudnn_rnn_ops from tensorflow.python.ops import init_ops diff --git a/tensorflow/contrib/eager/python/network.py b/tensorflow/contrib/eager/python/network.py index 9af50ee..f801d9a 100644 --- a/tensorflow/contrib/eager/python/network.py +++ b/tensorflow/contrib/eager/python/network.py @@ -24,7 +24,7 @@ import weakref from tensorflow.python.eager import context from tensorflow.python.framework import ops -from tensorflow.python.keras._impl.keras.engine import base_layer as keras_base_layer +from tensorflow.python.keras.engine import base_layer as keras_base_layer from tensorflow.python.layers import base from tensorflow.python.ops import variable_scope from tensorflow.python.platform import tf_logging as logging diff --git a/tensorflow/contrib/keras/api/keras/activations/__init__.py b/tensorflow/contrib/keras/api/keras/activations/__init__.py index d04838c..3f01842 100644 --- a/tensorflow/contrib/keras/api/keras/activations/__init__.py +++ b/tensorflow/contrib/keras/api/keras/activations/__init__.py @@ -19,22 +19,22 @@ from __future__ import division from __future__ import print_function # Activation functions. -from tensorflow.python.keras._impl.keras.activations import elu -from tensorflow.python.keras._impl.keras.activations import hard_sigmoid -from tensorflow.python.keras._impl.keras.activations import linear -from tensorflow.python.keras._impl.keras.activations import relu -from tensorflow.python.keras._impl.keras.activations import selu -from tensorflow.python.keras._impl.keras.activations import sigmoid -from tensorflow.python.keras._impl.keras.activations import softmax -from tensorflow.python.keras._impl.keras.activations import softplus -from tensorflow.python.keras._impl.keras.activations import softsign -from tensorflow.python.keras._impl.keras.activations import tanh +from tensorflow.python.keras.activations import elu +from tensorflow.python.keras.activations import hard_sigmoid +from tensorflow.python.keras.activations import linear +from tensorflow.python.keras.activations import relu +from tensorflow.python.keras.activations import selu +from tensorflow.python.keras.activations import sigmoid +from tensorflow.python.keras.activations import softmax +from tensorflow.python.keras.activations import softplus +from tensorflow.python.keras.activations import softsign +from tensorflow.python.keras.activations import tanh # Auxiliary utils. # pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.activations import deserialize -from tensorflow.python.keras._impl.keras.activations import serialize -from tensorflow.python.keras._impl.keras.activations import get +from tensorflow.python.keras.activations import deserialize +from tensorflow.python.keras.activations import serialize +from tensorflow.python.keras.activations import get del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/applications/inception_v3/__init__.py b/tensorflow/contrib/keras/api/keras/applications/inception_v3/__init__.py index abf8393..6dfb5ca 100644 --- a/tensorflow/contrib/keras/api/keras/applications/inception_v3/__init__.py +++ b/tensorflow/contrib/keras/api/keras/applications/inception_v3/__init__.py @@ -18,9 +18,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.applications.inception_v3 import decode_predictions -from tensorflow.python.keras._impl.keras.applications.inception_v3 import InceptionV3 -from tensorflow.python.keras._impl.keras.applications.inception_v3 import preprocess_input +from tensorflow.python.keras.applications.inception_v3 import decode_predictions +from tensorflow.python.keras.applications.inception_v3 import InceptionV3 +from tensorflow.python.keras.applications.inception_v3 import preprocess_input del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/applications/mobilenet/__init__.py b/tensorflow/contrib/keras/api/keras/applications/mobilenet/__init__.py index b809e91..67306cc 100644 --- a/tensorflow/contrib/keras/api/keras/applications/mobilenet/__init__.py +++ b/tensorflow/contrib/keras/api/keras/applications/mobilenet/__init__.py @@ -18,9 +18,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.applications.mobilenet import decode_predictions -from tensorflow.python.keras._impl.keras.applications.mobilenet import MobileNet -from tensorflow.python.keras._impl.keras.applications.mobilenet import preprocess_input +from tensorflow.python.keras.applications.mobilenet import decode_predictions +from tensorflow.python.keras.applications.mobilenet import MobileNet +from tensorflow.python.keras.applications.mobilenet import preprocess_input del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/applications/resnet50/__init__.py b/tensorflow/contrib/keras/api/keras/applications/resnet50/__init__.py index 530805d..a25ff48 100644 --- a/tensorflow/contrib/keras/api/keras/applications/resnet50/__init__.py +++ b/tensorflow/contrib/keras/api/keras/applications/resnet50/__init__.py @@ -18,9 +18,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.applications.resnet50 import decode_predictions -from tensorflow.python.keras._impl.keras.applications.resnet50 import preprocess_input -from tensorflow.python.keras._impl.keras.applications.resnet50 import ResNet50 +from tensorflow.python.keras.applications.resnet50 import decode_predictions +from tensorflow.python.keras.applications.resnet50 import preprocess_input +from tensorflow.python.keras.applications.resnet50 import ResNet50 del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/applications/vgg16/__init__.py b/tensorflow/contrib/keras/api/keras/applications/vgg16/__init__.py index 1183616..4964b1b 100644 --- a/tensorflow/contrib/keras/api/keras/applications/vgg16/__init__.py +++ b/tensorflow/contrib/keras/api/keras/applications/vgg16/__init__.py @@ -18,9 +18,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.applications.vgg16 import decode_predictions -from tensorflow.python.keras._impl.keras.applications.vgg16 import preprocess_input -from tensorflow.python.keras._impl.keras.applications.vgg16 import VGG16 +from tensorflow.python.keras.applications.vgg16 import decode_predictions +from tensorflow.python.keras.applications.vgg16 import preprocess_input +from tensorflow.python.keras.applications.vgg16 import VGG16 del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/applications/vgg19/__init__.py b/tensorflow/contrib/keras/api/keras/applications/vgg19/__init__.py index cda5262..afb3abe 100644 --- a/tensorflow/contrib/keras/api/keras/applications/vgg19/__init__.py +++ b/tensorflow/contrib/keras/api/keras/applications/vgg19/__init__.py @@ -18,9 +18,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.applications.vgg19 import decode_predictions -from tensorflow.python.keras._impl.keras.applications.vgg19 import preprocess_input -from tensorflow.python.keras._impl.keras.applications.vgg19 import VGG19 +from tensorflow.python.keras.applications.vgg19 import decode_predictions +from tensorflow.python.keras.applications.vgg19 import preprocess_input +from tensorflow.python.keras.applications.vgg19 import VGG19 del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/applications/xception/__init__.py b/tensorflow/contrib/keras/api/keras/applications/xception/__init__.py index ae9cd9c..2e3335d 100644 --- a/tensorflow/contrib/keras/api/keras/applications/xception/__init__.py +++ b/tensorflow/contrib/keras/api/keras/applications/xception/__init__.py @@ -18,9 +18,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.applications.xception import decode_predictions -from tensorflow.python.keras._impl.keras.applications.xception import preprocess_input -from tensorflow.python.keras._impl.keras.applications.xception import Xception +from tensorflow.python.keras.applications.xception import decode_predictions +from tensorflow.python.keras.applications.xception import preprocess_input +from tensorflow.python.keras.applications.xception import Xception del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/backend/__init__.py b/tensorflow/contrib/keras/api/keras/backend/__init__.py index 10ef5a7..a755364 100644 --- a/tensorflow/contrib/keras/api/keras/backend/__init__.py +++ b/tensorflow/contrib/keras/api/keras/backend/__init__.py @@ -19,144 +19,144 @@ from __future__ import division from __future__ import print_function # pylint: disable=redefined-builtin -from tensorflow.python.keras._impl.keras.backend import abs -from tensorflow.python.keras._impl.keras.backend import all -from tensorflow.python.keras._impl.keras.backend import any -from tensorflow.python.keras._impl.keras.backend import arange -from tensorflow.python.keras._impl.keras.backend import argmax -from tensorflow.python.keras._impl.keras.backend import argmin -from tensorflow.python.keras._impl.keras.backend import backend -from tensorflow.python.keras._impl.keras.backend import batch_dot -from tensorflow.python.keras._impl.keras.backend import batch_flatten -from tensorflow.python.keras._impl.keras.backend import batch_get_value -from tensorflow.python.keras._impl.keras.backend import batch_normalization -from tensorflow.python.keras._impl.keras.backend import batch_set_value -from tensorflow.python.keras._impl.keras.backend import bias_add -from tensorflow.python.keras._impl.keras.backend import binary_crossentropy -from tensorflow.python.keras._impl.keras.backend import cast -from tensorflow.python.keras._impl.keras.backend import cast_to_floatx -from tensorflow.python.keras._impl.keras.backend import categorical_crossentropy -from tensorflow.python.keras._impl.keras.backend import clear_session -from tensorflow.python.keras._impl.keras.backend import clip -from tensorflow.python.keras._impl.keras.backend import concatenate -from tensorflow.python.keras._impl.keras.backend import constant -from tensorflow.python.keras._impl.keras.backend import conv1d -from tensorflow.python.keras._impl.keras.backend import conv2d -from tensorflow.python.keras._impl.keras.backend import conv2d_transpose -from tensorflow.python.keras._impl.keras.backend import conv3d -from tensorflow.python.keras._impl.keras.backend import cos -from tensorflow.python.keras._impl.keras.backend import count_params -from tensorflow.python.keras._impl.keras.backend import ctc_batch_cost -from tensorflow.python.keras._impl.keras.backend import ctc_decode -from tensorflow.python.keras._impl.keras.backend import ctc_label_dense_to_sparse -from tensorflow.python.keras._impl.keras.backend import dot -from tensorflow.python.keras._impl.keras.backend import dropout -from tensorflow.python.keras._impl.keras.backend import dtype -from tensorflow.python.keras._impl.keras.backend import elu -from tensorflow.python.keras._impl.keras.backend import epsilon -from tensorflow.python.keras._impl.keras.backend import equal -from tensorflow.python.keras._impl.keras.backend import eval -from tensorflow.python.keras._impl.keras.backend import exp -from tensorflow.python.keras._impl.keras.backend import expand_dims -from tensorflow.python.keras._impl.keras.backend import eye -from tensorflow.python.keras._impl.keras.backend import flatten -from tensorflow.python.keras._impl.keras.backend import floatx -from tensorflow.python.keras._impl.keras.backend import foldl -from tensorflow.python.keras._impl.keras.backend import foldr -from tensorflow.python.keras._impl.keras.backend import function -from tensorflow.python.keras._impl.keras.backend import gather -from tensorflow.python.keras._impl.keras.backend import get_session -from tensorflow.python.keras._impl.keras.backend import get_uid -from tensorflow.python.keras._impl.keras.backend import get_value -from tensorflow.python.keras._impl.keras.backend import gradients -from tensorflow.python.keras._impl.keras.backend import greater -from tensorflow.python.keras._impl.keras.backend import greater_equal -from tensorflow.python.keras._impl.keras.backend import hard_sigmoid -from tensorflow.python.keras._impl.keras.backend import image_data_format -from tensorflow.python.keras._impl.keras.backend import in_test_phase -from tensorflow.python.keras._impl.keras.backend import in_top_k -from tensorflow.python.keras._impl.keras.backend import in_train_phase -from tensorflow.python.keras._impl.keras.backend import int_shape -from tensorflow.python.keras._impl.keras.backend import is_sparse -from tensorflow.python.keras._impl.keras.backend import l2_normalize -from tensorflow.python.keras._impl.keras.backend import learning_phase -from tensorflow.python.keras._impl.keras.backend import less -from tensorflow.python.keras._impl.keras.backend import less_equal -from tensorflow.python.keras._impl.keras.backend import log -from tensorflow.python.keras._impl.keras.backend import manual_variable_initialization -from tensorflow.python.keras._impl.keras.backend import map_fn -from tensorflow.python.keras._impl.keras.backend import max -from tensorflow.python.keras._impl.keras.backend import maximum -from tensorflow.python.keras._impl.keras.backend import mean -from tensorflow.python.keras._impl.keras.backend import min -from tensorflow.python.keras._impl.keras.backend import minimum -from tensorflow.python.keras._impl.keras.backend import moving_average_update -from tensorflow.python.keras._impl.keras.backend import name_scope -from tensorflow.python.keras._impl.keras.backend import ndim -from tensorflow.python.keras._impl.keras.backend import normalize_batch_in_training -from tensorflow.python.keras._impl.keras.backend import not_equal -from tensorflow.python.keras._impl.keras.backend import one_hot -from tensorflow.python.keras._impl.keras.backend import ones -from tensorflow.python.keras._impl.keras.backend import ones_like -from tensorflow.python.keras._impl.keras.backend import permute_dimensions -from tensorflow.python.keras._impl.keras.backend import placeholder -from tensorflow.python.keras._impl.keras.backend import pool2d -from tensorflow.python.keras._impl.keras.backend import pool3d -from tensorflow.python.keras._impl.keras.backend import pow -from tensorflow.python.keras._impl.keras.backend import print_tensor -from tensorflow.python.keras._impl.keras.backend import prod -from tensorflow.python.keras._impl.keras.backend import random_binomial -from tensorflow.python.keras._impl.keras.backend import random_normal -from tensorflow.python.keras._impl.keras.backend import random_normal_variable -from tensorflow.python.keras._impl.keras.backend import random_uniform -from tensorflow.python.keras._impl.keras.backend import random_uniform_variable -from tensorflow.python.keras._impl.keras.backend import relu -from tensorflow.python.keras._impl.keras.backend import repeat -from tensorflow.python.keras._impl.keras.backend import repeat_elements -from tensorflow.python.keras._impl.keras.backend import reset_uids -from tensorflow.python.keras._impl.keras.backend import reshape -from tensorflow.python.keras._impl.keras.backend import resize_images -from tensorflow.python.keras._impl.keras.backend import resize_volumes -from tensorflow.python.keras._impl.keras.backend import reverse -from tensorflow.python.keras._impl.keras.backend import rnn -from tensorflow.python.keras._impl.keras.backend import round -from tensorflow.python.keras._impl.keras.backend import separable_conv2d -from tensorflow.python.keras._impl.keras.backend import set_epsilon -from tensorflow.python.keras._impl.keras.backend import set_floatx -from tensorflow.python.keras._impl.keras.backend import set_image_data_format -from tensorflow.python.keras._impl.keras.backend import set_learning_phase -from tensorflow.python.keras._impl.keras.backend import set_session -from tensorflow.python.keras._impl.keras.backend import set_value -from tensorflow.python.keras._impl.keras.backend import shape -from tensorflow.python.keras._impl.keras.backend import sigmoid -from tensorflow.python.keras._impl.keras.backend import sign -from tensorflow.python.keras._impl.keras.backend import sin -from tensorflow.python.keras._impl.keras.backend import softmax -from tensorflow.python.keras._impl.keras.backend import softplus -from tensorflow.python.keras._impl.keras.backend import softsign -from tensorflow.python.keras._impl.keras.backend import sparse_categorical_crossentropy -from tensorflow.python.keras._impl.keras.backend import spatial_2d_padding -from tensorflow.python.keras._impl.keras.backend import spatial_3d_padding -from tensorflow.python.keras._impl.keras.backend import sqrt -from tensorflow.python.keras._impl.keras.backend import square -from tensorflow.python.keras._impl.keras.backend import squeeze -from tensorflow.python.keras._impl.keras.backend import stack -from tensorflow.python.keras._impl.keras.backend import std -from tensorflow.python.keras._impl.keras.backend import stop_gradient -from tensorflow.python.keras._impl.keras.backend import sum -from tensorflow.python.keras._impl.keras.backend import switch -from tensorflow.python.keras._impl.keras.backend import tanh -from tensorflow.python.keras._impl.keras.backend import temporal_padding -from tensorflow.python.keras._impl.keras.backend import to_dense -from tensorflow.python.keras._impl.keras.backend import transpose -from tensorflow.python.keras._impl.keras.backend import truncated_normal -from tensorflow.python.keras._impl.keras.backend import update -from tensorflow.python.keras._impl.keras.backend import update_add -from tensorflow.python.keras._impl.keras.backend import update_sub -from tensorflow.python.keras._impl.keras.backend import var -from tensorflow.python.keras._impl.keras.backend import variable -from tensorflow.python.keras._impl.keras.backend import zeros -from tensorflow.python.keras._impl.keras.backend import zeros_like +from tensorflow.python.keras.backend import abs +from tensorflow.python.keras.backend import all +from tensorflow.python.keras.backend import any +from tensorflow.python.keras.backend import arange +from tensorflow.python.keras.backend import argmax +from tensorflow.python.keras.backend import argmin +from tensorflow.python.keras.backend import backend +from tensorflow.python.keras.backend import batch_dot +from tensorflow.python.keras.backend import batch_flatten +from tensorflow.python.keras.backend import batch_get_value +from tensorflow.python.keras.backend import batch_normalization +from tensorflow.python.keras.backend import batch_set_value +from tensorflow.python.keras.backend import bias_add +from tensorflow.python.keras.backend import binary_crossentropy +from tensorflow.python.keras.backend import cast +from tensorflow.python.keras.backend import cast_to_floatx +from tensorflow.python.keras.backend import categorical_crossentropy +from tensorflow.python.keras.backend import clear_session +from tensorflow.python.keras.backend import clip +from tensorflow.python.keras.backend import concatenate +from tensorflow.python.keras.backend import constant +from tensorflow.python.keras.backend import conv1d +from tensorflow.python.keras.backend import conv2d +from tensorflow.python.keras.backend import conv2d_transpose +from tensorflow.python.keras.backend import conv3d +from tensorflow.python.keras.backend import cos +from tensorflow.python.keras.backend import count_params +from tensorflow.python.keras.backend import ctc_batch_cost +from tensorflow.python.keras.backend import ctc_decode +from tensorflow.python.keras.backend import ctc_label_dense_to_sparse +from tensorflow.python.keras.backend import dot +from tensorflow.python.keras.backend import dropout +from tensorflow.python.keras.backend import dtype +from tensorflow.python.keras.backend import elu +from tensorflow.python.keras.backend import epsilon +from tensorflow.python.keras.backend import equal +from tensorflow.python.keras.backend import eval +from tensorflow.python.keras.backend import exp +from tensorflow.python.keras.backend import expand_dims +from tensorflow.python.keras.backend import eye +from tensorflow.python.keras.backend import flatten +from tensorflow.python.keras.backend import floatx +from tensorflow.python.keras.backend import foldl +from tensorflow.python.keras.backend import foldr +from tensorflow.python.keras.backend import function +from tensorflow.python.keras.backend import gather +from tensorflow.python.keras.backend import get_session +from tensorflow.python.keras.backend import get_uid +from tensorflow.python.keras.backend import get_value +from tensorflow.python.keras.backend import gradients +from tensorflow.python.keras.backend import greater +from tensorflow.python.keras.backend import greater_equal +from tensorflow.python.keras.backend import hard_sigmoid +from tensorflow.python.keras.backend import image_data_format +from tensorflow.python.keras.backend import in_test_phase +from tensorflow.python.keras.backend import in_top_k +from tensorflow.python.keras.backend import in_train_phase +from tensorflow.python.keras.backend import int_shape +from tensorflow.python.keras.backend import is_sparse +from tensorflow.python.keras.backend import l2_normalize +from tensorflow.python.keras.backend import learning_phase +from tensorflow.python.keras.backend import less +from tensorflow.python.keras.backend import less_equal +from tensorflow.python.keras.backend import log +from tensorflow.python.keras.backend import manual_variable_initialization +from tensorflow.python.keras.backend import map_fn +from tensorflow.python.keras.backend import max +from tensorflow.python.keras.backend import maximum +from tensorflow.python.keras.backend import mean +from tensorflow.python.keras.backend import min +from tensorflow.python.keras.backend import minimum +from tensorflow.python.keras.backend import moving_average_update +from tensorflow.python.keras.backend import name_scope +from tensorflow.python.keras.backend import ndim +from tensorflow.python.keras.backend import normalize_batch_in_training +from tensorflow.python.keras.backend import not_equal +from tensorflow.python.keras.backend import one_hot +from tensorflow.python.keras.backend import ones +from tensorflow.python.keras.backend import ones_like +from tensorflow.python.keras.backend import permute_dimensions +from tensorflow.python.keras.backend import placeholder +from tensorflow.python.keras.backend import pool2d +from tensorflow.python.keras.backend import pool3d +from tensorflow.python.keras.backend import pow +from tensorflow.python.keras.backend import print_tensor +from tensorflow.python.keras.backend import prod +from tensorflow.python.keras.backend import random_binomial +from tensorflow.python.keras.backend import random_normal +from tensorflow.python.keras.backend import random_normal_variable +from tensorflow.python.keras.backend import random_uniform +from tensorflow.python.keras.backend import random_uniform_variable +from tensorflow.python.keras.backend import relu +from tensorflow.python.keras.backend import repeat +from tensorflow.python.keras.backend import repeat_elements +from tensorflow.python.keras.backend import reset_uids +from tensorflow.python.keras.backend import reshape +from tensorflow.python.keras.backend import resize_images +from tensorflow.python.keras.backend import resize_volumes +from tensorflow.python.keras.backend import reverse +from tensorflow.python.keras.backend import rnn +from tensorflow.python.keras.backend import round +from tensorflow.python.keras.backend import separable_conv2d +from tensorflow.python.keras.backend import set_epsilon +from tensorflow.python.keras.backend import set_floatx +from tensorflow.python.keras.backend import set_image_data_format +from tensorflow.python.keras.backend import set_learning_phase +from tensorflow.python.keras.backend import set_session +from tensorflow.python.keras.backend import set_value +from tensorflow.python.keras.backend import shape +from tensorflow.python.keras.backend import sigmoid +from tensorflow.python.keras.backend import sign +from tensorflow.python.keras.backend import sin +from tensorflow.python.keras.backend import softmax +from tensorflow.python.keras.backend import softplus +from tensorflow.python.keras.backend import softsign +from tensorflow.python.keras.backend import sparse_categorical_crossentropy +from tensorflow.python.keras.backend import spatial_2d_padding +from tensorflow.python.keras.backend import spatial_3d_padding +from tensorflow.python.keras.backend import sqrt +from tensorflow.python.keras.backend import square +from tensorflow.python.keras.backend import squeeze +from tensorflow.python.keras.backend import stack +from tensorflow.python.keras.backend import std +from tensorflow.python.keras.backend import stop_gradient +from tensorflow.python.keras.backend import sum +from tensorflow.python.keras.backend import switch +from tensorflow.python.keras.backend import tanh +from tensorflow.python.keras.backend import temporal_padding +from tensorflow.python.keras.backend import to_dense +from tensorflow.python.keras.backend import transpose +from tensorflow.python.keras.backend import truncated_normal +from tensorflow.python.keras.backend import update +from tensorflow.python.keras.backend import update_add +from tensorflow.python.keras.backend import update_sub +from tensorflow.python.keras.backend import var +from tensorflow.python.keras.backend import variable +from tensorflow.python.keras.backend import zeros +from tensorflow.python.keras.backend import zeros_like del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/callbacks/__init__.py b/tensorflow/contrib/keras/api/keras/callbacks/__init__.py index 2d88479..10e05f2 100644 --- a/tensorflow/contrib/keras/api/keras/callbacks/__init__.py +++ b/tensorflow/contrib/keras/api/keras/callbacks/__init__.py @@ -18,19 +18,19 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.callbacks import BaseLogger -from tensorflow.python.keras._impl.keras.callbacks import Callback -from tensorflow.python.keras._impl.keras.callbacks import CSVLogger -from tensorflow.python.keras._impl.keras.callbacks import EarlyStopping -from tensorflow.python.keras._impl.keras.callbacks import History -from tensorflow.python.keras._impl.keras.callbacks import LambdaCallback -from tensorflow.python.keras._impl.keras.callbacks import LearningRateScheduler -from tensorflow.python.keras._impl.keras.callbacks import ModelCheckpoint -from tensorflow.python.keras._impl.keras.callbacks import ProgbarLogger -from tensorflow.python.keras._impl.keras.callbacks import ReduceLROnPlateau -from tensorflow.python.keras._impl.keras.callbacks import RemoteMonitor -from tensorflow.python.keras._impl.keras.callbacks import TensorBoard -from tensorflow.python.keras._impl.keras.callbacks import TerminateOnNaN +from tensorflow.python.keras.callbacks import BaseLogger +from tensorflow.python.keras.callbacks import Callback +from tensorflow.python.keras.callbacks import CSVLogger +from tensorflow.python.keras.callbacks import EarlyStopping +from tensorflow.python.keras.callbacks import History +from tensorflow.python.keras.callbacks import LambdaCallback +from tensorflow.python.keras.callbacks import LearningRateScheduler +from tensorflow.python.keras.callbacks import ModelCheckpoint +from tensorflow.python.keras.callbacks import ProgbarLogger +from tensorflow.python.keras.callbacks import ReduceLROnPlateau +from tensorflow.python.keras.callbacks import RemoteMonitor +from tensorflow.python.keras.callbacks import TensorBoard +from tensorflow.python.keras.callbacks import TerminateOnNaN del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/constraints/__init__.py b/tensorflow/contrib/keras/api/keras/constraints/__init__.py index 152606d..08debf9 100644 --- a/tensorflow/contrib/keras/api/keras/constraints/__init__.py +++ b/tensorflow/contrib/keras/api/keras/constraints/__init__.py @@ -19,21 +19,21 @@ from __future__ import division from __future__ import print_function # Constraints functions / callable classes. -from tensorflow.python.keras._impl.keras.constraints import Constraint -from tensorflow.python.keras._impl.keras.constraints import max_norm -from tensorflow.python.keras._impl.keras.constraints import MaxNorm -from tensorflow.python.keras._impl.keras.constraints import min_max_norm -from tensorflow.python.keras._impl.keras.constraints import MinMaxNorm -from tensorflow.python.keras._impl.keras.constraints import non_neg -from tensorflow.python.keras._impl.keras.constraints import NonNeg -from tensorflow.python.keras._impl.keras.constraints import unit_norm -from tensorflow.python.keras._impl.keras.constraints import UnitNorm +from tensorflow.python.keras.constraints import Constraint +from tensorflow.python.keras.constraints import max_norm +from tensorflow.python.keras.constraints import MaxNorm +from tensorflow.python.keras.constraints import min_max_norm +from tensorflow.python.keras.constraints import MinMaxNorm +from tensorflow.python.keras.constraints import non_neg +from tensorflow.python.keras.constraints import NonNeg +from tensorflow.python.keras.constraints import unit_norm +from tensorflow.python.keras.constraints import UnitNorm # Auxiliary utils. # pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.constraints import deserialize -from tensorflow.python.keras._impl.keras.constraints import serialize -from tensorflow.python.keras._impl.keras.constraints import get +from tensorflow.python.keras.constraints import deserialize +from tensorflow.python.keras.constraints import serialize +from tensorflow.python.keras.constraints import get del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/datasets/boston_housing/__init__.py b/tensorflow/contrib/keras/api/keras/datasets/boston_housing/__init__.py index b5371a0..a5a6fda 100644 --- a/tensorflow/contrib/keras/api/keras/datasets/boston_housing/__init__.py +++ b/tensorflow/contrib/keras/api/keras/datasets/boston_housing/__init__.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.datasets.boston_housing import load_data +from tensorflow.python.keras.datasets.boston_housing import load_data del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/datasets/cifar10/__init__.py b/tensorflow/contrib/keras/api/keras/datasets/cifar10/__init__.py index 68d3eb7..e74e5f3 100644 --- a/tensorflow/contrib/keras/api/keras/datasets/cifar10/__init__.py +++ b/tensorflow/contrib/keras/api/keras/datasets/cifar10/__init__.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.datasets.cifar10 import load_data +from tensorflow.python.keras.datasets.cifar10 import load_data del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/datasets/cifar100/__init__.py b/tensorflow/contrib/keras/api/keras/datasets/cifar100/__init__.py index ca93742..8f5753a 100644 --- a/tensorflow/contrib/keras/api/keras/datasets/cifar100/__init__.py +++ b/tensorflow/contrib/keras/api/keras/datasets/cifar100/__init__.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.datasets.cifar100 import load_data +from tensorflow.python.keras.datasets.cifar100 import load_data del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/datasets/imdb/__init__.py b/tensorflow/contrib/keras/api/keras/datasets/imdb/__init__.py index 1c6396d..bd6ec4b 100644 --- a/tensorflow/contrib/keras/api/keras/datasets/imdb/__init__.py +++ b/tensorflow/contrib/keras/api/keras/datasets/imdb/__init__.py @@ -18,8 +18,8 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.datasets.imdb import get_word_index -from tensorflow.python.keras._impl.keras.datasets.imdb import load_data +from tensorflow.python.keras.datasets.imdb import get_word_index +from tensorflow.python.keras.datasets.imdb import load_data del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/datasets/mnist/__init__.py b/tensorflow/contrib/keras/api/keras/datasets/mnist/__init__.py index 364255f..f611456 100644 --- a/tensorflow/contrib/keras/api/keras/datasets/mnist/__init__.py +++ b/tensorflow/contrib/keras/api/keras/datasets/mnist/__init__.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.datasets.mnist import load_data +from tensorflow.python.keras.datasets.mnist import load_data del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/datasets/reuters/__init__.py b/tensorflow/contrib/keras/api/keras/datasets/reuters/__init__.py index bb6791a..ade31f4 100644 --- a/tensorflow/contrib/keras/api/keras/datasets/reuters/__init__.py +++ b/tensorflow/contrib/keras/api/keras/datasets/reuters/__init__.py @@ -18,8 +18,8 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.datasets.reuters import get_word_index -from tensorflow.python.keras._impl.keras.datasets.reuters import load_data +from tensorflow.python.keras.datasets.reuters import get_word_index +from tensorflow.python.keras.datasets.reuters import load_data del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/initializers/__init__.py b/tensorflow/contrib/keras/api/keras/initializers/__init__.py index 6b1fcfd..c6bdc4f 100644 --- a/tensorflow/contrib/keras/api/keras/initializers/__init__.py +++ b/tensorflow/contrib/keras/api/keras/initializers/__init__.py @@ -19,30 +19,30 @@ from __future__ import division from __future__ import print_function # Initializer functions / callable classes. -from tensorflow.python.keras._impl.keras.initializers import Constant -from tensorflow.python.keras._impl.keras.initializers import Identity -from tensorflow.python.keras._impl.keras.initializers import Initializer -from tensorflow.python.keras._impl.keras.initializers import Ones -from tensorflow.python.keras._impl.keras.initializers import Orthogonal -from tensorflow.python.keras._impl.keras.initializers import RandomNormal -from tensorflow.python.keras._impl.keras.initializers import RandomUniform -from tensorflow.python.keras._impl.keras.initializers import TruncatedNormal -from tensorflow.python.keras._impl.keras.initializers import VarianceScaling -from tensorflow.python.keras._impl.keras.initializers import Zeros +from tensorflow.python.keras.initializers import Constant +from tensorflow.python.keras.initializers import Identity +from tensorflow.python.keras.initializers import Initializer +from tensorflow.python.keras.initializers import Ones +from tensorflow.python.keras.initializers import Orthogonal +from tensorflow.python.keras.initializers import RandomNormal +from tensorflow.python.keras.initializers import RandomUniform +from tensorflow.python.keras.initializers import TruncatedNormal +from tensorflow.python.keras.initializers import VarianceScaling +from tensorflow.python.keras.initializers import Zeros # Functional interface. # pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.initializers import glorot_normal -from tensorflow.python.keras._impl.keras.initializers import glorot_uniform -from tensorflow.python.keras._impl.keras.initializers import he_normal -from tensorflow.python.keras._impl.keras.initializers import he_uniform -from tensorflow.python.keras._impl.keras.initializers import lecun_normal -from tensorflow.python.keras._impl.keras.initializers import lecun_uniform +from tensorflow.python.keras.initializers import glorot_normal +from tensorflow.python.keras.initializers import glorot_uniform +from tensorflow.python.keras.initializers import he_normal +from tensorflow.python.keras.initializers import he_uniform +from tensorflow.python.keras.initializers import lecun_normal +from tensorflow.python.keras.initializers import lecun_uniform # Auxiliary utils. -from tensorflow.python.keras._impl.keras.initializers import deserialize -from tensorflow.python.keras._impl.keras.initializers import serialize -from tensorflow.python.keras._impl.keras.initializers import get +from tensorflow.python.keras.initializers import deserialize +from tensorflow.python.keras.initializers import serialize +from tensorflow.python.keras.initializers import get del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/layers/__init__.py b/tensorflow/contrib/keras/api/keras/layers/__init__.py index acf0a5e..938c881 100644 --- a/tensorflow/contrib/keras/api/keras/layers/__init__.py +++ b/tensorflow/contrib/keras/api/keras/layers/__init__.py @@ -20,128 +20,128 @@ from __future__ import print_function # Generic layers. # pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.engine import Input -from tensorflow.python.keras._impl.keras.engine import InputLayer -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine import Layer +from tensorflow.python.keras.engine import Input +from tensorflow.python.keras.engine import InputLayer +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.engine import Layer # Advanced activations. -from tensorflow.python.keras._impl.keras.layers.advanced_activations import LeakyReLU -from tensorflow.python.keras._impl.keras.layers.advanced_activations import PReLU -from tensorflow.python.keras._impl.keras.layers.advanced_activations import ELU -from tensorflow.python.keras._impl.keras.layers.advanced_activations import ThresholdedReLU +from tensorflow.python.keras.layers.advanced_activations import LeakyReLU +from tensorflow.python.keras.layers.advanced_activations import PReLU +from tensorflow.python.keras.layers.advanced_activations import ELU +from tensorflow.python.keras.layers.advanced_activations import ThresholdedReLU # Convolution layers. -from tensorflow.python.keras._impl.keras.layers.convolutional import Conv1D -from tensorflow.python.keras._impl.keras.layers.convolutional import Conv2D -from tensorflow.python.keras._impl.keras.layers.convolutional import Conv3D -from tensorflow.python.keras._impl.keras.layers.convolutional import Conv2DTranspose -from tensorflow.python.keras._impl.keras.layers.convolutional import Conv3DTranspose -from tensorflow.python.keras._impl.keras.layers.convolutional import SeparableConv2D +from tensorflow.python.keras.layers.convolutional import Conv1D +from tensorflow.python.keras.layers.convolutional import Conv2D +from tensorflow.python.keras.layers.convolutional import Conv3D +from tensorflow.python.keras.layers.convolutional import Conv2DTranspose +from tensorflow.python.keras.layers.convolutional import Conv3DTranspose +from tensorflow.python.keras.layers.convolutional import SeparableConv2D # Convolution layer aliases. -from tensorflow.python.keras._impl.keras.layers.convolutional import Convolution1D -from tensorflow.python.keras._impl.keras.layers.convolutional import Convolution2D -from tensorflow.python.keras._impl.keras.layers.convolutional import Convolution3D -from tensorflow.python.keras._impl.keras.layers.convolutional import Convolution2DTranspose -from tensorflow.python.keras._impl.keras.layers.convolutional import Convolution3DTranspose -from tensorflow.python.keras._impl.keras.layers.convolutional import SeparableConvolution2D +from tensorflow.python.keras.layers.convolutional import Convolution1D +from tensorflow.python.keras.layers.convolutional import Convolution2D +from tensorflow.python.keras.layers.convolutional import Convolution3D +from tensorflow.python.keras.layers.convolutional import Convolution2DTranspose +from tensorflow.python.keras.layers.convolutional import Convolution3DTranspose +from tensorflow.python.keras.layers.convolutional import SeparableConvolution2D # Image processing layers. -from tensorflow.python.keras._impl.keras.layers.convolutional import UpSampling1D -from tensorflow.python.keras._impl.keras.layers.convolutional import UpSampling2D -from tensorflow.python.keras._impl.keras.layers.convolutional import UpSampling3D -from tensorflow.python.keras._impl.keras.layers.convolutional import ZeroPadding1D -from tensorflow.python.keras._impl.keras.layers.convolutional import ZeroPadding2D -from tensorflow.python.keras._impl.keras.layers.convolutional import ZeroPadding3D -from tensorflow.python.keras._impl.keras.layers.convolutional import Cropping1D -from tensorflow.python.keras._impl.keras.layers.convolutional import Cropping2D -from tensorflow.python.keras._impl.keras.layers.convolutional import Cropping3D +from tensorflow.python.keras.layers.convolutional import UpSampling1D +from tensorflow.python.keras.layers.convolutional import UpSampling2D +from tensorflow.python.keras.layers.convolutional import UpSampling3D +from tensorflow.python.keras.layers.convolutional import ZeroPadding1D +from tensorflow.python.keras.layers.convolutional import ZeroPadding2D +from tensorflow.python.keras.layers.convolutional import ZeroPadding3D +from tensorflow.python.keras.layers.convolutional import Cropping1D +from tensorflow.python.keras.layers.convolutional import Cropping2D +from tensorflow.python.keras.layers.convolutional import Cropping3D # Convolutional-recurrent layers. -from tensorflow.python.keras._impl.keras.layers.convolutional_recurrent import ConvLSTM2D +from tensorflow.python.keras.layers.convolutional_recurrent import ConvLSTM2D # Core layers. -from tensorflow.python.keras._impl.keras.layers.core import Masking -from tensorflow.python.keras._impl.keras.layers.core import Dropout -from tensorflow.python.keras._impl.keras.layers.core import SpatialDropout1D -from tensorflow.python.keras._impl.keras.layers.core import SpatialDropout2D -from tensorflow.python.keras._impl.keras.layers.core import SpatialDropout3D -from tensorflow.python.keras._impl.keras.layers.core import Activation -from tensorflow.python.keras._impl.keras.layers.core import Reshape -from tensorflow.python.keras._impl.keras.layers.core import Permute -from tensorflow.python.keras._impl.keras.layers.core import Flatten -from tensorflow.python.keras._impl.keras.layers.core import RepeatVector -from tensorflow.python.keras._impl.keras.layers.core import Lambda -from tensorflow.python.keras._impl.keras.layers.core import Dense -from tensorflow.python.keras._impl.keras.layers.core import ActivityRegularization +from tensorflow.python.keras.layers.core import Masking +from tensorflow.python.keras.layers.core import Dropout +from tensorflow.python.keras.layers.core import SpatialDropout1D +from tensorflow.python.keras.layers.core import SpatialDropout2D +from tensorflow.python.keras.layers.core import SpatialDropout3D +from tensorflow.python.keras.layers.core import Activation +from tensorflow.python.keras.layers.core import Reshape +from tensorflow.python.keras.layers.core import Permute +from tensorflow.python.keras.layers.core import Flatten +from tensorflow.python.keras.layers.core import RepeatVector +from tensorflow.python.keras.layers.core import Lambda +from tensorflow.python.keras.layers.core import Dense +from tensorflow.python.keras.layers.core import ActivityRegularization # Embedding layers. -from tensorflow.python.keras._impl.keras.layers.embeddings import Embedding +from tensorflow.python.keras.layers.embeddings import Embedding # Locally-connected layers. -from tensorflow.python.keras._impl.keras.layers.local import LocallyConnected1D -from tensorflow.python.keras._impl.keras.layers.local import LocallyConnected2D +from tensorflow.python.keras.layers.local import LocallyConnected1D +from tensorflow.python.keras.layers.local import LocallyConnected2D # Merge layers. -from tensorflow.python.keras._impl.keras.layers.merge import Add -from tensorflow.python.keras._impl.keras.layers.merge import Multiply -from tensorflow.python.keras._impl.keras.layers.merge import Average -from tensorflow.python.keras._impl.keras.layers.merge import Maximum -from tensorflow.python.keras._impl.keras.layers.merge import Concatenate -from tensorflow.python.keras._impl.keras.layers.merge import Dot -from tensorflow.python.keras._impl.keras.layers.merge import add -from tensorflow.python.keras._impl.keras.layers.merge import multiply -from tensorflow.python.keras._impl.keras.layers.merge import average -from tensorflow.python.keras._impl.keras.layers.merge import maximum -from tensorflow.python.keras._impl.keras.layers.merge import concatenate -from tensorflow.python.keras._impl.keras.layers.merge import dot +from tensorflow.python.keras.layers.merge import Add +from tensorflow.python.keras.layers.merge import Multiply +from tensorflow.python.keras.layers.merge import Average +from tensorflow.python.keras.layers.merge import Maximum +from tensorflow.python.keras.layers.merge import Concatenate +from tensorflow.python.keras.layers.merge import Dot +from tensorflow.python.keras.layers.merge import add +from tensorflow.python.keras.layers.merge import multiply +from tensorflow.python.keras.layers.merge import average +from tensorflow.python.keras.layers.merge import maximum +from tensorflow.python.keras.layers.merge import concatenate +from tensorflow.python.keras.layers.merge import dot # Noise layers. -from tensorflow.python.keras._impl.keras.layers.noise import AlphaDropout -from tensorflow.python.keras._impl.keras.layers.noise import GaussianNoise -from tensorflow.python.keras._impl.keras.layers.noise import GaussianDropout +from tensorflow.python.keras.layers.noise import AlphaDropout +from tensorflow.python.keras.layers.noise import GaussianNoise +from tensorflow.python.keras.layers.noise import GaussianDropout # Normalization layers. -from tensorflow.python.keras._impl.keras.layers.normalization import BatchNormalization +from tensorflow.python.keras.layers.normalization import BatchNormalization # Pooling layers. -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPooling1D -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPooling2D -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPooling3D -from tensorflow.python.keras._impl.keras.layers.pooling import AveragePooling1D -from tensorflow.python.keras._impl.keras.layers.pooling import AveragePooling2D -from tensorflow.python.keras._impl.keras.layers.pooling import AveragePooling3D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalAveragePooling1D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalAveragePooling2D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalAveragePooling3D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalMaxPooling1D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalMaxPooling2D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalMaxPooling3D +from tensorflow.python.keras.layers.pooling import MaxPooling1D +from tensorflow.python.keras.layers.pooling import MaxPooling2D +from tensorflow.python.keras.layers.pooling import MaxPooling3D +from tensorflow.python.keras.layers.pooling import AveragePooling1D +from tensorflow.python.keras.layers.pooling import AveragePooling2D +from tensorflow.python.keras.layers.pooling import AveragePooling3D +from tensorflow.python.keras.layers.pooling import GlobalAveragePooling1D +from tensorflow.python.keras.layers.pooling import GlobalAveragePooling2D +from tensorflow.python.keras.layers.pooling import GlobalAveragePooling3D +from tensorflow.python.keras.layers.pooling import GlobalMaxPooling1D +from tensorflow.python.keras.layers.pooling import GlobalMaxPooling2D +from tensorflow.python.keras.layers.pooling import GlobalMaxPooling3D # Pooling layer aliases. -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPool1D -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPool2D -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPool3D -from tensorflow.python.keras._impl.keras.layers.pooling import AvgPool1D -from tensorflow.python.keras._impl.keras.layers.pooling import AvgPool2D -from tensorflow.python.keras._impl.keras.layers.pooling import AvgPool3D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalAvgPool1D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalAvgPool2D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalAvgPool3D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalMaxPool1D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalMaxPool2D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalMaxPool3D +from tensorflow.python.keras.layers.pooling import MaxPool1D +from tensorflow.python.keras.layers.pooling import MaxPool2D +from tensorflow.python.keras.layers.pooling import MaxPool3D +from tensorflow.python.keras.layers.pooling import AvgPool1D +from tensorflow.python.keras.layers.pooling import AvgPool2D +from tensorflow.python.keras.layers.pooling import AvgPool3D +from tensorflow.python.keras.layers.pooling import GlobalAvgPool1D +from tensorflow.python.keras.layers.pooling import GlobalAvgPool2D +from tensorflow.python.keras.layers.pooling import GlobalAvgPool3D +from tensorflow.python.keras.layers.pooling import GlobalMaxPool1D +from tensorflow.python.keras.layers.pooling import GlobalMaxPool2D +from tensorflow.python.keras.layers.pooling import GlobalMaxPool3D # Recurrent layers. -from tensorflow.python.keras._impl.keras.layers.recurrent import SimpleRNN -from tensorflow.python.keras._impl.keras.layers.recurrent import GRU -from tensorflow.python.keras._impl.keras.layers.recurrent import LSTM +from tensorflow.python.keras.layers.recurrent import SimpleRNN +from tensorflow.python.keras.layers.recurrent import GRU +from tensorflow.python.keras.layers.recurrent import LSTM # Wrapper functions -from tensorflow.python.keras._impl.keras.layers.wrappers import Wrapper -from tensorflow.python.keras._impl.keras.layers.wrappers import Bidirectional -from tensorflow.python.keras._impl.keras.layers.wrappers import TimeDistributed +from tensorflow.python.keras.layers.wrappers import Wrapper +from tensorflow.python.keras.layers.wrappers import Bidirectional +from tensorflow.python.keras.layers.wrappers import TimeDistributed del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/losses/__init__.py b/tensorflow/contrib/keras/api/keras/losses/__init__.py index 66721b6..c4476a7 100644 --- a/tensorflow/contrib/keras/api/keras/losses/__init__.py +++ b/tensorflow/contrib/keras/api/keras/losses/__init__.py @@ -19,26 +19,26 @@ from __future__ import division from __future__ import print_function # Loss functions. -from tensorflow.python.keras._impl.keras.losses import binary_crossentropy -from tensorflow.python.keras._impl.keras.losses import categorical_crossentropy -from tensorflow.python.keras._impl.keras.losses import categorical_hinge -from tensorflow.python.keras._impl.keras.losses import cosine_proximity -from tensorflow.python.keras._impl.keras.losses import hinge -from tensorflow.python.keras._impl.keras.losses import kullback_leibler_divergence -from tensorflow.python.keras._impl.keras.losses import logcosh -from tensorflow.python.keras._impl.keras.losses import mean_absolute_error -from tensorflow.python.keras._impl.keras.losses import mean_absolute_percentage_error -from tensorflow.python.keras._impl.keras.losses import mean_squared_error -from tensorflow.python.keras._impl.keras.losses import mean_squared_logarithmic_error -from tensorflow.python.keras._impl.keras.losses import poisson -from tensorflow.python.keras._impl.keras.losses import sparse_categorical_crossentropy -from tensorflow.python.keras._impl.keras.losses import squared_hinge +from tensorflow.python.keras.losses import binary_crossentropy +from tensorflow.python.keras.losses import categorical_crossentropy +from tensorflow.python.keras.losses import categorical_hinge +from tensorflow.python.keras.losses import cosine_proximity +from tensorflow.python.keras.losses import hinge +from tensorflow.python.keras.losses import kullback_leibler_divergence +from tensorflow.python.keras.losses import logcosh +from tensorflow.python.keras.losses import mean_absolute_error +from tensorflow.python.keras.losses import mean_absolute_percentage_error +from tensorflow.python.keras.losses import mean_squared_error +from tensorflow.python.keras.losses import mean_squared_logarithmic_error +from tensorflow.python.keras.losses import poisson +from tensorflow.python.keras.losses import sparse_categorical_crossentropy +from tensorflow.python.keras.losses import squared_hinge # Auxiliary utils. # pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.losses import deserialize -from tensorflow.python.keras._impl.keras.losses import serialize -from tensorflow.python.keras._impl.keras.losses import get +from tensorflow.python.keras.losses import deserialize +from tensorflow.python.keras.losses import serialize +from tensorflow.python.keras.losses import get del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/metrics/__init__.py b/tensorflow/contrib/keras/api/keras/metrics/__init__.py index 59faf03..7317fdb 100644 --- a/tensorflow/contrib/keras/api/keras/metrics/__init__.py +++ b/tensorflow/contrib/keras/api/keras/metrics/__init__.py @@ -19,28 +19,28 @@ from __future__ import division from __future__ import print_function # Metrics functions. -from tensorflow.python.keras._impl.keras.metrics import binary_accuracy -from tensorflow.python.keras._impl.keras.metrics import binary_crossentropy -from tensorflow.python.keras._impl.keras.metrics import categorical_accuracy -from tensorflow.python.keras._impl.keras.metrics import categorical_crossentropy -from tensorflow.python.keras._impl.keras.metrics import cosine_proximity -from tensorflow.python.keras._impl.keras.metrics import hinge -from tensorflow.python.keras._impl.keras.metrics import kullback_leibler_divergence -from tensorflow.python.keras._impl.keras.metrics import mean_absolute_error -from tensorflow.python.keras._impl.keras.metrics import mean_absolute_percentage_error -from tensorflow.python.keras._impl.keras.metrics import mean_squared_error -from tensorflow.python.keras._impl.keras.metrics import mean_squared_logarithmic_error -from tensorflow.python.keras._impl.keras.metrics import poisson -from tensorflow.python.keras._impl.keras.metrics import sparse_categorical_crossentropy -from tensorflow.python.keras._impl.keras.metrics import sparse_top_k_categorical_accuracy -from tensorflow.python.keras._impl.keras.metrics import squared_hinge -from tensorflow.python.keras._impl.keras.metrics import top_k_categorical_accuracy +from tensorflow.python.keras.metrics import binary_accuracy +from tensorflow.python.keras.metrics import binary_crossentropy +from tensorflow.python.keras.metrics import categorical_accuracy +from tensorflow.python.keras.metrics import categorical_crossentropy +from tensorflow.python.keras.metrics import cosine_proximity +from tensorflow.python.keras.metrics import hinge +from tensorflow.python.keras.metrics import kullback_leibler_divergence +from tensorflow.python.keras.metrics import mean_absolute_error +from tensorflow.python.keras.metrics import mean_absolute_percentage_error +from tensorflow.python.keras.metrics import mean_squared_error +from tensorflow.python.keras.metrics import mean_squared_logarithmic_error +from tensorflow.python.keras.metrics import poisson +from tensorflow.python.keras.metrics import sparse_categorical_crossentropy +from tensorflow.python.keras.metrics import sparse_top_k_categorical_accuracy +from tensorflow.python.keras.metrics import squared_hinge +from tensorflow.python.keras.metrics import top_k_categorical_accuracy # Auxiliary utils. # pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.metrics import deserialize -from tensorflow.python.keras._impl.keras.metrics import serialize -from tensorflow.python.keras._impl.keras.metrics import get +from tensorflow.python.keras.metrics import deserialize +from tensorflow.python.keras.metrics import serialize +from tensorflow.python.keras.metrics import get del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/models/__init__.py b/tensorflow/contrib/keras/api/keras/models/__init__.py index 2fb4ac0..3a19698 100644 --- a/tensorflow/contrib/keras/api/keras/models/__init__.py +++ b/tensorflow/contrib/keras/api/keras/models/__init__.py @@ -18,13 +18,13 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.models import load_model -from tensorflow.python.keras._impl.keras.models import Model -from tensorflow.python.keras._impl.keras.models import model_from_config -from tensorflow.python.keras._impl.keras.models import model_from_json -from tensorflow.python.keras._impl.keras.models import model_from_yaml -from tensorflow.python.keras._impl.keras.models import save_model -from tensorflow.python.keras._impl.keras.models import Sequential +from tensorflow.python.keras.models import load_model +from tensorflow.python.keras.models import Model +from tensorflow.python.keras.models import model_from_config +from tensorflow.python.keras.models import model_from_json +from tensorflow.python.keras.models import model_from_yaml +from tensorflow.python.keras.models import save_model +from tensorflow.python.keras.models import Sequential del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/optimizers/__init__.py b/tensorflow/contrib/keras/api/keras/optimizers/__init__.py index 44f47bc..4849a06 100644 --- a/tensorflow/contrib/keras/api/keras/optimizers/__init__.py +++ b/tensorflow/contrib/keras/api/keras/optimizers/__init__.py @@ -19,20 +19,20 @@ from __future__ import division from __future__ import print_function # Optimizer classes. -from tensorflow.python.keras._impl.keras.optimizers import Adadelta -from tensorflow.python.keras._impl.keras.optimizers import Adagrad -from tensorflow.python.keras._impl.keras.optimizers import Adam -from tensorflow.python.keras._impl.keras.optimizers import Adamax -from tensorflow.python.keras._impl.keras.optimizers import Nadam -from tensorflow.python.keras._impl.keras.optimizers import Optimizer -from tensorflow.python.keras._impl.keras.optimizers import RMSprop -from tensorflow.python.keras._impl.keras.optimizers import SGD +from tensorflow.python.keras.optimizers import Adadelta +from tensorflow.python.keras.optimizers import Adagrad +from tensorflow.python.keras.optimizers import Adam +from tensorflow.python.keras.optimizers import Adamax +from tensorflow.python.keras.optimizers import Nadam +from tensorflow.python.keras.optimizers import Optimizer +from tensorflow.python.keras.optimizers import RMSprop +from tensorflow.python.keras.optimizers import SGD # Auxiliary utils. # pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.optimizers import deserialize -from tensorflow.python.keras._impl.keras.optimizers import serialize -from tensorflow.python.keras._impl.keras.optimizers import get +from tensorflow.python.keras.optimizers import deserialize +from tensorflow.python.keras.optimizers import serialize +from tensorflow.python.keras.optimizers import get del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/preprocessing/image/__init__.py b/tensorflow/contrib/keras/api/keras/preprocessing/image/__init__.py index b96e767..1f9e82b 100644 --- a/tensorflow/contrib/keras/api/keras/preprocessing/image/__init__.py +++ b/tensorflow/contrib/keras/api/keras/preprocessing/image/__init__.py @@ -18,20 +18,20 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.preprocessing.image import apply_transform -from tensorflow.python.keras._impl.keras.preprocessing.image import array_to_img -from tensorflow.python.keras._impl.keras.preprocessing.image import DirectoryIterator -from tensorflow.python.keras._impl.keras.preprocessing.image import flip_axis -from tensorflow.python.keras._impl.keras.preprocessing.image import ImageDataGenerator -from tensorflow.python.keras._impl.keras.preprocessing.image import img_to_array -from tensorflow.python.keras._impl.keras.preprocessing.image import Iterator -from tensorflow.python.keras._impl.keras.preprocessing.image import load_img -from tensorflow.python.keras._impl.keras.preprocessing.image import NumpyArrayIterator -from tensorflow.python.keras._impl.keras.preprocessing.image import random_channel_shift -from tensorflow.python.keras._impl.keras.preprocessing.image import random_rotation -from tensorflow.python.keras._impl.keras.preprocessing.image import random_shear -from tensorflow.python.keras._impl.keras.preprocessing.image import random_shift -from tensorflow.python.keras._impl.keras.preprocessing.image import random_zoom +from tensorflow.python.keras.preprocessing.image import apply_transform +from tensorflow.python.keras.preprocessing.image import array_to_img +from tensorflow.python.keras.preprocessing.image import DirectoryIterator +from tensorflow.python.keras.preprocessing.image import flip_axis +from tensorflow.python.keras.preprocessing.image import ImageDataGenerator +from tensorflow.python.keras.preprocessing.image import img_to_array +from tensorflow.python.keras.preprocessing.image import Iterator +from tensorflow.python.keras.preprocessing.image import load_img +from tensorflow.python.keras.preprocessing.image import NumpyArrayIterator +from tensorflow.python.keras.preprocessing.image import random_channel_shift +from tensorflow.python.keras.preprocessing.image import random_rotation +from tensorflow.python.keras.preprocessing.image import random_shear +from tensorflow.python.keras.preprocessing.image import random_shift +from tensorflow.python.keras.preprocessing.image import random_zoom del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/preprocessing/sequence/__init__.py b/tensorflow/contrib/keras/api/keras/preprocessing/sequence/__init__.py index 112f6af..9a93b6f 100644 --- a/tensorflow/contrib/keras/api/keras/preprocessing/sequence/__init__.py +++ b/tensorflow/contrib/keras/api/keras/preprocessing/sequence/__init__.py @@ -18,9 +18,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.preprocessing.sequence import make_sampling_table -from tensorflow.python.keras._impl.keras.preprocessing.sequence import pad_sequences -from tensorflow.python.keras._impl.keras.preprocessing.sequence import skipgrams +from tensorflow.python.keras.preprocessing.sequence import make_sampling_table +from tensorflow.python.keras.preprocessing.sequence import pad_sequences +from tensorflow.python.keras.preprocessing.sequence import skipgrams del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/preprocessing/text/__init__.py b/tensorflow/contrib/keras/api/keras/preprocessing/text/__init__.py index 5bf1a2f..86386a9 100644 --- a/tensorflow/contrib/keras/api/keras/preprocessing/text/__init__.py +++ b/tensorflow/contrib/keras/api/keras/preprocessing/text/__init__.py @@ -18,9 +18,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.preprocessing.text import one_hot -from tensorflow.python.keras._impl.keras.preprocessing.text import text_to_word_sequence -from tensorflow.python.keras._impl.keras.preprocessing.text import Tokenizer +from tensorflow.python.keras.preprocessing.text import one_hot +from tensorflow.python.keras.preprocessing.text import text_to_word_sequence +from tensorflow.python.keras.preprocessing.text import Tokenizer del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/regularizers/__init__.py b/tensorflow/contrib/keras/api/keras/regularizers/__init__.py index 3e707cc..d668e39 100644 --- a/tensorflow/contrib/keras/api/keras/regularizers/__init__.py +++ b/tensorflow/contrib/keras/api/keras/regularizers/__init__.py @@ -19,19 +19,19 @@ from __future__ import division from __future__ import print_function # Regularizer functions / callable classes. -from tensorflow.python.keras._impl.keras.regularizers import L1L2 -from tensorflow.python.keras._impl.keras.regularizers import Regularizer +from tensorflow.python.keras.regularizers import L1L2 +from tensorflow.python.keras.regularizers import Regularizer # Functional interface. # pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.regularizers import l1 -from tensorflow.python.keras._impl.keras.regularizers import l2 -from tensorflow.python.keras._impl.keras.regularizers import l1_l2 +from tensorflow.python.keras.regularizers import l1 +from tensorflow.python.keras.regularizers import l2 +from tensorflow.python.keras.regularizers import l1_l2 # Auxiliary utils. -from tensorflow.python.keras._impl.keras.regularizers import deserialize -from tensorflow.python.keras._impl.keras.regularizers import serialize -from tensorflow.python.keras._impl.keras.regularizers import get +from tensorflow.python.keras.regularizers import deserialize +from tensorflow.python.keras.regularizers import serialize +from tensorflow.python.keras.regularizers import get del absolute_import del division diff --git a/tensorflow/contrib/keras/api/keras/utils/__init__.py b/tensorflow/contrib/keras/api/keras/utils/__init__.py index a7c2179..47cd01b 100644 --- a/tensorflow/contrib/keras/api/keras/utils/__init__.py +++ b/tensorflow/contrib/keras/api/keras/utils/__init__.py @@ -18,21 +18,21 @@ from __future__ import absolute_import 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 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.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 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.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 diff --git a/tensorflow/contrib/keras/api/keras/wrappers/scikit_learn/__init__.py b/tensorflow/contrib/keras/api/keras/wrappers/scikit_learn/__init__.py index a46f859..c4b7aa7 100644 --- a/tensorflow/contrib/keras/api/keras/wrappers/scikit_learn/__init__.py +++ b/tensorflow/contrib/keras/api/keras/wrappers/scikit_learn/__init__.py @@ -18,8 +18,8 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.wrappers.scikit_learn import KerasClassifier -from tensorflow.python.keras._impl.keras.wrappers.scikit_learn import KerasRegressor +from tensorflow.python.keras.wrappers.scikit_learn import KerasClassifier +from tensorflow.python.keras.wrappers.scikit_learn import KerasRegressor del absolute_import del division diff --git a/tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py b/tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py index 548b494..64b9578 100644 --- a/tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py +++ b/tensorflow/contrib/optimizer_v2/checkpointable_utils_test.py @@ -33,8 +33,8 @@ from tensorflow.python.eager import test from tensorflow.python.framework import constant_op from tensorflow.python.framework import ops from tensorflow.python.framework import test_util -from tensorflow.python.keras._impl.keras.engine import training -from tensorflow.python.keras._impl.keras.layers import core +from tensorflow.python.keras.engine import training +from tensorflow.python.keras.layers import core from tensorflow.python.ops import control_flow_ops from tensorflow.python.ops import init_ops from tensorflow.python.ops import resource_variable_ops diff --git a/tensorflow/contrib/timeseries/python/timeseries/ar_model.py b/tensorflow/contrib/timeseries/python/timeseries/ar_model.py index ce96180..d808945 100644 --- a/tensorflow/contrib/timeseries/python/timeseries/ar_model.py +++ b/tensorflow/contrib/timeseries/python/timeseries/ar_model.py @@ -30,9 +30,9 @@ from tensorflow.python.estimator import estimator_lib from tensorflow.python.framework import constant_op from tensorflow.python.framework import dtypes from tensorflow.python.framework import ops -from tensorflow.python.keras._impl.keras.engine import sequential -from tensorflow.python.keras._impl.keras.engine import training -from tensorflow.python.keras._impl.keras.layers import core +from tensorflow.python.keras.engine import sequential +from tensorflow.python.keras.engine import training +from tensorflow.python.keras.layers import core from tensorflow.python.ops import array_ops from tensorflow.python.ops import check_ops from tensorflow.python.ops import control_flow_ops diff --git a/tensorflow/contrib/tpu/python/tpu/keras_support.py b/tensorflow/contrib/tpu/python/tpu/keras_support.py index 9cc841f..f1a11fa 100644 --- a/tensorflow/contrib/tpu/python/tpu/keras_support.py +++ b/tensorflow/contrib/tpu/python/tpu/keras_support.py @@ -61,11 +61,11 @@ from tensorflow.python.client import session as tf_session from tensorflow.python.estimator import model_fn as model_fn_lib from tensorflow.python.framework import ops from tensorflow.python.framework import tensor_spec -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import layers -from tensorflow.python.keras._impl.keras import models -from tensorflow.python.keras._impl.keras import optimizers as keras_optimizers -from tensorflow.python.keras._impl.keras.layers import embeddings +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import layers +from tensorflow.python.keras import models +from tensorflow.python.keras import optimizers as keras_optimizers +from tensorflow.python.keras.layers import embeddings from tensorflow.python.ops import array_ops from tensorflow.python.ops import math_ops from tensorflow.python.platform import tf_logging as logging @@ -400,7 +400,7 @@ class KerasTPUModel(models.Model): """TPU compatible Keras model wrapper.""" def __init__(self, inputs, outputs, name, replicas=1): - super(models.Model, self).__init__( + super(models.Model, self).__init__( # pylint: disable=bad-super-call inputs=inputs, outputs=outputs, name=name, diff --git a/tensorflow/python/estimator/keras.py b/tensorflow/python/estimator/keras.py index c3c3fce..9519d33 100644 --- a/tensorflow/python/estimator/keras.py +++ b/tensorflow/python/estimator/keras.py @@ -30,12 +30,12 @@ from tensorflow.python.framework import ops from tensorflow.python.framework import random_seed from tensorflow.python.framework import sparse_tensor as sparse_tensor_lib from tensorflow.python.framework import tensor_util -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import models -from tensorflow.python.keras._impl.keras import optimizers -from tensorflow.python.keras._impl.keras.engine.base_layer import Layer -from tensorflow.python.keras._impl.keras.engine.network import Network -from tensorflow.python.keras._impl.keras.utils.generic_utils import CustomObjectScope +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import models +from tensorflow.python.keras import optimizers +from tensorflow.python.keras.engine.base_layer import Layer +from tensorflow.python.keras.engine.network import Network +from tensorflow.python.keras.utils.generic_utils import CustomObjectScope from tensorflow.python.ops import check_ops from tensorflow.python.ops import math_ops from tensorflow.python.ops import metrics as metrics_module diff --git a/tensorflow/python/estimator/keras_test.py b/tensorflow/python/estimator/keras_test.py index a89f7f7..6688a84 100644 --- a/tensorflow/python/estimator/keras_test.py +++ b/tensorflow/python/estimator/keras_test.py @@ -25,16 +25,16 @@ import tempfile import numpy as np from tensorflow.core.protobuf import config_pb2 +from tensorflow.python import keras from tensorflow.python.estimator import keras as keras_lib from tensorflow.python.estimator import run_config as run_config_lib from tensorflow.python.estimator.inputs import numpy_io from tensorflow.python.framework import ops from tensorflow.python.framework import test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import testing_utils -from tensorflow.python.keras._impl.keras.applications import mobilenet -from tensorflow.python.keras._impl.keras.optimizers import SGD +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import testing_utils +from tensorflow.python.keras.applications import mobilenet +from tensorflow.python.keras.optimizers import SGD from tensorflow.python.platform import gfile from tensorflow.python.platform import test from tensorflow.python.summary.writer import writer_cache diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py index 42e59f1..ede6e0d 100644 --- a/tensorflow/python/feature_column/feature_column.py +++ b/tensorflow/python/feature_column/feature_column.py @@ -140,7 +140,7 @@ from tensorflow.python.framework import dtypes from tensorflow.python.framework import ops from tensorflow.python.framework import sparse_tensor as sparse_tensor_lib from tensorflow.python.framework import tensor_shape -from tensorflow.python.keras._impl.keras.engine import training +from tensorflow.python.keras.engine import training from tensorflow.python.layers import base from tensorflow.python.ops import array_ops from tensorflow.python.ops import check_ops diff --git a/tensorflow/python/keras/BUILD b/tensorflow/python/keras/BUILD index b4213f0..5d73069 100755 --- a/tensorflow/python/keras/BUILD +++ b/tensorflow/python/keras/BUILD @@ -19,74 +19,37 @@ py_library( name = "keras", srcs = [ "__init__.py", - "_impl/keras/__init__.py", - "_impl/keras/applications/__init__.py", - "_impl/keras/applications/densenet.py", - "_impl/keras/applications/imagenet_utils.py", - "_impl/keras/applications/inception_resnet_v2.py", - "_impl/keras/applications/inception_v3.py", - "_impl/keras/applications/mobilenet.py", - "_impl/keras/applications/nasnet.py", - "_impl/keras/applications/resnet50.py", - "_impl/keras/applications/vgg16.py", - "_impl/keras/applications/vgg19.py", - "_impl/keras/applications/xception.py", - "_impl/keras/datasets/__init__.py", - "_impl/keras/datasets/boston_housing.py", - "_impl/keras/datasets/cifar.py", - "_impl/keras/datasets/cifar10.py", - "_impl/keras/datasets/cifar100.py", - "_impl/keras/datasets/fashion_mnist.py", - "_impl/keras/datasets/imdb.py", - "_impl/keras/datasets/mnist.py", - "_impl/keras/datasets/reuters.py", - "_impl/keras/preprocessing/__init__.py", - "_impl/keras/preprocessing/image.py", - "_impl/keras/preprocessing/sequence.py", - "_impl/keras/preprocessing/text.py", - "_impl/keras/testing_utils.py", - "_impl/keras/utils/__init__.py", - "_impl/keras/utils/multi_gpu_utils.py", - "_impl/keras/utils/np_utils.py", - "_impl/keras/utils/vis_utils.py", - "_impl/keras/wrappers/__init__.py", - "_impl/keras/wrappers/scikit_learn.py", - "activations/__init__.py", "applications/__init__.py", - "applications/densenet/__init__.py", - "applications/inception_resnet_v2/__init__.py", - "applications/inception_v3/__init__.py", - "applications/mobilenet/__init__.py", - "applications/nasnet/__init__.py", - "applications/resnet50/__init__.py", - "applications/vgg16/__init__.py", - "applications/vgg19/__init__.py", - "applications/xception/__init__.py", - "backend/__init__.py", - "callbacks/__init__.py", - "constraints/__init__.py", + "applications/densenet.py", + "applications/imagenet_utils.py", + "applications/inception_resnet_v2.py", + "applications/inception_v3.py", + "applications/mobilenet.py", + "applications/nasnet.py", + "applications/resnet50.py", + "applications/vgg16.py", + "applications/vgg19.py", + "applications/xception.py", "datasets/__init__.py", - "datasets/boston_housing/__init__.py", - "datasets/cifar10/__init__.py", - "datasets/cifar100/__init__.py", - "datasets/fashion_mnist/__init__.py", - "datasets/imdb/__init__.py", - "datasets/mnist/__init__.py", - "datasets/reuters/__init__.py", - "initializers/__init__.py", - "layers/__init__.py", - "losses/__init__.py", - "metrics/__init__.py", - "models/__init__.py", - "optimizers/__init__.py", + "datasets/boston_housing.py", + "datasets/cifar.py", + "datasets/cifar10.py", + "datasets/cifar100.py", + "datasets/fashion_mnist.py", + "datasets/imdb.py", + "datasets/mnist.py", + "datasets/reuters.py", "preprocessing/__init__.py", - "preprocessing/image/__init__.py", - "preprocessing/sequence/__init__.py", - "preprocessing/text/__init__.py", - "regularizers/__init__.py", + "preprocessing/image.py", + "preprocessing/sequence.py", + "preprocessing/text.py", + "testing_utils.py", "utils/__init__.py", + "utils/multi_gpu_utils.py", + "utils/np_utils.py", + "utils/vis_utils.py", "wrappers/__init__.py", - "wrappers/scikit_learn/__init__.py", + "wrappers/scikit_learn.py", ], srcs_version = "PY2AND3", visibility = ["//visibility:public"], @@ -104,7 +67,7 @@ py_library( py_library( name = "backend", - srcs = ["_impl/keras/backend.py"], + srcs = ["backend.py"], srcs_version = "PY2AND3", deps = [ "//tensorflow/core:protos_all_py", @@ -145,28 +108,28 @@ py_library( py_library( name = "engine", srcs = [ - "_impl/keras/activations.py", - "_impl/keras/callbacks.py", - "_impl/keras/constraints.py", - "_impl/keras/engine/__init__.py", - "_impl/keras/engine/base_layer.py", - "_impl/keras/engine/input_layer.py", - "_impl/keras/engine/network.py", - "_impl/keras/engine/saving.py", - "_impl/keras/engine/sequential.py", - "_impl/keras/engine/training.py", - "_impl/keras/engine/training_arrays.py", - "_impl/keras/engine/training_eager.py", - "_impl/keras/engine/training_generator.py", - "_impl/keras/engine/training_utils.py", - "_impl/keras/initializers.py", - "_impl/keras/losses.py", - "_impl/keras/metrics.py", - "_impl/keras/models.py", - "_impl/keras/optimizers.py", - "_impl/keras/regularizers.py", - "_impl/keras/utils/data_utils.py", - "_impl/keras/utils/io_utils.py", + "activations.py", + "callbacks.py", + "constraints.py", + "engine/__init__.py", + "engine/base_layer.py", + "engine/input_layer.py", + "engine/network.py", + "engine/saving.py", + "engine/sequential.py", + "engine/training.py", + "engine/training_arrays.py", + "engine/training_eager.py", + "engine/training_generator.py", + "engine/training_utils.py", + "initializers.py", + "losses.py", + "metrics.py", + "models.py", + "optimizers.py", + "regularizers.py", + "utils/data_utils.py", + "utils/io_utils.py", ], srcs_version = "PY2AND3", deps = [ @@ -179,25 +142,25 @@ py_library( py_library( name = "layers", srcs = [ - "_impl/keras/layers/__init__.py", - "_impl/keras/layers/advanced_activations.py", - "_impl/keras/layers/convolutional.py", - "_impl/keras/layers/convolutional_recurrent.py", - "_impl/keras/layers/core.py", - "_impl/keras/layers/cudnn_recurrent.py", - "_impl/keras/layers/embeddings.py", - "_impl/keras/layers/local.py", - "_impl/keras/layers/merge.py", - "_impl/keras/layers/noise.py", - "_impl/keras/layers/normalization.py", - "_impl/keras/layers/pooling.py", - "_impl/keras/layers/recurrent.py", - "_impl/keras/layers/serialization.py", - "_impl/keras/layers/wrappers.py", - "_impl/keras/utils/conv_utils.py", - "_impl/keras/utils/generic_utils.py", - "_impl/keras/utils/layer_utils.py", - "_impl/keras/utils/tf_utils.py", + "layers/__init__.py", + "layers/advanced_activations.py", + "layers/convolutional.py", + "layers/convolutional_recurrent.py", + "layers/core.py", + "layers/cudnn_recurrent.py", + "layers/embeddings.py", + "layers/local.py", + "layers/merge.py", + "layers/noise.py", + "layers/normalization.py", + "layers/pooling.py", + "layers/recurrent.py", + "layers/serialization.py", + "layers/wrappers.py", + "utils/conv_utils.py", + "utils/generic_utils.py", + "utils/layer_utils.py", + "utils/tf_utils.py", ], srcs_version = "PY2AND3", deps = [ @@ -224,7 +187,7 @@ py_library( py_test( name = "integration_test", size = "medium", - srcs = ["_impl/keras/integration_test.py"], + srcs = ["integration_test.py"], srcs_version = "PY2AND3", tags = ["notsan"], deps = [ @@ -239,7 +202,7 @@ py_test( py_test( name = "activations_test", size = "small", - srcs = ["_impl/keras/activations_test.py"], + srcs = ["activations_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -251,7 +214,7 @@ py_test( py_test( name = "constraints_test", size = "small", - srcs = ["_impl/keras/constraints_test.py"], + srcs = ["constraints_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -263,7 +226,7 @@ py_test( py_test( name = "initializers_test", size = "small", - srcs = ["_impl/keras/initializers_test.py"], + srcs = ["initializers_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -276,7 +239,7 @@ py_test( py_test( name = "regularizers_test", size = "small", - srcs = ["_impl/keras/regularizers_test.py"], + srcs = ["regularizers_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -287,7 +250,7 @@ py_test( py_test( name = "optimizers_test", size = "medium", - srcs = ["_impl/keras/optimizers_test.py"], + srcs = ["optimizers_test.py"], srcs_version = "PY2AND3", tags = ["notsan"], deps = [ @@ -301,7 +264,7 @@ py_test( py_test( name = "losses_test", size = "small", - srcs = ["_impl/keras/losses_test.py"], + srcs = ["losses_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -313,7 +276,7 @@ py_test( py_test( name = "metrics_test", size = "medium", - srcs = ["_impl/keras/metrics_test.py"], + srcs = ["metrics_test.py"], srcs_version = "PY2AND3", tags = [ "manual", @@ -330,7 +293,7 @@ py_test( py_test( name = "densenet_test", size = "large", - srcs = ["_impl/keras/applications/densenet_test.py"], + srcs = ["applications/densenet_test.py"], srcs_version = "PY2AND3", tags = ["nomsan"], # times out, http://b/78650237 deps = [ @@ -343,7 +306,7 @@ py_test( py_test( name = "inception_resnet_v2_test", size = "medium", - srcs = ["_impl/keras/applications/inception_resnet_v2_test.py"], + srcs = ["applications/inception_resnet_v2_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -355,7 +318,7 @@ py_test( py_test( name = "inception_v3_test", size = "medium", - srcs = ["_impl/keras/applications/inception_v3_test.py"], + srcs = ["applications/inception_v3_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -367,7 +330,7 @@ py_test( py_test( name = "mobilenet_test", size = "medium", - srcs = ["_impl/keras/applications/mobilenet_test.py"], + srcs = ["applications/mobilenet_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -379,7 +342,7 @@ py_test( py_test( name = "nasnet_test", size = "large", - srcs = ["_impl/keras/applications/nasnet_test.py"], + srcs = ["applications/nasnet_test.py"], srcs_version = "PY2AND3", tags = ["nomsan"], # times out, http://b/78573625 deps = [ @@ -392,7 +355,7 @@ py_test( py_test( name = "resnet50_test", size = "medium", - srcs = ["_impl/keras/applications/resnet50_test.py"], + srcs = ["applications/resnet50_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -403,7 +366,7 @@ py_test( py_test( name = "vgg16_test", size = "small", - srcs = ["_impl/keras/applications/vgg16_test.py"], + srcs = ["applications/vgg16_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -414,7 +377,7 @@ py_test( py_test( name = "vgg19_test", size = "small", - srcs = ["_impl/keras/applications/vgg19_test.py"], + srcs = ["applications/vgg19_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -425,7 +388,7 @@ py_test( py_test( name = "xception_test", size = "medium", - srcs = ["_impl/keras/applications/xception_test.py"], + srcs = ["applications/xception_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -437,7 +400,7 @@ py_test( py_test( name = "advanced_activations_test", size = "small", - srcs = ["_impl/keras/layers/advanced_activations_test.py"], + srcs = ["layers/advanced_activations_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -448,7 +411,7 @@ py_test( py_test( name = "convolutional_recurrent_test", size = "large", - srcs = ["_impl/keras/layers/convolutional_recurrent_test.py"], + srcs = ["layers/convolutional_recurrent_test.py"], shard_count = 2, srcs_version = "PY2AND3", deps = [ @@ -461,7 +424,7 @@ py_test( py_test( name = "convolutional_test", size = "large", - srcs = ["_impl/keras/layers/convolutional_test.py"], + srcs = ["layers/convolutional_test.py"], srcs_version = "PY2AND3", tags = [ "manual", @@ -478,7 +441,7 @@ py_test( cuda_py_test( name = "cudnn_recurrent_test", size = "large", - srcs = ["_impl/keras/layers/cudnn_recurrent_test.py"], + srcs = ["layers/cudnn_recurrent_test.py"], additional_deps = [ ":keras", "@absl_py//absl/testing:parameterized", @@ -491,7 +454,7 @@ cuda_py_test( py_test( name = "pooling_test", size = "small", - srcs = ["_impl/keras/layers/pooling_test.py"], + srcs = ["layers/pooling_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -502,7 +465,7 @@ py_test( py_test( name = "core_test", size = "medium", - srcs = ["_impl/keras/layers/core_test.py"], + srcs = ["layers/core_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -514,7 +477,7 @@ py_test( py_test( name = "embeddings_test", size = "small", - srcs = ["_impl/keras/layers/embeddings_test.py"], + srcs = ["layers/embeddings_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -525,7 +488,7 @@ py_test( py_test( name = "local_test", size = "medium", - srcs = ["_impl/keras/layers/local_test.py"], + srcs = ["layers/local_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -537,7 +500,7 @@ py_test( py_test( name = "merge_test", size = "small", - srcs = ["_impl/keras/layers/merge_test.py"], + srcs = ["layers/merge_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -549,7 +512,7 @@ py_test( py_test( name = "noise_test", size = "small", - srcs = ["_impl/keras/layers/noise_test.py"], + srcs = ["layers/noise_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -560,7 +523,7 @@ py_test( py_test( name = "normalization_test", size = "medium", - srcs = ["_impl/keras/layers/normalization_test.py"], + srcs = ["layers/normalization_test.py"], srcs_version = "PY2AND3", tags = ["notsan"], deps = [ @@ -573,7 +536,7 @@ py_test( py_test( name = "simplernn_test", size = "medium", - srcs = ["_impl/keras/layers/simplernn_test.py"], + srcs = ["layers/simplernn_test.py"], srcs_version = "PY2AND3", tags = ["notsan"], deps = [ @@ -586,7 +549,7 @@ py_test( py_test( name = "gru_test", size = "medium", - srcs = ["_impl/keras/layers/gru_test.py"], + srcs = ["layers/gru_test.py"], srcs_version = "PY2AND3", tags = ["notsan"], # http://b/62136390 deps = [ @@ -599,7 +562,7 @@ py_test( py_test( name = "lstm_test", size = "medium", - srcs = ["_impl/keras/layers/lstm_test.py"], + srcs = ["layers/lstm_test.py"], shard_count = 4, srcs_version = "PY2AND3", tags = [ @@ -616,7 +579,7 @@ py_test( py_test( name = "recurrent_test", size = "medium", - srcs = ["_impl/keras/layers/recurrent_test.py"], + srcs = ["layers/recurrent_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -628,7 +591,7 @@ py_test( py_test( name = "serialization_test", size = "small", - srcs = ["_impl/keras/layers/serialization_test.py"], + srcs = ["layers/serialization_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -639,7 +602,7 @@ py_test( py_test( name = "wrappers_test", size = "medium", - srcs = ["_impl/keras/layers/wrappers_test.py"], + srcs = ["layers/wrappers_test.py"], shard_count = 4, srcs_version = "PY2AND3", tags = [ @@ -656,7 +619,7 @@ py_test( py_test( name = "scikit_learn_test", size = "small", - srcs = ["_impl/keras/wrappers/scikit_learn_test.py"], + srcs = ["wrappers/scikit_learn_test.py"], srcs_version = "PY2AND3", tags = ["notsan"], deps = [ @@ -669,7 +632,7 @@ py_test( py_test( name = "data_utils_test", size = "large", - srcs = ["_impl/keras/utils/data_utils_test.py"], + srcs = ["utils/data_utils_test.py"], srcs_version = "PY2AND3", tags = [ "no_oss", @@ -688,7 +651,7 @@ py_test( py_test( name = "generic_utils_test", size = "small", - srcs = ["_impl/keras/utils/generic_utils_test.py"], + srcs = ["utils/generic_utils_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -699,7 +662,7 @@ py_test( py_test( name = "io_utils_test", size = "small", - srcs = ["_impl/keras/utils/io_utils_test.py"], + srcs = ["utils/io_utils_test.py"], srcs_version = "PY2AND3", tags = [ "no_windows", # TODO: needs investigation on Windows @@ -715,7 +678,7 @@ py_test( py_test( name = "np_utils_test", size = "small", - srcs = ["_impl/keras/utils/np_utils_test.py"], + srcs = ["utils/np_utils_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -726,7 +689,7 @@ py_test( cuda_py_test( name = "multi_gpu_utils_test", - srcs = ["_impl/keras/utils/multi_gpu_utils_test.py"], + srcs = ["utils/multi_gpu_utils_test.py"], additional_deps = [ ":keras", "//third_party/py/numpy", @@ -741,7 +704,7 @@ cuda_py_test( py_test( name = "imagenet_utils_test", size = "small", - srcs = ["_impl/keras/applications/imagenet_utils_test.py"], + srcs = ["applications/imagenet_utils_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -753,7 +716,7 @@ py_test( py_test( name = "image_test", size = "medium", - srcs = ["_impl/keras/preprocessing/image_test.py"], + srcs = ["preprocessing/image_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -765,7 +728,7 @@ py_test( py_test( name = "sequence_test", size = "small", - srcs = ["_impl/keras/preprocessing/sequence_test.py"], + srcs = ["preprocessing/sequence_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -777,7 +740,7 @@ py_test( py_test( name = "text_test", size = "small", - srcs = ["_impl/keras/preprocessing/text_test.py"], + srcs = ["preprocessing/text_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -789,7 +752,7 @@ py_test( py_test( name = "callbacks_test", size = "medium", - srcs = ["_impl/keras/callbacks_test.py"], + srcs = ["callbacks_test.py"], srcs_version = "PY2AND3", tags = ["notsan"], deps = [ @@ -802,7 +765,7 @@ py_test( py_test( name = "training_test", size = "medium", - srcs = ["_impl/keras/engine/training_test.py"], + srcs = ["engine/training_test.py"], srcs_version = "PY2AND3", tags = ["notsan"], deps = [ @@ -815,7 +778,7 @@ py_test( py_test( name = "training_eager_test", size = "medium", - srcs = ["_impl/keras/engine/training_eager_test.py"], + srcs = ["engine/training_eager_test.py"], srcs_version = "PY2AND3", tags = ["notsan"], deps = [ @@ -828,7 +791,7 @@ py_test( py_test( name = "model_subclassing_test", size = "medium", - srcs = ["_impl/keras/model_subclassing_test.py"], + srcs = ["model_subclassing_test.py"], srcs_version = "PY2AND3", tags = ["notsan"], deps = [ @@ -841,7 +804,7 @@ py_test( py_test( name = "topology_test", size = "small", - srcs = ["_impl/keras/engine/topology_test.py"], + srcs = ["engine/topology_test.py"], srcs_version = "PY2AND3", tags = [ "no-internal-py3", @@ -856,7 +819,7 @@ py_test( py_test( name = "saving_test", size = "medium", - srcs = ["_impl/keras/engine/saving_test.py"], + srcs = ["engine/saving_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -869,7 +832,7 @@ py_test( py_test( name = "sequential_test", size = "small", - srcs = ["_impl/keras/engine/sequential_test.py"], + srcs = ["engine/sequential_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -881,7 +844,7 @@ py_test( py_test( name = "models_test", size = "small", - srcs = ["_impl/keras/models_test.py"], + srcs = ["models_test.py"], srcs_version = "PY2AND3", tags = ["notsan"], # b/67509773 deps = [ @@ -895,7 +858,7 @@ py_test( py_test( name = "backend_test", size = "small", - srcs = ["_impl/keras/backend_test.py"], + srcs = ["backend_test.py"], srcs_version = "PY2AND3", deps = [ ":keras", @@ -908,7 +871,7 @@ py_test( py_library( name = "testing_utils", srcs = [ - "_impl/keras/testing_utils.py", + "testing_utils.py", ], srcs_version = "PY2AND3", deps = [ diff --git a/tensorflow/python/keras/__init__.py b/tensorflow/python/keras/__init__.py index f76cfa6..197f306 100644 --- a/tensorflow/python/keras/__init__.py +++ b/tensorflow/python/keras/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015 The TensorFlow Authors. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,7 +21,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -# pylint: disable=wildcard-import from tensorflow.python.keras import activations from tensorflow.python.keras import applications from tensorflow.python.keras import backend @@ -39,11 +37,12 @@ from tensorflow.python.keras import preprocessing from tensorflow.python.keras import regularizers from tensorflow.python.keras import utils from tensorflow.python.keras import wrappers -from tensorflow.python.keras._impl.keras import __version__ from tensorflow.python.keras.layers import Input from tensorflow.python.keras.models import Model from tensorflow.python.keras.models import Sequential +__version__ = '2.1.6-tf' + del absolute_import del division del print_function diff --git a/tensorflow/python/keras/_impl/keras/__init__.py b/tensorflow/python/keras/_impl/keras/__init__.py deleted file mode 100644 index 9bb140b..0000000 --- a/tensorflow/python/keras/_impl/keras/__init__.py +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2015 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. -# ============================================================================== -"""The Keras API. -""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras import activations -from tensorflow.python.keras._impl.keras import applications -from tensorflow.python.keras._impl.keras import backend -from tensorflow.python.keras._impl.keras import callbacks -from tensorflow.python.keras._impl.keras import constraints -from tensorflow.python.keras._impl.keras import datasets -from tensorflow.python.keras._impl.keras import engine -from tensorflow.python.keras._impl.keras import initializers -from tensorflow.python.keras._impl.keras import layers -from tensorflow.python.keras._impl.keras import losses -from tensorflow.python.keras._impl.keras import metrics -from tensorflow.python.keras._impl.keras import models -from tensorflow.python.keras._impl.keras import optimizers -from tensorflow.python.keras._impl.keras import preprocessing -from tensorflow.python.keras._impl.keras import regularizers -from tensorflow.python.keras._impl.keras import utils -from tensorflow.python.keras._impl.keras import wrappers -from tensorflow.python.keras._impl.keras.layers import Input -from tensorflow.python.keras._impl.keras.models import Model -from tensorflow.python.keras._impl.keras.models import Sequential - -__version__ = '2.1.6-tf' diff --git a/tensorflow/python/keras/_impl/keras/applications/__init__.py b/tensorflow/python/keras/_impl/keras/applications/__init__.py deleted file mode 100644 index 206a769..0000000 --- a/tensorflow/python/keras/_impl/keras/applications/__init__.py +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2015 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. -# ============================================================================== -"""Keras Applications: models with automatic loading of pre-trained weights. -""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.applications.densenet import DenseNet121 -from tensorflow.python.keras._impl.keras.applications.densenet import DenseNet169 -from tensorflow.python.keras._impl.keras.applications.densenet import DenseNet201 -from tensorflow.python.keras._impl.keras.applications.inception_resnet_v2 import InceptionResNetV2 -from tensorflow.python.keras._impl.keras.applications.inception_v3 import InceptionV3 -from tensorflow.python.keras._impl.keras.applications.mobilenet import MobileNet -from tensorflow.python.keras._impl.keras.applications.nasnet import NASNetLarge -from tensorflow.python.keras._impl.keras.applications.nasnet import NASNetMobile -from tensorflow.python.keras._impl.keras.applications.resnet50 import ResNet50 -from tensorflow.python.keras._impl.keras.applications.vgg16 import VGG16 -from tensorflow.python.keras._impl.keras.applications.vgg19 import VGG19 -from tensorflow.python.keras._impl.keras.applications.xception import Xception diff --git a/tensorflow/python/keras/_impl/keras/datasets/__init__.py b/tensorflow/python/keras/_impl/keras/datasets/__init__.py deleted file mode 100644 index 60db376..0000000 --- a/tensorflow/python/keras/_impl/keras/datasets/__init__.py +++ /dev/null @@ -1,28 +0,0 @@ -# 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. -# ============================================================================== -"""Keras datasets: utilities for downloading and pre-processing common datasets. - -""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.datasets import boston_housing -from tensorflow.python.keras._impl.keras.datasets import cifar10 -from tensorflow.python.keras._impl.keras.datasets import cifar100 -from tensorflow.python.keras._impl.keras.datasets import fashion_mnist -from tensorflow.python.keras._impl.keras.datasets import imdb -from tensorflow.python.keras._impl.keras.datasets import mnist -from tensorflow.python.keras._impl.keras.datasets import reuters diff --git a/tensorflow/python/keras/_impl/keras/layers/__init__.py b/tensorflow/python/keras/_impl/keras/layers/__init__.py deleted file mode 100644 index d7bc859..0000000 --- a/tensorflow/python/keras/_impl/keras/layers/__init__.py +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2015 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. -# ============================================================================== -"""Keras layers module. -""" -# pylint: disable=wildcard-import -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.engine import Input -from tensorflow.python.keras._impl.keras.engine import InputLayer -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine import Layer -from tensorflow.python.keras._impl.keras.layers.advanced_activations import * -from tensorflow.python.keras._impl.keras.layers.convolutional import * -from tensorflow.python.keras._impl.keras.layers.convolutional_recurrent import * -from tensorflow.python.keras._impl.keras.layers.core import * -from tensorflow.python.keras._impl.keras.layers.cudnn_recurrent import * -from tensorflow.python.keras._impl.keras.layers.embeddings import * -from tensorflow.python.keras._impl.keras.layers.local import * -from tensorflow.python.keras._impl.keras.layers.merge import * -from tensorflow.python.keras._impl.keras.layers.noise import * -from tensorflow.python.keras._impl.keras.layers.normalization import * -from tensorflow.python.keras._impl.keras.layers.pooling import * -from tensorflow.python.keras._impl.keras.layers.recurrent import * -from tensorflow.python.keras._impl.keras.layers.serialization import deserialize -from tensorflow.python.keras._impl.keras.layers.serialization import serialize -from tensorflow.python.keras._impl.keras.layers.wrappers import * diff --git a/tensorflow/python/keras/_impl/keras/preprocessing/__init__.py b/tensorflow/python/keras/_impl/keras/preprocessing/__init__.py deleted file mode 100644 index 2ca48cd..0000000 --- a/tensorflow/python/keras/_impl/keras/preprocessing/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2015 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. -# ============================================================================== -"""Data preprocessing module. -""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.preprocessing import image -from tensorflow.python.keras._impl.keras.preprocessing import sequence -from tensorflow.python.keras._impl.keras.preprocessing import text - diff --git a/tensorflow/python/keras/_impl/keras/utils/__init__.py b/tensorflow/python/keras/_impl/keras/utils/__init__.py deleted file mode 100644 index 0c9f19a..0000000 --- a/tensorflow/python/keras/_impl/keras/utils/__init__.py +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2015 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. -# ============================================================================== -"""Keras utilities. -""" -from __future__ import absolute_import -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.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.layer_utils import print_summary -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 - diff --git a/tensorflow/python/keras/_impl/keras/wrappers/__init__.py b/tensorflow/python/keras/_impl/keras/wrappers/__init__.py deleted file mode 100644 index 20c9592..0000000 --- a/tensorflow/python/keras/_impl/keras/wrappers/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2015 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. -# ============================================================================== -"""Keras API wrappers. -""" -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.wrappers import scikit_learn - diff --git a/tensorflow/python/keras/_impl/keras/activations.py b/tensorflow/python/keras/activations.py similarity index 95% rename from tensorflow/python/keras/_impl/keras/activations.py rename to tensorflow/python/keras/activations.py index 8def7ec..a62dadb 100644 --- a/tensorflow/python/keras/_impl/keras/activations.py +++ b/tensorflow/python/keras/activations.py @@ -20,8 +20,8 @@ from __future__ import print_function import six -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.utils.generic_utils import deserialize_keras_object +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.utils.generic_utils import deserialize_keras_object from tensorflow.python.ops import math_ops from tensorflow.python.ops import nn from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/activations/__init__.py b/tensorflow/python/keras/activations/__init__.py deleted file mode 100644 index d04838c..0000000 --- a/tensorflow/python/keras/activations/__init__.py +++ /dev/null @@ -1,41 +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. -# ============================================================================== -"""Keras built-in activation functions.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -# Activation functions. -from tensorflow.python.keras._impl.keras.activations import elu -from tensorflow.python.keras._impl.keras.activations import hard_sigmoid -from tensorflow.python.keras._impl.keras.activations import linear -from tensorflow.python.keras._impl.keras.activations import relu -from tensorflow.python.keras._impl.keras.activations import selu -from tensorflow.python.keras._impl.keras.activations import sigmoid -from tensorflow.python.keras._impl.keras.activations import softmax -from tensorflow.python.keras._impl.keras.activations import softplus -from tensorflow.python.keras._impl.keras.activations import softsign -from tensorflow.python.keras._impl.keras.activations import tanh - -# Auxiliary utils. -# pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.activations import deserialize -from tensorflow.python.keras._impl.keras.activations import serialize -from tensorflow.python.keras._impl.keras.activations import get - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/activations_test.py b/tensorflow/python/keras/activations_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/activations_test.py rename to tensorflow/python/keras/activations_test.py index fb0bb5f..5cff1f8 100644 --- a/tensorflow/python/keras/_impl/keras/activations_test.py +++ b/tensorflow/python/keras/activations_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/applications/__init__.py b/tensorflow/python/keras/applications/__init__.py index fccedf9..0621352 100644 --- a/tensorflow/python/keras/applications/__init__.py +++ b/tensorflow/python/keras/applications/__init__.py @@ -18,15 +18,6 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras.applications import densenet -from tensorflow.python.keras.applications import inception_resnet_v2 -from tensorflow.python.keras.applications import inception_v3 -from tensorflow.python.keras.applications import mobilenet -from tensorflow.python.keras.applications import nasnet -from tensorflow.python.keras.applications import resnet50 -from tensorflow.python.keras.applications import vgg16 -from tensorflow.python.keras.applications import vgg19 -from tensorflow.python.keras.applications import xception from tensorflow.python.keras.applications.densenet import DenseNet121 from tensorflow.python.keras.applications.densenet import DenseNet169 from tensorflow.python.keras.applications.densenet import DenseNet201 diff --git a/tensorflow/python/keras/_impl/keras/applications/densenet.py b/tensorflow/python/keras/applications/densenet.py similarity index 90% rename from tensorflow/python/keras/_impl/keras/applications/densenet.py rename to tensorflow/python/keras/applications/densenet.py index ca83e86..f81f107 100644 --- a/tensorflow/python/keras/_impl/keras/applications/densenet.py +++ b/tensorflow/python/keras/applications/densenet.py @@ -27,24 +27,24 @@ from __future__ import print_function import os -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.applications import imagenet_utils -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import _obtain_input_shape -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import decode_predictions -from tensorflow.python.keras._impl.keras.engine.network import get_source_inputs -from tensorflow.python.keras._impl.keras.layers import Activation -from tensorflow.python.keras._impl.keras.layers import AveragePooling2D -from tensorflow.python.keras._impl.keras.layers import BatchNormalization -from tensorflow.python.keras._impl.keras.layers import Concatenate -from tensorflow.python.keras._impl.keras.layers import Conv2D -from tensorflow.python.keras._impl.keras.layers import Dense -from tensorflow.python.keras._impl.keras.layers import GlobalAveragePooling2D -from tensorflow.python.keras._impl.keras.layers import GlobalMaxPooling2D -from tensorflow.python.keras._impl.keras.layers import Input -from tensorflow.python.keras._impl.keras.layers import MaxPooling2D -from tensorflow.python.keras._impl.keras.layers import ZeroPadding2D -from tensorflow.python.keras._impl.keras.models import Model -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.applications import imagenet_utils +from tensorflow.python.keras.applications.imagenet_utils import _obtain_input_shape +from tensorflow.python.keras.applications.imagenet_utils import decode_predictions +from tensorflow.python.keras.engine.network import get_source_inputs +from tensorflow.python.keras.layers import Activation +from tensorflow.python.keras.layers import AveragePooling2D +from tensorflow.python.keras.layers import BatchNormalization +from tensorflow.python.keras.layers import Concatenate +from tensorflow.python.keras.layers import Conv2D +from tensorflow.python.keras.layers import Dense +from tensorflow.python.keras.layers import GlobalAveragePooling2D +from tensorflow.python.keras.layers import GlobalMaxPooling2D +from tensorflow.python.keras.layers import Input +from tensorflow.python.keras.layers import MaxPooling2D +from tensorflow.python.keras.layers import ZeroPadding2D +from tensorflow.python.keras.models import Model +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/applications/densenet/__init__.py b/tensorflow/python/keras/applications/densenet/__init__.py deleted file mode 100644 index 6b8ea83..0000000 --- a/tensorflow/python/keras/applications/densenet/__init__.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2018 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. -# ============================================================================== -"""DenseNet Keras applications.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.applications.densenet import decode_predictions -from tensorflow.python.keras._impl.keras.applications.densenet import DenseNet121 -from tensorflow.python.keras._impl.keras.applications.densenet import DenseNet169 -from tensorflow.python.keras._impl.keras.applications.densenet import DenseNet201 -from tensorflow.python.keras._impl.keras.applications.densenet import preprocess_input - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/applications/densenet_test.py b/tensorflow/python/keras/applications/densenet_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/applications/densenet_test.py rename to tensorflow/python/keras/applications/densenet_test.py index 3b92287..8b6aa28 100644 --- a/tensorflow/python/keras/_impl/keras/applications/densenet_test.py +++ b/tensorflow/python/keras/applications/densenet_test.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/applications/imagenet_utils.py b/tensorflow/python/keras/applications/imagenet_utils.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/applications/imagenet_utils.py rename to tensorflow/python/keras/applications/imagenet_utils.py index d928a7a..0d8ccca 100644 --- a/tensorflow/python/keras/_impl/keras/applications/imagenet_utils.py +++ b/tensorflow/python/keras/applications/imagenet_utils.py @@ -23,8 +23,8 @@ import json import numpy as np from tensorflow.python.framework import constant_op -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.ops import math_ops from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/_impl/keras/applications/imagenet_utils_test.py b/tensorflow/python/keras/applications/imagenet_utils_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/applications/imagenet_utils_test.py rename to tensorflow/python/keras/applications/imagenet_utils_test.py index d843dac..3493393 100644 --- a/tensorflow/python/keras/_impl/keras/applications/imagenet_utils_test.py +++ b/tensorflow/python/keras/applications/imagenet_utils_test.py @@ -20,8 +20,8 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import preprocess_input +from tensorflow.python import keras +from tensorflow.python.keras.applications.imagenet_utils import preprocess_input from tensorflow.python.platform import test @@ -197,4 +197,3 @@ class ImageNetUtilsTest(test.TestCase): if __name__ == '__main__': test.main() - diff --git a/tensorflow/python/keras/_impl/keras/applications/inception_resnet_v2.py b/tensorflow/python/keras/applications/inception_resnet_v2.py similarity index 91% rename from tensorflow/python/keras/_impl/keras/applications/inception_resnet_v2.py rename to tensorflow/python/keras/applications/inception_resnet_v2.py index 17e407d..fe1d0f2 100644 --- a/tensorflow/python/keras/_impl/keras/applications/inception_resnet_v2.py +++ b/tensorflow/python/keras/applications/inception_resnet_v2.py @@ -27,24 +27,24 @@ from __future__ import print_function import os -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.applications import imagenet_utils -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import _obtain_input_shape -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import decode_predictions -from tensorflow.python.keras._impl.keras.engine.network import get_source_inputs -from tensorflow.python.keras._impl.keras.layers import Activation -from tensorflow.python.keras._impl.keras.layers import AveragePooling2D -from tensorflow.python.keras._impl.keras.layers import BatchNormalization -from tensorflow.python.keras._impl.keras.layers import Concatenate -from tensorflow.python.keras._impl.keras.layers import Conv2D -from tensorflow.python.keras._impl.keras.layers import Dense -from tensorflow.python.keras._impl.keras.layers import GlobalAveragePooling2D -from tensorflow.python.keras._impl.keras.layers import GlobalMaxPooling2D -from tensorflow.python.keras._impl.keras.layers import Input -from tensorflow.python.keras._impl.keras.layers import Lambda -from tensorflow.python.keras._impl.keras.layers import MaxPooling2D -from tensorflow.python.keras._impl.keras.models import Model -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.applications import imagenet_utils +from tensorflow.python.keras.applications.imagenet_utils import _obtain_input_shape +from tensorflow.python.keras.applications.imagenet_utils import decode_predictions +from tensorflow.python.keras.engine.network import get_source_inputs +from tensorflow.python.keras.layers import Activation +from tensorflow.python.keras.layers import AveragePooling2D +from tensorflow.python.keras.layers import BatchNormalization +from tensorflow.python.keras.layers import Concatenate +from tensorflow.python.keras.layers import Conv2D +from tensorflow.python.keras.layers import Dense +from tensorflow.python.keras.layers import GlobalAveragePooling2D +from tensorflow.python.keras.layers import GlobalMaxPooling2D +from tensorflow.python.keras.layers import Input +from tensorflow.python.keras.layers import Lambda +from tensorflow.python.keras.layers import MaxPooling2D +from tensorflow.python.keras.models import Model +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/applications/inception_resnet_v2/__init__.py b/tensorflow/python/keras/applications/inception_resnet_v2/__init__.py deleted file mode 100644 index 223660e..0000000 --- a/tensorflow/python/keras/applications/inception_resnet_v2/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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. -# ============================================================================== -"""InceptionResNetV2 Keras application.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.applications.inception_resnet_v2 import decode_predictions -from tensorflow.python.keras._impl.keras.applications.inception_resnet_v2 import InceptionResNetV2 -from tensorflow.python.keras._impl.keras.applications.inception_resnet_v2 import preprocess_input - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/applications/inception_resnet_v2_test.py b/tensorflow/python/keras/applications/inception_resnet_v2_test.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/applications/inception_resnet_v2_test.py rename to tensorflow/python/keras/applications/inception_resnet_v2_test.py index de71e96..0a12f88 100644 --- a/tensorflow/python/keras/_impl/keras/applications/inception_resnet_v2_test.py +++ b/tensorflow/python/keras/applications/inception_resnet_v2_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/applications/inception_v3.py b/tensorflow/python/keras/applications/inception_v3.py similarity index 92% rename from tensorflow/python/keras/_impl/keras/applications/inception_v3.py rename to tensorflow/python/keras/applications/inception_v3.py index 2897c60..857ad49 100644 --- a/tensorflow/python/keras/_impl/keras/applications/inception_v3.py +++ b/tensorflow/python/keras/applications/inception_v3.py @@ -32,23 +32,23 @@ from __future__ import print_function import os -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import layers -from tensorflow.python.keras._impl.keras.applications import imagenet_utils -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import _obtain_input_shape -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import decode_predictions -from tensorflow.python.keras._impl.keras.engine.network import get_source_inputs -from tensorflow.python.keras._impl.keras.layers import Activation -from tensorflow.python.keras._impl.keras.layers import AveragePooling2D -from tensorflow.python.keras._impl.keras.layers import BatchNormalization -from tensorflow.python.keras._impl.keras.layers import Conv2D -from tensorflow.python.keras._impl.keras.layers import Dense -from tensorflow.python.keras._impl.keras.layers import GlobalAveragePooling2D -from tensorflow.python.keras._impl.keras.layers import GlobalMaxPooling2D -from tensorflow.python.keras._impl.keras.layers import Input -from tensorflow.python.keras._impl.keras.layers import MaxPooling2D -from tensorflow.python.keras._impl.keras.models import Model -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import layers +from tensorflow.python.keras.applications import imagenet_utils +from tensorflow.python.keras.applications.imagenet_utils import _obtain_input_shape +from tensorflow.python.keras.applications.imagenet_utils import decode_predictions +from tensorflow.python.keras.engine.network import get_source_inputs +from tensorflow.python.keras.layers import Activation +from tensorflow.python.keras.layers import AveragePooling2D +from tensorflow.python.keras.layers import BatchNormalization +from tensorflow.python.keras.layers import Conv2D +from tensorflow.python.keras.layers import Dense +from tensorflow.python.keras.layers import GlobalAveragePooling2D +from tensorflow.python.keras.layers import GlobalMaxPooling2D +from tensorflow.python.keras.layers import Input +from tensorflow.python.keras.layers import MaxPooling2D +from tensorflow.python.keras.models import Model +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/applications/inception_v3/__init__.py b/tensorflow/python/keras/applications/inception_v3/__init__.py deleted file mode 100644 index abf8393..0000000 --- a/tensorflow/python/keras/applications/inception_v3/__init__.py +++ /dev/null @@ -1,27 +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. -# ============================================================================== -"""Inception V3 Keras application.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.applications.inception_v3 import decode_predictions -from tensorflow.python.keras._impl.keras.applications.inception_v3 import InceptionV3 -from tensorflow.python.keras._impl.keras.applications.inception_v3 import preprocess_input - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/applications/inception_v3_test.py b/tensorflow/python/keras/applications/inception_v3_test.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/applications/inception_v3_test.py rename to tensorflow/python/keras/applications/inception_v3_test.py index 20e11fa..a3fcdd5 100644 --- a/tensorflow/python/keras/_impl/keras/applications/inception_v3_test.py +++ b/tensorflow/python/keras/applications/inception_v3_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/applications/mobilenet.py b/tensorflow/python/keras/applications/mobilenet.py similarity index 92% rename from tensorflow/python/keras/_impl/keras/applications/mobilenet.py rename to tensorflow/python/keras/applications/mobilenet.py index 18a0612..9d845be 100644 --- a/tensorflow/python/keras/_impl/keras/applications/mobilenet.py +++ b/tensorflow/python/keras/applications/mobilenet.py @@ -71,28 +71,28 @@ from __future__ import print_function import os -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import constraints -from tensorflow.python.keras._impl.keras import initializers -from tensorflow.python.keras._impl.keras import regularizers -from tensorflow.python.keras._impl.keras.applications import imagenet_utils -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import _obtain_input_shape -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import decode_predictions -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine.network import get_source_inputs -from tensorflow.python.keras._impl.keras.layers import Activation -from tensorflow.python.keras._impl.keras.layers import BatchNormalization -from tensorflow.python.keras._impl.keras.layers import Conv2D -from tensorflow.python.keras._impl.keras.layers import DepthwiseConv2D -from tensorflow.python.keras._impl.keras.layers import Dropout -from tensorflow.python.keras._impl.keras.layers import GlobalAveragePooling2D -from tensorflow.python.keras._impl.keras.layers import GlobalMaxPooling2D -from tensorflow.python.keras._impl.keras.layers import Input -from tensorflow.python.keras._impl.keras.layers import Reshape -from tensorflow.python.keras._impl.keras.layers import ZeroPadding2D -from tensorflow.python.keras._impl.keras.models import Model -from tensorflow.python.keras._impl.keras.utils import conv_utils -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import constraints +from tensorflow.python.keras import initializers +from tensorflow.python.keras import regularizers +from tensorflow.python.keras.applications import imagenet_utils +from tensorflow.python.keras.applications.imagenet_utils import _obtain_input_shape +from tensorflow.python.keras.applications.imagenet_utils import decode_predictions +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.engine.network import get_source_inputs +from tensorflow.python.keras.layers import Activation +from tensorflow.python.keras.layers import BatchNormalization +from tensorflow.python.keras.layers import Conv2D +from tensorflow.python.keras.layers import DepthwiseConv2D +from tensorflow.python.keras.layers import Dropout +from tensorflow.python.keras.layers import GlobalAveragePooling2D +from tensorflow.python.keras.layers import GlobalMaxPooling2D +from tensorflow.python.keras.layers import Input +from tensorflow.python.keras.layers import Reshape +from tensorflow.python.keras.layers import ZeroPadding2D +from tensorflow.python.keras.models import Model +from tensorflow.python.keras.utils import conv_utils +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/applications/mobilenet/__init__.py b/tensorflow/python/keras/applications/mobilenet/__init__.py deleted file mode 100644 index b809e91..0000000 --- a/tensorflow/python/keras/applications/mobilenet/__init__.py +++ /dev/null @@ -1,27 +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. -# ============================================================================== -"""MobileNet Keras application.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.applications.mobilenet import decode_predictions -from tensorflow.python.keras._impl.keras.applications.mobilenet import MobileNet -from tensorflow.python.keras._impl.keras.applications.mobilenet import preprocess_input - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/applications/mobilenet_test.py b/tensorflow/python/keras/applications/mobilenet_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/applications/mobilenet_test.py rename to tensorflow/python/keras/applications/mobilenet_test.py index 601d417..5661ed7 100644 --- a/tensorflow/python/keras/_impl/keras/applications/mobilenet_test.py +++ b/tensorflow/python/keras/applications/mobilenet_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/applications/nasnet.py b/tensorflow/python/keras/applications/nasnet.py similarity index 94% rename from tensorflow/python/keras/_impl/keras/applications/nasnet.py rename to tensorflow/python/keras/applications/nasnet.py index f3412d7..b521bc6 100644 --- a/tensorflow/python/keras/_impl/keras/applications/nasnet.py +++ b/tensorflow/python/keras/applications/nasnet.py @@ -45,27 +45,27 @@ from __future__ import print_function import os -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import _obtain_input_shape -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import decode_predictions -from tensorflow.python.keras._impl.keras.applications.inception_v3 import preprocess_input -from tensorflow.python.keras._impl.keras.engine.network import get_source_inputs -from tensorflow.python.keras._impl.keras.layers import Activation -from tensorflow.python.keras._impl.keras.layers import add -from tensorflow.python.keras._impl.keras.layers import AveragePooling2D -from tensorflow.python.keras._impl.keras.layers import BatchNormalization -from tensorflow.python.keras._impl.keras.layers import concatenate -from tensorflow.python.keras._impl.keras.layers import Conv2D -from tensorflow.python.keras._impl.keras.layers import Cropping2D -from tensorflow.python.keras._impl.keras.layers import Dense -from tensorflow.python.keras._impl.keras.layers import GlobalAveragePooling2D -from tensorflow.python.keras._impl.keras.layers import GlobalMaxPooling2D -from tensorflow.python.keras._impl.keras.layers import Input -from tensorflow.python.keras._impl.keras.layers import MaxPooling2D -from tensorflow.python.keras._impl.keras.layers import SeparableConv2D -from tensorflow.python.keras._impl.keras.layers import ZeroPadding2D -from tensorflow.python.keras._impl.keras.models import Model -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.applications.imagenet_utils import _obtain_input_shape +from tensorflow.python.keras.applications.imagenet_utils import decode_predictions +from tensorflow.python.keras.applications.inception_v3 import preprocess_input +from tensorflow.python.keras.engine.network import get_source_inputs +from tensorflow.python.keras.layers import Activation +from tensorflow.python.keras.layers import add +from tensorflow.python.keras.layers import AveragePooling2D +from tensorflow.python.keras.layers import BatchNormalization +from tensorflow.python.keras.layers import concatenate +from tensorflow.python.keras.layers import Conv2D +from tensorflow.python.keras.layers import Cropping2D +from tensorflow.python.keras.layers import Dense +from tensorflow.python.keras.layers import GlobalAveragePooling2D +from tensorflow.python.keras.layers import GlobalMaxPooling2D +from tensorflow.python.keras.layers import Input +from tensorflow.python.keras.layers import MaxPooling2D +from tensorflow.python.keras.layers import SeparableConv2D +from tensorflow.python.keras.layers import ZeroPadding2D +from tensorflow.python.keras.models import Model +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/applications/nasnet/__init__.py b/tensorflow/python/keras/applications/nasnet/__init__.py deleted file mode 100644 index 94eb145..0000000 --- a/tensorflow/python/keras/applications/nasnet/__init__.py +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2018 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. -# ============================================================================== -"""NASNet Keras applications.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.applications.nasnet import decode_predictions -from tensorflow.python.keras._impl.keras.applications.nasnet import NASNetLarge -from tensorflow.python.keras._impl.keras.applications.nasnet import NASNetMobile -from tensorflow.python.keras._impl.keras.applications.nasnet import preprocess_input - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/applications/nasnet_test.py b/tensorflow/python/keras/applications/nasnet_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/applications/nasnet_test.py rename to tensorflow/python/keras/applications/nasnet_test.py index aa1dec6..f96c3aa 100644 --- a/tensorflow/python/keras/_impl/keras/applications/nasnet_test.py +++ b/tensorflow/python/keras/applications/nasnet_test.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/applications/resnet50.py b/tensorflow/python/keras/applications/resnet50.py similarity index 88% rename from tensorflow/python/keras/_impl/keras/applications/resnet50.py rename to tensorflow/python/keras/applications/resnet50.py index c3a92be..508550f 100644 --- a/tensorflow/python/keras/_impl/keras/applications/resnet50.py +++ b/tensorflow/python/keras/applications/resnet50.py @@ -29,26 +29,26 @@ from __future__ import print_function import os -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import layers -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import _obtain_input_shape -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import decode_predictions -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import preprocess_input -from tensorflow.python.keras._impl.keras.engine.network import get_source_inputs -from tensorflow.python.keras._impl.keras.layers import Activation -from tensorflow.python.keras._impl.keras.layers import AveragePooling2D -from tensorflow.python.keras._impl.keras.layers import BatchNormalization -from tensorflow.python.keras._impl.keras.layers import Conv2D -from tensorflow.python.keras._impl.keras.layers import Dense -from tensorflow.python.keras._impl.keras.layers import Flatten -from tensorflow.python.keras._impl.keras.layers import GlobalAveragePooling2D -from tensorflow.python.keras._impl.keras.layers import GlobalMaxPooling2D -from tensorflow.python.keras._impl.keras.layers import Input -from tensorflow.python.keras._impl.keras.layers import MaxPooling2D -from tensorflow.python.keras._impl.keras.layers import ZeroPadding2D -from tensorflow.python.keras._impl.keras.models import Model -from tensorflow.python.keras._impl.keras.utils import layer_utils -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import layers +from tensorflow.python.keras.applications.imagenet_utils import _obtain_input_shape +from tensorflow.python.keras.applications.imagenet_utils import decode_predictions +from tensorflow.python.keras.applications.imagenet_utils import preprocess_input +from tensorflow.python.keras.engine.network import get_source_inputs +from tensorflow.python.keras.layers import Activation +from tensorflow.python.keras.layers import AveragePooling2D +from tensorflow.python.keras.layers import BatchNormalization +from tensorflow.python.keras.layers import Conv2D +from tensorflow.python.keras.layers import Dense +from tensorflow.python.keras.layers import Flatten +from tensorflow.python.keras.layers import GlobalAveragePooling2D +from tensorflow.python.keras.layers import GlobalMaxPooling2D +from tensorflow.python.keras.layers import Input +from tensorflow.python.keras.layers import MaxPooling2D +from tensorflow.python.keras.layers import ZeroPadding2D +from tensorflow.python.keras.models import Model +from tensorflow.python.keras.utils import layer_utils +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/applications/resnet50/__init__.py b/tensorflow/python/keras/applications/resnet50/__init__.py deleted file mode 100644 index 530805d..0000000 --- a/tensorflow/python/keras/applications/resnet50/__init__.py +++ /dev/null @@ -1,27 +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. -# ============================================================================== -"""ResNet50 Keras application.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.applications.resnet50 import decode_predictions -from tensorflow.python.keras._impl.keras.applications.resnet50 import preprocess_input -from tensorflow.python.keras._impl.keras.applications.resnet50 import ResNet50 - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/applications/resnet50_test.py b/tensorflow/python/keras/applications/resnet50_test.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/applications/resnet50_test.py rename to tensorflow/python/keras/applications/resnet50_test.py index 07f9ffd..22a3f05 100644 --- a/tensorflow/python/keras/_impl/keras/applications/resnet50_test.py +++ b/tensorflow/python/keras/applications/resnet50_test.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/applications/vgg16.py b/tensorflow/python/keras/applications/vgg16.py similarity index 87% rename from tensorflow/python/keras/_impl/keras/applications/vgg16.py rename to tensorflow/python/keras/applications/vgg16.py index 25a1547..659a653 100644 --- a/tensorflow/python/keras/_impl/keras/applications/vgg16.py +++ b/tensorflow/python/keras/applications/vgg16.py @@ -28,21 +28,21 @@ from __future__ import print_function import os -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import _obtain_input_shape -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import decode_predictions -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import preprocess_input -from tensorflow.python.keras._impl.keras.engine.network import get_source_inputs -from tensorflow.python.keras._impl.keras.layers import Conv2D -from tensorflow.python.keras._impl.keras.layers import Dense -from tensorflow.python.keras._impl.keras.layers import Flatten -from tensorflow.python.keras._impl.keras.layers import GlobalAveragePooling2D -from tensorflow.python.keras._impl.keras.layers import GlobalMaxPooling2D -from tensorflow.python.keras._impl.keras.layers import Input -from tensorflow.python.keras._impl.keras.layers import MaxPooling2D -from tensorflow.python.keras._impl.keras.models import Model -from tensorflow.python.keras._impl.keras.utils import layer_utils -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.applications.imagenet_utils import _obtain_input_shape +from tensorflow.python.keras.applications.imagenet_utils import decode_predictions +from tensorflow.python.keras.applications.imagenet_utils import preprocess_input +from tensorflow.python.keras.engine.network import get_source_inputs +from tensorflow.python.keras.layers import Conv2D +from tensorflow.python.keras.layers import Dense +from tensorflow.python.keras.layers import Flatten +from tensorflow.python.keras.layers import GlobalAveragePooling2D +from tensorflow.python.keras.layers import GlobalMaxPooling2D +from tensorflow.python.keras.layers import Input +from tensorflow.python.keras.layers import MaxPooling2D +from tensorflow.python.keras.models import Model +from tensorflow.python.keras.utils import layer_utils +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/applications/vgg16/__init__.py b/tensorflow/python/keras/applications/vgg16/__init__.py deleted file mode 100644 index 1183616..0000000 --- a/tensorflow/python/keras/applications/vgg16/__init__.py +++ /dev/null @@ -1,27 +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. -# ============================================================================== -"""VGG16 Keras application.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.applications.vgg16 import decode_predictions -from tensorflow.python.keras._impl.keras.applications.vgg16 import preprocess_input -from tensorflow.python.keras._impl.keras.applications.vgg16 import VGG16 - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/applications/vgg16_test.py b/tensorflow/python/keras/applications/vgg16_test.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/applications/vgg16_test.py rename to tensorflow/python/keras/applications/vgg16_test.py index e6eba83..cad6576 100644 --- a/tensorflow/python/keras/_impl/keras/applications/vgg16_test.py +++ b/tensorflow/python/keras/applications/vgg16_test.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/applications/vgg19.py b/tensorflow/python/keras/applications/vgg19.py similarity index 88% rename from tensorflow/python/keras/_impl/keras/applications/vgg19.py rename to tensorflow/python/keras/applications/vgg19.py index b09d006..5e27ab8 100644 --- a/tensorflow/python/keras/_impl/keras/applications/vgg19.py +++ b/tensorflow/python/keras/applications/vgg19.py @@ -28,21 +28,21 @@ from __future__ import print_function import os -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import _obtain_input_shape -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import decode_predictions -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import preprocess_input -from tensorflow.python.keras._impl.keras.engine.network import get_source_inputs -from tensorflow.python.keras._impl.keras.layers import Conv2D -from tensorflow.python.keras._impl.keras.layers import Dense -from tensorflow.python.keras._impl.keras.layers import Flatten -from tensorflow.python.keras._impl.keras.layers import GlobalAveragePooling2D -from tensorflow.python.keras._impl.keras.layers import GlobalMaxPooling2D -from tensorflow.python.keras._impl.keras.layers import Input -from tensorflow.python.keras._impl.keras.layers import MaxPooling2D -from tensorflow.python.keras._impl.keras.models import Model -from tensorflow.python.keras._impl.keras.utils import layer_utils -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.applications.imagenet_utils import _obtain_input_shape +from tensorflow.python.keras.applications.imagenet_utils import decode_predictions +from tensorflow.python.keras.applications.imagenet_utils import preprocess_input +from tensorflow.python.keras.engine.network import get_source_inputs +from tensorflow.python.keras.layers import Conv2D +from tensorflow.python.keras.layers import Dense +from tensorflow.python.keras.layers import Flatten +from tensorflow.python.keras.layers import GlobalAveragePooling2D +from tensorflow.python.keras.layers import GlobalMaxPooling2D +from tensorflow.python.keras.layers import Input +from tensorflow.python.keras.layers import MaxPooling2D +from tensorflow.python.keras.models import Model +from tensorflow.python.keras.utils import layer_utils +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/applications/vgg19/__init__.py b/tensorflow/python/keras/applications/vgg19/__init__.py deleted file mode 100644 index cda5262..0000000 --- a/tensorflow/python/keras/applications/vgg19/__init__.py +++ /dev/null @@ -1,27 +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. -# ============================================================================== -"""VGG19 Keras application.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.applications.vgg19 import decode_predictions -from tensorflow.python.keras._impl.keras.applications.vgg19 import preprocess_input -from tensorflow.python.keras._impl.keras.applications.vgg19 import VGG19 - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/applications/vgg19_test.py b/tensorflow/python/keras/applications/vgg19_test.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/applications/vgg19_test.py rename to tensorflow/python/keras/applications/vgg19_test.py index 25100a2..61dccc0 100644 --- a/tensorflow/python/keras/_impl/keras/applications/vgg19_test.py +++ b/tensorflow/python/keras/applications/vgg19_test.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/applications/xception.py b/tensorflow/python/keras/applications/xception.py similarity index 90% rename from tensorflow/python/keras/_impl/keras/applications/xception.py rename to tensorflow/python/keras/applications/xception.py index 971063a..e1be8a3 100644 --- a/tensorflow/python/keras/_impl/keras/applications/xception.py +++ b/tensorflow/python/keras/applications/xception.py @@ -39,23 +39,23 @@ from __future__ import print_function import os -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import layers -from tensorflow.python.keras._impl.keras.applications import imagenet_utils -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import _obtain_input_shape -from tensorflow.python.keras._impl.keras.applications.imagenet_utils import decode_predictions -from tensorflow.python.keras._impl.keras.engine.network import get_source_inputs -from tensorflow.python.keras._impl.keras.layers import Activation -from tensorflow.python.keras._impl.keras.layers import BatchNormalization -from tensorflow.python.keras._impl.keras.layers import Conv2D -from tensorflow.python.keras._impl.keras.layers import Dense -from tensorflow.python.keras._impl.keras.layers import GlobalAveragePooling2D -from tensorflow.python.keras._impl.keras.layers import GlobalMaxPooling2D -from tensorflow.python.keras._impl.keras.layers import Input -from tensorflow.python.keras._impl.keras.layers import MaxPooling2D -from tensorflow.python.keras._impl.keras.layers import SeparableConv2D -from tensorflow.python.keras._impl.keras.models import Model -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import layers +from tensorflow.python.keras.applications import imagenet_utils +from tensorflow.python.keras.applications.imagenet_utils import _obtain_input_shape +from tensorflow.python.keras.applications.imagenet_utils import decode_predictions +from tensorflow.python.keras.engine.network import get_source_inputs +from tensorflow.python.keras.layers import Activation +from tensorflow.python.keras.layers import BatchNormalization +from tensorflow.python.keras.layers import Conv2D +from tensorflow.python.keras.layers import Dense +from tensorflow.python.keras.layers import GlobalAveragePooling2D +from tensorflow.python.keras.layers import GlobalMaxPooling2D +from tensorflow.python.keras.layers import Input +from tensorflow.python.keras.layers import MaxPooling2D +from tensorflow.python.keras.layers import SeparableConv2D +from tensorflow.python.keras.models import Model +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/applications/xception/__init__.py b/tensorflow/python/keras/applications/xception/__init__.py deleted file mode 100644 index ae9cd9c..0000000 --- a/tensorflow/python/keras/applications/xception/__init__.py +++ /dev/null @@ -1,27 +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. -# ============================================================================== -"""Xception Keras application.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.applications.xception import decode_predictions -from tensorflow.python.keras._impl.keras.applications.xception import preprocess_input -from tensorflow.python.keras._impl.keras.applications.xception import Xception - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/applications/xception_test.py b/tensorflow/python/keras/applications/xception_test.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/applications/xception_test.py rename to tensorflow/python/keras/applications/xception_test.py index 7ebdc30..7e2efd0 100644 --- a/tensorflow/python/keras/_impl/keras/applications/xception_test.py +++ b/tensorflow/python/keras/applications/xception_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/backend.py b/tensorflow/python/keras/backend.py similarity index 100% rename from tensorflow/python/keras/_impl/keras/backend.py rename to tensorflow/python/keras/backend.py diff --git a/tensorflow/python/keras/backend/__init__.py b/tensorflow/python/keras/backend/__init__.py deleted file mode 100644 index 10ef5a7..0000000 --- a/tensorflow/python/keras/backend/__init__.py +++ /dev/null @@ -1,163 +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. -# ============================================================================== -"""Keras backend API.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -# pylint: disable=redefined-builtin -from tensorflow.python.keras._impl.keras.backend import abs -from tensorflow.python.keras._impl.keras.backend import all -from tensorflow.python.keras._impl.keras.backend import any -from tensorflow.python.keras._impl.keras.backend import arange -from tensorflow.python.keras._impl.keras.backend import argmax -from tensorflow.python.keras._impl.keras.backend import argmin -from tensorflow.python.keras._impl.keras.backend import backend -from tensorflow.python.keras._impl.keras.backend import batch_dot -from tensorflow.python.keras._impl.keras.backend import batch_flatten -from tensorflow.python.keras._impl.keras.backend import batch_get_value -from tensorflow.python.keras._impl.keras.backend import batch_normalization -from tensorflow.python.keras._impl.keras.backend import batch_set_value -from tensorflow.python.keras._impl.keras.backend import bias_add -from tensorflow.python.keras._impl.keras.backend import binary_crossentropy -from tensorflow.python.keras._impl.keras.backend import cast -from tensorflow.python.keras._impl.keras.backend import cast_to_floatx -from tensorflow.python.keras._impl.keras.backend import categorical_crossentropy -from tensorflow.python.keras._impl.keras.backend import clear_session -from tensorflow.python.keras._impl.keras.backend import clip -from tensorflow.python.keras._impl.keras.backend import concatenate -from tensorflow.python.keras._impl.keras.backend import constant -from tensorflow.python.keras._impl.keras.backend import conv1d -from tensorflow.python.keras._impl.keras.backend import conv2d -from tensorflow.python.keras._impl.keras.backend import conv2d_transpose -from tensorflow.python.keras._impl.keras.backend import conv3d -from tensorflow.python.keras._impl.keras.backend import cos -from tensorflow.python.keras._impl.keras.backend import count_params -from tensorflow.python.keras._impl.keras.backend import ctc_batch_cost -from tensorflow.python.keras._impl.keras.backend import ctc_decode -from tensorflow.python.keras._impl.keras.backend import ctc_label_dense_to_sparse -from tensorflow.python.keras._impl.keras.backend import dot -from tensorflow.python.keras._impl.keras.backend import dropout -from tensorflow.python.keras._impl.keras.backend import dtype -from tensorflow.python.keras._impl.keras.backend import elu -from tensorflow.python.keras._impl.keras.backend import epsilon -from tensorflow.python.keras._impl.keras.backend import equal -from tensorflow.python.keras._impl.keras.backend import eval -from tensorflow.python.keras._impl.keras.backend import exp -from tensorflow.python.keras._impl.keras.backend import expand_dims -from tensorflow.python.keras._impl.keras.backend import eye -from tensorflow.python.keras._impl.keras.backend import flatten -from tensorflow.python.keras._impl.keras.backend import floatx -from tensorflow.python.keras._impl.keras.backend import foldl -from tensorflow.python.keras._impl.keras.backend import foldr -from tensorflow.python.keras._impl.keras.backend import function -from tensorflow.python.keras._impl.keras.backend import gather -from tensorflow.python.keras._impl.keras.backend import get_session -from tensorflow.python.keras._impl.keras.backend import get_uid -from tensorflow.python.keras._impl.keras.backend import get_value -from tensorflow.python.keras._impl.keras.backend import gradients -from tensorflow.python.keras._impl.keras.backend import greater -from tensorflow.python.keras._impl.keras.backend import greater_equal -from tensorflow.python.keras._impl.keras.backend import hard_sigmoid -from tensorflow.python.keras._impl.keras.backend import image_data_format -from tensorflow.python.keras._impl.keras.backend import in_test_phase -from tensorflow.python.keras._impl.keras.backend import in_top_k -from tensorflow.python.keras._impl.keras.backend import in_train_phase -from tensorflow.python.keras._impl.keras.backend import int_shape -from tensorflow.python.keras._impl.keras.backend import is_sparse -from tensorflow.python.keras._impl.keras.backend import l2_normalize -from tensorflow.python.keras._impl.keras.backend import learning_phase -from tensorflow.python.keras._impl.keras.backend import less -from tensorflow.python.keras._impl.keras.backend import less_equal -from tensorflow.python.keras._impl.keras.backend import log -from tensorflow.python.keras._impl.keras.backend import manual_variable_initialization -from tensorflow.python.keras._impl.keras.backend import map_fn -from tensorflow.python.keras._impl.keras.backend import max -from tensorflow.python.keras._impl.keras.backend import maximum -from tensorflow.python.keras._impl.keras.backend import mean -from tensorflow.python.keras._impl.keras.backend import min -from tensorflow.python.keras._impl.keras.backend import minimum -from tensorflow.python.keras._impl.keras.backend import moving_average_update -from tensorflow.python.keras._impl.keras.backend import name_scope -from tensorflow.python.keras._impl.keras.backend import ndim -from tensorflow.python.keras._impl.keras.backend import normalize_batch_in_training -from tensorflow.python.keras._impl.keras.backend import not_equal -from tensorflow.python.keras._impl.keras.backend import one_hot -from tensorflow.python.keras._impl.keras.backend import ones -from tensorflow.python.keras._impl.keras.backend import ones_like -from tensorflow.python.keras._impl.keras.backend import permute_dimensions -from tensorflow.python.keras._impl.keras.backend import placeholder -from tensorflow.python.keras._impl.keras.backend import pool2d -from tensorflow.python.keras._impl.keras.backend import pool3d -from tensorflow.python.keras._impl.keras.backend import pow -from tensorflow.python.keras._impl.keras.backend import print_tensor -from tensorflow.python.keras._impl.keras.backend import prod -from tensorflow.python.keras._impl.keras.backend import random_binomial -from tensorflow.python.keras._impl.keras.backend import random_normal -from tensorflow.python.keras._impl.keras.backend import random_normal_variable -from tensorflow.python.keras._impl.keras.backend import random_uniform -from tensorflow.python.keras._impl.keras.backend import random_uniform_variable -from tensorflow.python.keras._impl.keras.backend import relu -from tensorflow.python.keras._impl.keras.backend import repeat -from tensorflow.python.keras._impl.keras.backend import repeat_elements -from tensorflow.python.keras._impl.keras.backend import reset_uids -from tensorflow.python.keras._impl.keras.backend import reshape -from tensorflow.python.keras._impl.keras.backend import resize_images -from tensorflow.python.keras._impl.keras.backend import resize_volumes -from tensorflow.python.keras._impl.keras.backend import reverse -from tensorflow.python.keras._impl.keras.backend import rnn -from tensorflow.python.keras._impl.keras.backend import round -from tensorflow.python.keras._impl.keras.backend import separable_conv2d -from tensorflow.python.keras._impl.keras.backend import set_epsilon -from tensorflow.python.keras._impl.keras.backend import set_floatx -from tensorflow.python.keras._impl.keras.backend import set_image_data_format -from tensorflow.python.keras._impl.keras.backend import set_learning_phase -from tensorflow.python.keras._impl.keras.backend import set_session -from tensorflow.python.keras._impl.keras.backend import set_value -from tensorflow.python.keras._impl.keras.backend import shape -from tensorflow.python.keras._impl.keras.backend import sigmoid -from tensorflow.python.keras._impl.keras.backend import sign -from tensorflow.python.keras._impl.keras.backend import sin -from tensorflow.python.keras._impl.keras.backend import softmax -from tensorflow.python.keras._impl.keras.backend import softplus -from tensorflow.python.keras._impl.keras.backend import softsign -from tensorflow.python.keras._impl.keras.backend import sparse_categorical_crossentropy -from tensorflow.python.keras._impl.keras.backend import spatial_2d_padding -from tensorflow.python.keras._impl.keras.backend import spatial_3d_padding -from tensorflow.python.keras._impl.keras.backend import sqrt -from tensorflow.python.keras._impl.keras.backend import square -from tensorflow.python.keras._impl.keras.backend import squeeze -from tensorflow.python.keras._impl.keras.backend import stack -from tensorflow.python.keras._impl.keras.backend import std -from tensorflow.python.keras._impl.keras.backend import stop_gradient -from tensorflow.python.keras._impl.keras.backend import sum -from tensorflow.python.keras._impl.keras.backend import switch -from tensorflow.python.keras._impl.keras.backend import tanh -from tensorflow.python.keras._impl.keras.backend import temporal_padding -from tensorflow.python.keras._impl.keras.backend import to_dense -from tensorflow.python.keras._impl.keras.backend import transpose -from tensorflow.python.keras._impl.keras.backend import truncated_normal -from tensorflow.python.keras._impl.keras.backend import update -from tensorflow.python.keras._impl.keras.backend import update_add -from tensorflow.python.keras._impl.keras.backend import update_sub -from tensorflow.python.keras._impl.keras.backend import var -from tensorflow.python.keras._impl.keras.backend import variable -from tensorflow.python.keras._impl.keras.backend import zeros -from tensorflow.python.keras._impl.keras.backend import zeros_like - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/backend_test.py b/tensorflow/python/keras/backend_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/backend_test.py rename to tensorflow/python/keras/backend_test.py index b224347..58df263 100644 --- a/tensorflow/python/keras/_impl/keras/backend_test.py +++ b/tensorflow/python/keras/backend_test.py @@ -20,8 +20,8 @@ from __future__ import print_function import numpy as np import scipy.sparse +from tensorflow.python import keras from tensorflow.python.framework import sparse_tensor -from tensorflow.python.keras._impl import keras from tensorflow.python.ops import variables from tensorflow.python.platform import test from tensorflow.python.util import tf_inspect diff --git a/tensorflow/python/keras/_impl/keras/callbacks.py b/tensorflow/python/keras/callbacks.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/callbacks.py rename to tensorflow/python/keras/callbacks.py index 79864a5..3678272 100644 --- a/tensorflow/python/keras/_impl/keras/callbacks.py +++ b/tensorflow/python/keras/callbacks.py @@ -30,8 +30,8 @@ import time import numpy as np import six -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.utils.generic_utils import Progbar +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.utils.generic_utils import Progbar from tensorflow.python.ops import array_ops from tensorflow.python.platform import tf_logging as logging from tensorflow.python.summary import summary as tf_summary diff --git a/tensorflow/python/keras/callbacks/__init__.py b/tensorflow/python/keras/callbacks/__init__.py deleted file mode 100644 index 2d88479..0000000 --- a/tensorflow/python/keras/callbacks/__init__.py +++ /dev/null @@ -1,37 +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. -# ============================================================================== -"""Keras callback classes.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.callbacks import BaseLogger -from tensorflow.python.keras._impl.keras.callbacks import Callback -from tensorflow.python.keras._impl.keras.callbacks import CSVLogger -from tensorflow.python.keras._impl.keras.callbacks import EarlyStopping -from tensorflow.python.keras._impl.keras.callbacks import History -from tensorflow.python.keras._impl.keras.callbacks import LambdaCallback -from tensorflow.python.keras._impl.keras.callbacks import LearningRateScheduler -from tensorflow.python.keras._impl.keras.callbacks import ModelCheckpoint -from tensorflow.python.keras._impl.keras.callbacks import ProgbarLogger -from tensorflow.python.keras._impl.keras.callbacks import ReduceLROnPlateau -from tensorflow.python.keras._impl.keras.callbacks import RemoteMonitor -from tensorflow.python.keras._impl.keras.callbacks import TensorBoard -from tensorflow.python.keras._impl.keras.callbacks import TerminateOnNaN - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/callbacks_test.py b/tensorflow/python/keras/callbacks_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/callbacks_test.py rename to tensorflow/python/keras/callbacks_test.py index 1d9d48d..ad5f416 100644 --- a/tensorflow/python/keras/_impl/keras/callbacks_test.py +++ b/tensorflow/python/keras/callbacks_test.py @@ -27,8 +27,8 @@ import unittest import numpy as np -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python import keras +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test from tensorflow.python.platform import tf_logging as logging from tensorflow.python.summary.writer import writer_cache diff --git a/tensorflow/python/keras/_impl/keras/constraints.py b/tensorflow/python/keras/constraints.py similarity index 96% rename from tensorflow/python/keras/_impl/keras/constraints.py rename to tensorflow/python/keras/constraints.py index abe95d8..bf3a3a7 100644 --- a/tensorflow/python/keras/_impl/keras/constraints.py +++ b/tensorflow/python/keras/constraints.py @@ -21,9 +21,9 @@ from __future__ import print_function import six -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.utils.generic_utils import deserialize_keras_object -from tensorflow.python.keras._impl.keras.utils.generic_utils import serialize_keras_object +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.utils.generic_utils import deserialize_keras_object +from tensorflow.python.keras.utils.generic_utils import serialize_keras_object from tensorflow.python.ops import math_ops from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/constraints/__init__.py b/tensorflow/python/keras/constraints/__init__.py deleted file mode 100644 index 152606d..0000000 --- a/tensorflow/python/keras/constraints/__init__.py +++ /dev/null @@ -1,40 +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. -# ============================================================================== -"""Keras built-in constraints functions.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -# Constraints functions / callable classes. -from tensorflow.python.keras._impl.keras.constraints import Constraint -from tensorflow.python.keras._impl.keras.constraints import max_norm -from tensorflow.python.keras._impl.keras.constraints import MaxNorm -from tensorflow.python.keras._impl.keras.constraints import min_max_norm -from tensorflow.python.keras._impl.keras.constraints import MinMaxNorm -from tensorflow.python.keras._impl.keras.constraints import non_neg -from tensorflow.python.keras._impl.keras.constraints import NonNeg -from tensorflow.python.keras._impl.keras.constraints import unit_norm -from tensorflow.python.keras._impl.keras.constraints import UnitNorm - -# Auxiliary utils. -# pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.constraints import deserialize -from tensorflow.python.keras._impl.keras.constraints import serialize -from tensorflow.python.keras._impl.keras.constraints import get - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/constraints_test.py b/tensorflow/python/keras/constraints_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/constraints_test.py rename to tensorflow/python/keras/constraints_test.py index 8790569..84e2db1 100644 --- a/tensorflow/python/keras/_impl/keras/constraints_test.py +++ b/tensorflow/python/keras/constraints_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/datasets/boston_housing.py b/tensorflow/python/keras/datasets/boston_housing.py similarity index 96% rename from tensorflow/python/keras/_impl/keras/datasets/boston_housing.py rename to tensorflow/python/keras/datasets/boston_housing.py index 13fa9ae..8c04363 100644 --- a/tensorflow/python/keras/_impl/keras/datasets/boston_housing.py +++ b/tensorflow/python/keras/datasets/boston_housing.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/datasets/boston_housing/__init__.py b/tensorflow/python/keras/datasets/boston_housing/__init__.py deleted file mode 100644 index b5371a0..0000000 --- a/tensorflow/python/keras/datasets/boston_housing/__init__.py +++ /dev/null @@ -1,25 +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. -# ============================================================================== -"""Boston housing price regression dataset.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.datasets.boston_housing import load_data - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/datasets/cifar.py b/tensorflow/python/keras/datasets/cifar.py similarity index 100% rename from tensorflow/python/keras/_impl/keras/datasets/cifar.py rename to tensorflow/python/keras/datasets/cifar.py diff --git a/tensorflow/python/keras/_impl/keras/datasets/cifar10.py b/tensorflow/python/keras/datasets/cifar10.py similarity index 90% rename from tensorflow/python/keras/_impl/keras/datasets/cifar10.py rename to tensorflow/python/keras/datasets/cifar10.py index 6b77243..d627160 100644 --- a/tensorflow/python/keras/_impl/keras/datasets/cifar10.py +++ b/tensorflow/python/keras/datasets/cifar10.py @@ -22,9 +22,9 @@ import os import numpy as np -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.datasets.cifar import load_batch -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.datasets.cifar import load_batch +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/datasets/cifar10/__init__.py b/tensorflow/python/keras/datasets/cifar10/__init__.py deleted file mode 100644 index 68d3eb7..0000000 --- a/tensorflow/python/keras/datasets/cifar10/__init__.py +++ /dev/null @@ -1,25 +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. -# ============================================================================== -"""CIFAR10 small image classification dataset.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.datasets.cifar10 import load_data - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/datasets/cifar100.py b/tensorflow/python/keras/datasets/cifar100.py similarity index 90% rename from tensorflow/python/keras/_impl/keras/datasets/cifar100.py rename to tensorflow/python/keras/datasets/cifar100.py index 28d7411..e9a6d63 100644 --- a/tensorflow/python/keras/_impl/keras/datasets/cifar100.py +++ b/tensorflow/python/keras/datasets/cifar100.py @@ -22,9 +22,9 @@ import os import numpy as np -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.datasets.cifar import load_batch -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.datasets.cifar import load_batch +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/datasets/cifar100/__init__.py b/tensorflow/python/keras/datasets/cifar100/__init__.py deleted file mode 100644 index ca93742..0000000 --- a/tensorflow/python/keras/datasets/cifar100/__init__.py +++ /dev/null @@ -1,25 +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. -# ============================================================================== -"""CIFAR100 small image classification dataset.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.datasets.cifar100 import load_data - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/datasets/fashion_mnist.py b/tensorflow/python/keras/datasets/fashion_mnist.py similarity index 96% rename from tensorflow/python/keras/_impl/keras/datasets/fashion_mnist.py rename to tensorflow/python/keras/datasets/fashion_mnist.py index 508e95f..45e27aa 100644 --- a/tensorflow/python/keras/_impl/keras/datasets/fashion_mnist.py +++ b/tensorflow/python/keras/datasets/fashion_mnist.py @@ -23,7 +23,7 @@ import os import numpy as np -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/datasets/fashion_mnist/__init__.py b/tensorflow/python/keras/datasets/fashion_mnist/__init__.py deleted file mode 100644 index 7f5ddec..0000000 --- a/tensorflow/python/keras/datasets/fashion_mnist/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2018 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. -# ============================================================================== -"""Fashion-MNIST dataset.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.datasets.fashion_mnist import load_data - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/datasets/imdb.py b/tensorflow/python/keras/datasets/imdb.py similarity index 96% rename from tensorflow/python/keras/_impl/keras/datasets/imdb.py rename to tensorflow/python/keras/datasets/imdb.py index 7467bb2..411b3e8 100644 --- a/tensorflow/python/keras/_impl/keras/datasets/imdb.py +++ b/tensorflow/python/keras/datasets/imdb.py @@ -22,8 +22,8 @@ import json import numpy as np -from tensorflow.python.keras._impl.keras.preprocessing.sequence import _remove_long_seq -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras.preprocessing.sequence import _remove_long_seq +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/datasets/imdb/__init__.py b/tensorflow/python/keras/datasets/imdb/__init__.py deleted file mode 100644 index 1c6396d..0000000 --- a/tensorflow/python/keras/datasets/imdb/__init__.py +++ /dev/null @@ -1,26 +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. -# ============================================================================== -"""IMDB movie review sentiment classification dataset.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.datasets.imdb import get_word_index -from tensorflow.python.keras._impl.keras.datasets.imdb import load_data - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/datasets/mnist.py b/tensorflow/python/keras/datasets/mnist.py similarity index 95% rename from tensorflow/python/keras/_impl/keras/datasets/mnist.py rename to tensorflow/python/keras/datasets/mnist.py index e306913..6311897 100644 --- a/tensorflow/python/keras/_impl/keras/datasets/mnist.py +++ b/tensorflow/python/keras/datasets/mnist.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/datasets/mnist/__init__.py b/tensorflow/python/keras/datasets/mnist/__init__.py deleted file mode 100644 index 364255f..0000000 --- a/tensorflow/python/keras/datasets/mnist/__init__.py +++ /dev/null @@ -1,25 +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. -# ============================================================================== -"""MNIST handwritten digits classification dataset.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.datasets.mnist import load_data - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/datasets/reuters.py b/tensorflow/python/keras/datasets/reuters.py similarity index 96% rename from tensorflow/python/keras/_impl/keras/datasets/reuters.py rename to tensorflow/python/keras/datasets/reuters.py index b711696..b070ba8 100644 --- a/tensorflow/python/keras/_impl/keras/datasets/reuters.py +++ b/tensorflow/python/keras/datasets/reuters.py @@ -22,8 +22,8 @@ import json import numpy as np -from tensorflow.python.keras._impl.keras.preprocessing.sequence import _remove_long_seq -from tensorflow.python.keras._impl.keras.utils.data_utils import get_file +from tensorflow.python.keras.preprocessing.sequence import _remove_long_seq +from tensorflow.python.keras.utils.data_utils import get_file from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/datasets/reuters/__init__.py b/tensorflow/python/keras/datasets/reuters/__init__.py deleted file mode 100644 index bb6791a..0000000 --- a/tensorflow/python/keras/datasets/reuters/__init__.py +++ /dev/null @@ -1,26 +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. -# ============================================================================== -"""Reuters newswire topic classification dataset.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.datasets.reuters import get_word_index -from tensorflow.python.keras._impl.keras.datasets.reuters import load_data - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/engine/__init__.py b/tensorflow/python/keras/engine/__init__.py similarity index 62% rename from tensorflow/python/keras/_impl/keras/engine/__init__.py rename to tensorflow/python/keras/engine/__init__.py index 1bc533a..ec7c083 100644 --- a/tensorflow/python/keras/_impl/keras/engine/__init__.py +++ b/tensorflow/python/keras/engine/__init__.py @@ -18,10 +18,14 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.engine.base_layer import InputSpec -from tensorflow.python.keras._impl.keras.engine.base_layer import Layer -from tensorflow.python.keras._impl.keras.engine.input_layer import Input -from tensorflow.python.keras._impl.keras.engine.input_layer import InputLayer -from tensorflow.python.keras._impl.keras.engine.network import get_source_inputs -from tensorflow.python.keras._impl.keras.engine.network import Network -from tensorflow.python.keras._impl.keras.engine.training import Model +from tensorflow.python.keras.engine.base_layer import InputSpec +from tensorflow.python.keras.engine.base_layer import Layer +from tensorflow.python.keras.engine.input_layer import Input +from tensorflow.python.keras.engine.input_layer import InputLayer +from tensorflow.python.keras.engine.network import get_source_inputs +from tensorflow.python.keras.engine.network import Network +from tensorflow.python.keras.engine.training import Model + +del absolute_import +del division +del print_function diff --git a/tensorflow/python/keras/_impl/keras/engine/base_layer.py b/tensorflow/python/keras/engine/base_layer.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/engine/base_layer.py rename to tensorflow/python/keras/engine/base_layer.py index e5e096d..24716cf 100644 --- a/tensorflow/python/keras/_impl/keras/engine/base_layer.py +++ b/tensorflow/python/keras/engine/base_layer.py @@ -29,15 +29,15 @@ from tensorflow.python.framework import dtypes from tensorflow.python.framework import ops from tensorflow.python.framework import tensor_shape from tensorflow.python.framework import tensor_util -from tensorflow.python.keras._impl.keras import backend -from tensorflow.python.keras._impl.keras import constraints -from tensorflow.python.keras._impl.keras import initializers -from tensorflow.python.keras._impl.keras import regularizers -from tensorflow.python.keras._impl.keras.utils import generic_utils -from tensorflow.python.keras._impl.keras.utils import tf_utils +from tensorflow.python.keras import backend +from tensorflow.python.keras import constraints +from tensorflow.python.keras import initializers +from tensorflow.python.keras import regularizers +from tensorflow.python.keras.utils import generic_utils +from tensorflow.python.keras.utils import tf_utils # A module that only depends on `keras.layers` import these from here. -from tensorflow.python.keras._impl.keras.utils.generic_utils import to_snake_case # pylint: disable=unused-import -from tensorflow.python.keras._impl.keras.utils.tf_utils import is_tensor_or_tensor_list # pylint: disable=unused-import +from tensorflow.python.keras.utils.generic_utils import to_snake_case # pylint: disable=unused-import +from tensorflow.python.keras.utils.tf_utils import is_tensor_or_tensor_list # pylint: disable=unused-import from tensorflow.python.ops import array_ops from tensorflow.python.ops import init_ops from tensorflow.python.ops import variable_scope as vs @@ -436,7 +436,7 @@ class Layer(checkpointable.CheckpointableBase): def _name_scope(self): return self.name - def build(self, _): + def build(self, input_shape): """Creates the variables of the layer.""" self.built = True diff --git a/tensorflow/python/keras/_impl/keras/engine/input_layer.py b/tensorflow/python/keras/engine/input_layer.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/engine/input_layer.py rename to tensorflow/python/keras/engine/input_layer.py index bd9dcbe..b04dc3c 100644 --- a/tensorflow/python/keras/_impl/keras/engine/input_layer.py +++ b/tensorflow/python/keras/engine/input_layer.py @@ -21,8 +21,8 @@ from __future__ import print_function from tensorflow.python.eager import context from tensorflow.python.framework import tensor_shape -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.engine import base_layer +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.engine import base_layer from tensorflow.python.ops import array_ops from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/_impl/keras/engine/network.py b/tensorflow/python/keras/engine/network.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/engine/network.py rename to tensorflow/python/keras/engine/network.py index a7afd6b..6002136 100644 --- a/tensorflow/python/keras/_impl/keras/engine/network.py +++ b/tensorflow/python/keras/engine/network.py @@ -32,13 +32,13 @@ from tensorflow.python.eager import context from tensorflow.python.framework import errors_impl from tensorflow.python.framework import ops from tensorflow.python.framework import tensor_shape -from tensorflow.python.keras._impl.keras import backend -from tensorflow.python.keras._impl.keras.engine import base_layer -from tensorflow.python.keras._impl.keras.engine import saving -from tensorflow.python.keras._impl.keras.utils import generic_utils -from tensorflow.python.keras._impl.keras.utils import tf_utils -from tensorflow.python.keras._impl.keras.utils.io_utils import ask_to_proceed_with_overwrite -from tensorflow.python.keras._impl.keras.utils.layer_utils import print_summary as print_layer_summary +from tensorflow.python.keras import backend +from tensorflow.python.keras.engine import base_layer +from tensorflow.python.keras.engine import saving +from tensorflow.python.keras.utils import generic_utils +from tensorflow.python.keras.utils import tf_utils +from tensorflow.python.keras.utils.io_utils import ask_to_proceed_with_overwrite +from tensorflow.python.keras.utils.layer_utils import print_summary as print_layer_summary from tensorflow.python.platform import tf_logging as logging from tensorflow.python.training.checkpointable import base as checkpointable from tensorflow.python.training.checkpointable import util as checkpointable_utils @@ -1082,7 +1082,7 @@ class Network(base_layer.Layer): layer_name = layer_data['name'] # Instantiate layer. - from tensorflow.python.keras._impl.keras.layers import deserialize as deserialize_layer # pylint: disable=g-import-not-at-top + from tensorflow.python.keras.layers import deserialize as deserialize_layer # pylint: disable=g-import-not-at-top layer = deserialize_layer(layer_data, custom_objects=custom_objects) created_layers[layer_name] = layer @@ -1166,7 +1166,7 @@ class Network(base_layer.Layer): if not self._is_graph_network: raise NotImplementedError - from tensorflow.python.keras._impl.keras.models import save_model # pylint: disable=g-import-not-at-top + from tensorflow.python.keras.models import save_model # pylint: disable=g-import-not-at-top save_model(self, filepath, overwrite, include_optimizer) def save_weights(self, filepath, overwrite=True, save_format=None): @@ -1348,7 +1348,7 @@ class Network(base_layer.Layer): Returns: Model config with Keras version information added. """ - from tensorflow.python.keras._impl.keras import __version__ as keras_version # pylint: disable=g-import-not-at-top + from tensorflow.python.keras import __version__ as keras_version # pylint: disable=g-import-not-at-top config = self.get_config() model_config = { diff --git a/tensorflow/python/keras/_impl/keras/engine/saving.py b/tensorflow/python/keras/engine/saving.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/engine/saving.py rename to tensorflow/python/keras/engine/saving.py index 6a3ae3b..99ce64a 100644 --- a/tensorflow/python/keras/_impl/keras/engine/saving.py +++ b/tensorflow/python/keras/engine/saving.py @@ -25,10 +25,10 @@ import os import numpy as np from six.moves import zip # pylint: disable=redefined-builtin -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import optimizers -from tensorflow.python.keras._impl.keras.utils import conv_utils -from tensorflow.python.keras._impl.keras.utils.io_utils import ask_to_proceed_with_overwrite +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import optimizers +from tensorflow.python.keras.utils import conv_utils +from tensorflow.python.keras.utils.io_utils import ask_to_proceed_with_overwrite from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util import serialization from tensorflow.python.util.tf_export import tf_export @@ -77,7 +77,7 @@ def save_model(model, filepath, overwrite=True, include_optimizer=True): if h5py is None: raise ImportError('`save_model` requires h5py.') - from tensorflow.python.keras._impl.keras import __version__ as keras_version # pylint: disable=g-import-not-at-top + from tensorflow.python.keras import __version__ as keras_version # pylint: disable=g-import-not-at-top if not isinstance(filepath, h5py.File): # If file exists and should not be overwritten. @@ -302,7 +302,7 @@ def model_from_config(config, custom_objects=None): raise TypeError('`model_from_config` expects a dictionary, not a list. ' 'Maybe you meant to use ' '`Sequential.from_config(config)`?') - from tensorflow.python.keras._impl.keras.layers import deserialize # pylint: disable=g-import-not-at-top + from tensorflow.python.keras.layers import deserialize # pylint: disable=g-import-not-at-top return deserialize(config, custom_objects=custom_objects) @@ -325,7 +325,7 @@ def model_from_yaml(yaml_string, custom_objects=None): if yaml is None: raise ImportError('Requires yaml module installed.') config = yaml.load(yaml_string) - from tensorflow.python.keras._impl.keras.layers import deserialize # pylint: disable=g-import-not-at-top + from tensorflow.python.keras.layers import deserialize # pylint: disable=g-import-not-at-top return deserialize(config, custom_objects=custom_objects) @@ -343,7 +343,7 @@ def model_from_json(json_string, custom_objects=None): A Keras model instance (uncompiled). """ config = json.loads(json_string) - from tensorflow.python.keras._impl.keras.layers import deserialize # pylint: disable=g-import-not-at-top + from tensorflow.python.keras.layers import deserialize # pylint: disable=g-import-not-at-top return deserialize(config, custom_objects=custom_objects) @@ -663,7 +663,7 @@ def save_weights_to_hdf5_group(f, layers): f: HDF5 group. layers: List of layer instances. """ - from tensorflow.python.keras._impl.keras import __version__ as keras_version # pylint: disable=g-import-not-at-top + from tensorflow.python.keras import __version__ as keras_version # pylint: disable=g-import-not-at-top save_attributes_to_hdf5_group( f, 'layer_names', [layer.name.encode('utf8') for layer in layers]) diff --git a/tensorflow/python/keras/_impl/keras/engine/saving_test.py b/tensorflow/python/keras/engine/saving_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/engine/saving_test.py rename to tensorflow/python/keras/engine/saving_test.py index e668440..5abca8a 100644 --- a/tensorflow/python/keras/_impl/keras/engine/saving_test.py +++ b/tensorflow/python/keras/engine/saving_test.py @@ -25,13 +25,13 @@ import tempfile from absl.testing import parameterized import numpy as np +from tensorflow.python import keras from tensorflow.python.eager import context from tensorflow.python.framework import constant_op from tensorflow.python.framework import dtypes from tensorflow.python.framework import ops from tensorflow.python.framework import test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras.engine import training +from tensorflow.python.keras.engine import training from tensorflow.python.ops import array_ops from tensorflow.python.ops import random_ops from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/engine/sequential.py b/tensorflow/python/keras/engine/sequential.py similarity index 95% rename from tensorflow/python/keras/_impl/keras/engine/sequential.py rename to tensorflow/python/keras/engine/sequential.py index 8626626..52e29b0 100644 --- a/tensorflow/python/keras/_impl/keras/engine/sequential.py +++ b/tensorflow/python/keras/engine/sequential.py @@ -21,13 +21,13 @@ from __future__ import print_function import copy -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import layers as layer_module -from tensorflow.python.keras._impl.keras.engine import base_layer -from tensorflow.python.keras._impl.keras.engine import network -from tensorflow.python.keras._impl.keras.engine.input_layer import Input -from tensorflow.python.keras._impl.keras.engine.input_layer import InputLayer -from tensorflow.python.keras._impl.keras.engine.training import Model +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import layers as layer_module +from tensorflow.python.keras.engine import base_layer +from tensorflow.python.keras.engine import network +from tensorflow.python.keras.engine.input_layer import Input +from tensorflow.python.keras.engine.input_layer import InputLayer +from tensorflow.python.keras.engine.training import Model from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/_impl/keras/engine/sequential_test.py b/tensorflow/python/keras/engine/sequential_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/engine/sequential_test.py rename to tensorflow/python/keras/engine/sequential_test.py index a90ad13..69a288e 100644 --- a/tensorflow/python/keras/_impl/keras/engine/sequential_test.py +++ b/tensorflow/python/keras/engine/sequential_test.py @@ -20,10 +20,10 @@ from __future__ import print_function import numpy as np +from tensorflow.python import keras from tensorflow.python.data.ops import dataset_ops from tensorflow.python.eager import context from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras from tensorflow.python.ops import array_ops from tensorflow.python.platform import test from tensorflow.python.training import rmsprop diff --git a/tensorflow/python/keras/_impl/keras/engine/topology_test.py b/tensorflow/python/keras/engine/topology_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/engine/topology_test.py rename to tensorflow/python/keras/engine/topology_test.py index 635c446..183e26e 100644 --- a/tensorflow/python/keras/_impl/keras/engine/topology_test.py +++ b/tensorflow/python/keras/engine/topology_test.py @@ -20,12 +20,12 @@ from __future__ import print_function import numpy as np +from tensorflow.python import keras from tensorflow.python.eager import context from tensorflow.python.framework import constant_op from tensorflow.python.framework import dtypes from tensorflow.python.framework import test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras.engine import base_layer +from tensorflow.python.keras.engine import base_layer from tensorflow.python.ops import array_ops from tensorflow.python.ops import math_ops from tensorflow.python.ops import state_ops diff --git a/tensorflow/python/keras/_impl/keras/engine/training.py b/tensorflow/python/keras/engine/training.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/engine/training.py rename to tensorflow/python/keras/engine/training.py index 16d1b16..ff50d0b 100644 --- a/tensorflow/python/keras/_impl/keras/engine/training.py +++ b/tensorflow/python/keras/engine/training.py @@ -27,18 +27,18 @@ from tensorflow.python.eager import context from tensorflow.python.framework import errors from tensorflow.python.framework import ops from tensorflow.python.framework import tensor_util -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import losses -from tensorflow.python.keras._impl.keras import metrics as metrics_module -from tensorflow.python.keras._impl.keras import optimizers -from tensorflow.python.keras._impl.keras.engine import training_arrays -from tensorflow.python.keras._impl.keras.engine import training_eager -from tensorflow.python.keras._impl.keras.engine import training_generator -from tensorflow.python.keras._impl.keras.engine import training_utils -from tensorflow.python.keras._impl.keras.engine.base_layer import DeferredTensor -from tensorflow.python.keras._impl.keras.engine.base_layer import Layer -from tensorflow.python.keras._impl.keras.engine.network import Network -from tensorflow.python.keras._impl.keras.utils.generic_utils import slice_arrays +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import losses +from tensorflow.python.keras import metrics as metrics_module +from tensorflow.python.keras import optimizers +from tensorflow.python.keras.engine import training_arrays +from tensorflow.python.keras.engine import training_eager +from tensorflow.python.keras.engine import training_generator +from tensorflow.python.keras.engine import training_utils +from tensorflow.python.keras.engine.base_layer import DeferredTensor +from tensorflow.python.keras.engine.base_layer import Layer +from tensorflow.python.keras.engine.network import Network +from tensorflow.python.keras.utils.generic_utils import slice_arrays from tensorflow.python.ops import array_ops from tensorflow.python.platform import tf_logging as logging from tensorflow.python.training import optimizer as tf_optimizer_module diff --git a/tensorflow/python/keras/_impl/keras/engine/training_arrays.py b/tensorflow/python/keras/engine/training_arrays.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/engine/training_arrays.py rename to tensorflow/python/keras/engine/training_arrays.py index 84f93da..93f4f1b 100644 --- a/tensorflow/python/keras/_impl/keras/engine/training_arrays.py +++ b/tensorflow/python/keras/engine/training_arrays.py @@ -24,12 +24,12 @@ import copy import numpy as np from tensorflow.python.framework import errors -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import callbacks as cbks -from tensorflow.python.keras._impl.keras.engine import training_utils -from tensorflow.python.keras._impl.keras.utils.generic_utils import make_batches -from tensorflow.python.keras._impl.keras.utils.generic_utils import Progbar -from tensorflow.python.keras._impl.keras.utils.generic_utils import slice_arrays +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import callbacks as cbks +from tensorflow.python.keras.engine import training_utils +from tensorflow.python.keras.utils.generic_utils import make_batches +from tensorflow.python.keras.utils.generic_utils import Progbar +from tensorflow.python.keras.utils.generic_utils import slice_arrays from tensorflow.python.platform import tf_logging as logging try: diff --git a/tensorflow/python/keras/_impl/keras/engine/training_eager.py b/tensorflow/python/keras/engine/training_eager.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/engine/training_eager.py rename to tensorflow/python/keras/engine/training_eager.py index adf0c9b..46e0e2b 100644 --- a/tensorflow/python/keras/_impl/keras/engine/training_eager.py +++ b/tensorflow/python/keras/engine/training_eager.py @@ -28,12 +28,12 @@ from tensorflow.python.eager.backprop import GradientTape from tensorflow.python.framework import errors from tensorflow.python.framework import ops from tensorflow.python.framework import tensor_util -from tensorflow.python.keras._impl.keras import backend -from tensorflow.python.keras._impl.keras import callbacks as cbks -from tensorflow.python.keras._impl.keras import losses -from tensorflow.python.keras._impl.keras import metrics as metrics_module -from tensorflow.python.keras._impl.keras.engine import training_utils -from tensorflow.python.keras._impl.keras.utils import generic_utils +from tensorflow.python.keras import backend +from tensorflow.python.keras import callbacks as cbks +from tensorflow.python.keras import losses +from tensorflow.python.keras import metrics as metrics_module +from tensorflow.python.keras.engine import training_utils +from tensorflow.python.keras.utils import generic_utils from tensorflow.python.ops import array_ops from tensorflow.python.platform import tf_logging as logging @@ -501,11 +501,11 @@ def iterator_test_loop(model, inputs, steps, verbose=0): if verbose == 1: progbar.update(step_index + 1) - for i in range(len(outs)): - outs[i] /= num_samples - if len(outs) == 1: - return outs[0] - return outs + for i in range(len(outs)): + outs[i] /= num_samples + if len(outs) == 1: + return outs[0] + return outs def batch_test_loop(model, diff --git a/tensorflow/python/keras/_impl/keras/engine/training_eager_test.py b/tensorflow/python/keras/engine/training_eager_test.py similarity index 88% rename from tensorflow/python/keras/_impl/keras/engine/training_eager_test.py rename to tensorflow/python/keras/engine/training_eager_test.py index 2031a8a..d9446fd 100644 --- a/tensorflow/python/keras/_impl/keras/engine/training_eager_test.py +++ b/tensorflow/python/keras/engine/training_eager_test.py @@ -20,11 +20,10 @@ from __future__ import print_function import numpy as np -from tensorflow.python.data.ops import dataset_ops +from tensorflow.python import keras from tensorflow.python.framework import ops from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test from tensorflow.python.training.rmsprop import RMSPropOptimizer @@ -403,24 +402,6 @@ class TrainingTest(test.TestCase): model.train_on_batch(inputs, targets) model.test_on_batch(inputs, targets) - def test_generator_methods(self): - model = keras.Sequential() - model.add(keras.layers.Dense(4, input_shape=(3,))) - optimizer = RMSPropOptimizer(learning_rate=0.001) - model.compile(optimizer, 'mse', metrics=['mae']) - - x = np.random.random((10, 3)) - y = np.random.random((10, 4)) - - def iterator(): - while 1: - yield x, y - - model.fit_generator(iterator(), steps_per_epoch=3, epochs=1) - model.evaluate_generator(iterator(), steps=3) - out = model.predict_generator(iterator(), steps=3) - self.assertEqual(out.shape, (30, 4)) - class LossWeightingTest(test.TestCase): @@ -689,59 +670,6 @@ class CorrectnessTest(test.TestCase): outs = model.evaluate(x, y) self.assertEqual(outs[1], 0.) - @tf_test_util.run_in_graph_and_eager_modes() - def test_loss_correctness_with_iterator(self): - # Test that training loss is the same in eager and graph - # (by comparing it to a reference value in a deterministic case) - model = keras.Sequential() - model.add( - keras.layers.Dense( - 3, activation='relu', input_dim=4, kernel_initializer='ones')) - model.add( - keras.layers.Dense(2, activation='softmax', kernel_initializer='ones')) - model.compile( - loss='sparse_categorical_crossentropy', - optimizer=RMSPropOptimizer(learning_rate=0.001)) - x = np.ones((100, 4), dtype=np.float32) - np.random.seed(123) - y = np.random.randint(0, 1, size=(100, 1)) - dataset = dataset_ops.Dataset.from_tensor_slices((x, y)) - dataset = dataset.repeat(100) - dataset = dataset.batch(10) - iterator = dataset.make_one_shot_iterator() - history = model.fit(iterator, epochs=1, steps_per_epoch=10) - self.assertEqual(np.around(history.history['loss'][-1], decimals=4), 0.6173) - - @tf_test_util.run_in_graph_and_eager_modes() - def test_metrics_correctness_with_iterator(self): - model = keras.Sequential() - model.add( - keras.layers.Dense( - 8, activation='relu', input_dim=4, kernel_initializer='ones')) - model.add( - keras.layers.Dense(1, activation='sigmoid', kernel_initializer='ones')) - model.compile( - loss='binary_crossentropy', - metrics=['accuracy'], - optimizer=RMSPropOptimizer(learning_rate=0.001)) - np.random.seed(123) - x = np.random.randint(10, size=(100, 4)).astype(np.float32) - y = np.random.randint(2, size=(100, 1)).astype(np.float32) - dataset = dataset_ops.Dataset.from_tensor_slices((x, y)) - dataset = dataset.batch(10) - iterator = dataset.make_one_shot_iterator() - outs = model.evaluate(iterator, steps=10) - self.assertEqual(np.around(outs[1], decimals=1), 0.5) - - y = np.zeros((100, 1), dtype=np.float32) - dataset = dataset_ops.Dataset.from_tensor_slices((x, y)) - dataset = dataset.repeat(100) - dataset = dataset.batch(10) - iterator = dataset.make_one_shot_iterator() - outs = model.evaluate(iterator, steps=10) - self.assertEqual(outs[1], 0.) - - if __name__ == '__main__': ops.enable_eager_execution() test.main() diff --git a/tensorflow/python/keras/_impl/keras/engine/training_generator.py b/tensorflow/python/keras/engine/training_generator.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/engine/training_generator.py rename to tensorflow/python/keras/engine/training_generator.py index 0de8297..d81b384 100644 --- a/tensorflow/python/keras/_impl/keras/engine/training_generator.py +++ b/tensorflow/python/keras/engine/training_generator.py @@ -21,12 +21,12 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import callbacks as cbks -from tensorflow.python.keras._impl.keras.utils.data_utils import GeneratorEnqueuer -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.generic_utils import Progbar +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import callbacks as cbks +from tensorflow.python.keras.utils.data_utils import GeneratorEnqueuer +from tensorflow.python.keras.utils.data_utils import OrderedEnqueuer +from tensorflow.python.keras.utils.data_utils import Sequence +from tensorflow.python.keras.utils.generic_utils import Progbar from tensorflow.python.platform import tf_logging as logging diff --git a/tensorflow/python/keras/_impl/keras/engine/training_test.py b/tensorflow/python/keras/engine/training_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/engine/training_test.py rename to tensorflow/python/keras/engine/training_test.py index 4b01fbb..7dec0bb 100644 --- a/tensorflow/python/keras/_impl/keras/engine/training_test.py +++ b/tensorflow/python/keras/engine/training_test.py @@ -23,14 +23,14 @@ import unittest import numpy as np +from tensorflow.python import keras from tensorflow.python.data.ops import dataset_ops from tensorflow.python.framework import ops from tensorflow.python.framework import tensor_shape from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils -from tensorflow.python.keras._impl.keras.engine.training_utils import weighted_masked_objective -from tensorflow.python.keras._impl.keras.utils.generic_utils import slice_arrays +from tensorflow.python.keras import testing_utils +from tensorflow.python.keras.engine.training_utils import weighted_masked_objective +from tensorflow.python.keras.utils.generic_utils import slice_arrays from tensorflow.python.ops import array_ops from tensorflow.python.platform import test from tensorflow.python.platform import tf_logging as logging diff --git a/tensorflow/python/keras/_impl/keras/engine/training_utils.py b/tensorflow/python/keras/engine/training_utils.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/engine/training_utils.py rename to tensorflow/python/keras/engine/training_utils.py index 04d80c8..7d214d6 100644 --- a/tensorflow/python/keras/_impl/keras/engine/training_utils.py +++ b/tensorflow/python/keras/engine/training_utils.py @@ -25,9 +25,9 @@ import numpy as np from tensorflow.python.data.ops import iterator_ops from tensorflow.python.eager import context from tensorflow.python.framework import tensor_util -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import losses -from tensorflow.python.keras._impl.keras import metrics as metrics_module +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import losses +from tensorflow.python.keras import metrics as metrics_module from tensorflow.python.ops import math_ops diff --git a/tensorflow/python/keras/_impl/keras/initializers.py b/tensorflow/python/keras/initializers.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/initializers.py rename to tensorflow/python/keras/initializers.py index ecb71d0..b9b2e9a 100644 --- a/tensorflow/python/keras/_impl/keras/initializers.py +++ b/tensorflow/python/keras/initializers.py @@ -20,8 +20,8 @@ from __future__ import print_function import six -from tensorflow.python.keras._impl.keras.utils.generic_utils import deserialize_keras_object -from tensorflow.python.keras._impl.keras.utils.generic_utils import serialize_keras_object +from tensorflow.python.keras.utils.generic_utils import deserialize_keras_object +from tensorflow.python.keras.utils.generic_utils import serialize_keras_object from tensorflow.python.ops.init_ops import Constant from tensorflow.python.ops.init_ops import Identity from tensorflow.python.ops.init_ops import Initializer # pylint: disable=unused-import diff --git a/tensorflow/python/keras/initializers/__init__.py b/tensorflow/python/keras/initializers/__init__.py deleted file mode 100644 index 6b1fcfd..0000000 --- a/tensorflow/python/keras/initializers/__init__.py +++ /dev/null @@ -1,49 +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. -# ============================================================================== -"""Keras built-in initializers.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -# Initializer functions / callable classes. -from tensorflow.python.keras._impl.keras.initializers import Constant -from tensorflow.python.keras._impl.keras.initializers import Identity -from tensorflow.python.keras._impl.keras.initializers import Initializer -from tensorflow.python.keras._impl.keras.initializers import Ones -from tensorflow.python.keras._impl.keras.initializers import Orthogonal -from tensorflow.python.keras._impl.keras.initializers import RandomNormal -from tensorflow.python.keras._impl.keras.initializers import RandomUniform -from tensorflow.python.keras._impl.keras.initializers import TruncatedNormal -from tensorflow.python.keras._impl.keras.initializers import VarianceScaling -from tensorflow.python.keras._impl.keras.initializers import Zeros - -# Functional interface. -# pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.initializers import glorot_normal -from tensorflow.python.keras._impl.keras.initializers import glorot_uniform -from tensorflow.python.keras._impl.keras.initializers import he_normal -from tensorflow.python.keras._impl.keras.initializers import he_uniform -from tensorflow.python.keras._impl.keras.initializers import lecun_normal -from tensorflow.python.keras._impl.keras.initializers import lecun_uniform - -# Auxiliary utils. -from tensorflow.python.keras._impl.keras.initializers import deserialize -from tensorflow.python.keras._impl.keras.initializers import serialize -from tensorflow.python.keras._impl.keras.initializers import get - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/initializers_test.py b/tensorflow/python/keras/initializers_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/initializers_test.py rename to tensorflow/python/keras/initializers_test.py index 7b4e6b4..a54d6da 100644 --- a/tensorflow/python/keras/_impl/keras/initializers_test.py +++ b/tensorflow/python/keras/initializers_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.ops import init_ops from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/integration_test.py b/tensorflow/python/keras/integration_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/integration_test.py rename to tensorflow/python/keras/integration_test.py index 43aff67..2e83544 100644 --- a/tensorflow/python/keras/_impl/keras/integration_test.py +++ b/tensorflow/python/keras/integration_test.py @@ -20,8 +20,8 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python import keras +from tensorflow.python.keras import testing_utils from tensorflow.python.layers import core as tf_core_layers from tensorflow.python.ops import nn from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/layers/__init__.py b/tensorflow/python/keras/layers/__init__.py index c7be8b9..8fb663a 100644 --- a/tensorflow/python/keras/layers/__init__.py +++ b/tensorflow/python/keras/layers/__init__.py @@ -20,141 +20,147 @@ from __future__ import print_function # Generic layers. # pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.engine import Input -from tensorflow.python.keras._impl.keras.engine import InputLayer -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine import Layer +from tensorflow.python.keras.engine import Input +from tensorflow.python.keras.engine import InputLayer +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.engine import Layer # Advanced activations. -from tensorflow.python.keras._impl.keras.layers.advanced_activations import LeakyReLU -from tensorflow.python.keras._impl.keras.layers.advanced_activations import PReLU -from tensorflow.python.keras._impl.keras.layers.advanced_activations import ELU -from tensorflow.python.keras._impl.keras.layers.advanced_activations import ThresholdedReLU -from tensorflow.python.keras._impl.keras.layers.advanced_activations import Softmax +from tensorflow.python.keras.layers.advanced_activations import LeakyReLU +from tensorflow.python.keras.layers.advanced_activations import PReLU +from tensorflow.python.keras.layers.advanced_activations import ELU +from tensorflow.python.keras.layers.advanced_activations import ThresholdedReLU +from tensorflow.python.keras.layers.advanced_activations import Softmax # Convolution layers. -from tensorflow.python.keras._impl.keras.layers.convolutional import Conv1D -from tensorflow.python.keras._impl.keras.layers.convolutional import Conv2D -from tensorflow.python.keras._impl.keras.layers.convolutional import Conv3D -from tensorflow.python.keras._impl.keras.layers.convolutional import Conv2DTranspose -from tensorflow.python.keras._impl.keras.layers.convolutional import Conv3DTranspose -from tensorflow.python.keras._impl.keras.layers.convolutional import SeparableConv1D -from tensorflow.python.keras._impl.keras.layers.convolutional import SeparableConv2D +from tensorflow.python.keras.layers.convolutional import Conv1D +from tensorflow.python.keras.layers.convolutional import Conv2D +from tensorflow.python.keras.layers.convolutional import Conv3D +from tensorflow.python.keras.layers.convolutional import Conv2DTranspose +from tensorflow.python.keras.layers.convolutional import Conv3DTranspose +from tensorflow.python.keras.layers.convolutional import SeparableConv1D +from tensorflow.python.keras.layers.convolutional import SeparableConv2D # Convolution layer aliases. -from tensorflow.python.keras._impl.keras.layers.convolutional import Convolution1D -from tensorflow.python.keras._impl.keras.layers.convolutional import Convolution2D -from tensorflow.python.keras._impl.keras.layers.convolutional import Convolution3D -from tensorflow.python.keras._impl.keras.layers.convolutional import Convolution2DTranspose -from tensorflow.python.keras._impl.keras.layers.convolutional import Convolution3DTranspose -from tensorflow.python.keras._impl.keras.layers.convolutional import SeparableConvolution1D -from tensorflow.python.keras._impl.keras.layers.convolutional import SeparableConvolution2D -from tensorflow.python.keras._impl.keras.layers.convolutional import DepthwiseConv2D +from tensorflow.python.keras.layers.convolutional import Convolution1D +from tensorflow.python.keras.layers.convolutional import Convolution2D +from tensorflow.python.keras.layers.convolutional import Convolution3D +from tensorflow.python.keras.layers.convolutional import Convolution2DTranspose +from tensorflow.python.keras.layers.convolutional import Convolution3DTranspose +from tensorflow.python.keras.layers.convolutional import SeparableConvolution1D +from tensorflow.python.keras.layers.convolutional import SeparableConvolution2D +from tensorflow.python.keras.layers.convolutional import DepthwiseConv2D # Image processing layers. -from tensorflow.python.keras._impl.keras.layers.convolutional import UpSampling1D -from tensorflow.python.keras._impl.keras.layers.convolutional import UpSampling2D -from tensorflow.python.keras._impl.keras.layers.convolutional import UpSampling3D -from tensorflow.python.keras._impl.keras.layers.convolutional import ZeroPadding1D -from tensorflow.python.keras._impl.keras.layers.convolutional import ZeroPadding2D -from tensorflow.python.keras._impl.keras.layers.convolutional import ZeroPadding3D -from tensorflow.python.keras._impl.keras.layers.convolutional import Cropping1D -from tensorflow.python.keras._impl.keras.layers.convolutional import Cropping2D -from tensorflow.python.keras._impl.keras.layers.convolutional import Cropping3D +from tensorflow.python.keras.layers.convolutional import UpSampling1D +from tensorflow.python.keras.layers.convolutional import UpSampling2D +from tensorflow.python.keras.layers.convolutional import UpSampling3D +from tensorflow.python.keras.layers.convolutional import ZeroPadding1D +from tensorflow.python.keras.layers.convolutional import ZeroPadding2D +from tensorflow.python.keras.layers.convolutional import ZeroPadding3D +from tensorflow.python.keras.layers.convolutional import Cropping1D +from tensorflow.python.keras.layers.convolutional import Cropping2D +from tensorflow.python.keras.layers.convolutional import Cropping3D # Core layers. -from tensorflow.python.keras._impl.keras.layers.core import Masking -from tensorflow.python.keras._impl.keras.layers.core import Dropout -from tensorflow.python.keras._impl.keras.layers.core import SpatialDropout1D -from tensorflow.python.keras._impl.keras.layers.core import SpatialDropout2D -from tensorflow.python.keras._impl.keras.layers.core import SpatialDropout3D -from tensorflow.python.keras._impl.keras.layers.core import Activation -from tensorflow.python.keras._impl.keras.layers.core import Reshape -from tensorflow.python.keras._impl.keras.layers.core import Permute -from tensorflow.python.keras._impl.keras.layers.core import Flatten -from tensorflow.python.keras._impl.keras.layers.core import RepeatVector -from tensorflow.python.keras._impl.keras.layers.core import Lambda -from tensorflow.python.keras._impl.keras.layers.core import Dense -from tensorflow.python.keras._impl.keras.layers.core import ActivityRegularization +from tensorflow.python.keras.layers.core import Masking +from tensorflow.python.keras.layers.core import Dropout +from tensorflow.python.keras.layers.core import SpatialDropout1D +from tensorflow.python.keras.layers.core import SpatialDropout2D +from tensorflow.python.keras.layers.core import SpatialDropout3D +from tensorflow.python.keras.layers.core import Activation +from tensorflow.python.keras.layers.core import Reshape +from tensorflow.python.keras.layers.core import Permute +from tensorflow.python.keras.layers.core import Flatten +from tensorflow.python.keras.layers.core import RepeatVector +from tensorflow.python.keras.layers.core import Lambda +from tensorflow.python.keras.layers.core import Dense +from tensorflow.python.keras.layers.core import ActivityRegularization # Embedding layers. -from tensorflow.python.keras._impl.keras.layers.embeddings import Embedding +from tensorflow.python.keras.layers.embeddings import Embedding # Locally-connected layers. -from tensorflow.python.keras._impl.keras.layers.local import LocallyConnected1D -from tensorflow.python.keras._impl.keras.layers.local import LocallyConnected2D +from tensorflow.python.keras.layers.local import LocallyConnected1D +from tensorflow.python.keras.layers.local import LocallyConnected2D # Merge layers. -from tensorflow.python.keras._impl.keras.layers.merge import Add -from tensorflow.python.keras._impl.keras.layers.merge import Multiply -from tensorflow.python.keras._impl.keras.layers.merge import Average -from tensorflow.python.keras._impl.keras.layers.merge import Maximum -from tensorflow.python.keras._impl.keras.layers.merge import Concatenate -from tensorflow.python.keras._impl.keras.layers.merge import Dot -from tensorflow.python.keras._impl.keras.layers.merge import add -from tensorflow.python.keras._impl.keras.layers.merge import multiply -from tensorflow.python.keras._impl.keras.layers.merge import average -from tensorflow.python.keras._impl.keras.layers.merge import maximum -from tensorflow.python.keras._impl.keras.layers.merge import concatenate -from tensorflow.python.keras._impl.keras.layers.merge import dot +from tensorflow.python.keras.layers.merge import Add +from tensorflow.python.keras.layers.merge import Multiply +from tensorflow.python.keras.layers.merge import Average +from tensorflow.python.keras.layers.merge import Maximum +from tensorflow.python.keras.layers.merge import Concatenate +from tensorflow.python.keras.layers.merge import Dot +from tensorflow.python.keras.layers.merge import add +from tensorflow.python.keras.layers.merge import subtract +from tensorflow.python.keras.layers.merge import multiply +from tensorflow.python.keras.layers.merge import average +from tensorflow.python.keras.layers.merge import maximum +from tensorflow.python.keras.layers.merge import minimum +from tensorflow.python.keras.layers.merge import concatenate +from tensorflow.python.keras.layers.merge import dot # Noise layers. -from tensorflow.python.keras._impl.keras.layers.noise import AlphaDropout -from tensorflow.python.keras._impl.keras.layers.noise import GaussianNoise -from tensorflow.python.keras._impl.keras.layers.noise import GaussianDropout +from tensorflow.python.keras.layers.noise import AlphaDropout +from tensorflow.python.keras.layers.noise import GaussianNoise +from tensorflow.python.keras.layers.noise import GaussianDropout # Normalization layers. -from tensorflow.python.keras._impl.keras.layers.normalization import BatchNormalization +from tensorflow.python.keras.layers.normalization import BatchNormalization # Pooling layers. -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPooling1D -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPooling2D -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPooling3D -from tensorflow.python.keras._impl.keras.layers.pooling import AveragePooling1D -from tensorflow.python.keras._impl.keras.layers.pooling import AveragePooling2D -from tensorflow.python.keras._impl.keras.layers.pooling import AveragePooling3D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalAveragePooling1D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalAveragePooling2D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalAveragePooling3D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalMaxPooling1D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalMaxPooling2D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalMaxPooling3D +from tensorflow.python.keras.layers.pooling import MaxPooling1D +from tensorflow.python.keras.layers.pooling import MaxPooling2D +from tensorflow.python.keras.layers.pooling import MaxPooling3D +from tensorflow.python.keras.layers.pooling import AveragePooling1D +from tensorflow.python.keras.layers.pooling import AveragePooling2D +from tensorflow.python.keras.layers.pooling import AveragePooling3D +from tensorflow.python.keras.layers.pooling import GlobalAveragePooling1D +from tensorflow.python.keras.layers.pooling import GlobalAveragePooling2D +from tensorflow.python.keras.layers.pooling import GlobalAveragePooling3D +from tensorflow.python.keras.layers.pooling import GlobalMaxPooling1D +from tensorflow.python.keras.layers.pooling import GlobalMaxPooling2D +from tensorflow.python.keras.layers.pooling import GlobalMaxPooling3D # Pooling layer aliases. -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPool1D -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPool2D -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPool3D -from tensorflow.python.keras._impl.keras.layers.pooling import AvgPool1D -from tensorflow.python.keras._impl.keras.layers.pooling import AvgPool2D -from tensorflow.python.keras._impl.keras.layers.pooling import AvgPool3D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalAvgPool1D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalAvgPool2D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalAvgPool3D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalMaxPool1D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalMaxPool2D -from tensorflow.python.keras._impl.keras.layers.pooling import GlobalMaxPool3D +from tensorflow.python.keras.layers.pooling import MaxPool1D +from tensorflow.python.keras.layers.pooling import MaxPool2D +from tensorflow.python.keras.layers.pooling import MaxPool3D +from tensorflow.python.keras.layers.pooling import AvgPool1D +from tensorflow.python.keras.layers.pooling import AvgPool2D +from tensorflow.python.keras.layers.pooling import AvgPool3D +from tensorflow.python.keras.layers.pooling import GlobalAvgPool1D +from tensorflow.python.keras.layers.pooling import GlobalAvgPool2D +from tensorflow.python.keras.layers.pooling import GlobalAvgPool3D +from tensorflow.python.keras.layers.pooling import GlobalMaxPool1D +from tensorflow.python.keras.layers.pooling import GlobalMaxPool2D +from tensorflow.python.keras.layers.pooling import GlobalMaxPool3D # Recurrent layers. -from tensorflow.python.keras._impl.keras.layers.recurrent import RNN -from tensorflow.python.keras._impl.keras.layers.recurrent import StackedRNNCells -from tensorflow.python.keras._impl.keras.layers.recurrent import SimpleRNNCell -from tensorflow.python.keras._impl.keras.layers.recurrent import GRUCell -from tensorflow.python.keras._impl.keras.layers.recurrent import LSTMCell -from tensorflow.python.keras._impl.keras.layers.recurrent import SimpleRNN -from tensorflow.python.keras._impl.keras.layers.recurrent import GRU -from tensorflow.python.keras._impl.keras.layers.recurrent import LSTM +from tensorflow.python.keras.layers.recurrent import RNN +from tensorflow.python.keras.layers.recurrent import StackedRNNCells +from tensorflow.python.keras.layers.recurrent import SimpleRNNCell +from tensorflow.python.keras.layers.recurrent import GRUCell +from tensorflow.python.keras.layers.recurrent import LSTMCell +from tensorflow.python.keras.layers.recurrent import SimpleRNN +from tensorflow.python.keras.layers.recurrent import GRU +from tensorflow.python.keras.layers.recurrent import LSTM # Convolutional-recurrent layers. -from tensorflow.python.keras._impl.keras.layers.convolutional_recurrent import ConvLSTM2D +from tensorflow.python.keras.layers.convolutional_recurrent import ConvLSTM2D # CuDNN recurrent layers. -from tensorflow.python.keras._impl.keras.layers.cudnn_recurrent import CuDNNLSTM -from tensorflow.python.keras._impl.keras.layers.cudnn_recurrent import CuDNNGRU +from tensorflow.python.keras.layers.cudnn_recurrent import CuDNNLSTM +from tensorflow.python.keras.layers.cudnn_recurrent import CuDNNGRU # Wrapper functions -from tensorflow.python.keras._impl.keras.layers.wrappers import Wrapper -from tensorflow.python.keras._impl.keras.layers.wrappers import Bidirectional -from tensorflow.python.keras._impl.keras.layers.wrappers import TimeDistributed +from tensorflow.python.keras.layers.wrappers import Wrapper +from tensorflow.python.keras.layers.wrappers import Bidirectional +from tensorflow.python.keras.layers.wrappers import TimeDistributed + +# Serialization functions +from tensorflow.python.keras.layers.serialization import deserialize +from tensorflow.python.keras.layers.serialization import serialize del absolute_import del division diff --git a/tensorflow/python/keras/_impl/keras/layers/advanced_activations.py b/tensorflow/python/keras/layers/advanced_activations.py similarity index 94% rename from tensorflow/python/keras/_impl/keras/layers/advanced_activations.py rename to tensorflow/python/keras/layers/advanced_activations.py index 89931db..8ade3c3 100644 --- a/tensorflow/python/keras/_impl/keras/layers/advanced_activations.py +++ b/tensorflow/python/keras/layers/advanced_activations.py @@ -18,14 +18,14 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras import activations -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import constraints -from tensorflow.python.keras._impl.keras import initializers -from tensorflow.python.keras._impl.keras import regularizers -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine import Layer -from tensorflow.python.keras._impl.keras.utils import tf_utils +from tensorflow.python.keras import activations +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import constraints +from tensorflow.python.keras import initializers +from tensorflow.python.keras import regularizers +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.engine import Layer +from tensorflow.python.keras.utils import tf_utils from tensorflow.python.ops import math_ops from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/_impl/keras/layers/advanced_activations_test.py b/tensorflow/python/keras/layers/advanced_activations_test.py similarity index 95% rename from tensorflow/python/keras/_impl/keras/layers/advanced_activations_test.py rename to tensorflow/python/keras/layers/advanced_activations_test.py index 343b794..81c76db 100644 --- a/tensorflow/python/keras/_impl/keras/layers/advanced_activations_test.py +++ b/tensorflow/python/keras/layers/advanced_activations_test.py @@ -18,8 +18,8 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python import keras +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/layers/convolutional.py b/tensorflow/python/keras/layers/convolutional.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/layers/convolutional.py rename to tensorflow/python/keras/layers/convolutional.py index e47aaf9..ce1c84e 100644 --- a/tensorflow/python/keras/_impl/keras/layers/convolutional.py +++ b/tensorflow/python/keras/layers/convolutional.py @@ -21,24 +21,24 @@ from __future__ import print_function from tensorflow.python.eager import context from tensorflow.python.framework import tensor_shape -from tensorflow.python.keras._impl.keras import activations -from tensorflow.python.keras._impl.keras import backend -from tensorflow.python.keras._impl.keras import constraints -from tensorflow.python.keras._impl.keras import initializers -from tensorflow.python.keras._impl.keras import regularizers -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine import Layer +from tensorflow.python.keras import activations +from tensorflow.python.keras import backend +from tensorflow.python.keras import constraints +from tensorflow.python.keras import initializers +from tensorflow.python.keras import regularizers +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.engine import Layer # imports for backwards namespace compatibility # pylint: disable=unused-import -from tensorflow.python.keras._impl.keras.layers.pooling import AveragePooling1D -from tensorflow.python.keras._impl.keras.layers.pooling import AveragePooling2D -from tensorflow.python.keras._impl.keras.layers.pooling import AveragePooling3D -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPooling1D -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPooling2D -from tensorflow.python.keras._impl.keras.layers.pooling import MaxPooling3D +from tensorflow.python.keras.layers.pooling import AveragePooling1D +from tensorflow.python.keras.layers.pooling import AveragePooling2D +from tensorflow.python.keras.layers.pooling import AveragePooling3D +from tensorflow.python.keras.layers.pooling import MaxPooling1D +from tensorflow.python.keras.layers.pooling import MaxPooling2D +from tensorflow.python.keras.layers.pooling import MaxPooling3D # pylint: enable=unused-import -from tensorflow.python.keras._impl.keras.utils import conv_utils -from tensorflow.python.keras._impl.keras.utils import tf_utils +from tensorflow.python.keras.utils import conv_utils +from tensorflow.python.keras.utils import tf_utils from tensorflow.python.ops import array_ops from tensorflow.python.ops import nn from tensorflow.python.ops import nn_ops diff --git a/tensorflow/python/keras/_impl/keras/layers/convolutional_recurrent.py b/tensorflow/python/keras/layers/convolutional_recurrent.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/layers/convolutional_recurrent.py rename to tensorflow/python/keras/layers/convolutional_recurrent.py index 9cad082..c731508 100644 --- a/tensorflow/python/keras/_impl/keras/layers/convolutional_recurrent.py +++ b/tensorflow/python/keras/layers/convolutional_recurrent.py @@ -21,19 +21,19 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl.keras import activations -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import constraints -from tensorflow.python.keras._impl.keras import initializers -from tensorflow.python.keras._impl.keras import regularizers -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine import Layer -from tensorflow.python.keras._impl.keras.layers.recurrent import _generate_dropout_mask -from tensorflow.python.keras._impl.keras.layers.recurrent import _standardize_args -from tensorflow.python.keras._impl.keras.layers.recurrent import RNN -from tensorflow.python.keras._impl.keras.utils import conv_utils -from tensorflow.python.keras._impl.keras.utils import generic_utils -from tensorflow.python.keras._impl.keras.utils import tf_utils +from tensorflow.python.keras import activations +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import constraints +from tensorflow.python.keras import initializers +from tensorflow.python.keras import regularizers +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.engine import Layer +from tensorflow.python.keras.layers.recurrent import _generate_dropout_mask +from tensorflow.python.keras.layers.recurrent import _standardize_args +from tensorflow.python.keras.layers.recurrent import RNN +from tensorflow.python.keras.utils import conv_utils +from tensorflow.python.keras.utils import generic_utils +from tensorflow.python.keras.utils import tf_utils from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/_impl/keras/layers/convolutional_recurrent_test.py b/tensorflow/python/keras/layers/convolutional_recurrent_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/layers/convolutional_recurrent_test.py rename to tensorflow/python/keras/layers/convolutional_recurrent_test.py index 827a7ff..4b8f6f2 100644 --- a/tensorflow/python/keras/_impl/keras/layers/convolutional_recurrent_test.py +++ b/tensorflow/python/keras/layers/convolutional_recurrent_test.py @@ -20,8 +20,8 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python import keras +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/layers/convolutional_test.py b/tensorflow/python/keras/layers/convolutional_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/layers/convolutional_test.py rename to tensorflow/python/keras/layers/convolutional_test.py index 12b4267..167caba 100644 --- a/tensorflow/python/keras/_impl/keras/layers/convolutional_test.py +++ b/tensorflow/python/keras/layers/convolutional_test.py @@ -22,10 +22,10 @@ import copy import numpy as np +from tensorflow.python import keras from tensorflow.python.eager import context from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/layers/core.py b/tensorflow/python/keras/layers/core.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/layers/core.py rename to tensorflow/python/keras/layers/core.py index 3032778..df4c391 100644 --- a/tensorflow/python/keras/_impl/keras/layers/core.py +++ b/tensorflow/python/keras/layers/core.py @@ -26,16 +26,16 @@ import numpy as np from tensorflow.python.eager import context from tensorflow.python.framework import ops from tensorflow.python.framework import tensor_shape -from tensorflow.python.keras._impl.keras import activations -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import constraints -from tensorflow.python.keras._impl.keras import initializers -from tensorflow.python.keras._impl.keras import regularizers -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine import Layer -from tensorflow.python.keras._impl.keras.utils import conv_utils -from tensorflow.python.keras._impl.keras.utils import generic_utils -from tensorflow.python.keras._impl.keras.utils import tf_utils +from tensorflow.python.keras import activations +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import constraints +from tensorflow.python.keras import initializers +from tensorflow.python.keras import regularizers +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.engine import Layer +from tensorflow.python.keras.utils import conv_utils +from tensorflow.python.keras.utils import generic_utils +from tensorflow.python.keras.utils import tf_utils from tensorflow.python.ops import array_ops from tensorflow.python.ops import gen_math_ops from tensorflow.python.ops import math_ops diff --git a/tensorflow/python/keras/_impl/keras/layers/core_test.py b/tensorflow/python/keras/layers/core_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/layers/core_test.py rename to tensorflow/python/keras/layers/core_test.py index 9b360b6..ff8af97 100644 --- a/tensorflow/python/keras/_impl/keras/layers/core_test.py +++ b/tensorflow/python/keras/layers/core_test.py @@ -20,9 +20,9 @@ from __future__ import print_function import numpy as np +from tensorflow.python import keras from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python.keras import testing_utils from tensorflow.python.ops import math_ops from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/layers/cudnn_recurrent.py b/tensorflow/python/keras/layers/cudnn_recurrent.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/layers/cudnn_recurrent.py rename to tensorflow/python/keras/layers/cudnn_recurrent.py index ffb9045..5c4a2db 100644 --- a/tensorflow/python/keras/_impl/keras/layers/cudnn_recurrent.py +++ b/tensorflow/python/keras/layers/cudnn_recurrent.py @@ -20,12 +20,12 @@ from __future__ import print_function import collections -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import constraints -from tensorflow.python.keras._impl.keras import initializers -from tensorflow.python.keras._impl.keras import regularizers -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.layers.recurrent import RNN +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import constraints +from tensorflow.python.keras import initializers +from tensorflow.python.keras import regularizers +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.layers.recurrent import RNN from tensorflow.python.ops import array_ops from tensorflow.python.ops import gen_cudnn_rnn_ops from tensorflow.python.ops import state_ops diff --git a/tensorflow/python/keras/_impl/keras/layers/cudnn_recurrent_test.py b/tensorflow/python/keras/layers/cudnn_recurrent_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/layers/cudnn_recurrent_test.py rename to tensorflow/python/keras/layers/cudnn_recurrent_test.py index ad25eb2..9d186f8 100644 --- a/tensorflow/python/keras/_impl/keras/layers/cudnn_recurrent_test.py +++ b/tensorflow/python/keras/layers/cudnn_recurrent_test.py @@ -21,9 +21,9 @@ from __future__ import print_function from absl.testing import parameterized import numpy as np +from tensorflow.python import keras from tensorflow.python.framework import test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test from tensorflow.python.training.rmsprop import RMSPropOptimizer diff --git a/tensorflow/python/keras/_impl/keras/layers/embeddings.py b/tensorflow/python/keras/layers/embeddings.py similarity index 94% rename from tensorflow/python/keras/_impl/keras/layers/embeddings.py rename to tensorflow/python/keras/layers/embeddings.py index f739884..25eeeee 100644 --- a/tensorflow/python/keras/_impl/keras/layers/embeddings.py +++ b/tensorflow/python/keras/layers/embeddings.py @@ -18,12 +18,12 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import constraints -from tensorflow.python.keras._impl.keras import initializers -from tensorflow.python.keras._impl.keras import regularizers -from tensorflow.python.keras._impl.keras.engine import Layer -from tensorflow.python.keras._impl.keras.utils import tf_utils +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import constraints +from tensorflow.python.keras import initializers +from tensorflow.python.keras import regularizers +from tensorflow.python.keras.engine import Layer +from tensorflow.python.keras.utils import tf_utils from tensorflow.python.ops import embedding_ops from tensorflow.python.ops import math_ops from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/_impl/keras/layers/embeddings_test.py b/tensorflow/python/keras/layers/embeddings_test.py similarity index 96% rename from tensorflow/python/keras/_impl/keras/layers/embeddings_test.py rename to tensorflow/python/keras/layers/embeddings_test.py index 6ebf5dc..fff1c5e 100644 --- a/tensorflow/python/keras/_impl/keras/layers/embeddings_test.py +++ b/tensorflow/python/keras/layers/embeddings_test.py @@ -20,9 +20,9 @@ from __future__ import print_function import numpy as np +from tensorflow.python import keras from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/layers/gru_test.py b/tensorflow/python/keras/layers/gru_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/layers/gru_test.py rename to tensorflow/python/keras/layers/gru_test.py index 48e7e14..234434f 100644 --- a/tensorflow/python/keras/_impl/keras/layers/gru_test.py +++ b/tensorflow/python/keras/layers/gru_test.py @@ -20,9 +20,9 @@ from __future__ import print_function import numpy as np +from tensorflow.python import keras from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test from tensorflow.python.training.rmsprop import RMSPropOptimizer diff --git a/tensorflow/python/keras/_impl/keras/layers/local.py b/tensorflow/python/keras/layers/local.py similarity index 96% rename from tensorflow/python/keras/_impl/keras/layers/local.py rename to tensorflow/python/keras/layers/local.py index caae820..46c18b7 100644 --- a/tensorflow/python/keras/_impl/keras/layers/local.py +++ b/tensorflow/python/keras/layers/local.py @@ -18,15 +18,15 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras import activations -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import constraints -from tensorflow.python.keras._impl.keras import initializers -from tensorflow.python.keras._impl.keras import regularizers -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine import Layer -from tensorflow.python.keras._impl.keras.utils import conv_utils -from tensorflow.python.keras._impl.keras.utils import tf_utils +from tensorflow.python.keras import activations +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import constraints +from tensorflow.python.keras import initializers +from tensorflow.python.keras import regularizers +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.engine import Layer +from tensorflow.python.keras.utils import conv_utils +from tensorflow.python.keras.utils import tf_utils from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/_impl/keras/layers/local_test.py b/tensorflow/python/keras/layers/local_test.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/layers/local_test.py rename to tensorflow/python/keras/layers/local_test.py index 93741d2..90ae171 100644 --- a/tensorflow/python/keras/_impl/keras/layers/local_test.py +++ b/tensorflow/python/keras/layers/local_test.py @@ -20,9 +20,9 @@ from __future__ import print_function import numpy as np +from tensorflow.python import keras from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/layers/lstm_test.py b/tensorflow/python/keras/layers/lstm_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/layers/lstm_test.py rename to tensorflow/python/keras/layers/lstm_test.py index 11a5e0a..87cb344 100644 --- a/tensorflow/python/keras/_impl/keras/layers/lstm_test.py +++ b/tensorflow/python/keras/layers/lstm_test.py @@ -20,9 +20,9 @@ from __future__ import print_function import numpy as np +from tensorflow.python import keras from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test from tensorflow.python.training.rmsprop import RMSPropOptimizer diff --git a/tensorflow/python/keras/_impl/keras/layers/merge.py b/tensorflow/python/keras/layers/merge.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/layers/merge.py rename to tensorflow/python/keras/layers/merge.py index 2b6cf7c..683e3e0 100644 --- a/tensorflow/python/keras/_impl/keras/layers/merge.py +++ b/tensorflow/python/keras/layers/merge.py @@ -20,9 +20,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.engine.base_layer import Layer -from tensorflow.python.keras._impl.keras.utils import tf_utils +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.engine.base_layer import Layer +from tensorflow.python.keras.utils import tf_utils from tensorflow.python.ops import array_ops from tensorflow.python.ops import math_ops from tensorflow.python.ops import nn diff --git a/tensorflow/python/keras/_impl/keras/layers/merge_test.py b/tensorflow/python/keras/layers/merge_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/layers/merge_test.py rename to tensorflow/python/keras/layers/merge_test.py index b2fe06f..8a097cf 100644 --- a/tensorflow/python/keras/_impl/keras/layers/merge_test.py +++ b/tensorflow/python/keras/layers/merge_test.py @@ -20,8 +20,8 @@ from __future__ import print_function import numpy as np +from tensorflow.python import keras from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras from tensorflow.python.ops import array_ops from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/layers/noise.py b/tensorflow/python/keras/layers/noise.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/layers/noise.py rename to tensorflow/python/keras/layers/noise.py index addac5b..a895caa 100644 --- a/tensorflow/python/keras/_impl/keras/layers/noise.py +++ b/tensorflow/python/keras/layers/noise.py @@ -20,9 +20,9 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.engine import Layer -from tensorflow.python.keras._impl.keras.utils import tf_utils +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.engine import Layer +from tensorflow.python.keras.utils import tf_utils from tensorflow.python.ops import array_ops from tensorflow.python.ops import math_ops from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/_impl/keras/layers/noise_test.py b/tensorflow/python/keras/layers/noise_test.py similarity index 93% rename from tensorflow/python/keras/_impl/keras/layers/noise_test.py rename to tensorflow/python/keras/layers/noise_test.py index af4f031..bde2185 100644 --- a/tensorflow/python/keras/_impl/keras/layers/noise_test.py +++ b/tensorflow/python/keras/layers/noise_test.py @@ -18,9 +18,9 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function +from tensorflow.python import keras from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/layers/normalization.py b/tensorflow/python/keras/layers/normalization.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/layers/normalization.py rename to tensorflow/python/keras/layers/normalization.py index c16fc07..c0dc522 100644 --- a/tensorflow/python/keras/_impl/keras/layers/normalization.py +++ b/tensorflow/python/keras/layers/normalization.py @@ -22,13 +22,13 @@ from tensorflow.python.eager import context from tensorflow.python.framework import dtypes from tensorflow.python.framework import ops from tensorflow.python.framework import tensor_shape -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import constraints -from tensorflow.python.keras._impl.keras import initializers -from tensorflow.python.keras._impl.keras import regularizers -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine import Layer -from tensorflow.python.keras._impl.keras.utils import tf_utils +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import constraints +from tensorflow.python.keras import initializers +from tensorflow.python.keras import regularizers +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.engine import Layer +from tensorflow.python.keras.utils import tf_utils from tensorflow.python.ops import array_ops from tensorflow.python.ops import init_ops from tensorflow.python.ops import math_ops diff --git a/tensorflow/python/keras/_impl/keras/layers/normalization_test.py b/tensorflow/python/keras/layers/normalization_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/layers/normalization_test.py rename to tensorflow/python/keras/layers/normalization_test.py index 84f0b27..b22f3bd 100644 --- a/tensorflow/python/keras/_impl/keras/layers/normalization_test.py +++ b/tensorflow/python/keras/layers/normalization_test.py @@ -20,8 +20,8 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python import keras +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/layers/pooling.py b/tensorflow/python/keras/layers/pooling.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/layers/pooling.py rename to tensorflow/python/keras/layers/pooling.py index 86bc8a6..10a82b2 100644 --- a/tensorflow/python/keras/_impl/keras/layers/pooling.py +++ b/tensorflow/python/keras/layers/pooling.py @@ -19,10 +19,10 @@ from __future__ import division from __future__ import print_function from tensorflow.python.framework import tensor_shape -from tensorflow.python.keras._impl.keras import backend -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine import Layer -from tensorflow.python.keras._impl.keras.utils import conv_utils +from tensorflow.python.keras import backend +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.engine import Layer +from tensorflow.python.keras.utils import conv_utils from tensorflow.python.ops import array_ops from tensorflow.python.ops import nn from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/_impl/keras/layers/pooling_test.py b/tensorflow/python/keras/layers/pooling_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/layers/pooling_test.py rename to tensorflow/python/keras/layers/pooling_test.py index 2c08b64..cbd58a2 100644 --- a/tensorflow/python/keras/_impl/keras/layers/pooling_test.py +++ b/tensorflow/python/keras/layers/pooling_test.py @@ -18,10 +18,10 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function +from tensorflow.python import keras from tensorflow.python.eager import context from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/layers/recurrent.py b/tensorflow/python/keras/layers/recurrent.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/layers/recurrent.py rename to tensorflow/python/keras/layers/recurrent.py index 93150b9..7e509fb 100644 --- a/tensorflow/python/keras/_impl/keras/layers/recurrent.py +++ b/tensorflow/python/keras/layers/recurrent.py @@ -24,15 +24,15 @@ import numpy as np from tensorflow.python.eager import context from tensorflow.python.framework import tensor_shape -from tensorflow.python.keras._impl.keras import activations -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras import constraints -from tensorflow.python.keras._impl.keras import initializers -from tensorflow.python.keras._impl.keras import regularizers -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine import Layer -from tensorflow.python.keras._impl.keras.utils import generic_utils -from tensorflow.python.keras._impl.keras.utils import tf_utils +from tensorflow.python.keras import activations +from tensorflow.python.keras import backend as K +from tensorflow.python.keras import constraints +from tensorflow.python.keras import initializers +from tensorflow.python.keras import regularizers +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.engine import Layer +from tensorflow.python.keras.utils import generic_utils +from tensorflow.python.keras.utils import tf_utils from tensorflow.python.ops import array_ops from tensorflow.python.ops import math_ops from tensorflow.python.ops import state_ops @@ -153,7 +153,7 @@ class StackedRNNCells(Layer): @classmethod def from_config(cls, config, custom_objects=None): - from tensorflow.python.keras._impl.keras.layers import deserialize as deserialize_layer # pylint: disable=g-import-not-at-top + from tensorflow.python.keras.layers import deserialize as deserialize_layer # pylint: disable=g-import-not-at-top cells = [] for cell_config in config.pop('cells'): cells.append( @@ -734,7 +734,7 @@ class RNN(Layer): @classmethod def from_config(cls, config, custom_objects=None): - from tensorflow.python.keras._impl.keras.layers import deserialize as deserialize_layer # pylint: disable=g-import-not-at-top + from tensorflow.python.keras.layers import deserialize as deserialize_layer # pylint: disable=g-import-not-at-top cell = deserialize_layer(config.pop('cell'), custom_objects=custom_objects) num_constants = config.pop('num_constants', None) layer = cls(cell, **config) diff --git a/tensorflow/python/keras/_impl/keras/layers/recurrent_test.py b/tensorflow/python/keras/layers/recurrent_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/layers/recurrent_test.py rename to tensorflow/python/keras/layers/recurrent_test.py index 4c68c18..802374d 100644 --- a/tensorflow/python/keras/_impl/keras/layers/recurrent_test.py +++ b/tensorflow/python/keras/layers/recurrent_test.py @@ -23,7 +23,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.ops import array_ops from tensorflow.python.ops import math_ops from tensorflow.python.ops import state_ops diff --git a/tensorflow/python/keras/_impl/keras/layers/serialization.py b/tensorflow/python/keras/layers/serialization.py similarity index 58% rename from tensorflow/python/keras/_impl/keras/layers/serialization.py rename to tensorflow/python/keras/layers/serialization.py index 8151ad7..be306c0 100644 --- a/tensorflow/python/keras/_impl/keras/layers/serialization.py +++ b/tensorflow/python/keras/layers/serialization.py @@ -20,22 +20,22 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras.engine import Input -from tensorflow.python.keras._impl.keras.engine import InputLayer -from tensorflow.python.keras._impl.keras.layers.advanced_activations import * -from tensorflow.python.keras._impl.keras.layers.convolutional import * -from tensorflow.python.keras._impl.keras.layers.convolutional_recurrent import * -from tensorflow.python.keras._impl.keras.layers.core import * -from tensorflow.python.keras._impl.keras.layers.cudnn_recurrent import * -from tensorflow.python.keras._impl.keras.layers.embeddings import * -from tensorflow.python.keras._impl.keras.layers.local import * -from tensorflow.python.keras._impl.keras.layers.merge import * -from tensorflow.python.keras._impl.keras.layers.noise import * -from tensorflow.python.keras._impl.keras.layers.normalization import * -from tensorflow.python.keras._impl.keras.layers.pooling import * -from tensorflow.python.keras._impl.keras.layers.recurrent import * -from tensorflow.python.keras._impl.keras.layers.wrappers import * -from tensorflow.python.keras._impl.keras.utils.generic_utils import deserialize_keras_object +from tensorflow.python.keras.engine import Input +from tensorflow.python.keras.engine import InputLayer +from tensorflow.python.keras.layers.advanced_activations import * +from tensorflow.python.keras.layers.convolutional import * +from tensorflow.python.keras.layers.convolutional_recurrent import * +from tensorflow.python.keras.layers.core import * +from tensorflow.python.keras.layers.cudnn_recurrent import * +from tensorflow.python.keras.layers.embeddings import * +from tensorflow.python.keras.layers.local import * +from tensorflow.python.keras.layers.merge import * +from tensorflow.python.keras.layers.noise import * +from tensorflow.python.keras.layers.normalization import * +from tensorflow.python.keras.layers.pooling import * +from tensorflow.python.keras.layers.recurrent import * +from tensorflow.python.keras.layers.wrappers import * +from tensorflow.python.keras.utils.generic_utils import deserialize_keras_object def serialize(layer): @@ -53,7 +53,7 @@ def deserialize(config, custom_objects=None): Returns: Layer instance (may be Model, Sequential, Layer...) """ - from tensorflow.python.keras._impl.keras import models # pylint: disable=g-import-not-at-top + from tensorflow.python.keras import models # pylint: disable=g-import-not-at-top globs = globals() # All layers. globs['Model'] = models.Model globs['Sequential'] = models.Sequential diff --git a/tensorflow/python/keras/_impl/keras/layers/serialization_test.py b/tensorflow/python/keras/layers/serialization_test.py similarity index 96% rename from tensorflow/python/keras/_impl/keras/layers/serialization_test.py rename to tensorflow/python/keras/layers/serialization_test.py index 787160d..5872185 100644 --- a/tensorflow/python/keras/_impl/keras/layers/serialization_test.py +++ b/tensorflow/python/keras/layers/serialization_test.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/layers/simplernn_test.py b/tensorflow/python/keras/layers/simplernn_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/layers/simplernn_test.py rename to tensorflow/python/keras/layers/simplernn_test.py index 8c7189c..3d24b0d 100644 --- a/tensorflow/python/keras/_impl/keras/layers/simplernn_test.py +++ b/tensorflow/python/keras/layers/simplernn_test.py @@ -20,9 +20,9 @@ from __future__ import print_function import numpy as np +from tensorflow.python import keras from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test from tensorflow.python.training.rmsprop import RMSPropOptimizer diff --git a/tensorflow/python/keras/_impl/keras/layers/wrappers.py b/tensorflow/python/keras/layers/wrappers.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/layers/wrappers.py rename to tensorflow/python/keras/layers/wrappers.py index 7fe5745..7759561 100644 --- a/tensorflow/python/keras/_impl/keras/layers/wrappers.py +++ b/tensorflow/python/keras/layers/wrappers.py @@ -22,12 +22,12 @@ from __future__ import print_function import copy from tensorflow.python.framework import tensor_shape -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.engine import InputSpec -from tensorflow.python.keras._impl.keras.engine import Layer -from tensorflow.python.keras._impl.keras.layers.recurrent import _standardize_args -from tensorflow.python.keras._impl.keras.utils import generic_utils -from tensorflow.python.keras._impl.keras.utils import tf_utils +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.engine import InputSpec +from tensorflow.python.keras.engine import Layer +from tensorflow.python.keras.layers.recurrent import _standardize_args +from tensorflow.python.keras.utils import generic_utils +from tensorflow.python.keras.utils import tf_utils from tensorflow.python.ops import array_ops from tensorflow.python.util.tf_export import tf_export @@ -104,7 +104,7 @@ class Wrapper(Layer): @classmethod def from_config(cls, config, custom_objects=None): - from tensorflow.python.keras._impl.keras.layers import deserialize as deserialize_layer # pylint: disable=g-import-not-at-top + from tensorflow.python.keras.layers import deserialize as deserialize_layer # pylint: disable=g-import-not-at-top layer = deserialize_layer( config.pop('layer'), custom_objects=custom_objects) return cls(layer, **config) diff --git a/tensorflow/python/keras/_impl/keras/layers/wrappers_test.py b/tensorflow/python/keras/layers/wrappers_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/layers/wrappers_test.py rename to tensorflow/python/keras/layers/wrappers_test.py index 05b272a..5eab6ab 100644 --- a/tensorflow/python/keras/_impl/keras/layers/wrappers_test.py +++ b/tensorflow/python/keras/layers/wrappers_test.py @@ -22,8 +22,8 @@ import copy import numpy as np +from tensorflow.python import keras from tensorflow.python.framework import test_util as tf_test_util -from tensorflow.python.keras._impl import keras from tensorflow.python.platform import test from tensorflow.python.training.rmsprop import RMSPropOptimizer diff --git a/tensorflow/python/keras/_impl/keras/losses.py b/tensorflow/python/keras/losses.py similarity index 95% rename from tensorflow/python/keras/_impl/keras/losses.py rename to tensorflow/python/keras/losses.py index 1d634d3..d82ebd9 100644 --- a/tensorflow/python/keras/_impl/keras/losses.py +++ b/tensorflow/python/keras/losses.py @@ -21,9 +21,9 @@ from __future__ import print_function import six -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.utils.generic_utils import deserialize_keras_object -from tensorflow.python.keras._impl.keras.utils.generic_utils import serialize_keras_object +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.utils.generic_utils import deserialize_keras_object +from tensorflow.python.keras.utils.generic_utils import serialize_keras_object from tensorflow.python.ops import math_ops from tensorflow.python.ops import nn from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/losses/__init__.py b/tensorflow/python/keras/losses/__init__.py deleted file mode 100644 index 66721b6..0000000 --- a/tensorflow/python/keras/losses/__init__.py +++ /dev/null @@ -1,45 +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. -# ============================================================================== -"""Keras built-in loss functions.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -# Loss functions. -from tensorflow.python.keras._impl.keras.losses import binary_crossentropy -from tensorflow.python.keras._impl.keras.losses import categorical_crossentropy -from tensorflow.python.keras._impl.keras.losses import categorical_hinge -from tensorflow.python.keras._impl.keras.losses import cosine_proximity -from tensorflow.python.keras._impl.keras.losses import hinge -from tensorflow.python.keras._impl.keras.losses import kullback_leibler_divergence -from tensorflow.python.keras._impl.keras.losses import logcosh -from tensorflow.python.keras._impl.keras.losses import mean_absolute_error -from tensorflow.python.keras._impl.keras.losses import mean_absolute_percentage_error -from tensorflow.python.keras._impl.keras.losses import mean_squared_error -from tensorflow.python.keras._impl.keras.losses import mean_squared_logarithmic_error -from tensorflow.python.keras._impl.keras.losses import poisson -from tensorflow.python.keras._impl.keras.losses import sparse_categorical_crossentropy -from tensorflow.python.keras._impl.keras.losses import squared_hinge - -# Auxiliary utils. -# pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.losses import deserialize -from tensorflow.python.keras._impl.keras.losses import serialize -from tensorflow.python.keras._impl.keras.losses import get - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/losses_test.py b/tensorflow/python/keras/losses_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/losses_test.py rename to tensorflow/python/keras/losses_test.py index 1884c0f..3098a6d 100644 --- a/tensorflow/python/keras/_impl/keras/losses_test.py +++ b/tensorflow/python/keras/losses_test.py @@ -23,7 +23,7 @@ import shutil import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test try: diff --git a/tensorflow/python/keras/_impl/keras/metrics.py b/tensorflow/python/keras/metrics.py similarity index 72% rename from tensorflow/python/keras/_impl/keras/metrics.py rename to tensorflow/python/keras/metrics.py index 747c3e6..e03d7df 100644 --- a/tensorflow/python/keras/_impl/keras/metrics.py +++ b/tensorflow/python/keras/metrics.py @@ -21,22 +21,22 @@ from __future__ import print_function import six -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.losses import binary_crossentropy -from tensorflow.python.keras._impl.keras.losses import categorical_crossentropy -from tensorflow.python.keras._impl.keras.losses import cosine_proximity -from tensorflow.python.keras._impl.keras.losses import hinge -from tensorflow.python.keras._impl.keras.losses import kullback_leibler_divergence -from tensorflow.python.keras._impl.keras.losses import logcosh -from tensorflow.python.keras._impl.keras.losses import mean_absolute_error -from tensorflow.python.keras._impl.keras.losses import mean_absolute_percentage_error -from tensorflow.python.keras._impl.keras.losses import mean_squared_error -from tensorflow.python.keras._impl.keras.losses import mean_squared_logarithmic_error -from tensorflow.python.keras._impl.keras.losses import poisson -from tensorflow.python.keras._impl.keras.losses import sparse_categorical_crossentropy -from tensorflow.python.keras._impl.keras.losses import squared_hinge -from tensorflow.python.keras._impl.keras.utils.generic_utils import deserialize_keras_object -from tensorflow.python.keras._impl.keras.utils.generic_utils import serialize_keras_object +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.losses import binary_crossentropy +from tensorflow.python.keras.losses import categorical_crossentropy +from tensorflow.python.keras.losses import cosine_proximity +from tensorflow.python.keras.losses import hinge +from tensorflow.python.keras.losses import kullback_leibler_divergence +from tensorflow.python.keras.losses import logcosh +from tensorflow.python.keras.losses import mean_absolute_error +from tensorflow.python.keras.losses import mean_absolute_percentage_error +from tensorflow.python.keras.losses import mean_squared_error +from tensorflow.python.keras.losses import mean_squared_logarithmic_error +from tensorflow.python.keras.losses import poisson +from tensorflow.python.keras.losses import sparse_categorical_crossentropy +from tensorflow.python.keras.losses import squared_hinge +from tensorflow.python.keras.utils.generic_utils import deserialize_keras_object +from tensorflow.python.keras.utils.generic_utils import serialize_keras_object from tensorflow.python.ops import math_ops from tensorflow.python.ops import nn from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/metrics/__init__.py b/tensorflow/python/keras/metrics/__init__.py deleted file mode 100644 index 59faf03..0000000 --- a/tensorflow/python/keras/metrics/__init__.py +++ /dev/null @@ -1,47 +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. -# ============================================================================== -"""Keras built-in metrics functions.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -# Metrics functions. -from tensorflow.python.keras._impl.keras.metrics import binary_accuracy -from tensorflow.python.keras._impl.keras.metrics import binary_crossentropy -from tensorflow.python.keras._impl.keras.metrics import categorical_accuracy -from tensorflow.python.keras._impl.keras.metrics import categorical_crossentropy -from tensorflow.python.keras._impl.keras.metrics import cosine_proximity -from tensorflow.python.keras._impl.keras.metrics import hinge -from tensorflow.python.keras._impl.keras.metrics import kullback_leibler_divergence -from tensorflow.python.keras._impl.keras.metrics import mean_absolute_error -from tensorflow.python.keras._impl.keras.metrics import mean_absolute_percentage_error -from tensorflow.python.keras._impl.keras.metrics import mean_squared_error -from tensorflow.python.keras._impl.keras.metrics import mean_squared_logarithmic_error -from tensorflow.python.keras._impl.keras.metrics import poisson -from tensorflow.python.keras._impl.keras.metrics import sparse_categorical_crossentropy -from tensorflow.python.keras._impl.keras.metrics import sparse_top_k_categorical_accuracy -from tensorflow.python.keras._impl.keras.metrics import squared_hinge -from tensorflow.python.keras._impl.keras.metrics import top_k_categorical_accuracy - -# Auxiliary utils. -# pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.metrics import deserialize -from tensorflow.python.keras._impl.keras.metrics import serialize -from tensorflow.python.keras._impl.keras.metrics import get - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/metrics_test.py b/tensorflow/python/keras/metrics_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/metrics_test.py rename to tensorflow/python/keras/metrics_test.py index 819bf60..15e793f 100644 --- a/tensorflow/python/keras/_impl/keras/metrics_test.py +++ b/tensorflow/python/keras/metrics_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.ops import math_ops from tensorflow.python.ops import state_ops from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/model_subclassing_test.py b/tensorflow/python/keras/model_subclassing_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/model_subclassing_test.py rename to tensorflow/python/keras/model_subclassing_test.py index 9efeef3..558854a 100644 --- a/tensorflow/python/keras/_impl/keras/model_subclassing_test.py +++ b/tensorflow/python/keras/model_subclassing_test.py @@ -23,11 +23,11 @@ import os import numpy as np import six +from tensorflow.python import keras from tensorflow.python.data.ops import dataset_ops from tensorflow.python.eager import context from tensorflow.python.framework import tensor_shape from tensorflow.python.framework import test_util -from tensorflow.python.keras._impl import keras from tensorflow.python.ops import array_ops from tensorflow.python.ops import resource_variable_ops from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/models.py b/tensorflow/python/keras/models.py similarity index 94% rename from tensorflow/python/keras/_impl/keras/models.py rename to tensorflow/python/keras/models.py index 9602e7b..21217fd 100644 --- a/tensorflow/python/keras/_impl/keras/models.py +++ b/tensorflow/python/keras/models.py @@ -19,14 +19,14 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.engine import saving -from tensorflow.python.keras._impl.keras.engine import sequential -from tensorflow.python.keras._impl.keras.engine import training -from tensorflow.python.keras._impl.keras.engine.input_layer import Input -from tensorflow.python.keras._impl.keras.engine.input_layer import InputLayer -from tensorflow.python.keras._impl.keras.utils import generic_utils -from tensorflow.python.keras._impl.keras.utils.generic_utils import has_arg +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.engine import saving +from tensorflow.python.keras.engine import sequential +from tensorflow.python.keras.engine import training +from tensorflow.python.keras.engine.input_layer import Input +from tensorflow.python.keras.engine.input_layer import InputLayer +from tensorflow.python.keras.utils import generic_utils +from tensorflow.python.keras.utils.generic_utils import has_arg # API entries importable from `keras.models`: diff --git a/tensorflow/python/keras/models/__init__.py b/tensorflow/python/keras/models/__init__.py deleted file mode 100644 index 2fb4ac0..0000000 --- a/tensorflow/python/keras/models/__init__.py +++ /dev/null @@ -1,31 +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. -# ============================================================================== -"""Keras models API.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.models import load_model -from tensorflow.python.keras._impl.keras.models import Model -from tensorflow.python.keras._impl.keras.models import model_from_config -from tensorflow.python.keras._impl.keras.models import model_from_json -from tensorflow.python.keras._impl.keras.models import model_from_yaml -from tensorflow.python.keras._impl.keras.models import save_model -from tensorflow.python.keras._impl.keras.models import Sequential - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/models_test.py b/tensorflow/python/keras/models_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/models_test.py rename to tensorflow/python/keras/models_test.py index 5978ddd..01fb41b 100644 --- a/tensorflow/python/keras/_impl/keras/models_test.py +++ b/tensorflow/python/keras/models_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/optimizers.py b/tensorflow/python/keras/optimizers.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/optimizers.py rename to tensorflow/python/keras/optimizers.py index 9f383de..febbda4 100644 --- a/tensorflow/python/keras/_impl/keras/optimizers.py +++ b/tensorflow/python/keras/optimizers.py @@ -26,9 +26,9 @@ from six.moves import zip # pylint: disable=redefined-builtin from tensorflow.python.framework import dtypes as dtypes_module from tensorflow.python.framework import ops -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.utils.generic_utils import deserialize_keras_object -from tensorflow.python.keras._impl.keras.utils.generic_utils import serialize_keras_object +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.utils.generic_utils import deserialize_keras_object +from tensorflow.python.keras.utils.generic_utils import serialize_keras_object from tensorflow.python.ops import control_flow_ops from tensorflow.python.ops import math_ops from tensorflow.python.ops import state_ops diff --git a/tensorflow/python/keras/optimizers/__init__.py b/tensorflow/python/keras/optimizers/__init__.py deleted file mode 100644 index 44f47bc..0000000 --- a/tensorflow/python/keras/optimizers/__init__.py +++ /dev/null @@ -1,39 +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. -# ============================================================================== -"""Keras built-in optimizers.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -# Optimizer classes. -from tensorflow.python.keras._impl.keras.optimizers import Adadelta -from tensorflow.python.keras._impl.keras.optimizers import Adagrad -from tensorflow.python.keras._impl.keras.optimizers import Adam -from tensorflow.python.keras._impl.keras.optimizers import Adamax -from tensorflow.python.keras._impl.keras.optimizers import Nadam -from tensorflow.python.keras._impl.keras.optimizers import Optimizer -from tensorflow.python.keras._impl.keras.optimizers import RMSprop -from tensorflow.python.keras._impl.keras.optimizers import SGD - -# Auxiliary utils. -# pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.optimizers import deserialize -from tensorflow.python.keras._impl.keras.optimizers import serialize -from tensorflow.python.keras._impl.keras.optimizers import get - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/optimizers_test.py b/tensorflow/python/keras/optimizers_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/optimizers_test.py rename to tensorflow/python/keras/optimizers_test.py index 57636af..92b0cf3 100644 --- a/tensorflow/python/keras/_impl/keras/optimizers_test.py +++ b/tensorflow/python/keras/optimizers_test.py @@ -20,8 +20,8 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python import keras +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test from tensorflow.python.training.adam import AdamOptimizer diff --git a/tensorflow/python/keras/preprocessing/__init__.py b/tensorflow/python/keras/preprocessing/__init__.py index 8fa3911..e6704ee 100644 --- a/tensorflow/python/keras/preprocessing/__init__.py +++ b/tensorflow/python/keras/preprocessing/__init__.py @@ -13,7 +13,6 @@ # limitations under the License. # ============================================================================== """Keras data preprocessing utils.""" - from __future__ import absolute_import from __future__ import division from __future__ import print_function diff --git a/tensorflow/python/keras/_impl/keras/preprocessing/image.py b/tensorflow/python/keras/preprocessing/image.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/preprocessing/image.py rename to tensorflow/python/keras/preprocessing/image.py index 5dfbf0f..aa425df 100644 --- a/tensorflow/python/keras/_impl/keras/preprocessing/image.py +++ b/tensorflow/python/keras/preprocessing/image.py @@ -29,8 +29,8 @@ import re import threading import numpy as np -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.utils.data_utils import Sequence +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.utils.data_utils import Sequence from tensorflow.python.platform import tf_logging as logging from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/preprocessing/image/__init__.py b/tensorflow/python/keras/preprocessing/image/__init__.py deleted file mode 100644 index 6aba5fc..0000000 --- a/tensorflow/python/keras/preprocessing/image/__init__.py +++ /dev/null @@ -1,39 +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. -# ============================================================================== -"""Keras data preprocessing utils for image data.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.preprocessing.image import apply_transform -from tensorflow.python.keras._impl.keras.preprocessing.image import array_to_img -from tensorflow.python.keras._impl.keras.preprocessing.image import DirectoryIterator -from tensorflow.python.keras._impl.keras.preprocessing.image import flip_axis -from tensorflow.python.keras._impl.keras.preprocessing.image import ImageDataGenerator -from tensorflow.python.keras._impl.keras.preprocessing.image import img_to_array -from tensorflow.python.keras._impl.keras.preprocessing.image import Iterator -from tensorflow.python.keras._impl.keras.preprocessing.image import load_img -from tensorflow.python.keras._impl.keras.preprocessing.image import NumpyArrayIterator -from tensorflow.python.keras._impl.keras.preprocessing.image import random_brightness -from tensorflow.python.keras._impl.keras.preprocessing.image import random_channel_shift -from tensorflow.python.keras._impl.keras.preprocessing.image import random_rotation -from tensorflow.python.keras._impl.keras.preprocessing.image import random_shear -from tensorflow.python.keras._impl.keras.preprocessing.image import random_shift -from tensorflow.python.keras._impl.keras.preprocessing.image import random_zoom - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/preprocessing/image_test.py b/tensorflow/python/keras/preprocessing/image_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/preprocessing/image_test.py rename to tensorflow/python/keras/preprocessing/image_test.py index d2e8ac1..275808a 100644 --- a/tensorflow/python/keras/_impl/keras/preprocessing/image_test.py +++ b/tensorflow/python/keras/preprocessing/image_test.py @@ -24,7 +24,7 @@ import tempfile import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test try: diff --git a/tensorflow/python/keras/_impl/keras/preprocessing/sequence.py b/tensorflow/python/keras/preprocessing/sequence.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/preprocessing/sequence.py rename to tensorflow/python/keras/preprocessing/sequence.py index 49bb0b9..e0924f8 100644 --- a/tensorflow/python/keras/_impl/keras/preprocessing/sequence.py +++ b/tensorflow/python/keras/preprocessing/sequence.py @@ -23,7 +23,7 @@ import random import numpy as np from six.moves import range # pylint: disable=redefined-builtin -from tensorflow.python.keras._impl.keras.utils.data_utils import Sequence +from tensorflow.python.keras.utils.data_utils import Sequence from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/preprocessing/sequence/__init__.py b/tensorflow/python/keras/preprocessing/sequence/__init__.py deleted file mode 100644 index b7a7149..0000000 --- a/tensorflow/python/keras/preprocessing/sequence/__init__.py +++ /dev/null @@ -1,28 +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. -# ============================================================================== -"""Keras data preprocessing utils for sequence data.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.preprocessing.sequence import make_sampling_table -from tensorflow.python.keras._impl.keras.preprocessing.sequence import pad_sequences -from tensorflow.python.keras._impl.keras.preprocessing.sequence import skipgrams -from tensorflow.python.keras._impl.keras.preprocessing.sequence import TimeseriesGenerator - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/preprocessing/sequence_test.py b/tensorflow/python/keras/preprocessing/sequence_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/preprocessing/sequence_test.py rename to tensorflow/python/keras/preprocessing/sequence_test.py index 0e7045f..ab6a091 100644 --- a/tensorflow/python/keras/_impl/keras/preprocessing/sequence_test.py +++ b/tensorflow/python/keras/preprocessing/sequence_test.py @@ -22,7 +22,7 @@ from math import ceil import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/preprocessing/text.py b/tensorflow/python/keras/preprocessing/text.py similarity index 100% rename from tensorflow/python/keras/_impl/keras/preprocessing/text.py rename to tensorflow/python/keras/preprocessing/text.py diff --git a/tensorflow/python/keras/preprocessing/text/__init__.py b/tensorflow/python/keras/preprocessing/text/__init__.py deleted file mode 100644 index 000ad68..0000000 --- a/tensorflow/python/keras/preprocessing/text/__init__.py +++ /dev/null @@ -1,28 +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. -# ============================================================================== -"""Keras data preprocessing utils for text data.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.preprocessing.text import hashing_trick -from tensorflow.python.keras._impl.keras.preprocessing.text import one_hot -from tensorflow.python.keras._impl.keras.preprocessing.text import text_to_word_sequence -from tensorflow.python.keras._impl.keras.preprocessing.text import Tokenizer - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/preprocessing/text_test.py b/tensorflow/python/keras/preprocessing/text_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/preprocessing/text_test.py rename to tensorflow/python/keras/preprocessing/text_test.py index 6cdc0a7..566fd3b 100644 --- a/tensorflow/python/keras/_impl/keras/preprocessing/text_test.py +++ b/tensorflow/python/keras/preprocessing/text_test.py @@ -21,7 +21,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/regularizers.py b/tensorflow/python/keras/regularizers.py similarity index 92% rename from tensorflow/python/keras/_impl/keras/regularizers.py rename to tensorflow/python/keras/regularizers.py index 74c37d3..28b6ad4 100644 --- a/tensorflow/python/keras/_impl/keras/regularizers.py +++ b/tensorflow/python/keras/regularizers.py @@ -20,9 +20,9 @@ from __future__ import print_function import six -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.utils.generic_utils import deserialize_keras_object -from tensorflow.python.keras._impl.keras.utils.generic_utils import serialize_keras_object +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.utils.generic_utils import deserialize_keras_object +from tensorflow.python.keras.utils.generic_utils import serialize_keras_object from tensorflow.python.ops import math_ops from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/regularizers/__init__.py b/tensorflow/python/keras/regularizers/__init__.py deleted file mode 100644 index 3e707cc..0000000 --- a/tensorflow/python/keras/regularizers/__init__.py +++ /dev/null @@ -1,38 +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. -# ============================================================================== -"""Keras built-in regularizers.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -# Regularizer functions / callable classes. -from tensorflow.python.keras._impl.keras.regularizers import L1L2 -from tensorflow.python.keras._impl.keras.regularizers import Regularizer - -# Functional interface. -# pylint: disable=g-bad-import-order -from tensorflow.python.keras._impl.keras.regularizers import l1 -from tensorflow.python.keras._impl.keras.regularizers import l2 -from tensorflow.python.keras._impl.keras.regularizers import l1_l2 - -# Auxiliary utils. -from tensorflow.python.keras._impl.keras.regularizers import deserialize -from tensorflow.python.keras._impl.keras.regularizers import serialize -from tensorflow.python.keras._impl.keras.regularizers import get - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/regularizers_test.py b/tensorflow/python/keras/regularizers_test.py similarity index 96% rename from tensorflow/python/keras/_impl/keras/regularizers_test.py rename to tensorflow/python/keras/regularizers_test.py index c4f0483..e207578 100644 --- a/tensorflow/python/keras/_impl/keras/regularizers_test.py +++ b/tensorflow/python/keras/regularizers_test.py @@ -18,8 +18,8 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python import keras +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/testing_utils.py b/tensorflow/python/keras/testing_utils.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/testing_utils.py rename to tensorflow/python/keras/testing_utils.py index b817206..e7cb45d 100644 --- a/tensorflow/python/keras/_impl/keras/testing_utils.py +++ b/tensorflow/python/keras/testing_utils.py @@ -20,8 +20,8 @@ from __future__ import print_function import numpy as np +from tensorflow.python import keras from tensorflow.python.framework import tensor_shape -from tensorflow.python.keras._impl import keras from tensorflow.python.training.rmsprop import RMSPropOptimizer from tensorflow.python.util import tf_inspect diff --git a/tensorflow/python/keras/utils/__init__.py b/tensorflow/python/keras/utils/__init__.py index 2f74cf0..7b5eecc 100644 --- a/tensorflow/python/keras/utils/__init__.py +++ b/tensorflow/python/keras/utils/__init__.py @@ -18,22 +18,22 @@ from __future__ import absolute_import 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 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 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 diff --git a/tensorflow/python/keras/_impl/keras/utils/conv_utils.py b/tensorflow/python/keras/utils/conv_utils.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/utils/conv_utils.py rename to tensorflow/python/keras/utils/conv_utils.py index 8882a3a..5419e7a 100644 --- a/tensorflow/python/keras/_impl/keras/utils/conv_utils.py +++ b/tensorflow/python/keras/utils/conv_utils.py @@ -21,7 +21,7 @@ from __future__ import print_function import numpy as np from six.moves import range # pylint: disable=redefined-builtin -from tensorflow.python.keras._impl.keras import backend +from tensorflow.python.keras import backend def convert_data_format(data_format, ndim): diff --git a/tensorflow/python/keras/_impl/keras/utils/data_utils.py b/tensorflow/python/keras/utils/data_utils.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/utils/data_utils.py rename to tensorflow/python/keras/utils/data_utils.py index 4c49544..a1f89d9 100644 --- a/tensorflow/python/keras/_impl/keras/utils/data_utils.py +++ b/tensorflow/python/keras/utils/data_utils.py @@ -39,7 +39,7 @@ from six.moves.urllib.error import HTTPError from six.moves.urllib.error import URLError from six.moves.urllib.request import urlopen -from tensorflow.python.keras._impl.keras.utils.generic_utils import Progbar +from tensorflow.python.keras.utils.generic_utils import Progbar from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/_impl/keras/utils/data_utils_test.py b/tensorflow/python/keras/utils/data_utils_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/utils/data_utils_test.py rename to tensorflow/python/keras/utils/data_utils_test.py index 677e98e..395df7e 100644 --- a/tensorflow/python/keras/_impl/keras/utils/data_utils_test.py +++ b/tensorflow/python/keras/utils/data_utils_test.py @@ -29,7 +29,7 @@ import numpy as np from six.moves.urllib.parse import urljoin from six.moves.urllib.request import pathname2url -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/utils/generic_utils.py b/tensorflow/python/keras/utils/generic_utils.py similarity index 100% rename from tensorflow/python/keras/_impl/keras/utils/generic_utils.py rename to tensorflow/python/keras/utils/generic_utils.py diff --git a/tensorflow/python/keras/_impl/keras/utils/generic_utils_test.py b/tensorflow/python/keras/utils/generic_utils_test.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/utils/generic_utils_test.py rename to tensorflow/python/keras/utils/generic_utils_test.py index d57692f..87bc19e 100644 --- a/tensorflow/python/keras/_impl/keras/utils/generic_utils_test.py +++ b/tensorflow/python/keras/utils/generic_utils_test.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/utils/io_utils.py b/tensorflow/python/keras/utils/io_utils.py similarity index 100% rename from tensorflow/python/keras/_impl/keras/utils/io_utils.py rename to tensorflow/python/keras/utils/io_utils.py diff --git a/tensorflow/python/keras/_impl/keras/utils/io_utils_test.py b/tensorflow/python/keras/utils/io_utils_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/utils/io_utils_test.py rename to tensorflow/python/keras/utils/io_utils_test.py index cfeba18..3895dca 100644 --- a/tensorflow/python/keras/_impl/keras/utils/io_utils_test.py +++ b/tensorflow/python/keras/utils/io_utils_test.py @@ -23,7 +23,7 @@ import shutil import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test try: diff --git a/tensorflow/python/keras/_impl/keras/utils/layer_utils.py b/tensorflow/python/keras/utils/layer_utils.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/utils/layer_utils.py rename to tensorflow/python/keras/utils/layer_utils.py index 902972e..bd61f8e 100644 --- a/tensorflow/python/keras/_impl/keras/utils/layer_utils.py +++ b/tensorflow/python/keras/utils/layer_utils.py @@ -21,8 +21,8 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.utils.conv_utils import convert_kernel +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.utils.conv_utils import convert_kernel from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/_impl/keras/utils/multi_gpu_utils.py b/tensorflow/python/keras/utils/multi_gpu_utils.py similarity index 95% rename from tensorflow/python/keras/_impl/keras/utils/multi_gpu_utils.py rename to tensorflow/python/keras/utils/multi_gpu_utils.py index 48c2537..e5442f0 100644 --- a/tensorflow/python/keras/_impl/keras/utils/multi_gpu_utils.py +++ b/tensorflow/python/keras/utils/multi_gpu_utils.py @@ -18,8 +18,8 @@ from __future__ import division from __future__ import print_function from tensorflow.python.framework import ops -from tensorflow.python.keras._impl.keras import backend as K -from tensorflow.python.keras._impl.keras.engine.training import Model +from tensorflow.python.keras import backend as K +from tensorflow.python.keras.engine.training import Model from tensorflow.python.ops import array_ops from tensorflow.python.util.tf_export import tf_export @@ -150,8 +150,8 @@ def multi_gpu_model(model, gpus, cpu_merge=True, cpu_relocation=False): ValueError: if the `gpus` argument does not match available devices. """ # pylint: disable=g-import-not-at-top - from tensorflow.python.keras._impl.keras.layers.core import Lambda - from tensorflow.python.keras._impl.keras.layers.merge import concatenate + from tensorflow.python.keras.layers.core import Lambda + from tensorflow.python.keras.layers.merge import concatenate if isinstance(gpus, (list, tuple)): if len(gpus) <= 1: @@ -207,7 +207,7 @@ def multi_gpu_model(model, gpus, cpu_merge=True, cpu_relocation=False): # Relocate the model definition under CPU device scope if needed if cpu_relocation: - from tensorflow.python.keras._impl.keras.models import clone_model # pylint: disable=g-import-not-at-top + from tensorflow.python.keras.models import clone_model # pylint: disable=g-import-not-at-top with ops.device('/cpu:0'): model = clone_model(model) diff --git a/tensorflow/python/keras/_impl/keras/utils/multi_gpu_utils_test.py b/tensorflow/python/keras/utils/multi_gpu_utils_test.py similarity index 99% rename from tensorflow/python/keras/_impl/keras/utils/multi_gpu_utils_test.py rename to tensorflow/python/keras/utils/multi_gpu_utils_test.py index 0a38d6b..77792d1 100644 --- a/tensorflow/python/keras/_impl/keras/utils/multi_gpu_utils_test.py +++ b/tensorflow/python/keras/utils/multi_gpu_utils_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np from tensorflow.python import data -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/utils/np_utils.py b/tensorflow/python/keras/utils/np_utils.py similarity index 100% rename from tensorflow/python/keras/_impl/keras/utils/np_utils.py rename to tensorflow/python/keras/utils/np_utils.py diff --git a/tensorflow/python/keras/_impl/keras/utils/np_utils_test.py b/tensorflow/python/keras/utils/np_utils_test.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/utils/np_utils_test.py rename to tensorflow/python/keras/utils/np_utils_test.py index 1e974c2..d77e76f 100644 --- a/tensorflow/python/keras/_impl/keras/utils/np_utils_test.py +++ b/tensorflow/python/keras/utils/np_utils_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras +from tensorflow.python import keras from tensorflow.python.platform import test diff --git a/tensorflow/python/keras/_impl/keras/utils/tf_utils.py b/tensorflow/python/keras/utils/tf_utils.py similarity index 100% rename from tensorflow/python/keras/_impl/keras/utils/tf_utils.py rename to tensorflow/python/keras/utils/tf_utils.py diff --git a/tensorflow/python/keras/_impl/keras/utils/vis_utils.py b/tensorflow/python/keras/utils/vis_utils.py similarity index 97% rename from tensorflow/python/keras/_impl/keras/utils/vis_utils.py rename to tensorflow/python/keras/utils/vis_utils.py index 4761cec..8007df4 100644 --- a/tensorflow/python/keras/_impl/keras/utils/vis_utils.py +++ b/tensorflow/python/keras/utils/vis_utils.py @@ -65,8 +65,8 @@ def model_to_dot(model, show_shapes=False, show_layer_names=True, rankdir='TB'): Returns: A `pydot.Dot` instance representing the Keras model. """ - from tensorflow.python.keras._impl.keras.layers.wrappers import Wrapper - from tensorflow.python.keras._impl.keras.models import Sequential + from tensorflow.python.keras.layers.wrappers import Wrapper + from tensorflow.python.keras.models import Sequential _check_pydot() dot = pydot.Dot() diff --git a/tensorflow/python/keras/_impl/keras/wrappers/scikit_learn.py b/tensorflow/python/keras/wrappers/scikit_learn.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/wrappers/scikit_learn.py rename to tensorflow/python/keras/wrappers/scikit_learn.py index 2884dc8..4462d94 100644 --- a/tensorflow/python/keras/_impl/keras/wrappers/scikit_learn.py +++ b/tensorflow/python/keras/wrappers/scikit_learn.py @@ -23,9 +23,9 @@ import types import numpy as np -from tensorflow.python.keras._impl.keras.models import Sequential -from tensorflow.python.keras._impl.keras.utils.generic_utils import has_arg -from tensorflow.python.keras._impl.keras.utils.np_utils import to_categorical +from tensorflow.python.keras.models import Sequential +from tensorflow.python.keras.utils.generic_utils import has_arg +from tensorflow.python.keras.utils.np_utils import to_categorical from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/keras/wrappers/scikit_learn/__init__.py b/tensorflow/python/keras/wrappers/scikit_learn/__init__.py deleted file mode 100644 index a46f859..0000000 --- a/tensorflow/python/keras/wrappers/scikit_learn/__init__.py +++ /dev/null @@ -1,26 +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. -# ============================================================================== -"""Keras scikit-learn API wrapper.""" - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - -from tensorflow.python.keras._impl.keras.wrappers.scikit_learn import KerasClassifier -from tensorflow.python.keras._impl.keras.wrappers.scikit_learn import KerasRegressor - -del absolute_import -del division -del print_function diff --git a/tensorflow/python/keras/_impl/keras/wrappers/scikit_learn_test.py b/tensorflow/python/keras/wrappers/scikit_learn_test.py similarity index 98% rename from tensorflow/python/keras/_impl/keras/wrappers/scikit_learn_test.py rename to tensorflow/python/keras/wrappers/scikit_learn_test.py index b20a84e..c322efd 100644 --- a/tensorflow/python/keras/_impl/keras/wrappers/scikit_learn_test.py +++ b/tensorflow/python/keras/wrappers/scikit_learn_test.py @@ -20,8 +20,8 @@ from __future__ import print_function import numpy as np -from tensorflow.python.keras._impl import keras -from tensorflow.python.keras._impl.keras import testing_utils +from tensorflow.python import keras +from tensorflow.python.keras import testing_utils from tensorflow.python.platform import test INPUT_DIM = 5 diff --git a/tensorflow/python/layers/base.py b/tensorflow/python/layers/base.py index 2040e00..340c34f 100644 --- a/tensorflow/python/layers/base.py +++ b/tensorflow/python/layers/base.py @@ -22,7 +22,7 @@ import copy from tensorflow.python.eager import context from tensorflow.python.framework import dtypes from tensorflow.python.framework import ops -from tensorflow.python.keras._impl.keras.engine import base_layer +from tensorflow.python.keras.engine import base_layer from tensorflow.python.ops import variable_scope as vs from tensorflow.python.ops import variables as tf_variables from tensorflow.python.util import function_utils diff --git a/tensorflow/python/layers/convolutional.py b/tensorflow/python/layers/convolutional.py index 34a1487..267d78d 100644 --- a/tensorflow/python/layers/convolutional.py +++ b/tensorflow/python/layers/convolutional.py @@ -23,7 +23,7 @@ from __future__ import print_function from tensorflow.python.eager import context from tensorflow.python.framework import ops from tensorflow.python.framework import tensor_shape -from tensorflow.python.keras._impl.keras import layers as keras_layers +from tensorflow.python.keras import layers as keras_layers from tensorflow.python.layers import base from tensorflow.python.layers import utils from tensorflow.python.ops import array_ops diff --git a/tensorflow/python/layers/core.py b/tensorflow/python/layers/core.py index 6d8e9ea..abbacac 100644 --- a/tensorflow/python/layers/core.py +++ b/tensorflow/python/layers/core.py @@ -27,7 +27,7 @@ import six from six.moves import xrange # pylint: disable=redefined-builtin import numpy as np -from tensorflow.python.keras._impl.keras import layers as keras_layers +from tensorflow.python.keras import layers as keras_layers from tensorflow.python.layers import base from tensorflow.python.ops import init_ops from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/layers/normalization.py b/tensorflow/python/layers/normalization.py index 33284b0..d082e31 100644 --- a/tensorflow/python/layers/normalization.py +++ b/tensorflow/python/layers/normalization.py @@ -24,7 +24,7 @@ import six from six.moves import xrange # pylint: disable=redefined-builtin import numpy as np -from tensorflow.python.keras._impl.keras import layers as keras_layers +from tensorflow.python.keras import layers as keras_layers from tensorflow.python.layers import base from tensorflow.python.ops import init_ops from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/layers/pooling.py b/tensorflow/python/layers/pooling.py index 75abe56..c53cca3 100644 --- a/tensorflow/python/layers/pooling.py +++ b/tensorflow/python/layers/pooling.py @@ -19,7 +19,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.python.keras._impl.keras import layers as keras_layers +from tensorflow.python.keras import layers as keras_layers from tensorflow.python.layers import base from tensorflow.python.util.tf_export import tf_export diff --git a/tensorflow/python/training/checkpointable/util_test.py b/tensorflow/python/training/checkpointable/util_test.py index 8968aad..8cdf5d7 100644 --- a/tensorflow/python/training/checkpointable/util_test.py +++ b/tensorflow/python/training/checkpointable/util_test.py @@ -32,9 +32,9 @@ from tensorflow.python.framework import constant_op from tensorflow.python.framework import dtypes from tensorflow.python.framework import ops from tensorflow.python.framework import test_util -from tensorflow.python.keras._impl.keras.engine import sequential -from tensorflow.python.keras._impl.keras.engine import training -from tensorflow.python.keras._impl.keras.layers import core +from tensorflow.python.keras.engine import sequential +from tensorflow.python.keras.engine import training +from tensorflow.python.keras.layers import core from tensorflow.python.ops import control_flow_ops from tensorflow.python.ops import init_ops from tensorflow.python.ops import resource_variable_ops diff --git a/tensorflow/python/training/saver_test.py b/tensorflow/python/training/saver_test.py index dd5174f..e7f7add 100644 --- a/tensorflow/python/training/saver_test.py +++ b/tensorflow/python/training/saver_test.py @@ -51,8 +51,8 @@ from tensorflow.python.framework import graph_io from tensorflow.python.framework import meta_graph from tensorflow.python.framework import ops as ops_lib from tensorflow.python.framework import test_util -from tensorflow.python.keras._impl.keras.engine import training -from tensorflow.python.keras._impl.keras.layers import core +from tensorflow.python.keras.engine import training +from tensorflow.python.keras.layers import core from tensorflow.python.lib.io import file_io from tensorflow.python.ops import array_ops from tensorflow.python.ops import control_flow_ops diff --git a/tensorflow/python/util/serialization_test.py b/tensorflow/python/util/serialization_test.py index f16fa53..5000bcf 100644 --- a/tensorflow/python/util/serialization_test.py +++ b/tensorflow/python/util/serialization_test.py @@ -23,10 +23,10 @@ import json from tensorflow.python.framework import constant_op from tensorflow.python.framework import tensor_shape from tensorflow.python.framework import test_util -from tensorflow.python.keras._impl.keras.engine import input_layer -from tensorflow.python.keras._impl.keras.engine import sequential -from tensorflow.python.keras._impl.keras.engine import training -from tensorflow.python.keras._impl.keras.layers import core +from tensorflow.python.keras.engine import input_layer +from tensorflow.python.keras.engine import sequential +from tensorflow.python.keras.engine import training +from tensorflow.python.keras.layers import core from tensorflow.python.platform import test from tensorflow.python.util import serialization diff --git a/tensorflow/tools/api/golden/tensorflow.keras.-model.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.-model.pbtxt index 2d02647..11cdd6f 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.-model.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.-model.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.Model" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -127,7 +127,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.-sequential.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.-sequential.pbtxt index 60b0c10..4afad3e 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.-sequential.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.-sequential.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.Sequential" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-base-logger.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-base-logger.pbtxt index 454823f..9eee9b3 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-base-logger.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-base-logger.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.callbacks.BaseLogger" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-c-s-v-logger.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-c-s-v-logger.pbtxt index 86b264c..5bb949c 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-c-s-v-logger.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-c-s-v-logger.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.callbacks.CSVLogger" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-callback.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-callback.pbtxt index 1474b39..a5340d5 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-callback.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-callback.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.callbacks.Callback" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-early-stopping.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-early-stopping.pbtxt index 27d4a20..7b0ad85 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-early-stopping.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-early-stopping.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.callbacks.EarlyStopping" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-history.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-history.pbtxt index a7b2dee..ee400b3 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-history.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-history.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.callbacks.History" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-lambda-callback.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-lambda-callback.pbtxt index 5ee2294..df8d7b0 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-lambda-callback.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-lambda-callback.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.callbacks.LambdaCallback" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-learning-rate-scheduler.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-learning-rate-scheduler.pbtxt index d4c85a4..ce1a9b6 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-learning-rate-scheduler.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-learning-rate-scheduler.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.callbacks.LearningRateScheduler" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-model-checkpoint.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-model-checkpoint.pbtxt index 79f9c88..48bb24a 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-model-checkpoint.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-model-checkpoint.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.callbacks.ModelCheckpoint" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-progbar-logger.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-progbar-logger.pbtxt index 543de0a..d8bb8b2 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-progbar-logger.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-progbar-logger.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.callbacks.ProgbarLogger" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt index 805b1c3..dc27af9 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-reduce-l-r-on-plateau.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.callbacks.ReduceLROnPlateau" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-remote-monitor.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-remote-monitor.pbtxt index 1d80559..5a3b791 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-remote-monitor.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-remote-monitor.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.callbacks.RemoteMonitor" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-tensor-board.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-tensor-board.pbtxt index 7de4008..2f52464 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-tensor-board.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-tensor-board.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.callbacks.TensorBoard" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-terminate-on-na-n.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-terminate-on-na-n.pbtxt index bf17e87..5c2d336 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-terminate-on-na-n.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.callbacks.-terminate-on-na-n.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.callbacks.TerminateOnNaN" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.constraints.-constraint.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.constraints.-constraint.pbtxt index 14977c6..8e07b7d 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.constraints.-constraint.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.constraints.-constraint.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.constraints.Constraint" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.constraints.-max-norm.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.constraints.-max-norm.pbtxt index a2269f8..2b81174 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.constraints.-max-norm.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.constraints.-max-norm.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.constraints.MaxNorm" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.constraints.-min-max-norm.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.constraints.-min-max-norm.pbtxt index afe0d64..a41eda8 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.constraints.-min-max-norm.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.constraints.-min-max-norm.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.constraints.MinMaxNorm" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.constraints.-non-neg.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.constraints.-non-neg.pbtxt index e8c4bb9..572e3ee 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.constraints.-non-neg.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.constraints.-non-neg.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.constraints.NonNeg" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.constraints.-unit-norm.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.constraints.-unit-norm.pbtxt index d457cb6..fe16c38 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.constraints.-unit-norm.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.constraints.-unit-norm.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.constraints.UnitNorm" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.constraints.max_norm.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.constraints.max_norm.pbtxt index 4812809..6650bae 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.constraints.max_norm.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.constraints.max_norm.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.constraints.max_norm" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.constraints.min_max_norm.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.constraints.min_max_norm.pbtxt index 02eb3fb..9dd3bc9 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.constraints.min_max_norm.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.constraints.min_max_norm.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.constraints.min_max_norm" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.constraints.non_neg.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.constraints.non_neg.pbtxt index cc11010..a565840 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.constraints.non_neg.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.constraints.non_neg.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.constraints.non_neg" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.constraints.unit_norm.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.constraints.unit_norm.pbtxt index 086f9f2..5cbe0da 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.constraints.unit_norm.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.constraints.unit_norm.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.constraints.unit_norm" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-activation.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-activation.pbtxt index 010eaf7..2bf973d 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-activation.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-activation.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Activation" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-activity-regularization.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-activity-regularization.pbtxt index 01d2511..03f20e7 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-activity-regularization.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-activity-regularization.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.ActivityRegularization" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-add.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-add.pbtxt index edd7ec0..4b46b8d 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-add.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-add.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Add" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-alpha-dropout.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-alpha-dropout.pbtxt index dd3c77a..d8a1c76 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-alpha-dropout.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-alpha-dropout.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.AlphaDropout" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-average-pooling1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-average-pooling1-d.pbtxt index d9945d7..622926b 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-average-pooling1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-average-pooling1-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.AveragePooling1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-average-pooling2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-average-pooling2-d.pbtxt index 3dfe41f..82100d8 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-average-pooling2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-average-pooling2-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.AveragePooling2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-average-pooling3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-average-pooling3-d.pbtxt index 91f0cc9..4080610 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-average-pooling3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-average-pooling3-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.AveragePooling3D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-average.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-average.pbtxt index 11586b2..a3c8031 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-average.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-average.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Average" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-avg-pool1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-avg-pool1-d.pbtxt index 3bb1bfb..e2dfaca 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-avg-pool1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-avg-pool1-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.AvgPool1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-avg-pool2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-avg-pool2-d.pbtxt index 3b36feb..4f068d2 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-avg-pool2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-avg-pool2-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.AvgPool2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-avg-pool3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-avg-pool3-d.pbtxt index 21b8b0e..b8c261a 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-avg-pool3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-avg-pool3-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.AvgPool3D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-batch-normalization.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-batch-normalization.pbtxt index df7c849..4ccd6ca 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-batch-normalization.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-batch-normalization.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.BatchNormalization" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-bidirectional.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-bidirectional.pbtxt index 86f0a15..2790e5f 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-bidirectional.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-bidirectional.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Bidirectional" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-concatenate.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-concatenate.pbtxt index 72e840c..b1326bd 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-concatenate.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-concatenate.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Concatenate" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt index 8b77d3f..e3ac3db 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv-l-s-t-m2-d.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.layers.ConvLSTM2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv1-d.pbtxt index 117b941..1117a69 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv1-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Conv1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv2-d-transpose.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv2-d-transpose.pbtxt index aa64a99..b9de142 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv2-d-transpose.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv2-d-transpose.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.layers.Conv2DTranspose" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv2-d.pbtxt index 0247300..deb535e 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv2-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Conv2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv3-d-transpose.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv3-d-transpose.pbtxt index 528c31e..9a9a223 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv3-d-transpose.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv3-d-transpose.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.layers.Conv3DTranspose" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv3-d.pbtxt index a16038e..1c59b0b 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-conv3-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Conv3D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution1-d.pbtxt index f899320..30cf548 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution1-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Convolution1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution2-d-transpose.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution2-d-transpose.pbtxt index ad373fa..0ec6950 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution2-d-transpose.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution2-d-transpose.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.layers.Convolution2DTranspose" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution2-d.pbtxt index 17f5b98..4cd8928 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution2-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Convolution2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution3-d-transpose.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution3-d-transpose.pbtxt index b67d132..4b49124 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution3-d-transpose.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution3-d-transpose.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.layers.Convolution3DTranspose" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution3-d.pbtxt index 3b55871..d0ad9cf 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-convolution3-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Convolution3D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-cropping1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-cropping1-d.pbtxt index 1c03f24..98cff95 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-cropping1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-cropping1-d.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Cropping1D" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-cropping2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-cropping2-d.pbtxt index 6649e5b..2357498 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-cropping2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-cropping2-d.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Cropping2D" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-cropping3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-cropping3-d.pbtxt index c676e86..3324cbf 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-cropping3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-cropping3-d.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Cropping3D" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-cu-d-n-n-g-r-u.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-cu-d-n-n-g-r-u.pbtxt index eef2a58..6c81823 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-cu-d-n-n-g-r-u.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-cu-d-n-n-g-r-u.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.layers.CuDNNGRU" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-cu-d-n-n-l-s-t-m.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-cu-d-n-n-l-s-t-m.pbtxt index 5a8bc2c..487e04f 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-cu-d-n-n-l-s-t-m.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-cu-d-n-n-l-s-t-m.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.layers.CuDNNLSTM" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-dense.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-dense.pbtxt index 3142724..137e7cc 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-dense.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-dense.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Dense" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-depthwise-conv2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-depthwise-conv2-d.pbtxt index 468c2d0..7161665 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-depthwise-conv2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-depthwise-conv2-d.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.layers.DepthwiseConv2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-dot.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-dot.pbtxt index 753dfa7..24affa2 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-dot.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-dot.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Dot" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-dropout.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-dropout.pbtxt index 178bfd5..7ba19a4 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-dropout.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-dropout.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Dropout" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-e-l-u.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-e-l-u.pbtxt index d0f223c..503aa91 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-e-l-u.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-e-l-u.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.ELU" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-embedding.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-embedding.pbtxt index 86b4ac1..1737e59 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-embedding.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-embedding.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Embedding" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-flatten.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-flatten.pbtxt index e73a5d1..021d024 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-flatten.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-flatten.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Flatten" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-g-r-u-cell.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-g-r-u-cell.pbtxt index cd8a6fe..6538700 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-g-r-u-cell.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-g-r-u-cell.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.GRUCell" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-g-r-u.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-g-r-u.pbtxt index f061b9a..4f791ac 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-g-r-u.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-g-r-u.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GRU" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-gaussian-dropout.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-gaussian-dropout.pbtxt index fe2f553..abc30e5 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-gaussian-dropout.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-gaussian-dropout.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.GaussianDropout" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-gaussian-noise.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-gaussian-noise.pbtxt index fa36090..20791bb 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-gaussian-noise.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-gaussian-noise.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.GaussianNoise" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-average-pooling1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-average-pooling1-d.pbtxt index e7fbd4e..449a91d 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-average-pooling1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-average-pooling1-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GlobalAveragePooling1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-average-pooling2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-average-pooling2-d.pbtxt index 19ab9ae..bb361e1 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-average-pooling2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-average-pooling2-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GlobalAveragePooling2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-average-pooling3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-average-pooling3-d.pbtxt index e6f6254..e564bf3 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-average-pooling3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-average-pooling3-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GlobalAveragePooling3D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-avg-pool1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-avg-pool1-d.pbtxt index 1390ef2..4cb9cc3 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-avg-pool1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-avg-pool1-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GlobalAvgPool1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-avg-pool2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-avg-pool2-d.pbtxt index 9091bec..5ed52b8 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-avg-pool2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-avg-pool2-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GlobalAvgPool2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-avg-pool3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-avg-pool3-d.pbtxt index cce7d96..f4559d2 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-avg-pool3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-avg-pool3-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GlobalAvgPool3D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pool1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pool1-d.pbtxt index b912657..64e2d061 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pool1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pool1-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GlobalMaxPool1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pool2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pool2-d.pbtxt index 2a165a1..3372ad6 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pool2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pool2-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GlobalMaxPool2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pool3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pool3-d.pbtxt index 5d082de..08a6860 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pool3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pool3-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GlobalMaxPool3D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pooling1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pooling1-d.pbtxt index 308ccf0..22c9eab 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pooling1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pooling1-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GlobalMaxPooling1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pooling2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pooling2-d.pbtxt index f226867..74c405b 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pooling2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pooling2-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GlobalMaxPooling2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pooling3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pooling3-d.pbtxt index 8fa2c0a..39f6f98 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pooling3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-global-max-pooling3-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.GlobalMaxPooling3D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-input-layer.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-input-layer.pbtxt index 6283a34..7b25e80 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-input-layer.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-input-layer.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.InputLayer" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-input-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-input-spec.pbtxt index 29edabe..5fd0a47 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-input-spec.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-input-spec.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.layers.InputSpec" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-l-s-t-m-cell.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-l-s-t-m-cell.pbtxt index bc190ec..3619b8b 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-l-s-t-m-cell.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-l-s-t-m-cell.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.LSTMCell" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-l-s-t-m.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-l-s-t-m.pbtxt index 69ea66f..8ef3d71 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-l-s-t-m.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-l-s-t-m.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.LSTM" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-lambda.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-lambda.pbtxt index fa395e5..ecbaa9c 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-lambda.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-lambda.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Lambda" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-layer.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-layer.pbtxt index 66260a7..9b90db1 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-layer.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-layer.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.layers.Layer" tf_class { - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -105,7 +105,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-leaky-re-l-u.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-leaky-re-l-u.pbtxt index 914ce32..3c60eaa 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-leaky-re-l-u.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-leaky-re-l-u.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.LeakyReLU" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-locally-connected1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-locally-connected1-d.pbtxt index ede2e05..3dac1ff 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-locally-connected1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-locally-connected1-d.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.LocallyConnected1D" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-locally-connected2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-locally-connected2-d.pbtxt index eed43fb..7f1b5db 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-locally-connected2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-locally-connected2-d.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.LocallyConnected2D" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-masking.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-masking.pbtxt index 15b59a9..b3e3100 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-masking.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-masking.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Masking" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pool1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pool1-d.pbtxt index b2a486e..bbd9d1b 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pool1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pool1-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.MaxPool1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pool2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pool2-d.pbtxt index ebfc8c0..fe72bee 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pool2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pool2-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.MaxPool2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pool3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pool3-d.pbtxt index b28948d..e9bf57b 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pool3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pool3-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.MaxPool3D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pooling1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pooling1-d.pbtxt index 2a55d2a..0eecc58 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pooling1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pooling1-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.MaxPooling1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pooling2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pooling2-d.pbtxt index 6f80f18..96785a7 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pooling2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pooling2-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.MaxPooling2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pooling3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pooling3-d.pbtxt index 7c8c5b5..42c46cc 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pooling3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-max-pooling3-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.MaxPooling3D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-maximum.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-maximum.pbtxt index ebecf55..ac816f6 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-maximum.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-maximum.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Maximum" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-multiply.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-multiply.pbtxt index 841d817..9ae9956 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-multiply.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-multiply.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.Multiply" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-p-re-l-u.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-p-re-l-u.pbtxt index 5c5b51c..815f3bc 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-p-re-l-u.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-p-re-l-u.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.PReLU" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-permute.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-permute.pbtxt index 7298266..e704992 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-permute.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-permute.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Permute" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-r-n-n.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-r-n-n.pbtxt index 5c273db..b3a58fa 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-r-n-n.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-r-n-n.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.RNN" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-repeat-vector.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-repeat-vector.pbtxt index 1be64d5..78f4645 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-repeat-vector.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-repeat-vector.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.RepeatVector" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-reshape.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-reshape.pbtxt index 1be686f..222344f 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-reshape.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-reshape.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Reshape" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-conv1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-conv1-d.pbtxt index 68fc224..55fddf5 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-conv1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-conv1-d.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.layers.SeparableConv1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-conv2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-conv2-d.pbtxt index 04774b4..96314ce 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-conv2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-conv2-d.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.layers.SeparableConv2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-convolution1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-convolution1-d.pbtxt index 9bdde6f..88bdf99 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-convolution1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-convolution1-d.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.layers.SeparableConvolution1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-convolution2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-convolution2-d.pbtxt index a480454..6eeea7a 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-convolution2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-separable-convolution2-d.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.layers.SeparableConvolution2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-simple-r-n-n-cell.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-simple-r-n-n-cell.pbtxt index 8bc0955..3050d46 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-simple-r-n-n-cell.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-simple-r-n-n-cell.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.SimpleRNNCell" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-simple-r-n-n.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-simple-r-n-n.pbtxt index d8ee155..dda4c93 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-simple-r-n-n.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-simple-r-n-n.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.SimpleRNN" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-softmax.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-softmax.pbtxt index 642c753..cc62751 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-softmax.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-softmax.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Softmax" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-spatial-dropout1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-spatial-dropout1-d.pbtxt index 45a3e09..5eb7e75 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-spatial-dropout1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-spatial-dropout1-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.SpatialDropout1D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-spatial-dropout2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-spatial-dropout2-d.pbtxt index 3c61a81..500cb8c 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-spatial-dropout2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-spatial-dropout2-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.SpatialDropout2D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-spatial-dropout3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-spatial-dropout3-d.pbtxt index 4909632..1113a76 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-spatial-dropout3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-spatial-dropout3-d.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.SpatialDropout3D" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -107,7 +107,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-stacked-r-n-n-cells.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-stacked-r-n-n-cells.pbtxt index a376019..c4b9f93 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-stacked-r-n-n-cells.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-stacked-r-n-n-cells.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.StackedRNNCells" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-thresholded-re-l-u.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-thresholded-re-l-u.pbtxt index 71d5a91..282c98d 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-thresholded-re-l-u.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-thresholded-re-l-u.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.ThresholdedReLU" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-time-distributed.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-time-distributed.pbtxt index c5cf655..acab937 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-time-distributed.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-time-distributed.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.layers.TimeDistributed" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-up-sampling1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-up-sampling1-d.pbtxt index 801465a..a5ec228 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-up-sampling1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-up-sampling1-d.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.UpSampling1D" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-up-sampling2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-up-sampling2-d.pbtxt index eba8305..d8d8e0b 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-up-sampling2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-up-sampling2-d.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.UpSampling2D" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-up-sampling3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-up-sampling3-d.pbtxt index a59bd30..97d6dc0 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-up-sampling3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-up-sampling3-d.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.UpSampling3D" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-wrapper.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-wrapper.pbtxt index 3ebb240..ea9bb41 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-wrapper.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-wrapper.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.Wrapper" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-zero-padding1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-zero-padding1-d.pbtxt index 193e354..e6d1d2e 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-zero-padding1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-zero-padding1-d.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.ZeroPadding1D" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-zero-padding2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-zero-padding2-d.pbtxt index 55e71e1..f620173 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-zero-padding2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-zero-padding2-d.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.ZeroPadding2D" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.layers.-zero-padding3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.layers.-zero-padding3-d.pbtxt index 97d34a4..07a1fde 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.layers.-zero-padding3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.layers.-zero-padding3-d.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.layers.ZeroPadding3D" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -106,7 +106,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.models.-model.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.models.-model.pbtxt index 9417f77..62aa929 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.models.-model.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.models.-model.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.models.Model" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -127,7 +127,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.models.-sequential.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.models.-sequential.pbtxt index e658f85..93ecbbc 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.models.-sequential.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.models.-sequential.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.keras.models.Sequential" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adadelta.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adadelta.pbtxt index 32667cf..b9ce154 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adadelta.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adadelta.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.optimizers.Adadelta" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adagrad.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adagrad.pbtxt index efca59e..d0dc9e3 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adagrad.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adagrad.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.optimizers.Adagrad" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adam.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adam.pbtxt index 5546e20..06815fa 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adam.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adam.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.optimizers.Adam" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adamax.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adamax.pbtxt index aaa54a1..47b55fd 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adamax.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-adamax.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.optimizers.Adamax" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-nadam.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-nadam.pbtxt index 1fada7f..8c63a7d 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-nadam.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-nadam.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.optimizers.Nadam" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-optimizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-optimizer.pbtxt index ca47e95..53d64da 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-optimizer.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-optimizer.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.optimizers.Optimizer" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-r-m-sprop.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-r-m-sprop.pbtxt index fd3f97f..a1e9b8c 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-r-m-sprop.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-r-m-sprop.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.optimizers.RMSprop" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-s-g-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-s-g-d.pbtxt index 25adfd3..a67fefb 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-s-g-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.optimizers.-s-g-d.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.optimizers.SGD" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-directory-iterator.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-directory-iterator.pbtxt index ec0f3d8..dddace8 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-directory-iterator.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-directory-iterator.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.preprocessing.image.DirectoryIterator" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-image-data-generator.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-image-data-generator.pbtxt index f5bc04e..c1e2e94 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-image-data-generator.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-image-data-generator.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.preprocessing.image.ImageDataGenerator" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-iterator.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-iterator.pbtxt index 69488d6..825d9f1 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-iterator.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-iterator.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.preprocessing.image.Iterator" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-numpy-array-iterator.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-numpy-array-iterator.pbtxt index 42196dd..75924a2 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-numpy-array-iterator.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.image.-numpy-array-iterator.pbtxt @@ -1,8 +1,8 @@ path: "tensorflow.keras.preprocessing.image.NumpyArrayIterator" tf_class { - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.sequence.-timeseries-generator.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.sequence.-timeseries-generator.pbtxt index d9c3215..326b1fa 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.sequence.-timeseries-generator.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.sequence.-timeseries-generator.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.preprocessing.sequence.TimeseriesGenerator" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.text.-tokenizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.text.-tokenizer.pbtxt index ce91caa..b42b12b 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.text.-tokenizer.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.preprocessing.text.-tokenizer.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.preprocessing.text.Tokenizer" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.regularizers.-l1-l2.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.regularizers.-l1-l2.pbtxt index 04dcda3..a45fb7b 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.regularizers.-l1-l2.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.regularizers.-l1-l2.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.regularizers.L1L2" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.regularizers.-regularizer.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.regularizers.-regularizer.pbtxt index b0a125f..641001a 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.regularizers.-regularizer.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.regularizers.-regularizer.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.regularizers.Regularizer" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.utils.-custom-object-scope.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.utils.-custom-object-scope.pbtxt index dda39ed..1096820 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.utils.-custom-object-scope.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.utils.-custom-object-scope.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.utils.CustomObjectScope" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.utils.-generator-enqueuer.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.utils.-generator-enqueuer.pbtxt index 1c5868e..939fd54 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.utils.-generator-enqueuer.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.utils.-generator-enqueuer.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.utils.GeneratorEnqueuer" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.utils.-h-d-f5-matrix.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.utils.-h-d-f5-matrix.pbtxt index ce62c8b..6b83205 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.utils.-h-d-f5-matrix.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.utils.-h-d-f5-matrix.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.utils.HDF5Matrix" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member { name: "dtype" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.utils.-progbar.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.utils.-progbar.pbtxt index 16e1cbe..be4496e 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.utils.-progbar.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.utils.-progbar.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.utils.Progbar" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.utils.-sequence-enqueuer.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.utils.-sequence-enqueuer.pbtxt index 5cf2a07..a9e499d 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.utils.-sequence-enqueuer.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.utils.-sequence-enqueuer.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.utils.SequenceEnqueuer" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.utils.-sequence.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.utils.-sequence.pbtxt index 5b27225..e2dc932 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.utils.-sequence.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.utils.-sequence.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.keras.utils.Sequence" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.wrappers.scikit_learn.-keras-classifier.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.wrappers.scikit_learn.-keras-classifier.pbtxt index 8d200f9..67cca3a 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.wrappers.scikit_learn.-keras-classifier.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.wrappers.scikit_learn.-keras-classifier.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.wrappers.scikit_learn.KerasClassifier" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.keras.wrappers.scikit_learn.-keras-regressor.pbtxt b/tensorflow/tools/api/golden/tensorflow.keras.wrappers.scikit_learn.-keras-regressor.pbtxt index 7a97134..f4b9b7e 100644 --- a/tensorflow/tools/api/golden/tensorflow.keras.wrappers.scikit_learn.-keras-regressor.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.keras.wrappers.scikit_learn.-keras-regressor.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.keras.wrappers.scikit_learn.KerasRegressor" tf_class { - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-average-pooling1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-average-pooling1-d.pbtxt index c9feadb..1106705 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-average-pooling1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-average-pooling1-d.pbtxt @@ -1,10 +1,10 @@ path: "tensorflow.layers.AveragePooling1D" tf_class { is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -117,7 +117,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-average-pooling2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-average-pooling2-d.pbtxt index 8405bee..3259e70 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-average-pooling2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-average-pooling2-d.pbtxt @@ -1,10 +1,10 @@ path: "tensorflow.layers.AveragePooling2D" tf_class { is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -117,7 +117,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-average-pooling3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-average-pooling3-d.pbtxt index ffe5174..e561f2f 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-average-pooling3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-average-pooling3-d.pbtxt @@ -1,10 +1,10 @@ path: "tensorflow.layers.AveragePooling3D" tf_class { is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -117,7 +117,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-batch-normalization.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-batch-normalization.pbtxt index a50b83a..3124a35 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-batch-normalization.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-batch-normalization.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.layers.BatchNormalization" tf_class { is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-conv1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-conv1-d.pbtxt index 56d7759..b5ec612 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-conv1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-conv1-d.pbtxt @@ -1,10 +1,10 @@ path: "tensorflow.layers.Conv1D" tf_class { is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-conv2-d-transpose.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-conv2-d-transpose.pbtxt index 6ab4e0a..b2c89ae 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-conv2-d-transpose.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-conv2-d-transpose.pbtxt @@ -1,11 +1,11 @@ path: "tensorflow.layers.Conv2DTranspose" tf_class { is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-conv2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-conv2-d.pbtxt index e4d47c7..9e4f496 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-conv2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-conv2-d.pbtxt @@ -1,10 +1,10 @@ path: "tensorflow.layers.Conv2D" tf_class { is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-conv3-d-transpose.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-conv3-d-transpose.pbtxt index 9195b54..9850e6d 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-conv3-d-transpose.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-conv3-d-transpose.pbtxt @@ -1,11 +1,11 @@ path: "tensorflow.layers.Conv3DTranspose" tf_class { is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-conv3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-conv3-d.pbtxt index 4d0033f..be11382 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-conv3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-conv3-d.pbtxt @@ -1,10 +1,10 @@ path: "tensorflow.layers.Conv3D" tf_class { is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-dense.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-dense.pbtxt index 7017921..0d951bf 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-dense.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-dense.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.layers.Dense" tf_class { is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-dropout.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-dropout.pbtxt index 3381b59..f1beeed 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-dropout.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-dropout.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.layers.Dropout" tf_class { is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -116,7 +116,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-flatten.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-flatten.pbtxt index af8f55a..b75a012 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-flatten.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-flatten.pbtxt @@ -1,9 +1,9 @@ path: "tensorflow.layers.Flatten" tf_class { is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -116,7 +116,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-input-spec.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-input-spec.pbtxt index 2ff89f0..fd02c91 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-input-spec.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-input-spec.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.layers.InputSpec" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-layer.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-layer.pbtxt index ff6c5b1..80e0fb2 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-layer.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-layer.pbtxt @@ -1,7 +1,7 @@ path: "tensorflow.layers.Layer" tf_class { is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -114,7 +114,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-max-pooling1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-max-pooling1-d.pbtxt index aaabf13..50ff484 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-max-pooling1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-max-pooling1-d.pbtxt @@ -1,10 +1,10 @@ path: "tensorflow.layers.MaxPooling1D" tf_class { is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -117,7 +117,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-max-pooling2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-max-pooling2-d.pbtxt index 813d322..cea8097 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-max-pooling2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-max-pooling2-d.pbtxt @@ -1,10 +1,10 @@ path: "tensorflow.layers.MaxPooling2D" tf_class { is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -117,7 +117,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-max-pooling3-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-max-pooling3-d.pbtxt index 62c46d9..ab9e895 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-max-pooling3-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-max-pooling3-d.pbtxt @@ -1,10 +1,10 @@ path: "tensorflow.layers.MaxPooling3D" tf_class { is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { @@ -117,7 +117,7 @@ tf_class { } member_method { name: "build" - argspec: "args=[\'self\', \'_\'], varargs=None, keywords=None, defaults=None" + argspec: "args=[\'self\', \'input_shape\'], varargs=None, keywords=None, defaults=None" } member_method { name: "call" diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-separable-conv1-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-separable-conv1-d.pbtxt index fb7af3e..4362568 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-separable-conv1-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-separable-conv1-d.pbtxt @@ -1,11 +1,11 @@ path: "tensorflow.layers.SeparableConv1D" tf_class { is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.layers.-separable-conv2-d.pbtxt b/tensorflow/tools/api/golden/tensorflow.layers.-separable-conv2-d.pbtxt index d3dfb84..3cad824 100644 --- a/tensorflow/tools/api/golden/tensorflow.layers.-separable-conv2-d.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.layers.-separable-conv2-d.pbtxt @@ -1,11 +1,11 @@ path: "tensorflow.layers.SeparableConv2D" tf_class { is_instance: "" - is_instance: "" - is_instance: "" - is_instance: "" + is_instance: "" + is_instance: "" + is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-basic-l-s-t-m-cell.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-basic-l-s-t-m-cell.pbtxt index b1d3352..a8d9e12 100644 --- a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-basic-l-s-t-m-cell.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-basic-l-s-t-m-cell.pbtxt @@ -4,7 +4,7 @@ tf_class { is_instance: "" is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-basic-r-n-n-cell.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-basic-r-n-n-cell.pbtxt index 143247e..c039890 100644 --- a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-basic-r-n-n-cell.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-basic-r-n-n-cell.pbtxt @@ -4,7 +4,7 @@ tf_class { is_instance: "" is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-device-wrapper.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-device-wrapper.pbtxt index 18ce1cb..62c393d 100644 --- a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-device-wrapper.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-device-wrapper.pbtxt @@ -3,7 +3,7 @@ tf_class { is_instance: "" is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-dropout-wrapper.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-dropout-wrapper.pbtxt index b4ac459..f121ba7 100644 --- a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-dropout-wrapper.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-dropout-wrapper.pbtxt @@ -3,7 +3,7 @@ tf_class { is_instance: "" is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-g-r-u-cell.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-g-r-u-cell.pbtxt index 3cdfd6c..4583dc3 100644 --- a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-g-r-u-cell.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-g-r-u-cell.pbtxt @@ -4,7 +4,7 @@ tf_class { is_instance: "" is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-l-s-t-m-cell.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-l-s-t-m-cell.pbtxt index fc7f72c..5016b6a 100644 --- a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-l-s-t-m-cell.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-l-s-t-m-cell.pbtxt @@ -4,7 +4,7 @@ tf_class { is_instance: "" is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-multi-r-n-n-cell.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-multi-r-n-n-cell.pbtxt index dab10b3..59623fc 100644 --- a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-multi-r-n-n-cell.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-multi-r-n-n-cell.pbtxt @@ -3,7 +3,7 @@ tf_class { is_instance: "" is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-r-n-n-cell.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-r-n-n-cell.pbtxt index 79f2993..e2ab5aa 100644 --- a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-r-n-n-cell.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-r-n-n-cell.pbtxt @@ -2,7 +2,7 @@ path: "tensorflow.nn.rnn_cell.RNNCell" tf_class { is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-residual-wrapper.pbtxt b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-residual-wrapper.pbtxt index a29b6e8..bd2a6d6 100644 --- a/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-residual-wrapper.pbtxt +++ b/tensorflow/tools/api/golden/tensorflow.nn.rnn_cell.-residual-wrapper.pbtxt @@ -3,7 +3,7 @@ tf_class { is_instance: "" is_instance: "" is_instance: "" - is_instance: "" + is_instance: "" is_instance: "" is_instance: "" member { diff --git a/tensorflow/tools/ci_build/ci_sanity.sh b/tensorflow/tools/ci_build/ci_sanity.sh index 8e8b219..05676f9 100755 --- a/tensorflow/tools/ci_build/ci_sanity.sh +++ b/tensorflow/tools/ci_build/ci_sanity.sh @@ -100,9 +100,9 @@ do_pylint() { "^tensorflow/contrib/eager/python/evaluator\.py.*\[E0202.*method-hidden "\ "^tensorflow/contrib/eager/python/metrics_impl\.py.*\[E0202.*method-hidden "\ "^tensorflow/python/platform/gfile\.py.*\[E0301.*non-iterator "\ -"^tensorflow/python/keras/_impl/keras/callbacks\.py.*\[E1133.*not-an-iterable "\ -"^tensorflow/python/keras/_impl/keras/engine/base_layer.py.*\[E0203.*access-member-before-definition "\ -"^tensorflow/python/keras/_impl/keras/layers/recurrent\.py.*\[E0203.*access-member-before-definition "\ +"^tensorflow/python/keras/callbacks\.py.*\[E1133.*not-an-iterable "\ +"^tensorflow/python/keras/engine/base_layer.py.*\[E0203.*access-member-before-definition "\ +"^tensorflow/python/keras/layers/recurrent\.py.*\[E0203.*access-member-before-definition "\ "^tensorflow/python/kernel_tests/constant_op_eager_test.py.*\[E0303.*invalid-length-returned" echo "ERROR_WHITELIST=\"${ERROR_WHITELIST}\"" -- 2.7.4