From ae6745f77a2832881f0d20c36a8cdd65f4c06bd8 Mon Sep 17 00:00:00 2001
From: wuzewu <wuzewu@baidu.com>
Date: Thu, 9 May 2019 10:33:36 +0800
Subject: [PATCH] fix py2 bug

---
 paddlehub/common/paddle_helper.py | 22 ++++++++++++++++++++--
 paddlehub/version.py              |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/paddlehub/common/paddle_helper.py b/paddlehub/common/paddle_helper.py
index 715b1578..955ae809 100644
--- a/paddlehub/common/paddle_helper.py
+++ b/paddlehub/common/paddle_helper.py
@@ -25,15 +25,33 @@ from paddlehub.module import module_desc_pb2
 from paddlehub.common.utils import from_pyobj_to_module_attr, from_module_attr_to_pyobj
 from paddlehub.common.logger import logger
 
+dtype_map = {
+    fluid.core.VarDesc.VarType.FP32: "float32",
+    fluid.core.VarDesc.VarType.FP64: "float64",
+    fluid.core.VarDesc.VarType.FP16: "float16",
+    fluid.core.VarDesc.VarType.INT32: "int32",
+    fluid.core.VarDesc.VarType.INT16: "int16",
+    fluid.core.VarDesc.VarType.INT64: "int64",
+    fluid.core.VarDesc.VarType.BOOL: "bool",
+    fluid.core.VarDesc.VarType.INT16: "int16",
+    fluid.core.VarDesc.VarType.UINT8: "uint8",
+    fluid.core.VarDesc.VarType.INT8: "int8",
+}
+
+
+def convert_dtype_to_string(dtype):
+    if dtype in dtype_map:
+        return dtype_map[dtype]
+    raise TypeError("dtype shoule in %s" % list(dtype_map.keys()))
+
 
 def get_variable_info(var):
     if not isinstance(var, fluid.framework.Variable):
         raise TypeError("var shoule be an instance of fluid.framework.Variable")
 
     var_info = {
-        'type': var.type,
         'name': var.name,
-        'dtype': var.dtype,
+        'dtype': convert_dtype_to_string(var.dtype),
         'lod_level': var.lod_level,
         'shape': var.shape,
         'stop_gradient': var.stop_gradient,
diff --git a/paddlehub/version.py b/paddlehub/version.py
index d62ca38f..71a25047 100644
--- a/paddlehub/version.py
+++ b/paddlehub/version.py
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """ PaddleHub version string """
-hub_version = "0.4.8.beta"
+hub_version = "0.5.1"
 module_proto_version = "1.0.0"
-- 
GitLab