Add flags for output dir in saved_model_half_plus_two.py. Remove static Saved Model of half plus two and its dependency.

Change: 140441828

10 files changed, 4 insertions, 1964 deletions

diff --git a/tensorflow/cc/saved_model/BUILD b/tensorflow/cc/saved_model/BUILD
index 90c87210b1..bfa1386d96 100644
--- a/tensorflow/cc/saved_model/BUILD
+++ b/tensorflow/cc/saved_model/BUILD
@@ -45,7 +45,7 @@ tf_cc_test(
     name = "loader_test",
     srcs = ["loader_test.cc"],
     data = [
-        ":saved_model_half_plus_two",
+        "//tensorflow/python/saved_model/example:saved_model_half_plus_two_data",
     ],
     linkstatic = 1,
     deps = [
@@ -61,14 +61,6 @@ tf_cc_test(
     ],
 )
 
-filegroup(
-    name = "saved_model_half_plus_two",
-    srcs = glob([
-        "testdata/half_plus_two_pbtxt/**",
-        "testdata/half_plus_two_sharded/**",
-    ]),
-)
-
 # -----------------------------------------------------------------------------
 # Google-internal targets.
 
diff --git a/tensorflow/cc/saved_model/loader_test.cc b/tensorflow/cc/saved_model/loader_test.cc
index 82f30c23f6..dbbcc79802 100644
--- a/tensorflow/cc/saved_model/loader_test.cc
+++ b/tensorflow/cc/saved_model/loader_test.cc
@@ -29,9 +29,10 @@ limitations under the License.
 namespace tensorflow {
 namespace {
 
-constexpr char kTestDataPbTxt[] = "cc/saved_model/testdata/half_plus_two_pbtxt";
+constexpr char kTestDataPbTxt[] =
+    "python/saved_model/example/saved_model_half_plus_two_pbtxt/00000123";
 constexpr char kTestDataSharded[] =
-    "cc/saved_model/testdata/half_plus_two_sharded";
+    "python/saved_model/example/saved_model_half_plus_two/00000123";
 
 class LoaderTest : public ::testing::Test {
  protected:
diff --git a/tensorflow/cc/saved_model/testdata/half_plus_two_pbtxt/assets/foo.txt b/tensorflow/cc/saved_model/testdata/half_plus_two_pbtxt/assets/foo.txt
deleted file mode 100644
index f9ff036688..0000000000
--- a/tensorflow/cc/saved_model/testdata/half_plus_two_pbtxt/assets/foo.txt
+++ /dev/null
@@ -1 +0,0 @@
-asset-file-contents
\ No newline at end of file
diff --git a/tensorflow/cc/saved_model/testdata/half_plus_two_pbtxt/saved_model.pbtxt b/tensorflow/cc/saved_model/testdata/half_plus_two_pbtxt/saved_model.pbtxt
deleted file mode 100644
index 693262eb4d..0000000000
--- a/tensorflow/cc/saved_model/testdata/half_plus_two_pbtxt/saved_model.pbtxt
+++ /dev/null
@@ -1,1951 +0,0 @@
-saved_model_schema_version: 1
-meta_graphs {
-  meta_info_def {
-    stripped_op_list {
-      op {
-        name: "Add"
-        input_arg {
-          name: "x"
-          type_attr: "T"
-        }
-        input_arg {
-          name: "y"
-          type_attr: "T"
-        }
-        output_arg {
-          name: "z"
-          type_attr: "T"
-        }
-        attr {
-          name: "T"
-          type: "type"
-          allowed_values {
-            list {
-              type: DT_HALF
-              type: DT_FLOAT
-              type: DT_DOUBLE
-              type: DT_UINT8
-              type: DT_INT8
-              type: DT_INT16
-              type: DT_INT32
-              type: DT_INT64
-              type: DT_COMPLEX64
-              type: DT_COMPLEX128
-              type: DT_STRING
-            }
-          }
-        }
-      }
-      op {
-        name: "Assign"
-        input_arg {
-          name: "ref"
-          type_attr: "T"
-          is_ref: true
-        }
-        input_arg {
-          name: "value"
-          type_attr: "T"
-        }
-        output_arg {
-          name: "output_ref"
-          type_attr: "T"
-          is_ref: true
-        }
-        attr {
-          name: "T"
-          type: "type"
-        }
-        attr {
-          name: "validate_shape"
-          type: "bool"
-          default_value {
-            b: true
-          }
-        }
-        attr {
-          name: "use_locking"
-          type: "bool"
-          default_value {
-            b: true
-          }
-        }
-        allows_uninitialized_input: true
-      }
-      op {
-        name: "Const"
-        output_arg {
-          name: "output"
-          type_attr: "dtype"
-        }
-        attr {
-          name: "value"
-          type: "tensor"
-        }
-        attr {
-          name: "dtype"
-          type: "type"
-        }
-      }
-      op {
-        name: "Identity"
-        input_arg {
-          name: "input"
-          type_attr: "T"
-        }
-        output_arg {
-          name: "output"
-          type_attr: "T"
-        }
-        attr {
-          name: "T"
-          type: "type"
-        }
-      }
-      op {
-        name: "MergeV2Checkpoints"
-        input_arg {
-          name: "checkpoint_prefixes"
-          type: DT_STRING
-        }
-        input_arg {
-          name: "destination_prefix"
-          type: DT_STRING
-        }
-        attr {
-          name: "delete_old_dirs"
-          type: "bool"
-          default_value {
-            b: true
-          }
-        }
-      }
-      op {
-        name: "Mul"
-        input_arg {
-          name: "x"
-          type_attr: "T"
-        }
-        input_arg {
-          name: "y"
-          type_attr: "T"
-        }
-        output_arg {
-          name: "z"
-          type_attr: "T"
-        }
-        attr {
-          name: "T"
-          type: "type"
-          allowed_values {
-            list {
-              type: DT_HALF
-              type: DT_FLOAT
-              type: DT_DOUBLE
-              type: DT_UINT8
-              type: DT_INT8
-              type: DT_UINT16
-              type: DT_INT16
-              type: DT_INT32
-              type: DT_INT64
-              type: DT_COMPLEX64
-              type: DT_COMPLEX128
-            }
-          }
-        }
-        is_commutative: true
-      }
-      op {
-        name: "NoOp"
-      }
-      op {
-        name: "Pack"
-        input_arg {
-          name: "values"
-          type_attr: "T"
-          number_attr: "N"
-        }
-        output_arg {
-          name: "output"
-          type_attr: "T"
-        }
-        attr {
-          name: "N"
-          type: "int"
-          has_minimum: true
-          minimum: 1
-        }
-        attr {
-          name: "T"
-          type: "type"
-        }
-        attr {
-          name: "axis"
-          type: "int"
-          default_value {
-            i: 0
-          }
-        }
-      }
-      op {
-        name: "ParseExample"
-        input_arg {
-          name: "serialized"
-          type: DT_STRING
-        }
-        input_arg {
-          name: "names"
-          type: DT_STRING
-        }
-        input_arg {
-          name: "sparse_keys"
-          type: DT_STRING
-          number_attr: "Nsparse"
-        }
-        input_arg {
-          name: "dense_keys"
-          type: DT_STRING
-          number_attr: "Ndense"
-        }
-        input_arg {
-          name: "dense_defaults"
-          type_list_attr: "Tdense"
-        }
-        output_arg {
-          name: "sparse_indices"
-          type: DT_INT64
-          number_attr: "Nsparse"
-        }
-        output_arg {
-          name: "sparse_values"
-          type_list_attr: "sparse_types"
-        }
-        output_arg {
-          name: "sparse_shapes"
-          type: DT_INT64
-          number_attr: "Nsparse"
-        }
-        output_arg {
-          name: "dense_values"
-          type_list_attr: "Tdense"
-        }
-        attr {
-          name: "Nsparse"
-          type: "int"
-          has_minimum: true
-        }
-        attr {
-          name: "Ndense"
-          type: "int"
-          has_minimum: true
-        }
-        attr {
-          name: "sparse_types"
-          type: "list(type)"
-          has_minimum: true
-          allowed_values {
-            list {
-              type: DT_FLOAT
-              type: DT_INT64
-              type: DT_STRING
-            }
-          }
-        }
-        attr {
-          name: "Tdense"
-          type: "list(type)"
-          has_minimum: true
-          allowed_values {
-            list {
-              type: DT_FLOAT
-              type: DT_INT64
-              type: DT_STRING
-            }
-          }
-        }
-        attr {
-          name: "dense_shapes"
-          type: "list(shape)"
-          has_minimum: true
-        }
-      }
-      op {
-        name: "Placeholder"
-        output_arg {
-          name: "output"
-          type_attr: "dtype"
-        }
-        attr {
-          name: "dtype"
-          type: "type"
-        }
-        attr {
-          name: "shape"
-          type: "shape"
-          default_value {
-            shape {
-            }
-          }
-        }
-      }
-      op {
-        name: "RestoreV2"
-        input_arg {
-          name: "prefix"
-          type: DT_STRING
-        }
-        input_arg {
-          name: "tensor_names"
-          type: DT_STRING
-        }
-        input_arg {
-          name: "shape_and_slices"
-          type: DT_STRING
-        }
-        output_arg {
-          name: "tensors"
-          type_list_attr: "dtypes"
-        }
-        attr {
-          name: "dtypes"
-          type: "list(type)"
-          has_minimum: true
-          minimum: 1
-        }
-      }
-      op {
-        name: "SaveV2"
-        input_arg {
-          name: "prefix"
-          type: DT_STRING
-        }
-        input_arg {
-          name: "tensor_names"
-          type: DT_STRING
-        }
-        input_arg {
-          name: "shape_and_slices"
-          type: DT_STRING
-        }
-        input_arg {
-          name: "tensors"
-          type_list_attr: "dtypes"
-        }
-        attr {
-          name: "dtypes"
-          type: "list(type)"
-          has_minimum: true
-          minimum: 1
-        }
-      }
-      op {
-        name: "ShardedFilename"
-        input_arg {
-          name: "basename"
-          type: DT_STRING
-        }
-        input_arg {
-          name: "shard"
-          type: DT_INT32
-        }
-        input_arg {
-          name: "num_shards"
-          type: DT_INT32
-        }
-        output_arg {
-          name: "filename"
-          type: DT_STRING
-        }
-      }
-      op {
-        name: "StringJoin"
-        input_arg {
-          name: "inputs"
-          type: DT_STRING
-          number_attr: "N"
-        }
-        output_arg {
-          name: "output"
-          type: DT_STRING
-        }
-        attr {
-          name: "N"
-          type: "int"
-          has_minimum: true
-          minimum: 1
-        }
-        attr {
-          name: "separator"
-          type: "string"
-          default_value {
-            s: ""
-          }
-        }
-      }
-      op {
-        name: "Variable"
-        output_arg {
-          name: "ref"
-          type_attr: "dtype"
-          is_ref: true
-        }
-        attr {
-          name: "shape"
-          type: "shape"
-        }
-        attr {
-          name: "dtype"
-          type: "type"
-        }
-        attr {
-          name: "container"
-          type: "string"
-          default_value {
-            s: ""
-          }
-        }
-        attr {
-          name: "shared_name"
-          type: "string"
-          default_value {
-            s: ""
-          }
-        }
-        is_stateful: true
-      }
-    }
-    tags: "serve"
-  }
-  graph_def {
-    node {
-      name: "a/initial_value"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_FLOAT
-            tensor_shape {
-            }
-            float_val: 0.5
-          }
-        }
-      }
-    }
-    node {
-      name: "a"
-      op: "Variable"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "container"
-        value {
-          s: ""
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-          }
-        }
-      }
-      attr {
-        key: "shared_name"
-        value {
-          s: ""
-        }
-      }
-    }
-    node {
-      name: "a/Assign"
-      op: "Assign"
-      input: "a"
-      input: "a/initial_value"
-      attr {
-        key: "T"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "_class"
-        value {
-          list {
-            s: "loc:@a"
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "use_locking"
-        value {
-          b: true
-        }
-      }
-      attr {
-        key: "validate_shape"
-        value {
-          b: true
-        }
-      }
-    }
-    node {
-      name: "a/read"
-      op: "Identity"
-      input: "a"
-      attr {
-        key: "T"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "_class"
-        value {
-          list {
-            s: "loc:@a"
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "b/initial_value"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_FLOAT
-            tensor_shape {
-            }
-            float_val: 2.0
-          }
-        }
-      }
-    }
-    node {
-      name: "b"
-      op: "Variable"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "container"
-        value {
-          s: ""
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-          }
-        }
-      }
-      attr {
-        key: "shared_name"
-        value {
-          s: ""
-        }
-      }
-    }
-    node {
-      name: "b/Assign"
-      op: "Assign"
-      input: "b"
-      input: "b/initial_value"
-      attr {
-        key: "T"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "_class"
-        value {
-          list {
-            s: "loc:@b"
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "use_locking"
-        value {
-          b: true
-        }
-      }
-      attr {
-        key: "validate_shape"
-        value {
-          b: true
-        }
-      }
-    }
-    node {
-      name: "b/read"
-      op: "Identity"
-      input: "b"
-      attr {
-        key: "T"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "_class"
-        value {
-          list {
-            s: "loc:@b"
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "tf_example"
-      op: "Placeholder"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              unknown_rank: true
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-          }
-        }
-      }
-    }
-    node {
-      name: "ParseExample/Const"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_FLOAT
-            tensor_shape {
-              dim {
-              }
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "ParseExample/ParseExample/names"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-              dim {
-              }
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "ParseExample/ParseExample/dense_keys_0"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-            }
-            string_val: "x"
-          }
-        }
-      }
-    }
-    node {
-      name: "ParseExample/ParseExample"
-      op: "ParseExample"
-      input: "tf_example"
-      input: "ParseExample/ParseExample/names"
-      input: "ParseExample/ParseExample/dense_keys_0"
-      input: "ParseExample/Const"
-      attr {
-        key: "Ndense"
-        value {
-          i: 1
-        }
-      }
-      attr {
-        key: "Nsparse"
-        value {
-          i: 0
-        }
-      }
-      attr {
-        key: "Tdense"
-        value {
-          list {
-            type: DT_FLOAT
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dense_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "sparse_types"
-        value {
-          list {
-          }
-        }
-      }
-    }
-    node {
-      name: "x"
-      op: "Identity"
-      input: "ParseExample/ParseExample"
-      attr {
-        key: "T"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "Mul"
-      op: "Mul"
-      input: "a/read"
-      input: "x"
-      attr {
-        key: "T"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "y"
-      op: "Add"
-      input: "Mul"
-      input: "b/read"
-      attr {
-        key: "T"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "Const"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-            }
-            string_val: "/tmp/original/export/assets/foo.txt"
-          }
-        }
-      }
-    }
-    node {
-      name: "filename_tensor/initial_value"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-            }
-            string_val: "foo.txt"
-          }
-        }
-      }
-    }
-    node {
-      name: "filename_tensor"
-      op: "Variable"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "container"
-        value {
-          s: ""
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "shape"
-        value {
-          shape {
-          }
-        }
-      }
-      attr {
-        key: "shared_name"
-        value {
-          s: ""
-        }
-      }
-    }
-    node {
-      name: "filename_tensor/Assign"
-      op: "Assign"
-      input: "filename_tensor"
-      input: "filename_tensor/initial_value"
-      attr {
-        key: "T"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "_class"
-        value {
-          list {
-            s: "loc:@filename_tensor"
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "use_locking"
-        value {
-          b: true
-        }
-      }
-      attr {
-        key: "validate_shape"
-        value {
-          b: true
-        }
-      }
-    }
-    node {
-      name: "filename_tensor/read"
-      op: "Identity"
-      input: "filename_tensor"
-      attr {
-        key: "T"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "_class"
-        value {
-          list {
-            s: "loc:@filename_tensor"
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "Assign/value"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-            }
-            string_val: "foo.txt"
-          }
-        }
-      }
-    }
-    node {
-      name: "Assign"
-      op: "Assign"
-      input: "filename_tensor"
-      input: "Assign/value"
-      attr {
-        key: "T"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "_class"
-        value {
-          list {
-            s: "loc:@filename_tensor"
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "use_locking"
-        value {
-          b: false
-        }
-      }
-      attr {
-        key: "validate_shape"
-        value {
-          b: true
-        }
-      }
-    }
-    node {
-      name: "Identity"
-      op: "Identity"
-      input: "y"
-      attr {
-        key: "T"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: -1
-              }
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "init"
-      op: "NoOp"
-      input: "^a/Assign"
-      input: "^b/Assign"
-    }
-    node {
-      name: "group_deps"
-      op: "NoOp"
-      input: "^Assign"
-    }
-    node {
-      name: "save/Const"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-            }
-            string_val: "model"
-          }
-        }
-      }
-    }
-    node {
-      name: "save/StringJoin/inputs_1"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-            }
-            string_val: "_temp_ff2bd25218b646ea9ed224eecdce5e79/part"
-          }
-        }
-      }
-    }
-    node {
-      name: "save/StringJoin"
-      op: "StringJoin"
-      input: "save/Const"
-      input: "save/StringJoin/inputs_1"
-      attr {
-        key: "N"
-        value {
-          i: 2
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "separator"
-        value {
-          s: ""
-        }
-      }
-    }
-    node {
-      name: "save/num_shards"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_INT32
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_INT32
-            tensor_shape {
-            }
-            int_val: 1
-          }
-        }
-      }
-    }
-    node {
-      name: "save/ShardedFilename/shard"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_INT32
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_INT32
-            tensor_shape {
-            }
-            int_val: 0
-          }
-        }
-      }
-    }
-    node {
-      name: "save/ShardedFilename"
-      op: "ShardedFilename"
-      input: "save/StringJoin"
-      input: "save/ShardedFilename/shard"
-      input: "save/num_shards"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "save/SaveV2/tensor_names"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: 2
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-              dim {
-                size: 2
-              }
-            }
-            string_val: "a"
-            string_val: "b"
-          }
-        }
-      }
-    }
-    node {
-      name: "save/SaveV2/shape_and_slices"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: 2
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-              dim {
-                size: 2
-              }
-            }
-            string_val: ""
-            string_val: ""
-          }
-        }
-      }
-    }
-    node {
-      name: "save/SaveV2"
-      op: "SaveV2"
-      input: "save/ShardedFilename"
-      input: "save/SaveV2/tensor_names"
-      input: "save/SaveV2/shape_and_slices"
-      input: "a"
-      input: "b"
-      attr {
-        key: "dtypes"
-        value {
-          list {
-            type: DT_FLOAT
-            type: DT_FLOAT
-          }
-        }
-      }
-    }
-    node {
-      name: "save/control_dependency"
-      op: "Identity"
-      input: "save/ShardedFilename"
-      input: "^save/SaveV2"
-      attr {
-        key: "T"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "_class"
-        value {
-          list {
-            s: "loc:@save/ShardedFilename"
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "save/MergeV2Checkpoints/checkpoint_prefixes"
-      op: "Pack"
-      input: "save/ShardedFilename"
-      input: "^save/control_dependency"
-      attr {
-        key: "N"
-        value {
-          i: 1
-        }
-      }
-      attr {
-        key: "T"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "axis"
-        value {
-          i: 0
-        }
-      }
-    }
-    node {
-      name: "save/MergeV2Checkpoints"
-      op: "MergeV2Checkpoints"
-      input: "save/MergeV2Checkpoints/checkpoint_prefixes"
-      input: "save/Const"
-      attr {
-        key: "delete_old_dirs"
-        value {
-          b: true
-        }
-      }
-    }
-    node {
-      name: "save/Identity"
-      op: "Identity"
-      input: "save/Const"
-      input: "^save/control_dependency"
-      input: "^save/MergeV2Checkpoints"
-      attr {
-        key: "T"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-    }
-    node {
-      name: "save/RestoreV2/tensor_names"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-              dim {
-                size: 1
-              }
-            }
-            string_val: "a"
-          }
-        }
-      }
-    }
-    node {
-      name: "save/RestoreV2/shape_and_slices"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-              dim {
-                size: 1
-              }
-            }
-            string_val: ""
-          }
-        }
-      }
-    }
-    node {
-      name: "save/RestoreV2"
-      op: "RestoreV2"
-      input: "save/Const"
-      input: "save/RestoreV2/tensor_names"
-      input: "save/RestoreV2/shape_and_slices"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              unknown_rank: true
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtypes"
-        value {
-          list {
-            type: DT_FLOAT
-          }
-        }
-      }
-    }
-    node {
-      name: "save/Assign"
-      op: "Assign"
-      input: "a"
-      input: "save/RestoreV2"
-      attr {
-        key: "T"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "_class"
-        value {
-          list {
-            s: "loc:@a"
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "use_locking"
-        value {
-          b: true
-        }
-      }
-      attr {
-        key: "validate_shape"
-        value {
-          b: true
-        }
-      }
-    }
-    node {
-      name: "save/RestoreV2_1/tensor_names"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-              dim {
-                size: 1
-              }
-            }
-            string_val: "b"
-          }
-        }
-      }
-    }
-    node {
-      name: "save/RestoreV2_1/shape_and_slices"
-      op: "Const"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              dim {
-                size: 1
-              }
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtype"
-        value {
-          type: DT_STRING
-        }
-      }
-      attr {
-        key: "value"
-        value {
-          tensor {
-            dtype: DT_STRING
-            tensor_shape {
-              dim {
-                size: 1
-              }
-            }
-            string_val: ""
-          }
-        }
-      }
-    }
-    node {
-      name: "save/RestoreV2_1"
-      op: "RestoreV2"
-      input: "save/Const"
-      input: "save/RestoreV2_1/tensor_names"
-      input: "save/RestoreV2_1/shape_and_slices"
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-              unknown_rank: true
-            }
-          }
-        }
-      }
-      attr {
-        key: "dtypes"
-        value {
-          list {
-            type: DT_FLOAT
-          }
-        }
-      }
-    }
-    node {
-      name: "save/Assign_1"
-      op: "Assign"
-      input: "b"
-      input: "save/RestoreV2_1"
-      attr {
-        key: "T"
-        value {
-          type: DT_FLOAT
-        }
-      }
-      attr {
-        key: "_class"
-        value {
-          list {
-            s: "loc:@b"
-          }
-        }
-      }
-      attr {
-        key: "_output_shapes"
-        value {
-          list {
-            shape {
-            }
-          }
-        }
-      }
-      attr {
-        key: "use_locking"
-        value {
-          b: true
-        }
-      }
-      attr {
-        key: "validate_shape"
-        value {
-          b: true
-        }
-      }
-    }
-    node {
-      name: "save/restore_shard"
-      op: "NoOp"
-      input: "^save/Assign"
-      input: "^save/Assign_1"
-    }
-    node {
-      name: "save/restore_all"
-      op: "NoOp"
-      input: "^save/restore_shard"
-    }
-    versions {
-      producer: 15
-    }
-  }
-  saver_def {
-    filename_tensor_name: "save/Const:0"
-    save_tensor_name: "save/Identity:0"
-    restore_op_name: "save/restore_all"
-    max_to_keep: 5
-    sharded: true
-    keep_checkpoint_every_n_hours: 10000.0
-    version: V2
-  }
-  collection_def {
-    key: "asset_filepaths"
-    value {
-      node_list {
-        value: "Const:0"
-      }
-    }
-  }
-  collection_def {
-    key: "legacy_init_op"
-    value {
-      node_list {
-        value: "group_deps"
-      }
-    }
-  }
-  collection_def {
-    key: "saved_model_assets"
-    value {
-      any_list {
-        value {
-          type_url: "type.googleapis.com/tensorflow.AssetFileDef"
-          value: "\n\t\n\007Const:0\022\007foo.txt"
-        }
-      }
-    }
-  }
-  collection_def {
-    key: "trainable_variables"
-    value {
-      bytes_list {
-        value: "\n\003a:0\022\010a/Assign\032\010a/read:0"
-        value: "\n\003b:0\022\010b/Assign\032\010b/read:0"
-      }
-    }
-  }
-  collection_def {
-    key: "variables"
-    value {
-      bytes_list {
-        value: "\n\003a:0\022\010a/Assign\032\010a/read:0"
-        value: "\n\003b:0\022\010b/Assign\032\010b/read:0"
-      }
-    }
-  }
-  signature_def {
-    key: "tensorflow/serving/regress"
-    value {
-      inputs {
-        key: "inputs"
-        value {
-          name: "tf_example:0"
-        }
-      }
-      outputs {
-        key: "outputs"
-        value {
-          name: "Identity:0"
-        }
-      }
-      method_name: "tensorflow/serving/regress"
-    }
-  }
-}
diff --git a/tensorflow/cc/saved_model/testdata/half_plus_two_pbtxt/variables/variables.data-00000-of-00001 b/tensorflow/cc/saved_model/testdata/half_plus_two_pbtxt/variables/variables.data-00000-of-00001
deleted file mode 100644
index 20bc7d454d..0000000000
--- a/tensorflow/cc/saved_model/testdata/half_plus_two_pbtxt/variables/variables.data-00000-of-00001
+++ /dev/null
diff --git a/tensorflow/cc/saved_model/testdata/half_plus_two_pbtxt/variables/variables.index b/tensorflow/cc/saved_model/testdata/half_plus_two_pbtxt/variables/variables.index
deleted file mode 100644
index e7df518f5b..0000000000
--- a/tensorflow/cc/saved_model/testdata/half_plus_two_pbtxt/variables/variables.index
+++ /dev/null
diff --git a/tensorflow/cc/saved_model/testdata/half_plus_two_sharded/assets/foo.txt b/tensorflow/cc/saved_model/testdata/half_plus_two_sharded/assets/foo.txt
deleted file mode 100644
index f9ff036688..0000000000
--- a/tensorflow/cc/saved_model/testdata/half_plus_two_sharded/assets/foo.txt
+++ /dev/null
@@ -1 +0,0 @@
-asset-file-contents
\ No newline at end of file
diff --git a/tensorflow/cc/saved_model/testdata/half_plus_two_sharded/saved_model.pb b/tensorflow/cc/saved_model/testdata/half_plus_two_sharded/saved_model.pb
deleted file mode 100644
index 0df49f2168..0000000000
--- a/tensorflow/cc/saved_model/testdata/half_plus_two_sharded/saved_model.pb
+++ /dev/null
diff --git a/tensorflow/cc/saved_model/testdata/half_plus_two_sharded/variables/variables.data-00000-of-00001 b/tensorflow/cc/saved_model/testdata/half_plus_two_sharded/variables/variables.data-00000-of-00001
deleted file mode 100644
index 20bc7d454d..0000000000
--- a/tensorflow/cc/saved_model/testdata/half_plus_two_sharded/variables/variables.data-00000-of-00001
+++ /dev/null
diff --git a/tensorflow/cc/saved_model/testdata/half_plus_two_sharded/variables/variables.index b/tensorflow/cc/saved_model/testdata/half_plus_two_sharded/variables/variables.index
deleted file mode 100644
index e7df518f5b..0000000000
--- a/tensorflow/cc/saved_model/testdata/half_plus_two_sharded/variables/variables.index
+++ /dev/null