From b972b0dfe3a0a1345495f6bff4c52afadfb3a470 Mon Sep 17 00:00:00 2001
From: Chen Weihang <chenweihang@baidu.com>
Date: Thu, 28 Apr 2022 09:39:49 +0800
Subject: [PATCH] polish attr get impl (#42337)

---
 paddle/fluid/framework/attribute.cc | 60 +++++++++++++++--------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/paddle/fluid/framework/attribute.cc b/paddle/fluid/framework/attribute.cc
index cf7a7c3c9f4..2599e3232ca 100644
--- a/paddle/fluid/framework/attribute.cc
+++ b/paddle/fluid/framework/attribute.cc
@@ -18,35 +18,37 @@ namespace paddle {
 namespace framework {
 
 paddle::any GetAttrValue(const Attribute& attr) {
-  if (attr.type() == typeid(int)) {
-    return paddle::any(BOOST_GET_CONST(int, attr));
-  } else if (attr.type() == typeid(float)) {
-    return paddle::any(BOOST_GET_CONST(float, attr));
-  } else if (attr.type() == typeid(std::string)) {
-    return paddle::any(BOOST_GET_CONST(std::string, attr));
-  } else if (attr.type() == typeid(std::vector<int>)) {
-    return paddle::any(BOOST_GET_CONST(std::vector<int>, attr));
-  } else if (attr.type() == typeid(std::vector<float>)) {
-    return paddle::any(BOOST_GET_CONST(std::vector<float>, attr));
-  } else if (attr.type() == typeid(std::vector<std::string>)) {
-    return paddle::any(BOOST_GET_CONST(std::vector<std::string>, attr));
-  } else if (attr.type() == typeid(bool)) {
-    return paddle::any(BOOST_GET_CONST(bool, attr));
-  } else if (attr.type() == typeid(std::vector<bool>)) {
-    return paddle::any(BOOST_GET_CONST(std::vector<bool>, attr));
-  } else if (attr.type() == typeid(BlockDesc*)) {
-    return paddle::any(BOOST_GET_CONST(BlockDesc*, attr));
-  } else if (attr.type() == typeid(int64_t)) {
-    return paddle::any(BOOST_GET_CONST(int64_t, attr));
-  } else if (attr.type() == typeid(std::vector<BlockDesc*>)) {
-    return paddle::any(BOOST_GET_CONST(std::vector<BlockDesc*>, attr));
-  } else if (attr.type() == typeid(std::vector<int64_t>)) {
-    return paddle::any(BOOST_GET_CONST(std::vector<int64_t>, attr));
-  } else if (attr.type() == typeid(std::vector<double>)) {
-    return paddle::any(BOOST_GET_CONST(std::vector<double>, attr));
-  } else {
-    PADDLE_THROW(
-        platform::errors::Unimplemented("Unsupported Attribute value type."));
+  switch (AttrTypeID(attr)) {
+    case proto::AttrType::INT:
+      return BOOST_GET_CONST(int, attr);
+    case proto::AttrType::FLOAT:
+      return BOOST_GET_CONST(float, attr);
+    case proto::AttrType::STRING:
+      return BOOST_GET_CONST(std::string, attr);
+    case proto::AttrType::INTS:
+      return BOOST_GET_CONST(std::vector<int>, attr);
+    case proto::AttrType::FLOATS:
+      return BOOST_GET_CONST(std::vector<float>, attr);
+    case proto::AttrType::STRINGS:
+      return BOOST_GET_CONST(std::vector<std::string>, attr);
+    case proto::AttrType::BOOLEAN:
+      return BOOST_GET_CONST(bool, attr);
+    case proto::AttrType::BOOLEANS:
+      return BOOST_GET_CONST(std::vector<bool>, attr);
+    case proto::AttrType::LONG:
+      return BOOST_GET_CONST(int64_t, attr);
+    case proto::AttrType::LONGS:
+      return BOOST_GET_CONST(std::vector<int64_t>, attr);
+    case proto::AttrType::FLOAT64S:
+      return BOOST_GET_CONST(std::vector<double>, attr);
+    case proto::AttrType::BLOCK:
+      return BOOST_GET_CONST(BlockDesc*, attr);
+    case proto::AttrType::BLOCKS:
+      return BOOST_GET_CONST(std::vector<BlockDesc*>, attr);
+    default:
+      PADDLE_THROW(platform::errors::Unimplemented(
+          "Unsupported Attribute value type `%s` for phi.",
+          platform::demangle(attr.type().name())));
   }
 }
 
-- 
GitLab