Mingyan.w (#56065)

TonibMw · web-flow · commit 70a009eeae8d · 2023-08-16T10:10:54.000+08:00
Fixed a bug in the if (!id_hint.empty()) code block by adding missing code to correctly modify id_hint.
diff --git a/paddle/cinn/frontend/net_builder.cc b/paddle/cinn/frontend/net_builder.cc
@@ -253,12 +253,8 @@ NETBUILDER_REDUCE_OP_DEF(ReduceAny, reduce_any)
 Placeholder NetBuilder::CreateInput(const Type& type,
                                     const std::vector<int>& shape,
                                     const std::string& id_hint) {
-  if (!id_hint.empty()) {
-    cinn::utils::TransValidVarName(id_hint);
-  }
-  std::string id =
-      id_hint.empty() ? Context::Global().NewName("placeholder") : id_hint;
-
+  std::string id = id_hint.empty() ? Context::Global().NewName("placeholder")
+                                   : cinn::utils::TransValidVarName(id_hint);
   inputs_.emplace_back(id);
   auto& var = inputs_.back();
   var->type = type;
diff --git a/paddle/cinn/frontend/net_builder_test.cc b/paddle/cinn/frontend/net_builder_test.cc
@@ -76,6 +76,16 @@ TEST(net_build, basic) {
   }
 }
 
+TEST(net_build, TestTransValidVarName) {
+  std::string a_val_id = "A";
+  std::string b_val_id = "B___";
+  frontend::NetBuilder builder("net_builder");
+  auto a = builder.CreateInput(Float(32), {1, 64, 112, 112}, "@A");
+  auto b = builder.CreateInput(Float(32), {64}, "B/");
+  EXPECT_EQ(a.id(), a_val_id);
+  EXPECT_EQ(b.id(), b_val_id);
+}
+
 TEST(net_build, program_execute_multi_elementwise_add) {
   auto program = CreateAddProgram();
 #ifdef CINN_WITH_CUDA
