Skip to content

Commit 0133f23

Browse files
committed
fix ut test=develop
1 parent 8bfc90b commit 0133f23

File tree

4 files changed

+4
-27
lines changed

4 files changed

+4
-27
lines changed

paddle/fluid/framework/generator.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ struct Generator {
3737
Generator() {
3838
GeneratorState default_gen_state_cpu;
3939
default_gen_state_cpu.device = -1;
40-
std::random_device rnd;
41-
uint64_t init_seed = (((uint64_t)rnd()) << 32) + rnd();
42-
default_gen_state_cpu.current_seed = init_seed;
43-
std::seed_seq seq({init_seed});
40+
default_gen_state_cpu.current_seed = 34342423252;
41+
std::seed_seq seq({34342423252});
4442
default_gen_state_cpu.cpu_engine = std::mt19937_64(seq);
4543
this->state_ = std::make_shared<GeneratorState>(default_gen_state_cpu);
4644
}

paddle/fluid/memory/allocation/mmap_allocator.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ std::string GetIPCName() {
6161
#endif
6262
handle += "_";
6363
handle += std::to_string(rd());
64-
/*
65-
handle +=
66-
framework::Generator::GetInstance()->is_init_py
67-
? std::to_string(framework::Generator::GetInstance()->Random64())
68-
: std::to_string(rd());
69-
*/
7064
return std::move(handle);
7165
}
7266

paddle/fluid/operators/detection/generate_proposal_labels_op.cc

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ limitations under the License. */
1313
#include <algorithm>
1414
#include <string>
1515
#include <vector>
16-
#include "paddle/fluid/framework/generator.h"
1716
#include "paddle/fluid/framework/op_registry.h"
1817
#include "paddle/fluid/operators/detection/bbox_util.h"
1918
#include "paddle/fluid/operators/gather.h"
@@ -191,13 +190,7 @@ std::vector<std::vector<int>> SampleFgBgGt(
191190
const int64_t fg_size = static_cast<int64_t>(fg_inds.size());
192191
if (fg_size > fg_rois_per_this_image) {
193192
for (int64_t i = fg_rois_per_this_image; i < fg_size; ++i) {
194-
int rng_ind =
195-
framework::Generator::GetInstance()->is_init_py
196-
? std::floor(uniform(framework::Generator::GetInstance()
197-
->GetCPUEngine()) *
198-
i)
199-
: std::floor(uniform(engine) * i);
200-
// int rng_ind = std::floor(uniform(engine) * i);
193+
int rng_ind = std::floor(uniform(engine) * i);
201194
if (rng_ind < fg_rois_per_this_image) {
202195
std::iter_swap(fg_inds.begin() + rng_ind, fg_inds.begin() + i);
203196
std::iter_swap(mapped_gt_inds.begin() + rng_ind,

paddle/fluid/operators/detection/rpn_target_assign_op.cc

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ See the License for the specific language governing permissions and
1313
limitations under the License. */
1414

1515
#include <random>
16-
#include "paddle/fluid/framework/generator.h"
1716
#include "paddle/fluid/framework/op_registry.h"
1817
#include "paddle/fluid/operators/detection/bbox_util.h"
1918
#include "paddle/fluid/operators/math/math_function.h"
@@ -160,14 +159,7 @@ void ReservoirSampling(const int num, std::vector<int>* inds,
160159
if (len > static_cast<size_t>(num)) {
161160
if (use_random) {
162161
for (size_t i = num; i < len; ++i) {
163-
int rng_ind =
164-
framework::Generator::GetInstance()->is_init_py
165-
? std::floor(
166-
uniform(
167-
framework::Generator::GetInstance()->GetCPUEngine()) *
168-
i)
169-
: std::floor(uniform(engine) * i);
170-
// int rng_ind = std::floor(uniform(engine) * i);
162+
int rng_ind = std::floor(uniform(engine) * i);
171163
if (rng_ind < num)
172164
std::iter_swap(inds->begin() + rng_ind, inds->begin() + i);
173165
}

0 commit comments

Comments
 (0)