Update on "[CPU] Refactor Random Number Generators in ATen"

syed-ahmed · syed-ahmed · commit 3565af22ebd8 · 2019-06-11T17:13:15.000-07:00
[CPU] Refactor Random Number Generators in ATen

gh-metadata: pytorch pytorch 21364 gh/syed-ahmed/14/head
diff --git a/aten/src/ATen/core/DistributionsHelper.h b/aten/src/ATen/core/DistributionsHelper.h
@@ -166,7 +166,7 @@ struct bernoulli_distribution {
     p = p_in;
   }
 
-  inline T operator()(at::CPUGenerator* generator) { 
+  inline int operator()(at::CPUGenerator* generator) { 
     uniform_real_distribution<T> uniform(0.0, 1.0);
     return uniform(generator) <= p;
   }
diff --git a/aten/src/ATen/core/MT19937RNGEngine.h b/aten/src/ATen/core/MT19937RNGEngine.h
@@ -14,7 +14,6 @@ namespace at {
 
 constexpr int MERSENNE_STATE_N = 624;
 constexpr int MERSENNE_STATE_M = 397;
-constexpr int INIT_KEY_MULTIPLIER = 3;
 constexpr uint32_t MATRIX_A = 0x9908b0df;
 constexpr uint32_t UMASK = 0x80000000;
 constexpr uint32_t LMASK = 0x7fffffff;
diff --git a/aten/src/ATen/native/cpu/UnaryOpsKernel.cpp b/aten/src/ATen/native/cpu/UnaryOpsKernel.cpp
@@ -126,7 +126,7 @@ void bernoulli_mkl_kernel(Tensor &self, const double p, Generator* gen) {
   {
     // See Note [Acquire lock when using random generators]
     std::lock_guard<std::mutex> lock(generator->mutex_);
-    seed = generator->random64();
+    seed = generator->random();
   }
   int64_t n = self.numel();
   bool contig = self.is_contiguous();

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ struct bernoulli_distribution {`
`166`	`166`	`p = p_in;`
`167`	`167`	`}`
`168`	`168`
`169`		`- inline T operator()(at::CPUGenerator* generator) {`
	`169`	`+ inline int operator()(at::CPUGenerator* generator) {`
`170`	`170`	`uniform_real_distribution<T> uniform(0.0, 1.0);`
`171`	`171`	`return uniform(generator) <= p;`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ void bernoulli_mkl_kernel(Tensor &self, const double p, Generator* gen) {`
`126`	`126`	`{`
`127`	`127`	`// See Note [Acquire lock when using random generators]`
`128`	`128`	`std::lock_guard<std::mutex> lock(generator->mutex_);`
`129`		`- seed = generator->random64();`
	`129`	`+ seed = generator->random();`
`130`	`130`	`}`
`131`	`131`	`int64_t n = self.numel();`
`132`	`132`	`bool contig = self.is_contiguous();`