summaryrefslogtreecommitdiff
path: root/benchmarks
diff options
context:
space:
mode:
authormattip <matti.picus@gmail.com>2019-04-12 10:27:33 +0300
committermattip <matti.picus@gmail.com>2019-05-20 18:45:27 +0300
commit9578dcfbe744854312690ea79063e50d67fc88a2 (patch)
treec81fd1e43aa3a2a5124aae8575dcb427746b8ef9 /benchmarks
parentc53b2eb729bae1f248a2654dfcfa4a3dd3e2902b (diff)
downloadnumpy-9578dcfbe744854312690ea79063e50d67fc88a2.tar.gz
BUG: __dealloc__ can be called without __init__ in some error modes
skip doctests that require scipy move original mtrand module to _mtrand adjust documentation for namespace change
Diffstat (limited to 'benchmarks')
-rw-r--r--benchmarks/benchmarks/bench_random.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/benchmarks/benchmarks/bench_random.py b/benchmarks/benchmarks/bench_random.py
index 38a079e84..3589c65a3 100644
--- a/benchmarks/benchmarks/bench_random.py
+++ b/benchmarks/benchmarks/bench_random.py
@@ -4,8 +4,7 @@ from .common import Benchmark
import numpy as np
-from numpy.random import RandomState
-from numpy.random.randomgen import RandomGenerator
+from numpy.random import RandomState, RandomGenerator
class Random(Benchmark):
params = ['normal', 'uniform', 'weibull 1', 'binomial 10 0.5',
@@ -95,7 +94,7 @@ class RNG(Benchmark):
if brng == 'numpy':
self.rg = np.random.RandomState()
else:
- self.rg = RandomGenerator(getattr(np.random.randomgen, brng)())
+ self.rg = RandomGenerator(getattr(np.random, brng)())
self.rg.random_sample()
self.int32info = np.iinfo(np.int32)
self.uint32info = np.iinfo(np.uint32)
@@ -149,7 +148,7 @@ class Bounded(Benchmark):
if brng == 'numpy':
self.rg = np.random.RandomState()
else:
- self.rg = RandomGenerator(getattr(np.random.randomgen, brng)())
+ self.rg = RandomGenerator(getattr(np.random, brng)())
self.rg.random_sample()
def time_bounded(self, brng, args):