diff options
| author | mattip <matti.picus@gmail.com> | 2019-05-13 14:17:51 -0700 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2019-05-20 19:00:34 +0300 |
| commit | 17e0070df93f4262908f884dca4b08cb7d0bba7f (patch) | |
| tree | 2db0eec024d5e021a36e6dca9f4b97d118bc9444 /doc/source/reference/random/performance.py | |
| parent | dd77ce3cb84986308986974acfe988575323f75a (diff) | |
| download | numpy-17e0070df93f4262908f884dca4b08cb7d0bba7f.tar.gz | |
MAINT: Implement API changes for randomgen-derived code
remove numpy.random.gen, BRNG.generator, pcg*, rand, randn
remove use_mask and Lemire's method, fix benchmarks for PCG removal
convert brng to bitgen (in C) and bit_generator (in python)
convert base R{NG,andom.*} to BitGenerator, fix last commit
randint -> integers, remove rand, randn, random_integers
RandomGenerator -> Generator, more "basic RNG" -> BitGenerator
random_sample -> random, jump -> jumped, resync with randomgen
Remove derived code from entropy
Port over changes accepted in upstream to protect log(0.0) where relevant
fix doctests for jumped, better document choice
Remove Python 2.7 shims
Use NPY_INLINE to simplify
Fix performance.py to work
Renam directory brng to bit_generators
Fix examples wiht new directory structure
Clarify relationship to historical RandomState
Remove references to .generator
Rename xoshiro256/512starstar
Diffstat (limited to 'doc/source/reference/random/performance.py')
| -rw-r--r-- | doc/source/reference/random/performance.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/doc/source/reference/random/performance.py b/doc/source/reference/random/performance.py index 12cbbc5d3..a29e09c41 100644 --- a/doc/source/reference/random/performance.py +++ b/doc/source/reference/random/performance.py @@ -4,16 +4,15 @@ from timeit import repeat import numpy as np import pandas as pd -from randomgen import MT19937, DSFMT, ThreeFry, PCG64, Xoroshiro128, \ - Xorshift1024, Philox, Xoshiro256StarStar, Xoshiro512StarStar +from numpy.random import MT19937, DSFMT, ThreeFry, Xoroshiro128, \ + Xorshift1024, Philox, Xoshiro256, Xoshiro512 -PRNGS = [DSFMT, MT19937, Philox, PCG64, ThreeFry, Xoroshiro128, Xorshift1024, - Xoshiro256StarStar, Xoshiro512StarStar] +PRNGS = [DSFMT, MT19937, Philox, ThreeFry, Xoroshiro128, Xorshift1024, + Xoshiro256, Xoshiro512] -funcs = {'32-bit Unsigned Ints': 'random_uintegers(size=1000000,bits=32)', - '64-bit Unsigned Ints': 'random_uintegers(size=1000000,bits=32)', - 'Uniforms': 'random_sample(size=1000000)', - 'Complex Normals': 'complex_normal(size=1000000)', +funcs = {'32-bit Unsigned Ints': 'integers(0, 2**32,size=1000000, dtype="uint32")', + '64-bit Unsigned Ints': 'integers(0, 2**64,size=1000000, dtype="uint64")', + 'Uniforms': 'random(size=1000000)', 'Normals': 'standard_normal(size=1000000)', 'Exponentials': 'standard_exponential(size=1000000)', 'Gammas': 'standard_gamma(3.0,size=1000000)', @@ -22,8 +21,8 @@ funcs = {'32-bit Unsigned Ints': 'random_uintegers(size=1000000,bits=32)', 'Poissons': 'poisson(3.0, size=1000000)', } setup = """ -from randomgen import {prng} -rg = {prng}().generator +from numpy.random import {prng}, Generator +rg = Generator({prng}()) """ test = "rg.{func}" @@ -43,7 +42,6 @@ npfuncs = OrderedDict() npfuncs.update(funcs) npfuncs['32-bit Unsigned Ints'] = 'randint(2**32,dtype="uint32",size=1000000)' npfuncs['64-bit Unsigned Ints'] = 'tomaxint(size=1000000)' -del npfuncs['Complex Normals'] setup = """ from numpy.random import RandomState rg = RandomState() |