Merge pull request #3197 from ROCm/develop-upstream-sync-260316

Develop upstream sync 260316

Author: nurmukhametov

ci/official/envs/linux_arm64

@@ -28,5 +28,5 @@ TFCI_OUTPUT_DIR=build_output
 TFCI_WHL_AUDIT_ENABLE=1
 TFCI_WHL_AUDIT_PLAT=manylinux_2_27_aarch64
 TFCI_WHL_BAZEL_TEST_ENABLE=1
-TFCI_WHL_SIZE_LIMIT=275M
+TFCI_WHL_SIZE_LIMIT=300M
 TFCI_WHL_SIZE_LIMIT_ENABLE=1

ci/official/envs/linux_x86

@@ -25,5 +25,5 @@ TFCI_OUTPUT_DIR=build_output
 TFCI_WHL_AUDIT_ENABLE=1
 TFCI_WHL_AUDIT_PLAT=manylinux_2_27_x86_64
 TFCI_WHL_BAZEL_TEST_ENABLE=1
-TFCI_WHL_SIZE_LIMIT=265M
+TFCI_WHL_SIZE_LIMIT=300M
 TFCI_WHL_SIZE_LIMIT_ENABLE=1

tensorflow/cc/framework/cc_op_gen.cc

@@ -26,7 +26,8 @@ namespace tensorflow {
 namespace cc_op {
 /// Result is written to files dot_h and dot_cc.
 void WriteCCOps(const OpList& ops, const ApiDefMap& api_def_map,
-                const string& dot_h_fname, const string& dot_cc_fname);
+                const std::string& dot_h_fname,
+                const std::string& dot_cc_fname);
 
 }  // namespace cc_op
 }  // namespace tensorflow

tensorflow/cc/framework/cc_op_gen.h

@@ -34,7 +34,7 @@ namespace {
 
 void PrintAllCCOps(const std::string& dot_h, const std::string& dot_cc,
                    bool include_internal,
-                   const std::vector<string>& api_def_dirs) {
+                   const std::vector<std::string>& api_def_dirs) {
   OpList ops;
   absl::StatusOr<ApiDefMap> api_def_map =
       LoadOpsAndApiDefs(ops, include_internal, api_def_dirs);
@@ -62,7 +62,7 @@ int main(int argc, char* argv[]) {
   }
 
   bool include_internal = absl::string_view("1") == argv[3];
-  std::vector<tensorflow::string> api_def_dirs = tensorflow::str_util::Split(
+  std::vector<std::string> api_def_dirs = tensorflow::str_util::Split(
       argv[4], ",", tensorflow::str_util::SkipEmpty());
   tensorflow::cc_op::PrintAllCCOps(argv[1], argv[2], include_internal,
                                    api_def_dirs);

tensorflow/cc/framework/cc_op_gen_main.cc

@@ -71,8 +71,8 @@ void ExpectDoesNotHaveSubstr(absl::string_view s, absl::string_view expected) {
       << "'" << s << "' contains '" << expected << "'";
 }
 
-void ExpectSubstrOrder(const string& s, const string& before,
-                       const string& after) {
+void ExpectSubstrOrder(const std::string& s, const std::string& before,
+                       const std::string& after) {
   int before_pos = s.find(before);
   int after_pos = s.find(after);
   ASSERT_NE(std::string::npos, before_pos);
@@ -84,9 +84,9 @@ void ExpectSubstrOrder(const string& s, const string& before,
 // Runs WriteCCOps and stores output in (internal_)cc_file_path and
 // (internal_)h_file_path.
 void GenerateCcOpFiles(Env* env, const OpList& ops,
-                       const ApiDefMap& api_def_map, string* h_file_text,
-                       string* internal_h_file_text) {
-  const string& tmpdir = testing::TmpDir();
+                       const ApiDefMap& api_def_map, std::string* h_file_text,
+                       std::string* internal_h_file_text) {
+  const std::string& tmpdir = testing::TmpDir();
 
   const auto h_file_path = io::JoinPath(tmpdir, "test.h");
   const auto cc_file_path = io::JoinPath(tmpdir, "test.cc");
@@ -101,7 +101,7 @@ void GenerateCcOpFiles(Env* env, const OpList& ops,
 }
 
 TEST(CcOpGenTest, TestVisibilityChangedToHidden) {
-  const string api_def = R"(
+  const std::string api_def = R"(
 op {
   graph_op_name: "Foo"
   visibility: HIDDEN
@@ -112,7 +112,7 @@ op {
   protobuf::TextFormat::ParseFromString(kBaseOpDef, &op_defs);  // NOLINT
   ApiDefMap api_def_map(op_defs);
 
-  string h_file_text, internal_h_file_text;
+  std::string h_file_text, internal_h_file_text;
   // Without ApiDef
   GenerateCcOpFiles(env, op_defs, api_def_map, &h_file_text,
                     &internal_h_file_text);
@@ -128,7 +128,7 @@ op {
 }
 
 TEST(CcOpGenTest, TestArgNameChanges) {
-  const string api_def = R"(
+  const std::string api_def = R"(
 op {
   graph_op_name: "Foo"
   arg_order: "dim"
@@ -140,8 +140,8 @@ op {
   protobuf::TextFormat::ParseFromString(kBaseOpDef, &op_defs);  // NOLINT
 
   ApiDefMap api_def_map(op_defs);
-  string cc_file_text, h_file_text;
-  string internal_cc_file_text, internal_h_file_text;
+  std::string cc_file_text, h_file_text;
+  std::string internal_cc_file_text, internal_h_file_text;
   // Without ApiDef
   GenerateCcOpFiles(env, op_defs, api_def_map, &h_file_text,
                     &internal_h_file_text);
@@ -155,7 +155,7 @@ op {
 }
 
 TEST(CcOpGenTest, TestEndpoints) {
-  const string api_def = R"(
+  const std::string api_def = R"(
 op {
   graph_op_name: "Foo"
   endpoint {
@@ -171,8 +171,8 @@ op {
   protobuf::TextFormat::ParseFromString(kBaseOpDef, &op_defs);  // NOLINT
 
   ApiDefMap api_def_map(op_defs);
-  string cc_file_text, h_file_text;
-  string internal_cc_file_text, internal_h_file_text;
+  std::string cc_file_text, h_file_text;
+  std::string internal_cc_file_text, internal_h_file_text;
   // Without ApiDef
   GenerateCcOpFiles(env, op_defs, api_def_map, &h_file_text,
                     &internal_h_file_text);