From f18f3826dc5d59f49908f2c232ff81b15c0abd9a Mon Sep 17 00:00:00 2001
From: dzhwinter <dzhwinter@gmail.com>
Date: Mon, 5 Feb 2018 03:04:39 -0800
Subject: [PATCH] "parallel op set lod after copy "

---
 paddle/framework/mixed_vector.h    | 4 ++--
 paddle/operators/parallel_do_op.cc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/paddle/framework/mixed_vector.h b/paddle/framework/mixed_vector.h
index d86899bc631..aade7d83918 100644
--- a/paddle/framework/mixed_vector.h
+++ b/paddle/framework/mixed_vector.h
@@ -54,7 +54,7 @@ class Vector : public std::vector<T> {
     CopyToCUDA();
     PADDLE_ENFORCE_NOT_NULL(
         cuda_ptr_, "No data or Insufficient CUDA memory to allocation");
-    return static_cast<T *>(cuda_ptr_);
+    return static_cast<T *>(cuda_ptr_.get());
   }
 
   /* Get host vector */
@@ -127,7 +127,7 @@ void Vector<T>::CopyToCUDA() {
 #ifdef PADDLE_WITH_CUDA
   if (cuda_size_ < this->size() || cuda_ptr_ == nullptr) {
     cuda_ptr_.reset(
-        memory::Alloc<platform::CUDAPlace>(this->size() * sizeof(T)),
+        memory::Alloc<platform::CUDAPlace>(place_, this->size() * sizeof(T)),
         memory::PlainDeleter<void, platform::CUDAPlace>(place_));
   }
   cuda_size_ = this->size();
diff --git a/paddle/operators/parallel_do_op.cc b/paddle/operators/parallel_do_op.cc
index d662878592a..87678decde1 100644
--- a/paddle/operators/parallel_do_op.cc
+++ b/paddle/operators/parallel_do_op.cc
@@ -79,7 +79,7 @@ inline void CopyOrShare(const framework::Variable &src,
     } else {
       Copy(src.Get<LoDTensor>(), dst_place, dst->GetMutable<LoDTensor>());
     }
-    dst->set_lod(src.lod());
+    dst->GetMutable<LoDTensor>()->set_lod(src.Get<LoDTensor>().lod());
   } else if (src.IsType<SelectedRows>()) {
     auto &src_sr = src.Get<SelectedRows>();
     auto *dst_sr = dst->GetMutable<SelectedRows>();
-- 
GitLab