summaryrefslogtreecommitdiff
path: root/benchmarks
diff options
context:
space:
mode:
authorKevin Sheppard <kevin.k.sheppard@gmail.com>2019-05-24 21:19:11 +0100
committermattip <matti.picus@gmail.com>2019-05-27 22:58:35 +0300
commit23853d65e5c31f182a405427f580123f214e386e (patch)
tree8221947b3e5cc539fa4b1b30c88041f1ad93655e /benchmarks
parent58c0e72854c3f79d3d165d74f2dc721815a38b57 (diff)
downloadnumpy-23853d65e5c31f182a405427f580123f214e386e.tar.gz
STY: Clean up code
Pep8 fixes Remove unused imports Fix name error
Diffstat (limited to 'benchmarks')
-rw-r--r--benchmarks/benchmarks/bench_random.py30
1 files changed, 15 insertions, 15 deletions
diff --git a/benchmarks/benchmarks/bench_random.py b/benchmarks/benchmarks/bench_random.py
index 044986029..c9c7baf7c 100644
--- a/benchmarks/benchmarks/bench_random.py
+++ b/benchmarks/benchmarks/bench_random.py
@@ -89,37 +89,37 @@ class RNG(Benchmark):
params = ['DSFMT', 'PCG64', 'PCG32', 'MT19937', 'Xoshiro256',
'Xoshiro512', 'Philox', 'ThreeFry', 'numpy']
- def setup(self, brng):
- if brng == 'numpy':
+ def setup(self, bitgen):
+ if bitgen == 'numpy':
self.rg = np.random.RandomState()
else:
- self.rg = Generator(getattr(np.random, brng)())
+ self.rg = Generator(getattr(np.random, bitgen)())
self.rg.random()
self.int32info = np.iinfo(np.int32)
self.uint32info = np.iinfo(np.uint32)
self.uint64info = np.iinfo(np.uint64)
- def time_raw(self, brng):
- if brng == 'numpy':
+ def time_raw(self, bitgen):
+ if bitgen == 'numpy':
self.rg.random_integers(self.int32info.max, size=nom_size)
else:
self.rg.integers(self.int32info.max, size=nom_size, endpoint=True)
- def time_32bit(self, brng):
+ def time_32bit(self, bitgen):
min, max = self.uint32info.min, self.uint32info.max
- if brng == 'numpy':
+ if bitgen == 'numpy':
self.rg.randint(min, max + 1, nom_size, dtype=np.uint32)
else:
self.rg.integers(min, max + 1, nom_size, dtype=np.uint32)
- def time_64bit(self, brng):
+ def time_64bit(self, bitgen):
min, max = self.uint64info.min, self.uint64info.max
- if brng == 'numpy':
+ if bitgen == 'numpy':
self.rg.randint(min, max + 1, nom_size, dtype=np.uint64)
else:
self.rg.integers(min, max + 1, nom_size, dtype=np.uint64)
- def time_normal_zig(self, brng):
+ def time_normal_zig(self, bitgen):
self.rg.standard_normal(nom_size)
class Bounded(Benchmark):
@@ -146,14 +146,14 @@ class Bounded(Benchmark):
[u64, 2047], # Best case for legacy
]]
- def setup(self, brng, args):
- if brng == 'numpy':
+ def setup(self, bitgen, args):
+ if bitgen == 'numpy':
self.rg = np.random.RandomState()
else:
- self.rg = Generator(getattr(np.random, brng)())
+ self.rg = Generator(getattr(np.random, bitgen)())
self.rg.random()
- def time_bounded(self, brng, args):
+ def time_bounded(self, bitgen, args):
"""
Timer for 8-bit bounded values.
@@ -165,7 +165,7 @@ class Bounded(Benchmark):
Upper bound for range. Lower is always 0. Must be <= 2**bits.
"""
dt, max = args
- if brng == 'numpy':
+ if bitgen == 'numpy':
self.rg.randint(0, max + 1, nom_size, dtype=dt)
else:
self.rg.integers(0, max + 1, nom_size, dtype=dt)