diff --git a/paddle/framework/CMakeLists.txt b/paddle/framework/CMakeLists.txt
index eb3416462324edf6f6e76e32d7400d1fd774b9bd..a00b9c81906fb1194b51efc50e6255f092875281 100644
--- a/paddle/framework/CMakeLists.txt
+++ b/paddle/framework/CMakeLists.txt
@@ -4,8 +4,11 @@ cc_test(enforce_test SRCS enforce_test.cc DEPS enforce)
 cc_library(ddim SRCS ddim.cc DEPS eigen3)
 cc_test(ddim_test SRCS ddim_test.cc DEPS ddim)
 nv_test(dim_test SRCS dim_test.cu DEPS ddim)
+
 cc_library(tensor SRCS tensor.cc DEPS ddim place enforce paddle_memory)
 cc_test(tensor_test SRCS tensor_test.cc DEPS tensor)
+cc_test(eigen_test SRCS eigen_test.cc DEPS tensor)
+
 cc_test(variable_test SRCS variable_test.cc)
 cc_test(scope_test SRCS scope_test.cc)
 proto_library(attr_type SRCS attr_type.proto)
diff --git a/paddle/operators/add_op.h b/paddle/operators/add_op.h
index e08b3fb18775e2536a13bc838f40472c5c3e7ff7..e7c106a23ffe34baec179f58efa67943a6164a23 100644
--- a/paddle/operators/add_op.h
+++ b/paddle/operators/add_op.h
@@ -14,6 +14,7 @@ limitations under the License. */
 
 #pragma once
 #include "glog/logging.h"
+#include "paddle/framework/eigen.h"
 #include "paddle/framework/operator.h"
 
 namespace paddle {
@@ -29,8 +30,9 @@ public:
 
     output->mutable_data<T>(context.GetPlace());
 
-    output->flat<T>().device(*(context.GetEigenDevice<Place>())) =
-        input0.flat<T>() + input1.flat<T>();
+    framework::EigenVector<T>::From(*output).device(
+        *(context.GetEigenDevice<Place>())) =
+        framework::EigenVector<T>(*input0) + framework::EigenVector<T>(*input1);
   }
 };