Skip to content

Commit 609b2ce

Browse files
pavithrasvtensorflower-gardener
authored andcommitted
Move Keras code out of _impl folder and remove API files.
PiperOrigin-RevId: 197097430
1 parent aca0458 commit 609b2ce

386 files changed

Lines changed: 1711 additions & 3160 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

tensorflow/contrib/autograph/impl/conversion_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from tensorflow.contrib.autograph.impl import api
2525
from tensorflow.contrib.autograph.impl import conversion
2626
from tensorflow.python.framework import constant_op
27-
from tensorflow.python.keras._impl.keras.engine import training
27+
from tensorflow.python.keras.engine import training
2828
from tensorflow.python.platform import test
2929

3030

tensorflow/contrib/checkpoint/python/visualize_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
from tensorflow.python.eager import context
2525
from tensorflow.python.eager import test
2626
from tensorflow.python.framework import constant_op
27-
from tensorflow.python.keras._impl.keras.engine import training
28-
from tensorflow.python.keras._impl.keras.layers import core
27+
from tensorflow.python.keras.engine import training
28+
from tensorflow.python.keras.layers import core
2929
from tensorflow.python.ops import resource_variable_ops
3030
from tensorflow.python.training import adam
3131
from tensorflow.python.training.checkpointable import util as checkpointable_utils

tensorflow/contrib/cmake/python_modules.txt

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -32,51 +32,13 @@ tensorflow/python/feature_column
3232
tensorflow/python/framework
3333
tensorflow/python/grappler
3434
tensorflow/python/keras
35-
tensorflow/python/keras/activations
3635
tensorflow/python/keras/applications
37-
tensorflow/python/keras/applications/densenet
38-
tensorflow/python/keras/applications/inception_resnet_v2
39-
tensorflow/python/keras/applications/inception_v3
40-
tensorflow/python/keras/applications/mobilenet
41-
tensorflow/python/keras/applications/nasnet
42-
tensorflow/python/keras/applications/resnet50
43-
tensorflow/python/keras/applications/vgg16
44-
tensorflow/python/keras/applications/vgg19
45-
tensorflow/python/keras/applications/xception
46-
tensorflow/python/keras/backend
47-
tensorflow/python/keras/callbacks
48-
tensorflow/python/keras/constraints
4936
tensorflow/python/keras/datasets
50-
tensorflow/python/keras/datasets/boston_housing
51-
tensorflow/python/keras/datasets/cifar10
52-
tensorflow/python/keras/datasets/cifar100
53-
tensorflow/python/keras/datasets/fashion_mnist
54-
tensorflow/python/keras/datasets/imdb
55-
tensorflow/python/keras/datasets/mnist
56-
tensorflow/python/keras/datasets/reuters
57-
tensorflow/python/keras/initializers
37+
tensorflow/python/keras/engine
5838
tensorflow/python/keras/layers
59-
tensorflow/python/keras/losses
60-
tensorflow/python/keras/metrics
61-
tensorflow/python/keras/models
62-
tensorflow/python/keras/optimizers
6339
tensorflow/python/keras/preprocessing
64-
tensorflow/python/keras/preprocessing/image
65-
tensorflow/python/keras/preprocessing/sequence
66-
tensorflow/python/keras/preprocessing/text
67-
tensorflow/python/keras/regularizers
6840
tensorflow/python/keras/utils
6941
tensorflow/python/keras/wrappers
70-
tensorflow/python/keras/wrappers/scikit_learn
71-
tensorflow/python/keras/_impl
72-
tensorflow/python/keras/_impl/keras
73-
tensorflow/python/keras/_impl/keras/applications
74-
tensorflow/python/keras/_impl/keras/datasets
75-
tensorflow/python/keras/_impl/keras/engine
76-
tensorflow/python/keras/_impl/keras/layers
77-
tensorflow/python/keras/_impl/keras/preprocessing
78-
tensorflow/python/keras/_impl/keras/utils
79-
tensorflow/python/keras/_impl/keras/wrappers
8042
tensorflow/python/kernel_tests
8143
tensorflow/python/kernel_tests/boosted_trees
8244
tensorflow/python/kernel_tests/distributions

tensorflow/contrib/coder/python/layers/entropybottleneck.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from tensorflow.python.framework import dtypes
2929
from tensorflow.python.framework import ops
3030
from tensorflow.python.framework import tensor_shape
31-
from tensorflow.python.keras._impl.keras import engine
31+
from tensorflow.python.keras import engine
3232
from tensorflow.python.ops import array_ops
3333
from tensorflow.python.ops import functional_ops
3434
from tensorflow.python.ops import init_ops

tensorflow/contrib/cudnn_rnn/python/ops/cudnn_rnn_ops.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from tensorflow.python.framework import dtypes
2525
from tensorflow.python.framework import ops
2626
from tensorflow.python.framework import random_seed
27-
from tensorflow.python.keras._impl.keras.engine import base_layer
27+
from tensorflow.python.keras.engine import base_layer
2828
from tensorflow.python.ops import array_ops
2929
from tensorflow.python.ops import gen_cudnn_rnn_ops
3030
from tensorflow.python.ops import init_ops

tensorflow/contrib/eager/python/network.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
from tensorflow.python.eager import context
2626
from tensorflow.python.framework import ops
27-
from tensorflow.python.keras._impl.keras.engine import base_layer as keras_base_layer
27+
from tensorflow.python.keras.engine import base_layer as keras_base_layer
2828
from tensorflow.python.layers import base
2929
from tensorflow.python.ops import variable_scope
3030
from tensorflow.python.platform import tf_logging as logging

tensorflow/contrib/keras/api/keras/activations/__init__.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@
1919
from __future__ import print_function
2020

2121
# Activation functions.
22-
from tensorflow.python.keras._impl.keras.activations import elu
23-
from tensorflow.python.keras._impl.keras.activations import hard_sigmoid
24-
from tensorflow.python.keras._impl.keras.activations import linear
25-
from tensorflow.python.keras._impl.keras.activations import relu
26-
from tensorflow.python.keras._impl.keras.activations import selu
27-
from tensorflow.python.keras._impl.keras.activations import sigmoid
28-
from tensorflow.python.keras._impl.keras.activations import softmax
29-
from tensorflow.python.keras._impl.keras.activations import softplus
30-
from tensorflow.python.keras._impl.keras.activations import softsign
31-
from tensorflow.python.keras._impl.keras.activations import tanh
22+
from tensorflow.python.keras.activations import elu
23+
from tensorflow.python.keras.activations import hard_sigmoid
24+
from tensorflow.python.keras.activations import linear
25+
from tensorflow.python.keras.activations import relu
26+
from tensorflow.python.keras.activations import selu
27+
from tensorflow.python.keras.activations import sigmoid
28+
from tensorflow.python.keras.activations import softmax
29+
from tensorflow.python.keras.activations import softplus
30+
from tensorflow.python.keras.activations import softsign
31+
from tensorflow.python.keras.activations import tanh
3232

3333
# Auxiliary utils.
3434
# pylint: disable=g-bad-import-order
35-
from tensorflow.python.keras._impl.keras.activations import deserialize
36-
from tensorflow.python.keras._impl.keras.activations import serialize
37-
from tensorflow.python.keras._impl.keras.activations import get
35+
from tensorflow.python.keras.activations import deserialize
36+
from tensorflow.python.keras.activations import serialize
37+
from tensorflow.python.keras.activations import get
3838

3939
del absolute_import
4040
del division

tensorflow/contrib/keras/api/keras/applications/inception_v3/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
from __future__ import division
1919
from __future__ import print_function
2020

21-
from tensorflow.python.keras._impl.keras.applications.inception_v3 import decode_predictions
22-
from tensorflow.python.keras._impl.keras.applications.inception_v3 import InceptionV3
23-
from tensorflow.python.keras._impl.keras.applications.inception_v3 import preprocess_input
21+
from tensorflow.python.keras.applications.inception_v3 import decode_predictions
22+
from tensorflow.python.keras.applications.inception_v3 import InceptionV3
23+
from tensorflow.python.keras.applications.inception_v3 import preprocess_input
2424

2525
del absolute_import
2626
del division

tensorflow/contrib/keras/api/keras/applications/mobilenet/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
from __future__ import division
1919
from __future__ import print_function
2020

21-
from tensorflow.python.keras._impl.keras.applications.mobilenet import decode_predictions
22-
from tensorflow.python.keras._impl.keras.applications.mobilenet import MobileNet
23-
from tensorflow.python.keras._impl.keras.applications.mobilenet import preprocess_input
21+
from tensorflow.python.keras.applications.mobilenet import decode_predictions
22+
from tensorflow.python.keras.applications.mobilenet import MobileNet
23+
from tensorflow.python.keras.applications.mobilenet import preprocess_input
2424

2525
del absolute_import
2626
del division

tensorflow/contrib/keras/api/keras/applications/resnet50/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
from __future__ import division
1919
from __future__ import print_function
2020

21-
from tensorflow.python.keras._impl.keras.applications.resnet50 import decode_predictions
22-
from tensorflow.python.keras._impl.keras.applications.resnet50 import preprocess_input
23-
from tensorflow.python.keras._impl.keras.applications.resnet50 import ResNet50
21+
from tensorflow.python.keras.applications.resnet50 import decode_predictions
22+
from tensorflow.python.keras.applications.resnet50 import preprocess_input
23+
from tensorflow.python.keras.applications.resnet50 import ResNet50
2424

2525
del absolute_import
2626
del division

0 commit comments

Comments
 (0)