From 04a05d1d58528775609c75370f9f2848395e287d Mon Sep 17 00:00:00 2001
From: zenghsh3 <zenghongsheng@baidu.com>
Date: Fri, 31 Aug 2018 13:12:10 +0800
Subject: [PATCH] merged

---
 paddle/fluid/operators/sampling_id_op.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/paddle/fluid/operators/sampling_id_op.h b/paddle/fluid/operators/sampling_id_op.h
index a2bffa9c8ef..14abb78e043 100644
--- a/paddle/fluid/operators/sampling_id_op.h
+++ b/paddle/fluid/operators/sampling_id_op.h
@@ -53,13 +53,8 @@ class SamplingIdKernel : public framework::OpKernel<T> {
         static_cast<T>(context.Attr<float>("min")),
         static_cast<T>(context.Attr<float>("max")));
 
-<<<<<<< HEAD
     std::vector<int64_t> ids(batch_size);
     for (size_t i = 0; i < batch_size; ++i) {
-=======
-    std::vector<T> ids(batch_size);
-    for (int i = 0; i < batch_size; ++i) {
->>>>>>> 823c4f87beff04e4029e3f4a183658621ca8f01b
       T r = dist(engine);
       int idx = width - 1;
       for (int j = 0; j < width; ++j) {
@@ -68,11 +63,7 @@ class SamplingIdKernel : public framework::OpKernel<T> {
           break;
         }
       }
-<<<<<<< HEAD
       ids[i] = int64_t(idx);
-=======
-      ids[i] = ins_vector[idx];
->>>>>>> 823c4f87beff04e4029e3f4a183658621ca8f01b
     }
 
     std::vector<int64_t> out_dim;
-- 
GitLab