From 5e5e7b33053dd6784e2e0f1176048a5bb37fb8d7 Mon Sep 17 00:00:00 2001
From: Zeng Jinle <32832641+sneaxiy@users.noreply.github.com>
Date: Fri, 10 May 2019 00:52:54 +0800
Subject: [PATCH] fix data_type error message (#17312)

test=develop
---
 paddle/fluid/framework/operator.cc   | 2 +-
 paddle/fluid/framework/tensor_impl.h | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/paddle/fluid/framework/operator.cc b/paddle/fluid/framework/operator.cc
index de8766809c..fae33f55b0 100644
--- a/paddle/fluid/framework/operator.cc
+++ b/paddle/fluid/framework/operator.cc
@@ -1148,7 +1148,7 @@ proto::VarType::Type OperatorWithKernel::IndicateDataType(
           proto::VarType::Type tmp = t->type();
           PADDLE_ENFORCE(
               tmp == data_type || data_type == dafault_data_type,
-              "DataType of Paddle Op %s %s must be the same. Get (%d) != (%d)",
+              "DataType of Paddle Op %s %s must be the same. Get (%s) != (%s)",
               Type(), input.first, DataTypeToString(data_type),
               DataTypeToString(tmp));
           data_type = tmp;
diff --git a/paddle/fluid/framework/tensor_impl.h b/paddle/fluid/framework/tensor_impl.h
index ef5404e475..8dabecac8a 100644
--- a/paddle/fluid/framework/tensor_impl.h
+++ b/paddle/fluid/framework/tensor_impl.h
@@ -25,8 +25,9 @@ inline const T* Tensor::data() const {
   check_memory_size();
   bool valid =
       std::is_same<T, void>::value || type_ == DataTypeTrait<T>::DataType;
-  PADDLE_ENFORCE(valid, "Tensor holds the wrong type, it holds %d",
-                 DataTypeToString(type_));
+  PADDLE_ENFORCE(
+      valid, "Tensor holds the wrong type, it holds %s, but desires to be %s",
+      DataTypeToString(type_), DataTypeToString(DataTypeTrait<T>::DataType));
 
   return reinterpret_cast<const T*>(
       reinterpret_cast<uintptr_t>(holder_->ptr()) + offset_);
@@ -39,7 +40,9 @@ inline T* Tensor::data() {
   check_memory_size();
   bool valid =
       std::is_same<T, void>::value || type_ == DataTypeTrait<T>::DataType;
-  PADDLE_ENFORCE(valid, "Tensor holds the wrong type, it holds %s", type_);
+  PADDLE_ENFORCE(
+      valid, "Tensor holds the wrong type, it holds %s, but desires to be %s",
+      DataTypeToString(type_), DataTypeToString(DataTypeTrait<T>::DataType));
   return reinterpret_cast<T*>(reinterpret_cast<uintptr_t>(holder_->ptr()) +
                               offset_);
 }
-- 
GitLab