experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix V1 Layer and Model API exports.

Browse Source 
PiperOrigin-RevId: 306910272
Change-Id: I8323e429d373f251bfb047b433f68a8454aac647
This commit is contained in:
A. Unique TensorFlower 2020-04-16 13:27:11 -07:00 committed by TensorFlower Gardener
parent bb86c3c1f0
commit 203942391f
8 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tensorflow/python/keras/api/BUILD
View File

@ -42,7 +42,6 @@ keras_packages = [
"tensorflow.python.keras.datasets.mnist",
"tensorflow.python.keras.datasets.reuters",
"tensorflow.python.keras.engine.base_layer",
"tensorflow.python.keras.engine.base_layer_v1",
"tensorflow.python.keras.engine.input_layer",
"tensorflow.python.keras.engine.input_spec",
"tensorflow.python.keras.engine.sequential",

3
tensorflow/python/keras/engine/base_layer.py
View File

@ -93,8 +93,7 @@ _keras_model_gauge = monitoring.BoolGauge(
'/tensorflow/api/keras/premade_models', 'premade keras model usage', 'type')
# pylint: disable=g-classes-have-attributes
@keras_export('keras.layers.Layer', v1=[])
@keras_export('keras.layers.Layer')
class Layer(module.Module, version_utils.LayerVersionSelector):
"""This is the class from which all layers inherit.

2
tensorflow/python/keras/engine/base_layer_v1.py
View File

@ -71,12 +71,10 @@ from tensorflow.python.util import deprecation
from tensorflow.python.util import nest
from tensorflow.python.util import object_identity
from tensorflow.python.util import tf_inspect
from tensorflow.python.util.tf_export import keras_export
from tensorflow.tools.docs import doc_controls
# pylint: disable=g-classes-have-attributes
@keras_export(v1=['keras.layers.Layer'])
class Layer(base_layer.Layer):
"""Base layer class.

3
tensorflow/python/keras/engine/training.py
View File

@ -96,8 +96,7 @@ def disable_multi_worker(method):
target=method, decorator_func=_method_wrapper)
# pylint: disable=g-classes-have-attributes
@keras_export('keras.Model', 'keras.models.Model', v1=[])
@keras_export('keras.Model', 'keras.models.Model')
class Model(network.Network, version_utils.ModelVersionSelector):
"""`Model` groups layers into an object with training and inference features.

2
tensorflow/python/keras/engine/training_v1.py
View File

@ -65,7 +65,6 @@ from tensorflow.python.util import deprecation
from tensorflow.python.util import nest
from tensorflow.python.util import tf_inspect
from tensorflow.python.util.compat import collections_abc
from tensorflow.python.util.tf_export import keras_export
try:
from scipy.sparse import issparse # pylint: disable=g-import-not-at-top
@ -76,7 +75,6 @@ _keras_api_gauge = monitoring.BoolGauge('/tensorflow/api/keras/model_v1',
'keras model v1 usage', 'method')
@keras_export(v1=['keras.Model', 'keras.models.Model'])
class Model(training_lib.Model):
"""`Model` groups layers into an object with training and inference features.

15
tensorflow/tools/api/golden/v1/tensorflow.keras.-model.pbtxt
View File

@ -1,6 +1,5 @@
path: "tensorflow.keras.Model"
tf_class {
is_instance: "<class \'tensorflow.python.keras.engine.training_v1.Model\'>"
is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
is_instance: "<class \'tensorflow.python.keras.engine.network.Network\'>"
is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
@ -98,10 +97,6 @@ tf_class {
name: "run_eagerly"
mtype: "<type \'property\'>"
}
member {
name: "sample_weights"
mtype: "<type \'property\'>"
}
member {
name: "state_updates"
mtype: "<type \'property\'>"
@ -176,7 +171,7 @@ tf_class {
}
member_method {
name: "compile"
argspec: "args=[\'self\', \'optimizer\', \'loss\', \'metrics\', \'loss_weights\', \'sample_weight_mode\', \'weighted_metrics\', \'target_tensors\', \'distribute\'], varargs=None, keywords=kwargs, defaults=[\'rmsprop\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
argspec: "args=[\'self\', \'optimizer\', \'loss\', \'metrics\', \'loss_weights\', \'weighted_metrics\', \'run_eagerly\'], varargs=None, keywords=kwargs, defaults=[\'rmsprop\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
}
member_method {
name: "compute_mask"
@ -196,7 +191,7 @@ tf_class {
}
member_method {
name: "evaluate"
argspec: "args=[\'self\', \'x\', \'y\', \'batch_size\', \'verbose\', \'sample_weight\', \'steps\', \'callbacks\', \'max_queue_size\', \'workers\', \'use_multiprocessing\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'1\', \'None\', \'None\', \'None\', \'10\', \'1\', \'False\'], "
argspec: "args=[\'self\', \'x\', \'y\', \'batch_size\', \'verbose\', \'sample_weight\', \'steps\', \'callbacks\', \'max_queue_size\', \'workers\', \'use_multiprocessing\', \'return_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'1\', \'None\', \'None\', \'None\', \'10\', \'1\', \'False\', \'False\'], "
}
member_method {
name: "evaluate_generator"
@ -204,7 +199,7 @@ tf_class {
}
member_method {
name: "fit"
argspec: "args=[\'self\', \'x\', \'y\', \'batch_size\', \'epochs\', \'verbose\', \'callbacks\', \'validation_split\', \'validation_data\', \'shuffle\', \'class_weight\', \'sample_weight\', \'initial_epoch\', \'steps_per_epoch\', \'validation_steps\', \'validation_freq\', \'max_queue_size\', \'workers\', \'use_multiprocessing\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'None\', \'None\', \'1\', \'1\', \'None\', \'0.0\', \'None\', \'True\', \'None\', \'None\', \'0\', \'None\', \'None\', \'1\', \'10\', \'1\', \'False\'], "
argspec: "args=[\'self\', \'x\', \'y\', \'batch_size\', \'epochs\', \'verbose\', \'callbacks\', \'validation_split\', \'validation_data\', \'shuffle\', \'class_weight\', \'sample_weight\', \'initial_epoch\', \'steps_per_epoch\', \'validation_steps\', \'validation_batch_size\', \'validation_freq\', \'max_queue_size\', \'workers\', \'use_multiprocessing\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'None\', \'None\', \'1\', \'1\', \'None\', \'0.0\', \'None\', \'True\', \'None\', \'None\', \'0\', \'None\', \'None\', \'None\', \'1\', \'10\', \'1\', \'False\'], "
}
member_method {
name: "fit_generator"
@ -316,7 +311,7 @@ tf_class {
}
member_method {
name: "test_on_batch"
argspec: "args=[\'self\', \'x\', \'y\', \'sample_weight\', \'reset_metrics\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\'], "
argspec: "args=[\'self\', \'x\', \'y\', \'sample_weight\', \'reset_metrics\', \'return_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'False\'], "
}
member_method {
name: "test_step"
@ -332,7 +327,7 @@ tf_class {
}
member_method {
name: "train_on_batch"
argspec: "args=[\'self\', \'x\', \'y\', \'sample_weight\', \'class_weight\', \'reset_metrics\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'True\'], "
argspec: "args=[\'self\', \'x\', \'y\', \'sample_weight\', \'class_weight\', \'reset_metrics\', \'return_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'True\', \'False\'], "
}
member_method {
name: "train_step"

3
tensorflow/tools/api/golden/v1/tensorflow.keras.layers.-layer.pbtxt
View File

@ -1,6 +1,5 @@
path: "tensorflow.keras.layers.Layer"
tf_class {
is_instance: "<class \'tensorflow.python.keras.engine.base_layer_v1.Layer\'>"
is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
is_instance: "<class \'tensorflow.python.module.module.Module\'>"
is_instance: "<class \'tensorflow.python.training.tracking.tracking.AutoTrackable\'>"
@ -121,7 +120,7 @@ tf_class {
}
member_method {
name: "add_metric"
argspec: "args=[\'self\', \'value\', \'aggregation\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'None\'], "
argspec: "args=[\'self\', \'value\', \'name\'], varargs=None, keywords=kwargs, defaults=[\'None\'], "
}
member_method {
name: "add_update"

15
tensorflow/tools/api/golden/v1/tensorflow.keras.models.-model.pbtxt
View File

@ -1,6 +1,5 @@
path: "tensorflow.keras.models.Model"
tf_class {
is_instance: "<class \'tensorflow.python.keras.engine.training_v1.Model\'>"
is_instance: "<class \'tensorflow.python.keras.engine.training.Model\'>"
is_instance: "<class \'tensorflow.python.keras.engine.network.Network\'>"
is_instance: "<class \'tensorflow.python.keras.engine.base_layer.Layer\'>"
@ -98,10 +97,6 @@ tf_class {
name: "run_eagerly"
mtype: "<type \'property\'>"
}
member {
name: "sample_weights"
mtype: "<type \'property\'>"
}
member {
name: "state_updates"
mtype: "<type \'property\'>"
@ -176,7 +171,7 @@ tf_class {
}
member_method {
name: "compile"
argspec: "args=[\'self\', \'optimizer\', \'loss\', \'metrics\', \'loss_weights\', \'sample_weight_mode\', \'weighted_metrics\', \'target_tensors\', \'distribute\'], varargs=None, keywords=kwargs, defaults=[\'rmsprop\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
argspec: "args=[\'self\', \'optimizer\', \'loss\', \'metrics\', \'loss_weights\', \'weighted_metrics\', \'run_eagerly\'], varargs=None, keywords=kwargs, defaults=[\'rmsprop\', \'None\', \'None\', \'None\', \'None\', \'None\'], "
}
member_method {
name: "compute_mask"
@ -196,7 +191,7 @@ tf_class {
}
member_method {
name: "evaluate"
argspec: "args=[\'self\', \'x\', \'y\', \'batch_size\', \'verbose\', \'sample_weight\', \'steps\', \'callbacks\', \'max_queue_size\', \'workers\', \'use_multiprocessing\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'1\', \'None\', \'None\', \'None\', \'10\', \'1\', \'False\'], "
argspec: "args=[\'self\', \'x\', \'y\', \'batch_size\', \'verbose\', \'sample_weight\', \'steps\', \'callbacks\', \'max_queue_size\', \'workers\', \'use_multiprocessing\', \'return_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'1\', \'None\', \'None\', \'None\', \'10\', \'1\', \'False\', \'False\'], "
}
member_method {
name: "evaluate_generator"
@ -204,7 +199,7 @@ tf_class {
}
member_method {
name: "fit"
argspec: "args=[\'self\', \'x\', \'y\', \'batch_size\', \'epochs\', \'verbose\', \'callbacks\', \'validation_split\', \'validation_data\', \'shuffle\', \'class_weight\', \'sample_weight\', \'initial_epoch\', \'steps_per_epoch\', \'validation_steps\', \'validation_freq\', \'max_queue_size\', \'workers\', \'use_multiprocessing\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'None\', \'None\', \'1\', \'1\', \'None\', \'0.0\', \'None\', \'True\', \'None\', \'None\', \'0\', \'None\', \'None\', \'1\', \'10\', \'1\', \'False\'], "
argspec: "args=[\'self\', \'x\', \'y\', \'batch_size\', \'epochs\', \'verbose\', \'callbacks\', \'validation_split\', \'validation_data\', \'shuffle\', \'class_weight\', \'sample_weight\', \'initial_epoch\', \'steps_per_epoch\', \'validation_steps\', \'validation_batch_size\', \'validation_freq\', \'max_queue_size\', \'workers\', \'use_multiprocessing\'], varargs=None, keywords=kwargs, defaults=[\'None\', \'None\', \'None\', \'1\', \'1\', \'None\', \'0.0\', \'None\', \'True\', \'None\', \'None\', \'0\', \'None\', \'None\', \'None\', \'1\', \'10\', \'1\', \'False\'], "
}
member_method {
name: "fit_generator"
@ -316,7 +311,7 @@ tf_class {
}
member_method {
name: "test_on_batch"
argspec: "args=[\'self\', \'x\', \'y\', \'sample_weight\', \'reset_metrics\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\'], "
argspec: "args=[\'self\', \'x\', \'y\', \'sample_weight\', \'reset_metrics\', \'return_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'True\', \'False\'], "
}
member_method {
name: "test_step"
@ -332,7 +327,7 @@ tf_class {
}
member_method {
name: "train_on_batch"
argspec: "args=[\'self\', \'x\', \'y\', \'sample_weight\', \'class_weight\', \'reset_metrics\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'True\'], "
argspec: "args=[\'self\', \'x\', \'y\', \'sample_weight\', \'class_weight\', \'reset_metrics\', \'return_dict\'], varargs=None, keywords=None, defaults=[\'None\', \'None\', \'None\', \'True\', \'False\'], "
}
member_method {
name: "train_step"