From 9aa39584feab51a8b92862fcef713477f88deaec Mon Sep 17 00:00:00 2001
From: yaoxuefeng <yaoxuefeng@baidu.com>
Date: Sat, 5 Sep 2020 15:50:15 +0800
Subject: [PATCH] fix cuda generator hard-coded offset step (#27027)

---
 paddle/fluid/operators/gaussian_random_op.cu         | 12 ++----------
 .../fluid/operators/truncated_gaussian_random_op.cu  |  6 +-----
 paddle/fluid/operators/uniform_random_op.cu          |  6 +-----
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/paddle/fluid/operators/gaussian_random_op.cu b/paddle/fluid/operators/gaussian_random_op.cu
index eca42ac581a..69c8b600406 100644
--- a/paddle/fluid/operators/gaussian_random_op.cu
+++ b/paddle/fluid/operators/gaussian_random_op.cu
@@ -71,11 +71,7 @@ class GPUGaussianRandomKernel : public framework::OpKernel<T> {
 
     if (gen_cuda->GetIsInitPy() && seed_flag) {
       auto seed_offset = gen_cuda->IncrementOffset(1);
-      int offset_step = 100;
-      // NOTE(xuefeng): Currently, we let offset step fixed to avoid
-      // unexpected results which may cause ut fail.
-      // we will fix this in future.
-      int gen_offset = offset_step * seed_offset.second;
+      int gen_offset = size * seed_offset.second;
       thrust::transform(
           index_sequence_begin, index_sequence_begin + size,
           thrust::device_ptr<T>(data),
@@ -112,11 +108,7 @@ class GPUGaussianRandomBatchSizeLikeKernel : public framework::OpKernel<T> {
 
     if (gen_cuda->GetIsInitPy() && seed_flag) {
       auto seed_offset = gen_cuda->IncrementOffset(1);
-      int offset_step = 100;
-      // NOTE(xuefeng): Currently, we let offset step fixed to avoid
-      // unexpected results which may cause ut fail.
-      // we will fix this in future.
-      int gen_offset = offset_step * seed_offset.second;
+      int gen_offset = size * seed_offset.second;
       thrust::transform(index_sequence_begin, index_sequence_begin + size,
                         thrust::device_ptr<T>(data),
                         GaussianGenerator<T>(mean, std, seed_offset.first,
diff --git a/paddle/fluid/operators/truncated_gaussian_random_op.cu b/paddle/fluid/operators/truncated_gaussian_random_op.cu
index ef1e40b46d0..a838c30771a 100644
--- a/paddle/fluid/operators/truncated_gaussian_random_op.cu
+++ b/paddle/fluid/operators/truncated_gaussian_random_op.cu
@@ -103,11 +103,7 @@ class GPUTruncatedGaussianRandomKernel : public framework::OpKernel<T> {
 
     if (gen_cuda->GetIsInitPy() && seed_flag) {
       auto seed_offset = gen_cuda->IncrementOffset(1);
-      int offset_step = 100;
-      // NOTE(xuefeng): Currently, we let offset step fixed to avoid
-      // unexpected results which may cause ut fail.
-      // we will fix this in future.
-      int gen_offset = offset_step * seed_offset.second;
+      int gen_offset = size * seed_offset.second;
       thrust::transform(
           index_sequence_begin, index_sequence_begin + size,
           thrust::device_ptr<T>(data),
diff --git a/paddle/fluid/operators/uniform_random_op.cu b/paddle/fluid/operators/uniform_random_op.cu
index 43a25a098b0..6237137cccb 100644
--- a/paddle/fluid/operators/uniform_random_op.cu
+++ b/paddle/fluid/operators/uniform_random_op.cu
@@ -143,11 +143,7 @@ class GPUUniformRandomKernel : public framework::OpKernel<T> {
     auto gen_cuda = framework::GetDefaultCUDAGenerator(device_id);
     if (gen_cuda->GetIsInitPy() && seed_flag) {
       auto seed_offset = gen_cuda->IncrementOffset(1);
-      int offset_step = 100;
-      // NOTE(xuefeng): Currently, we let offset step fixed to avoid
-      // unexpected results which may cause ut fail.
-      // we will fix this in future.
-      int gen_offset = offset_step * seed_offset.second;
+      int gen_offset = size * seed_offset.second;
       thrust::transform(
           index_sequence_begin, index_sequence_begin + size,
           thrust::device_ptr<T>(data),
-- 
GitLab