Automated rollback of commit cab7fe0c13

PiperOrigin-RevId: 267714534

tensorflow/core/common_runtime/metrics.cc

@@ -61,18 +61,6 @@ auto* tf_data_elements_counter = monitoring::Counter<1>::New(
 auto* tf_data_optimization_counter = monitoring::Counter<1>::New(
     "/tensorflow/data/optimization", "tf.data optimization", "name");
 
-auto* parse_dense_feature_counter = monitoring::Counter<0>::New(
-    "/tensorflow/data/dense_feature",
-    "The number of dense features parsed by ops for parsing tf.Example.");
-
-auto* parse_sparse_feature_counter = monitoring::Counter<0>::New(
-    "/tensorflow/data/sparse_feature",
-    "The number of sparse features parsed by ops for parsing tf.Example.");
-
-auto* parse_ragged_feature_counter = monitoring::Counter<0>::New(
-    "/tensorflow/data/ragged_feature",
-    "The number of ragged features parsed by ops for parsing tf.Example.");
-
 auto* build_graph_calls = monitoring::Counter<0>::New(
     "/tensorflow/core/graph_build_calls",
     "The number of times TensorFlow has created a new client graph. "
@@ -117,18 +105,6 @@ void RecordTFDataOptimization(const string& name, int64 num_changes) {
   tf_data_optimization_counter->GetCell(name)->IncrementBy(num_changes);
 }
 
-void RecordParseDenseFeature(int64 num_features) {
-  parse_dense_feature_counter->GetCell()->IncrementBy(num_features);
-}
-
-void RecordParseSparseFeature(int64 num_features) {
-  parse_sparse_feature_counter->GetCell()->IncrementBy(num_features);
-}
-
-void RecordParseRaggedFeature(int64 num_features) {
-  parse_ragged_feature_counter->GetCell()->IncrementBy(num_features);
-}
-
 void RecordGraphInputTensors(const size_t size) {
   graph_run_input_tensor_bytes->GetCell()->Add(size);
 }

tensorflow/core/common_runtime/metrics.h

@@ -43,15 +43,6 @@ void RecordTFDataElements(const string& name, int64 num_elements);
 // The `name` argument identifies the optimization (e.g. "noop_eliminiation").
 void RecordTFDataOptimization(const string& name, int64 num_changes);
 
-// Records parsing of dense tensor features.
-void RecordParseDenseFeature(int64 num_features);
-
-// Records parsing of sparse tensor features.
-void RecordParseSparseFeature(int64 num_features);
-
-// Records parsing of ragged tensor features.
-void RecordParseRaggedFeature(int64 num_features);
-
 // Records the size of input/output tensors in bytes.
 void RecordGraphInputTensors(const size_t size);
 void RecordGraphOutputTensors(const size_t size);

tensorflow/core/kernels/BUILD

@@ -4749,7 +4749,6 @@ cc_library(
 )
 
 PARSING_DEPS = [
-    "//tensorflow/core:core_cpu_internal",
     "//tensorflow/core:framework",
     "//tensorflow/core:lib",
     "//tensorflow/core:protos_all_cc",

tensorflow/core/kernels/data/experimental/parse_example_dataset_op.cc

@@ -15,7 +15,6 @@ limitations under the License.
 #include <deque>
 
 #include "tensorflow/core/common_runtime/device.h"
-#include "tensorflow/core/common_runtime/metrics.h"
 #include "tensorflow/core/framework/stats_aggregator.h"
 #include "tensorflow/core/kernels/data/parallel_map_dataset_op.h"
 #include "tensorflow/core/kernels/data/stats_utils.h"
@@ -69,11 +68,6 @@ class ParseExampleDatasetOp : public UnaryDatasetOpKernel {
     }
   }
 
-  ~ParseExampleDatasetOp() override {
-    metrics::RecordParseDenseFeature(dense_keys_.size());
-    metrics::RecordParseSparseFeature(sparse_keys_.size());
-  }
-
  protected:
   void MakeDataset(OpKernelContext* ctx, DatasetBase* input,
                    DatasetBase** output) override {
@@ -343,6 +337,8 @@ class ParseExampleDatasetOp : public UnaryDatasetOpKernel {
                   << ", got " << serialized_sparse.shape().DebugString()
                   << ").";
             }
+            // TODO(b/123360128): Add component name to streamz metrics without
+            // breaking TFX metrics.
             if (stats_aggregator) {
               stats_aggregator->IncrementCounter(
                   stats_utils::kExamplesCount, "trainer",

tensorflow/core/kernels/example_parsing_ops.cc

@@ -19,7 +19,6 @@ limitations under the License.
 #include <unordered_set>
 #include <vector>
 
-#include "tensorflow/core/common_runtime/metrics.h"
 #include "tensorflow/core/example/example.pb.h"
 #include "tensorflow/core/example/feature.pb.h"
 #include "tensorflow/core/framework/common_shape_fns.h"
@@ -50,12 +49,6 @@ class ParseExampleOp : public OpKernel {
     OP_REQUIRES_OK(ctx, attrs_.Init(ctx, op_version_));
   }
 
-  ~ParseExampleOp() override {
-    metrics::RecordParseDenseFeature(dense_keys_.size());
-    metrics::RecordParseSparseFeature(sparse_keys_.size());
-    metrics::RecordParseRaggedFeature(ragged_keys_.size());
-  }
-
   void Compute(OpKernelContext* ctx) override {
     const Tensor* names;
     const Tensor* serialized;
@@ -75,15 +68,6 @@ class ParseExampleOp : public OpKernel {
       OP_REQUIRES_OK(ctx, GetInputListKeys(ctx, "dense_keys", &dense_keys_t));
       OP_REQUIRES_OK(ctx, GetInputListKeys(ctx, "sparse_keys", &sparse_keys_t));
     }
-    for (const auto key : dense_keys_t) {
-      dense_keys_.insert(key);
-    }
-    for (const auto key : sparse_keys_t) {
-      sparse_keys_.insert(key);
-    }
-    for (const auto key : ragged_keys_t) {
-      ragged_keys_.insert(key);
-    }
     OP_REQUIRES_OK(ctx, ctx->input_list("dense_defaults", &dense_defaults));
 
     // Validate input tensor shapes.
@@ -287,9 +271,6 @@ class ParseExampleOp : public OpKernel {
     return Status::OK();
   }
 
-  std::set<string> dense_keys_;
-  std::set<string> sparse_keys_;
-  std::set<string> ragged_keys_;
   ParseExampleAttrs attrs_;
   int op_version_;
 };
@@ -305,11 +286,6 @@ class ParseSingleExampleOp : public OpKernel {
     OP_REQUIRES_OK(ctx, attrs_.Init(ctx));
   }
 
-  ~ParseSingleExampleOp() override {
-    metrics::RecordParseDenseFeature(attrs_.dense_keys.size());
-    metrics::RecordParseSparseFeature(attrs_.sparse_keys.size());
-  }
-
   void Compute(OpKernelContext* ctx) override {
     const Tensor* serialized;
     OpInputList dense_defaults;
@@ -406,13 +382,6 @@ class ParseSequenceExampleOp : public OpKernel {
     OP_REQUIRES_OK(ctx, attrs_.Init(ctx));
   }
 
-  ~ParseSequenceExampleOp() override {
-    metrics::RecordParseDenseFeature(attrs_.context_dense_keys.size() +
-                                     attrs_.feature_list_dense_keys.size());
-    metrics::RecordParseSparseFeature(attrs_.context_sparse_keys.size() +
-                                      attrs_.feature_list_sparse_keys.size());
-  }
-
   void Compute(OpKernelContext* ctx) override {
     const Tensor* debug_name;
     const Tensor* serialized;
@@ -573,13 +542,6 @@ class ParseSingleSequenceExampleOp : public OpKernel {
     OP_REQUIRES_OK(ctx, attrs_.Init(ctx));
   }
 
-  ~ParseSingleSequenceExampleOp() override {
-    metrics::RecordParseDenseFeature(context_dense_keys_.size() +
-                                     feature_list_dense_keys_.size());
-    metrics::RecordParseSparseFeature(context_sparse_keys_.size() +
-                                      feature_list_sparse_keys_.size());
-  }
-
   void Compute(OpKernelContext* ctx) override {
     const Tensor* debug_name;
     const Tensor* serialized;
@@ -611,18 +573,6 @@ class ParseSingleSequenceExampleOp : public OpKernel {
         attrs_.num_feature_list_dense);
     std::vector<string> feature_list_sparse_keys_t(
         attrs_.num_feature_list_sparse);
-    for (const auto key : context_dense_keys_t) {
-      context_dense_keys_.insert(key);
-    }
-    for (const auto key : context_sparse_keys_t) {
-      context_sparse_keys_.insert(key);
-    }
-    for (const auto key : feature_list_dense_keys_t) {
-      feature_list_dense_keys_.insert(key);
-    }
-    for (const auto key : feature_list_sparse_keys_t) {
-      feature_list_sparse_keys_.insert(key);
-    }
     std::unordered_set<string> feature_list_dense_missing_assumed_empty_set;
     CHECK_EQ(context_dense_keys.size(), attrs_.num_context_dense);
     CHECK_EQ(context_sparse_keys.size(), attrs_.num_context_sparse);
@@ -991,10 +941,6 @@ class ParseSingleSequenceExampleOp : public OpKernel {
 
  protected:
   ParseSingleSequenceExampleAttrs attrs_;
-  std::set<string> context_dense_keys_;
-  std::set<string> context_sparse_keys_;
-  std::set<string> feature_list_dense_keys_;
-  std::set<string> feature_list_sparse_keys_;
 };
 
 REGISTER_KERNEL_BUILDER(Name("ParseSingleSequenceExample").Device(DEVICE_CPU),