Apply ClangTidy fixes to TF codebase.

rjpower · tensorflower-gardener · commit 9f96c91cf9aa · 2023-06-07T17:59:20.000-07:00
PiperOrigin-RevId: 538642169
diff --git a/tensorflow/compiler/aot/tests/tfcompile_test.cc b/tensorflow/compiler/aot/tests/tfcompile_test.cc
@@ -13,6 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include <algorithm>
+#include <vector>
 #define EIGEN_USE_THREADS
 #define EIGEN_USE_CUSTOM_THREAD_POOL
 
diff --git a/tensorflow/compiler/tests/randomized_tests.cc b/tensorflow/compiler/tests/randomized_tests.cc
@@ -43,8 +43,19 @@ limitations under the License.
 // * StridedSliceGrad (need to use shape function to compute sensible inputs)
 
 #include <algorithm>
+#include <array>
+#include <cmath>
+#include <functional>
+#include <iterator>
+#include <limits>
+#include <memory>
+#include <numeric>
+#include <optional>
 #include <random>
+#include <string>
 #include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include "absl/algorithm/container.h"
 #include "absl/container/flat_hash_set.h"
@@ -504,7 +515,7 @@ OpTest::OpTest() {
              << ". To reproduce the "
                 "results of this test, pass flag --tf_xla_random_seed="
              << seed;
-  generator_.reset(new std::mt19937(seed));
+  generator_ = std::make_unique<std::mt19937>(seed);
 }
 
 namespace {
@@ -532,7 +543,7 @@ template <typename T>
 class TensorGenerator {
  public:
   explicit TensorGenerator(OpTest& test) : test_(test) {}
-  virtual ~TensorGenerator() {}
+  virtual ~TensorGenerator() = default;
   virtual DataType dtype() = 0;
   virtual void RandomVals(std::optional<T> lo, std::optional<T> hi,
                           bool needs_unique_values,
diff --git a/tensorflow/compiler/tf2tensorrt/common/utils.cc b/tensorflow/compiler/tf2tensorrt/common/utils.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/compiler/tf2tensorrt/common/utils.h"
 
+#include <tuple>
+
 #if GOOGLE_CUDA && GOOGLE_TENSORRT
 #include "absl/base/call_once.h"
 #include "absl/strings/str_cat.h"
diff --git a/tensorflow/compiler/xrt/ops/xrt_execute_op.cc b/tensorflow/compiler/xrt/ops/xrt_execute_op.cc
@@ -13,6 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include <vector>
+
 #include "tensorflow/core/framework/common_shape_fns.h"
 #include "tensorflow/core/framework/op.h"
 #include "tensorflow/core/framework/shape_inference.h"
diff --git a/tensorflow/compiler/xrt/tests/raw_api_test.cc b/tensorflow/compiler/xrt/tests/raw_api_test.cc
@@ -13,8 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include <functional>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/strings/str_cat.h"
diff --git a/tensorflow/core/activity_watcher/activity.cc b/tensorflow/core/activity_watcher/activity.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/activity_watcher/activity.h"
 
+#include <atomic>
 #include <memory>
 
 namespace tensorflow {
diff --git a/tensorflow/core/config/flags_api_wrapper.cc b/tensorflow/core/config/flags_api_wrapper.cc
@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include <memory>
 #include <string>
 
 #include "absl/types/optional.h"
diff --git a/tensorflow/core/data/service/snapshot/snapshot_split_provider_test.cc b/tensorflow/core/data/service/snapshot/snapshot_split_provider_test.cc
@@ -75,9 +75,10 @@ SnapshotTaskDef TestSnapshotTask() {
 }
 
 Status WriteSplits(const SnapshotTaskDef& snapshot_task, int64_t num_splits) {
-  std::string source_dir = RepetitionDirectory(
-      snapshot_task.base_path(), snapshot_task.stream_index(), /*source_id=*/0,
-      /*repetition_index=*/0);
+  std::string source_dir =
+      RepetitionDirectory(snapshot_task.base_path(),
+                          snapshot_task.stream_index(), /*source_index=*/0,
+                          /*repetition_index=*/0);
   TF_RETURN_IF_ERROR(Env::Default()->RecursivelyCreateDir(source_dir));
   for (int64_t i = 0; i < num_splits; ++i) {
     std::string split_filename = absl::StrCat("split_", i, "_", i);
diff --git a/tensorflow/core/ir/importexport/tests/roundtrip/roundtrip.cc b/tensorflow/core/ir/importexport/tests/roundtrip/roundtrip.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #include "tensorflow/core/ir/importexport/tests/roundtrip/roundtrip.h"
 
 #include <algorithm>
+#include <cmath>
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
diff --git a/tensorflow/core/ir/importexport/tests/saved_model/saved_model_roundtrip_test.cc b/tensorflow/core/ir/importexport/tests/saved_model/saved_model_roundtrip_test.cc
@@ -53,9 +53,9 @@ void RunRoundTrip(const std::string& input_file) {
   auto status = mlir::tfg::ExportMlirToSavedModel(*module_ref, original_model,
                                                   &final_model);
   if (!status.ok()) {
-    LOG(ERROR) << "Export failed: " << status.ToString();
+    LOG(ERROR) << "Export failed: " << status;
   }
-  ASSERT_TRUE(status.ok()) << status.ToString();
+  ASSERT_TRUE(status.ok()) << status;
 
   tensorflow::MetaGraphDef* original_metagraph =
       original_model.mutable_meta_graphs(0);
diff --git a/tensorflow/core/lib/jpeg/jpeg_mem.cc b/tensorflow/core/lib/jpeg/jpeg_mem.cc
@@ -20,8 +20,11 @@ limitations under the License.
 
 #include <setjmp.h>
 #include <string.h>
+
 #include <algorithm>
+#include <functional>
 #include <memory>
+#include <ostream>
 #include <string>
 #include <utility>
 
diff --git a/tensorflow/core/lib/monitoring/collection_registry_test.cc b/tensorflow/core/lib/monitoring/collection_registry_test.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/core/lib/monitoring/collection_registry.h"
 
+#include <memory>
+
 #include "tensorflow/core/lib/monitoring/counter.h"
 #include "tensorflow/core/lib/monitoring/gauge.h"
 #include "tensorflow/core/lib/monitoring/percentile_sampler.h"
diff --git a/tensorflow/core/platform/cloud/gcs_dns_cache.h b/tensorflow/core/platform/cloud/gcs_dns_cache.h
@@ -16,7 +16,9 @@ limitations under the License.
 #ifndef TENSORFLOW_CORE_PLATFORM_CLOUD_GCS_DNS_CACHE_H_
 #define TENSORFLOW_CORE_PLATFORM_CLOUD_GCS_DNS_CACHE_H_
 
+#include <memory>
 #include <random>
+#include <vector>
 
 #include "tensorflow/core/platform/cloud/http_request.h"
 #include "tensorflow/core/platform/env.h"
diff --git a/tensorflow/core/profiler/backends/cpu/host_tracer_test.cc b/tensorflow/core/profiler/backends/cpu/host_tracer_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
 #include "tensorflow/core/profiler/backends/cpu/host_tracer.h"
 
 #include <memory>
+#include <optional>
 #include <ostream>
 #include <string>
 
@@ -99,7 +100,7 @@ TEST(HostTracerTest, CollectsTraceMeEventsAsXSpace) {
   EXPECT_EQ(e3.Name(), "good");
   ASSERT_EQ(events[3].stats_size(), 1);
   {
-    absl::optional<std::string> value;
+    std::optional<std::string> value;
     e3.ForEachStat([&](const XStatVisitor& stat) {
       if (stat.Name() == "key1") value = stat.ToString();
     });
@@ -111,7 +112,7 @@ TEST(HostTracerTest, CollectsTraceMeEventsAsXSpace) {
   EXPECT_EQ(e4.Name(), "morning");
   ASSERT_EQ(events[4].stats_size(), 2);
   {
-    absl::optional<std::string> value1, value2;
+    std::optional<std::string> value1, value2;
     e4.ForEachStat([&](const XStatVisitor& stat) {
       if (stat.Name() == "key1") {
         value1 = stat.ToString();
@@ -128,7 +129,7 @@ TEST(HostTracerTest, CollectsTraceMeEventsAsXSpace) {
   EXPECT_EQ(e5.Name(), "incomplete");
   ASSERT_EQ(events[5].stats_size(), 1);
   {
-    absl::optional<std::string> value1, value2;
+    std::optional<std::string> value1, value2;
     e5.ForEachStat([&](const XStatVisitor& stat) {
       if (stat.Name() == "key1") {
         value1 = stat.ToString();
diff --git a/tensorflow/core/profiler/backends/gpu/device_tracer_test.cc b/tensorflow/core/profiler/backends/gpu/device_tracer_test.cc
@@ -19,6 +19,7 @@ limitations under the License.
 #include <sstream>
 #include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #if GOOGLE_CUDA
@@ -117,10 +118,10 @@ class DeviceTracerTest : public ::testing::Test {
 
  protected:
   void ExpectFailure(const Status& status, error::Code code) {
-    EXPECT_FALSE(status.ok()) << status.ToString();
+    EXPECT_FALSE(status.ok()) << status;
     if (!status.ok()) {
       LOG(INFO) << "Status message: " << status.message();
-      EXPECT_EQ(code, status.code()) << status.ToString();
+      EXPECT_EQ(code, status.code()) << status;
     }
   }
 
diff --git a/tensorflow/core/profiler/rpc/oss/grpc.cc b/tensorflow/core/profiler/rpc/oss/grpc.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/core/profiler/rpc/grpc.h"
 
+#include <memory>
+
 namespace tensorflow {
 namespace profiler {
 
diff --git a/tensorflow/core/public/session.h b/tensorflow/core/public/session.h
@@ -17,6 +17,7 @@ limitations under the License.
 #define TENSORFLOW_CORE_PUBLIC_SESSION_H_
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "absl/status/status.h"
diff --git a/tensorflow/core/tpu/ops/tpu_embedding_shape_util.cc b/tensorflow/core/tpu/ops/tpu_embedding_shape_util.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <array>
 #include <string>
+#include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "tensorflow/compiler/xla/status_macros.h"
diff --git a/tensorflow/core/transforms/const_dedupe_hoist/pass.cc b/tensorflow/core/transforms/const_dedupe_hoist/pass.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <forward_list>
 #include <memory>
+#include <vector>
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
diff --git a/tensorflow/core/transforms/constant_folding/pass.cc b/tensorflow/core/transforms/constant_folding/pass.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <algorithm>
 #include <iterator>
+#include <memory>
 #include <numeric>
 #include <optional>
 #include <string>
diff --git a/tensorflow/core/transforms/eliminate_passthrough_iter_args/pass.cc b/tensorflow/core/transforms/eliminate_passthrough_iter_args/pass.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/transforms/eliminate_passthrough_iter_args/pass.h"
 
+#include <memory>
 #include <utility>
 
 #include "llvm/ADT/BitVector.h"
diff --git a/tensorflow/core/transforms/func_to_graph/pass.cc b/tensorflow/core/transforms/func_to_graph/pass.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tensorflow/core/transforms/func_to_graph/pass.h"
 
+#include <memory>
+
 #include "mlir/IR/BuiltinAttributes.h"  // from @llvm-project
 #include "mlir/IR/SymbolTable.h"  // from @llvm-project
 #include "mlir/Pass/Pass.h"  // from @llvm-project
diff --git a/tensorflow/core/transforms/functional_to_region/impl.cc b/tensorflow/core/transforms/functional_to_region/impl.cc
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <algorithm>
 #include <tuple>
+#include <utility>
 
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/STLExtras.h"
diff --git a/tensorflow/core/transforms/shape_inference/pass.cc b/tensorflow/core/transforms/shape_inference/pass.cc
@@ -15,6 +15,9 @@ limitations under the License.
 
 #include "tensorflow/core/transforms/shape_inference/pass.h"
 
+#include <memory>
+#include <vector>
+
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/SmallVector.h"
diff --git a/tensorflow/core/transforms/toposort/pass.cc b/tensorflow/core/transforms/toposort/pass.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tensorflow/core/transforms/toposort/pass.h"
 
+#include <memory>
 #include <vector>
 
 #include "llvm/ADT/STLExtras.h"
diff --git a/tensorflow/distribute/experimental/rpc/kernels/oss/grpc_credentials.cc b/tensorflow/distribute/experimental/rpc/kernels/oss/grpc_credentials.cc
@@ -13,6 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include <memory>
+
 #include "grpcpp/security/credentials.h"
 #include "grpcpp/security/server_credentials.h"
 
diff --git a/tensorflow/distribute/experimental/rpc/kernels/rpc_ops.cc b/tensorflow/distribute/experimental/rpc/kernels/rpc_ops.cc
@@ -12,9 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
+#include <algorithm>
 #include <functional>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "grpcpp/channel.h"
diff --git a/tensorflow/examples/adding_an_op/cuda_op_kernel.cc b/tensorflow/examples/adding_an_op/cuda_op_kernel.cc
@@ -28,7 +28,7 @@ output: A Tensor.
   output = input + 1
 )doc");
 
-void AddOneKernelLauncher(const int* in, const int N, int* out);
+void AddOneKernelLauncher(const int* in, int N, int* out);
 
 class AddOneOp : public OpKernel {
  public:
diff --git a/tensorflow/examples/custom_ops_doc/multiplex_3/multiplex_3_kernel.cc b/tensorflow/examples/custom_ops_doc/multiplex_3/multiplex_3_kernel.cc
@@ -16,6 +16,8 @@ limitations under the License.
 #include <algorithm>
 #include <cstdint>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
diff --git a/tensorflow/examples/custom_ops_doc/multiplex_4/multiplex_4_op.cc b/tensorflow/examples/custom_ops_doc/multiplex_4/multiplex_4_op.cc
@@ -29,7 +29,6 @@ namespace tensorflow {
 namespace custom_op_examples {
 
 using ::tensorflow::shape_inference::InferenceContext;
-using ::tensorflow::shape_inference::ShapeHandle;
 
 Status MultiplexShapeFunction(InferenceContext* c) {
   int64_t num_cond_a;
diff --git a/tensorflow/examples/label_image/main.cc b/tensorflow/examples/label_image/main.cc
@@ -34,7 +34,10 @@ limitations under the License.
 // Note that, for GIF inputs, to reuse existing code, only single-frame ones
 // are supported.
 
+#include <algorithm>
 #include <fstream>
+#include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/tensorflow/examples/multibox_detector/main.cc b/tensorflow/examples/multibox_detector/main.cc
@@ -17,8 +17,11 @@ limitations under the License.
 #include <stdio.h>
 #include <string.h>
 
+#include <algorithm>
 #include <cmath>
 #include <fstream>
+#include <memory>
+#include <string>
 #include <vector>
 
 #include "tensorflow/cc/ops/const_op.h"
@@ -119,8 +122,8 @@ Status ReadTensorFromImageFile(const string& file_name, const int input_height,
       root, dims_expander,
       Const(root.WithOpName("size"), {input_height, input_width}));
   // Subtract the mean and divide by the scale.
-  Div(root.WithOpName(output_name), Sub(root, resized, {input_mean}),
-      {input_std});
+  Div give_me_a_name(root.WithOpName(output_name),
+                     Sub(root, resized, {input_mean}), {input_std});
 
   // This runs the GraphDef network definition that we've just constructed, and
   // returns the results in the output tensor.
@@ -190,7 +193,8 @@ Status GetTopDetections(const std::vector<Tensor>& outputs, int how_many_labels,
   using namespace ::tensorflow::ops;  // NOLINT(build/namespaces)
 
   string output_name = "top_k";
-  TopK(root.WithOpName(output_name), outputs[0], how_many_labels);
+  TopK give_me_a_name(root.WithOpName(output_name), outputs[0],
+                      how_many_labels);
   // This runs the GraphDef network definition that we've just constructed, and
   // returns the results in the output tensors.
   tensorflow::GraphDef graph;
diff --git a/tensorflow/java/src/main/native/graph_jni.cc b/tensorflow/java/src/main/native/graph_jni.cc
@@ -163,7 +163,7 @@ JNIEXPORT jlongArray JNICALL Java_org_tensorflow_Graph_addGradients(
                      "expected %d, got %d dx handles", ny,
                      env->GetArrayLength(dx_handles));
     }
-    dx.reset(new TF_Output[ny]);
+    dx = std::make_unique<TF_Output[]>(ny);
     resolveOutputs(env, "dx", dx_handles, dx_indices, dx.get(), ny);
   }
   if (env->ExceptionCheck()) return nullptr;
diff --git a/tensorflow/js/ops/ts_op_gen.cc b/tensorflow/js/ops/ts_op_gen.cc
diff --git a/tensorflow/python/distribute/parallel_device/pywrap_parallel_device.cc b/tensorflow/python/distribute/parallel_device/pywrap_parallel_device.cc
diff --git a/tensorflow/python/platform/stacktrace_handler_wrapper.cc b/tensorflow/python/platform/stacktrace_handler_wrapper.cc
diff --git a/tensorflow/python/training/quantize_training_wrapper.cc b/tensorflow/python/training/quantize_training_wrapper.cc
diff --git a/tensorflow/security/fuzzing/cc/fuzz_session.h b/tensorflow/security/fuzzing/cc/fuzz_session.h
diff --git a/tensorflow/tools/api/tests/convert_from_multiline.cc b/tensorflow/tools/api/tests/convert_from_multiline.cc
diff --git a/tensorflow/tools/tfg_graph_transforms/tfg_graph_transforms_main.cc b/tensorflow/tools/tfg_graph_transforms/tfg_graph_transforms_main.cc
diff --git a/tensorflow/tsl/c/tsl_status_test.cc b/tensorflow/tsl/c/tsl_status_test.cc
diff --git a/tensorflow/tsl/concurrency/async_value.cc b/tensorflow/tsl/concurrency/async_value.cc
diff --git a/tensorflow/tsl/distributed_runtime/call_options.cc b/tensorflow/tsl/distributed_runtime/call_options.cc
diff --git a/tensorflow/tsl/lib/hash/crc32c_test.cc b/tensorflow/tsl/lib/hash/crc32c_test.cc
diff --git a/tensorflow/tsl/lib/strings/proto_serialization.cc b/tensorflow/tsl/lib/strings/proto_serialization.cc
