8000 Merge pull request #20 from bashtage/remove-py27-compat · bashtage/numpy@89ff1e2 · GitHub
[go: up one dir, main page]

Skip to content

Commit 89ff1e2

Browse files
authored
Merge pull request #20 from bashtage/remove-py27-compat
MAINT: Remove Python 2.7 shims
2 parents faff58b + 4f443a4 commit 89ff1e2

33 files changed

+77
-778
lines changed

doc/source/reference/random/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ Bit Generators
195195
.. toctree::
196196
:maxdepth: 1
197197

198-
Bit Generators <brng/index>
198+
Bit Generators <bit_generators/index>
199199

200200
Features
201201
--------

doc/source/reference/random/performance.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
import numpy as np
55
import pandas as pd
66

7-
from randomgen import MT19937, DSFMT, ThreeFry, Xoroshiro128, \
7+
from numpy.random import MT19937, DSFMT, ThreeFry, Xoroshiro128, \
88
Xorshift1024, Philox, Xoshiro256StarStar, Xoshiro512StarStar
99

1010
PRNGS = [DSFMT, MT19937, Philox, ThreeFry, Xoroshiro128, Xorshift1024,
1111
Xoshiro256StarStar, Xoshiro512StarStar]
1212

13-
funcs = {'32-bit Unsigned Ints': 'random_uintegers(size=1000000,bits=32)',
14-
'64-bit Unsigned Ints': 'random_uintegers(size=1000000,bits=32)',
15-
'Uniforms': 'random_sample(size=1000000)',
16-
'Complex Normals': 'complex_normal(size=1000000)',
13+
funcs = {'32-bit Unsigned Ints': 'integers(0, 2**32,size=1000000, dtype="uint32")',
14+
'64-bit Unsigned Ints': 'integers(0, 2**64,size=1000000, dtype="uint64")',
15+
'Uniforms': 'random(size=1000000)',
1716
'Normals': 'standard_normal(size=1000000)',
1817
'Exponentials': 'standard_exponential(size=1000000)',
1918
'Gammas': 'standard_gamma(3.0,size=1000000)',
@@ -22,8 +21,8 @@
2221
'Poissons': 'poisson(3.0, size=1000000)', }
2322

2423
setup = """
25-
from randomgen import {prng}
26-
rg = {prng}().generator
24+
from numpy.random import {prng}, Generator
25+
rg = Generator({prng}())
2726
"""
2827

2928
test = "rg.{func}"
@@ -43,7 +42,6 @@
4342
npfuncs.update(funcs)
4443
npfuncs['32-bit Unsigned Ints'] = 'randint(2**32,dtype="uint32",size=1000000)'
4544
npfuncs['64-bit Unsigned Ints'] = 'tomaxint(size=1000000)'
46-
del npfuncs['Complex Normals']
4745
setup = """
4846
from numpy.random import RandomState
4947
rg = RandomState()

numpy/random/src/common/LICENSE.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

numpy/random/src/common/inttypes.h

Lines changed: 0 additions & 306 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0