Automated Code Change

PiperOrigin-RevId: 621403466
tensorflow · Apr 3, 2024 · 29e3c03 · 29e3c03
1 parent 7909dde
commit 29e3c03
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 25 deletions.
diff --git a/tensorflow/core/common_runtime/function_test.cc b/tensorflow/core/common_runtime/function_test.cc
@@ -635,7 +635,7 @@ TEST_F(FunctionLibraryRuntimeTest, StateHandle) {
       // Attrs
       {},
       // Nodes
-      {FDH::Const<int32>("shape", gtl::ArraySlice<int32>({1})),
+      {FDH::Const<int32>("shape", absl::Span<const int32>({1})),
        FDH::Const<int32>("minval", 0),
        FDH::Const<int32>("maxval", 10),
        // A stateful node.

diff --git a/tensorflow/core/common_runtime/function_testlib.cc b/tensorflow/core/common_runtime/function_testlib.cc
@@ -127,7 +127,7 @@ FunctionDef BlockingOpFn() {
 
 // TODO(phawkins): replace with C++ API for calling functions, when that exists.
 Output Call(Scope* scope, const string& op_name, const string& fn_name,
-            gtl::ArraySlice<Input> inputs) {
+            absl::Span<const Input> inputs) {
   NodeDef def;
   NodeDefBuilder builder(op_name, fn_name, scope->graph()->op_registry());
   for (const Input& input : inputs) {

diff --git a/tensorflow/core/common_runtime/function_testlib.h b/tensorflow/core/common_runtime/function_testlib.h
@@ -45,7 +45,7 @@ FunctionDef BlockingOpFn();
 // Adds a function call to the given scope and returns the output for the node.
 // TODO(phawkins): replace with C++ API for calling functions, when that exists.
 Output Call(Scope* scope, const string& op_name, const string& fn_name,
-            gtl::ArraySlice<Input> inputs);
+            absl::Span<const Input> inputs);
 
 }  // namespace function
 }  // namespace test

diff --git a/tensorflow/core/common_runtime/gradients.cc b/tensorflow/core/common_runtime/gradients.cc
@@ -99,7 +99,7 @@ static Node* AddZerosLike(Graph* g, NodeOut input) {
   }
 }
 
-static Node* AddSymGrad(Graph* g, Node* n, gtl::ArraySlice<NodeOut> grads) {
+static Node* AddSymGrad(Graph* g, Node* n, absl::Span<const NodeOut> grads) {
   const int num_x = n->num_inputs();
   const int num_y = n->num_outputs();
   CHECK_EQ(num_y, grads.size());
@@ -151,18 +151,18 @@ static Node* AddSymGrad(Graph* g, Node* n, gtl::ArraySlice<NodeOut> grads) {
 
 class SymbolicGradientBuilder {
  public:
-  SymbolicGradientBuilder(gtl::ArraySlice<NodeOut> y_node_outputs,
-                          gtl::ArraySlice<NodeOut> x_node_outputs,
-                          gtl::ArraySlice<NodeOut> y_grad_node_outputs,
+  SymbolicGradientBuilder(absl::Span<const NodeOut> y_node_outputs,
+                          absl::Span<const NodeOut> x_node_outputs,
+                          absl::Span<const NodeOut> y_grad_node_outputs,
                           std::vector<NodeOut>* x_grad_node_outputs,
                           Graph* graph);
 
   Status Compute();
 
  private:
-  gtl::ArraySlice<NodeOut> y_node_outputs_;
-  gtl::ArraySlice<NodeOut> x_node_outputs_;
-  gtl::ArraySlice<NodeOut> y_grad_node_outputs_;
+  absl::Span<const NodeOut> y_node_outputs_;
+  absl::Span<const NodeOut> x_node_outputs_;
+  absl::Span<const NodeOut> y_grad_node_outputs_;
   std::vector<NodeOut>* x_grad_node_outputs_;
   Graph* graph_;  // Not owned.
 
@@ -209,9 +209,9 @@ class SymbolicGradientBuilder {
 };
 
 SymbolicGradientBuilder::SymbolicGradientBuilder(
-    gtl::ArraySlice<NodeOut> y_node_outputs,
-    gtl::ArraySlice<NodeOut> x_node_outputs,
-    gtl::ArraySlice<NodeOut> y_grad_node_outputs,
+    absl::Span<const NodeOut> y_node_outputs,
+    absl::Span<const NodeOut> x_node_outputs,
+    absl::Span<const NodeOut> y_grad_node_outputs,
     std::vector<NodeOut>* x_grad_node_outputs, Graph* graph)
     : y_node_outputs_(y_node_outputs),
       x_node_outputs_(x_node_outputs),
@@ -405,9 +405,9 @@ Status SymbolicGradientBuilder::Compute() {
   return absl::OkStatus();
 }
 
-Status AddSymbolicGradients(gtl::ArraySlice<NodeOut> y_node_outputs,
-                            gtl::ArraySlice<NodeOut> x_node_outputs,
-                            gtl::ArraySlice<NodeOut> y_grad_node_outputs,
+Status AddSymbolicGradients(absl::Span<const NodeOut> y_node_outputs,
+                            absl::Span<const NodeOut> x_node_outputs,
+                            absl::Span<const NodeOut> y_grad_node_outputs,
                             std::vector<NodeOut>* x_grad_node_outputs,
                             Graph* graph) {
   SymbolicGradientBuilder builder(y_node_outputs, x_node_outputs,

diff --git a/tensorflow/core/common_runtime/gradients.h b/tensorflow/core/common_runtime/gradients.h
@@ -47,9 +47,9 @@ struct NodeOut {
 // implementation only supports gradients for functions). In particular,
 // the nodes in 'x_nodes' are currently restricted to have one output.
 
-Status AddSymbolicGradients(gtl::ArraySlice<NodeOut> y_node_outputs,
-                            gtl::ArraySlice<NodeOut> x_node_outputs,
-                            gtl::ArraySlice<NodeOut> y_grad_node_outputs,
+Status AddSymbolicGradients(absl::Span<const NodeOut> y_node_outputs,
+                            absl::Span<const NodeOut> x_node_outputs,
+                            absl::Span<const NodeOut> y_grad_node_outputs,
                             std::vector<NodeOut>* x_grad_node_outputs,
                             Graph* graph);
 

diff --git a/tensorflow/core/common_runtime/graph_constructor.cc b/tensorflow/core/common_runtime/graph_constructor.cc
@@ -164,7 +164,7 @@ class GraphConstructor {
     string default_device;
   };
 
-  typedef gtl::ArraySlice<const NodeDef*> NodeDefSlice;
+  typedef absl::Span<const NodeDef* const> NodeDefSlice;
 
   // versions, library, and debug_info may be nullptr
   static Status Construct(
@@ -1534,7 +1534,7 @@ Status ConvertGraphDefToGraph(const GraphConstructorOptions& opts,
 }
 
 Status ConvertNodeDefsToGraph(const GraphConstructorOptions& opts,
-                              gtl::ArraySlice<NodeDef> nodes, Graph* g,
+                              absl::Span<const NodeDef> nodes, Graph* g,
                               const GraphDebugInfo* debug_info) {
   ShapeRefiner refiner(TF_GRAPH_DEF_VERSION, g->op_registry());
   // TODO(irving): Copy will go away once NodeInfo exists

diff --git a/tensorflow/core/common_runtime/graph_constructor.h b/tensorflow/core/common_runtime/graph_constructor.h
@@ -62,7 +62,7 @@ extern Status ConvertGraphDefToGraph(const GraphConstructorOptions& opts,
 // instantiation.
 // TODO(irving): This will turn into std::vector<NodeInfoPtr> soon.
 extern Status ConvertNodeDefsToGraph(
-    const GraphConstructorOptions& opts, gtl::ArraySlice<NodeDef> nodes,
+    const GraphConstructorOptions& opts, absl::Span<const NodeDef> nodes,
     Graph* g, const GraphDebugInfo* debug_info = nullptr);
 
 // Options for calling ImportGraphDef().

diff --git a/tensorflow/core/common_runtime/graph_view.h b/tensorflow/core/common_runtime/graph_view.h
@@ -111,9 +111,8 @@ struct NodeItem {
   // is true if and only if the ith output is consumed by another node.
   std::unique_ptr<bool[]> outputs_required;
 
-  gtl::MutableArraySlice<EdgeInfo> mutable_output_edges() {
-    return gtl::MutableArraySlice<EdgeInfo>(output_edge_base(),
-                                            num_output_edges);
+  absl::Span<EdgeInfo> mutable_output_edges() {
+    return absl::Span<EdgeInfo>(output_edge_base(), num_output_edges);
   }
 
   gtl::ArraySlice<EdgeInfo> output_edges() const {