From f380ee4e57c73fcd99049120a90b793786a73b14 Mon Sep 17 00:00:00 2001
From: Kavya Srinet <kavyasrinet@baidu.com>
Date: Wed, 14 Feb 2018 10:58:54 -0800
Subject: [PATCH] Updated format of type in data_type.h

---
 paddle/fluid/framework/data_type.h | 44 +++++++++++++++---------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/paddle/fluid/framework/data_type.h b/paddle/fluid/framework/data_type.h
index 2b42c814558..1dec766a345 100644
--- a/paddle/fluid/framework/data_type.h
+++ b/paddle/fluid/framework/data_type.h
@@ -23,15 +23,15 @@ namespace framework {
 inline proto::VarType::Type ToDataType(std::type_index type) {
   using namespace paddle::framework::proto;
   if (typeid(float).hash_code() == type.hash_code()) {
-    return VarType_Type_FP32;
+    return proto::VarType::FP32;
   } else if (typeid(double).hash_code() == type.hash_code()) {
-    return VarType_Type_FP64;
+    return proto::VarType::FP64;
   } else if (typeid(int).hash_code() == type.hash_code()) {
-    return VarType_Type_INT32;
+    return proto::VarType::INT32;
   } else if (typeid(int64_t).hash_code() == type.hash_code()) {
-    return VarType_Type_INT64;
+    return proto::VarType::INT64;
   } else if (typeid(bool).hash_code() == type.hash_code()) {
-    return VarType_Type_BOOL;
+    return proto::VarType::BOOL;
   } else {
     PADDLE_THROW("Not supported");
   }
@@ -40,15 +40,15 @@ inline proto::VarType::Type ToDataType(std::type_index type) {
 inline std::type_index ToTypeIndex(proto::VarType::Type type) {
   using namespace paddle::framework::proto;
   switch (type) {
-    case VarType_Type_FP32:
+    case proto::VarType::FP32:
       return typeid(float);
-    case VarType_Type_FP64:
+    case proto::VarType::FP64:
       return typeid(double);
-    case VarType_Type_INT32:
+    case proto::VarType::INT32:
       return typeid(int);
-    case VarType_Type_INT64:
+    case proto::VarType::INT64:
       return typeid(int64_t);
-    case VarType_Type_BOOL:
+    case proto::VarType::BOOL:
       return typeid(bool);
     default:
       PADDLE_THROW("Not support type %d", type);
@@ -59,19 +59,19 @@ template <typename Visitor>
 inline void VisitDataType(proto::VarType::Type type, Visitor visitor) {
   using namespace paddle::framework::proto;
   switch (type) {
-    case VarType_Type_FP32:
+    case proto::VarType::FP32:
       visitor.template operator()<float>();
       break;
-    case VarType_Type_FP64:
+    case proto::VarType::FP64:
       visitor.template operator()<double>();
       break;
-    case VarType_Type_INT32:
+    case proto::VarType::INT32:
       visitor.template operator()<int>();
       break;
-    case VarType_Type_INT64:
+    case proto::VarType::INT64:
       visitor.template operator()<int64_t>();
       break;
-    case VarType_Type_BOOL:
+    case proto::VarType::BOOL:
       visitor.template operator()<bool>();
       break;
     default:
@@ -82,19 +82,19 @@ inline void VisitDataType(proto::VarType::Type type, Visitor visitor) {
 inline std::string DataTypeToString(const proto::VarType::Type type) {
   using namespace paddle::framework::proto;
   switch (type) {
-    case VarType_Type_FP16:
+    case proto::VarType::FP16:
       return "float16";
-    case VarType_Type_FP32:
+    case proto::VarType::FP32:
       return "float32";
-    case VarType_Type_FP64:
+    case proto::VarType::FP64:
       return "float64";
-    case VarType_Type_INT16:
+    case proto::VarType::INT16:
       return "int16";
-    case VarType_Type_INT32:
+    case proto::VarType::INT32:
       return "int32";
-    case VarType_Type_INT64:
+    case proto::VarType::INT64:
       return "int64";
-    case VarType_Type_BOOL:
+    case proto::VarType::BOOL:
       return "bool";
     default:
       PADDLE_THROW("Not support type %d", type);
-- 
GitLab