From 86afd7efc8b7de5296169a808b10b85e40768c17 Mon Sep 17 00:00:00 2001
From: Katherine Wu <kathywu@google.com>
Date: Fri, 5 Apr 2019 11:55:50 -0700
Subject: [PATCH] Swap Estimator V1 and V2 so that Estimator V1 contains all of
the old method definitions.
Previously any new methods and modifications added to EstimatorV2 would also get attached to EstimatorV1 (because EstimatorV1 inherited from V2). This would have become problematic as development on EstimatorV2 continued, because compat V1 behavior/API should remain the same.
PiperOrigin-RevId: 242166024
---
tensorflow/python/tpu/tpu_estimator.py | 9 ++++++---
.../v1/tensorflow.estimator.-baseline-classifier.pbtxt | 1 -
.../v1/tensorflow.estimator.-baseline-estimator.pbtxt | 1 -
.../v1/tensorflow.estimator.-baseline-regressor.pbtxt | 1 -
.../tensorflow.estimator.-boosted-trees-classifier.pbtxt | 1 -
.../tensorflow.estimator.-boosted-trees-estimator.pbtxt | 1 -
.../tensorflow.estimator.-boosted-trees-regressor.pbtxt | 1 -
.../v1/tensorflow.estimator.-d-n-n-classifier.pbtxt | 1 -
.../v1/tensorflow.estimator.-d-n-n-estimator.pbtxt | 1 -
...low.estimator.-d-n-n-linear-combined-classifier.pbtxt | 1 -
...flow.estimator.-d-n-n-linear-combined-estimator.pbtxt | 1 -
...flow.estimator.-d-n-n-linear-combined-regressor.pbtxt | 1 -
.../v1/tensorflow.estimator.-d-n-n-regressor.pbtxt | 1 -
.../api/golden/v1/tensorflow.estimator.-estimator.pbtxt | 1 -
.../v1/tensorflow.estimator.-linear-classifier.pbtxt | 1 -
.../v1/tensorflow.estimator.-linear-estimator.pbtxt | 1 -
.../v1/tensorflow.estimator.-linear-regressor.pbtxt | 1 -
.../v1/tensorflow.estimator.experimental.-k-means.pbtxt | 1 -
.../v2/tensorflow.estimator.-baseline-classifier.pbtxt | 1 +
.../v2/tensorflow.estimator.-baseline-estimator.pbtxt | 1 +
.../v2/tensorflow.estimator.-baseline-regressor.pbtxt | 1 +
.../tensorflow.estimator.-boosted-trees-classifier.pbtxt | 1 -
.../tensorflow.estimator.-boosted-trees-estimator.pbtxt | 1 -
.../tensorflow.estimator.-boosted-trees-regressor.pbtxt | 1 -
.../v2/tensorflow.estimator.-d-n-n-classifier.pbtxt | 1 +
.../v2/tensorflow.estimator.-d-n-n-estimator.pbtxt | 1 +
...low.estimator.-d-n-n-linear-combined-classifier.pbtxt | 1 +
...flow.estimator.-d-n-n-linear-combined-estimator.pbtxt | 1 +
...flow.estimator.-d-n-n-linear-combined-regressor.pbtxt | 1 +
.../v2/tensorflow.estimator.-d-n-n-regressor.pbtxt | 1 +
.../api/golden/v2/tensorflow.estimator.-estimator.pbtxt | 1 +
.../v2/tensorflow.estimator.-linear-classifier.pbtxt | 1 +
.../v2/tensorflow.estimator.-linear-estimator.pbtxt | 1 +
.../v2/tensorflow.estimator.-linear-regressor.pbtxt | 1 +
34 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/tensorflow/python/tpu/tpu_estimator.py b/tensorflow/python/tpu/tpu_estimator.py
index c096e7b521e..7379f351a46 100644
--- a/tensorflow/python/tpu/tpu_estimator.py
+++ b/tensorflow/python/tpu/tpu_estimator.py
@@ -2403,7 +2403,8 @@ class TPUEstimator(estimator_lib.Estimator):
save_variables=True,
mode=model_fn_lib.ModeKeys.PREDICT,
export_tags=None,
- check_variables=True):
+ check_variables=True,
+ strip_default_attrs=True):
if self._export_to_tpu and mode != model_fn_lib.ModeKeys.PREDICT:
logging.warning('TPUEstimator only handles mode PREDICT for exporting '
'when `export_to_tpu` is `True`; Mode {} will be ignored '
@@ -2420,7 +2421,8 @@ class TPUEstimator(estimator_lib.Estimator):
save_variables,
mode=mode,
export_tags=export_tags,
- check_variables=check_variables))
+ check_variables=check_variables,
+ strip_default_attrs=strip_default_attrs))
if self._export_to_tpu and mode == model_fn_lib.ModeKeys.PREDICT:
input_receiver_fn_map = {
@@ -2441,7 +2443,8 @@ class TPUEstimator(estimator_lib.Estimator):
save_variables=save_variables,
mode=mode,
export_tags=export_tags,
- check_variables=check_variables))
+ check_variables=check_variables,
+ strip_default_attrs=strip_default_attrs))
def _call_model_fn(self, features, labels, mode, config):
if mode == _REWRITE_FOR_INFERENCE_MODE:
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-baseline-classifier.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-baseline-classifier.pbtxt
index ee3a72bfce7..63e86d91a22 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-baseline-classifier.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-baseline-classifier.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.BaselineClassifier"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.baseline.BaselineClassifier\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-baseline-estimator.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-baseline-estimator.pbtxt
index 38b27f735ff..5cf47a16be0 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-baseline-estimator.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-baseline-estimator.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.BaselineEstimator"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.baseline.BaselineEstimator\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-baseline-regressor.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-baseline-regressor.pbtxt
index 3874b84d5a6..392b10e94e7 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-baseline-regressor.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-baseline-regressor.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.BaselineRegressor"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.baseline.BaselineRegressor\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-boosted-trees-classifier.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-boosted-trees-classifier.pbtxt
index 216854587d6..a2efe9a204c 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-boosted-trees-classifier.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-boosted-trees-classifier.pbtxt
@@ -3,7 +3,6 @@ tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.boosted_trees.BoostedTreesClassifier\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.boosted_trees._BoostedTreesBase\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-boosted-trees-estimator.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-boosted-trees-estimator.pbtxt
index 0fdbecb8856..72907b7459e 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-boosted-trees-estimator.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-boosted-trees-estimator.pbtxt
@@ -3,7 +3,6 @@ tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.boosted_trees.BoostedTreesEstimator\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.boosted_trees._BoostedTreesBase\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-boosted-trees-regressor.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-boosted-trees-regressor.pbtxt
index 25d021ad8de..e9ba13c4345 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-boosted-trees-regressor.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-boosted-trees-regressor.pbtxt
@@ -3,7 +3,6 @@ tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.boosted_trees.BoostedTreesRegressor\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.boosted_trees._BoostedTreesBase\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-classifier.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-classifier.pbtxt
index b54133b294e..0124eb4df88 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-classifier.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-classifier.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.DNNClassifier"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.dnn.DNNClassifier\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-estimator.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-estimator.pbtxt
index 09e0d381924..14a38869f09 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-estimator.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-estimator.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.DNNEstimator"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.dnn.DNNEstimator\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-linear-combined-classifier.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-linear-combined-classifier.pbtxt
index 5a1d85a9b10..0f8f5cd6f94 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-linear-combined-classifier.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-linear-combined-classifier.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.DNNLinearCombinedClassifier"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.dnn_linear_combined.DNNLinearCombinedClassifier\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-linear-combined-estimator.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-linear-combined-estimator.pbtxt
index e311f96d3dc..0d47eb3a7c8 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-linear-combined-estimator.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-linear-combined-estimator.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.DNNLinearCombinedEstimator"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.dnn_linear_combined.DNNLinearCombinedEstimator\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-linear-combined-regressor.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-linear-combined-regressor.pbtxt
index db4780e4c01..0915b116dc6 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-linear-combined-regressor.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-linear-combined-regressor.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.DNNLinearCombinedRegressor"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.dnn_linear_combined.DNNLinearCombinedRegressor\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-regressor.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-regressor.pbtxt
index a44e719099e..9b99bbed340 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-regressor.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-d-n-n-regressor.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.DNNRegressor"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.dnn.DNNRegressor\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-estimator.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-estimator.pbtxt
index bff6c86cd75..78058dccd10 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-estimator.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-estimator.pbtxt
@@ -1,7 +1,6 @@
path: "tensorflow.estimator.Estimator"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-linear-classifier.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-linear-classifier.pbtxt
index 2c8e82517be..5862a8a5123 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-linear-classifier.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-linear-classifier.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.LinearClassifier"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.linear.LinearClassifier\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-linear-estimator.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-linear-estimator.pbtxt
index 2148374fdee..b59d695214d 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-linear-estimator.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-linear-estimator.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.LinearEstimator"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.linear.LinearEstimator\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-linear-regressor.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-linear-regressor.pbtxt
index 1bdc6124fe9..62fe43d249b 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.-linear-regressor.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.-linear-regressor.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.LinearRegressor"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.linear.LinearRegressor\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v1/tensorflow.estimator.experimental.-k-means.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.estimator.experimental.-k-means.pbtxt
index fd425e46dbd..670aa40b0c8 100644
--- a/tensorflow/tools/api/golden/v1/tensorflow.estimator.experimental.-k-means.pbtxt
+++ b/tensorflow/tools/api/golden/v1/tensorflow.estimator.experimental.-k-means.pbtxt
@@ -2,7 +2,6 @@ path: "tensorflow.estimator.experimental.KMeans"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.kmeans.KMeansClustering\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "ALL_DISTANCES"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-baseline-classifier.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-baseline-classifier.pbtxt
index 13d77d9f5b8..0672d29cab2 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-baseline-classifier.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-baseline-classifier.pbtxt
@@ -2,6 +2,7 @@ path: "tensorflow.estimator.BaselineClassifier"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.baseline.BaselineClassifierV2\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-baseline-estimator.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-baseline-estimator.pbtxt
index 382d392f39e..5ba9a42e959 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-baseline-estimator.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-baseline-estimator.pbtxt
@@ -2,6 +2,7 @@ path: "tensorflow.estimator.BaselineEstimator"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.baseline.BaselineEstimatorV2\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-baseline-regressor.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-baseline-regressor.pbtxt
index 7e33a210596..f16b8ebf187 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-baseline-regressor.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-baseline-regressor.pbtxt
@@ -2,6 +2,7 @@ path: "tensorflow.estimator.BaselineRegressor"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.baseline.BaselineRegressorV2\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-boosted-trees-classifier.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-boosted-trees-classifier.pbtxt
index 216854587d6..a2efe9a204c 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-boosted-trees-classifier.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-boosted-trees-classifier.pbtxt
@@ -3,7 +3,6 @@ tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.boosted_trees.BoostedTreesClassifier\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.boosted_trees._BoostedTreesBase\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-boosted-trees-estimator.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-boosted-trees-estimator.pbtxt
index 0fdbecb8856..72907b7459e 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-boosted-trees-estimator.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-boosted-trees-estimator.pbtxt
@@ -3,7 +3,6 @@ tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.boosted_trees.BoostedTreesEstimator\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.boosted_trees._BoostedTreesBase\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-boosted-trees-regressor.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-boosted-trees-regressor.pbtxt
index 25d021ad8de..e9ba13c4345 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-boosted-trees-regressor.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-boosted-trees-regressor.pbtxt
@@ -3,7 +3,6 @@ tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.boosted_trees.BoostedTreesRegressor\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.boosted_trees._BoostedTreesBase\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
- is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-classifier.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-classifier.pbtxt
index a4e9b564233..a38291cc5be 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-classifier.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-classifier.pbtxt
@@ -2,6 +2,7 @@ path: "tensorflow.estimator.DNNClassifier"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.dnn.DNNClassifierV2\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-estimator.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-estimator.pbtxt
index cfb49257c48..12a9d227afd 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-estimator.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-estimator.pbtxt
@@ -2,6 +2,7 @@ path: "tensorflow.estimator.DNNEstimator"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.dnn.DNNEstimatorV2\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-linear-combined-classifier.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-linear-combined-classifier.pbtxt
index 89029a2b79d..86a117daf75 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-linear-combined-classifier.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-linear-combined-classifier.pbtxt
@@ -2,6 +2,7 @@ path: "tensorflow.estimator.DNNLinearCombinedClassifier"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.dnn_linear_combined.DNNLinearCombinedClassifierV2\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-linear-combined-estimator.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-linear-combined-estimator.pbtxt
index d81054233a8..b3dc14f7fe3 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-linear-combined-estimator.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-linear-combined-estimator.pbtxt
@@ -2,6 +2,7 @@ path: "tensorflow.estimator.DNNLinearCombinedEstimator"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.dnn_linear_combined.DNNLinearCombinedEstimatorV2\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-linear-combined-regressor.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-linear-combined-regressor.pbtxt
index a158cd037eb..dd659b42980 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-linear-combined-regressor.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-linear-combined-regressor.pbtxt
@@ -2,6 +2,7 @@ path: "tensorflow.estimator.DNNLinearCombinedRegressor"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.dnn_linear_combined.DNNLinearCombinedRegressorV2\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-regressor.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-regressor.pbtxt
index cb6c88203a5..f293a1d8500 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-regressor.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-d-n-n-regressor.pbtxt
@@ -2,6 +2,7 @@ path: "tensorflow.estimator.DNNRegressor"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.dnn.DNNRegressorV2\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-estimator.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-estimator.pbtxt
index a1f0e76c8b8..6f44133417e 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-estimator.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-estimator.pbtxt
@@ -1,6 +1,7 @@
path: "tensorflow.estimator.Estimator"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-linear-classifier.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-linear-classifier.pbtxt
index 5c0e8f5a894..5c157b4db8e 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-linear-classifier.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-linear-classifier.pbtxt
@@ -2,6 +2,7 @@ path: "tensorflow.estimator.LinearClassifier"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.linear.LinearClassifierV2\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-linear-estimator.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-linear-estimator.pbtxt
index e562bf1c576..742a095820b 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-linear-estimator.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-linear-estimator.pbtxt
@@ -2,6 +2,7 @@ path: "tensorflow.estimator.LinearEstimator"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.linear.LinearEstimatorV2\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"
diff --git a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-linear-regressor.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-linear-regressor.pbtxt
index 5df93619a7d..bdeb2a80396 100644
--- a/tensorflow/tools/api/golden/v2/tensorflow.estimator.-linear-regressor.pbtxt
+++ b/tensorflow/tools/api/golden/v2/tensorflow.estimator.-linear-regressor.pbtxt
@@ -2,6 +2,7 @@ path: "tensorflow.estimator.LinearRegressor"
tf_class {
is_instance: "<class \'tensorflow_estimator.python.estimator.canned.linear.LinearRegressorV2\'>"
is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.EstimatorV2\'>"
+ is_instance: "<class \'tensorflow_estimator.python.estimator.estimator.Estimator\'>"
is_instance: "<type \'object\'>"
member {
name: "config"