10000 MAINT: fix imports, module name in setup.py; remove _testing · numpy/numpy@a3303a2 · GitHub
[go: up one dir, main page]
Skip to content

Commit a3303a2

Browse files
mattipmattip
committed
MAINT: fix imports, module name in setup.py; remove _testing
1 parent 161f69e commit a3303a2

12 files changed

+51
-369
lines changed

‎numpy/random/randomgen/_pickle.py

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
from .generator import RandomGenerator
2-
# from .dsfmt import DSFMT
3-
# from .mt19937 import MT19937
4-
# from .pcg32 import PCG32
5-
# from .pcg64 import PCG64
6-
# from .philox import Philox
7-
# from .threefry import ThreeFry
8-
# from .threefry32 import ThreeFry32
9-
# from .xoroshiro128 import Xoroshiro128
10-
# from .xorshift1024 import Xorshift1024
11-
# from .xoshiro256starstar import Xoshiro256StarStar
12-
# from .xoshiro512starstar import Xoshiro512StarStar
13-
# from .legacy import LegacyGenerator
14-
#
15-
# BasicRNGS = {'MT19937': MT19937,
16-
# 'DSFMT': DSFMT,
17-
# 'PCG32': PCG32,
18-
# 'PCG64': PCG64,
19-
# 'Philox': Philox,
20-
# 'ThreeFry': ThreeFry,
21-
# 'ThreeFry32': ThreeFry32,
22-
# 'Xorshift1024': Xorshift1024,
23-
# 'Xoroshiro128': Xoroshiro128,
24-
# 'Xoshiro256StarStar': Xoshiro256StarStar,
25-
# 'Xoshiro512StarStar': Xoshiro512StarStar,
26-
# }
2+
from .dsfmt import DSFMT
3+
from .mt19937 import MT19937
4+
from .pcg32 import PCG32
5+
from .pcg64 import PCG64
6+
from .philox import Philox
7+
from .threefry import ThreeFry
8+
from .threefry32 import ThreeFry32
9+
from .xoroshiro128 import Xoroshiro128
10+
from .xorshift1024 import Xorshift1024
11+
from .xoshiro256starstar import Xoshiro256StarStar
12+
from .xoshiro512starstar import Xoshiro512StarStar
13+
from .legacy import LegacyGenerator
14+
15+
BasicRNGS = {'MT19937': MT19937,
16+
'DSFMT': DSFMT,
17+
'PCG32': PCG32,
18+
'PCG64': PCG64,
19+
'Philox': Philox,
20+
'ThreeFry': ThreeFry,
21+
'ThreeFry32': ThreeFry32,
22+
'Xorshift1024': Xorshift1024,
23+
'Xoroshiro128': Xoroshiro128,
24+
'Xoshiro256StarStar': Xoshiro256StarStar,
25+
'Xoshiro512StarStar': Xoshiro512StarStar,
26+
}
2727

2828

2929
def __generator_ctor(brng_name='mt19937'):

‎numpy/random/randomgen/_testing.py

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

‎numpy/random/randomgen/legacy/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
from randomgen.legacy.legacy import LegacyGenerator
1+
from .legacy import LegacyGenerator
22

33
__all__ = ['LegacyGenerator']

‎numpy/random/randomgen/legacy/_legacy.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ from ..common cimport cont, disc, CONS_NONE, CONS_POSITIVE, CONS_NON_NEGATIVE, C
2020
from ..distributions cimport brng_t
2121
from .legacy_distributions cimport *
2222
from ..xoroshiro128 import Xoroshiro128
23-
from ..pickle import __legacy_ctor
2423

2524
np.import_array()
2625

@@ -119,6 +118,7 @@ cdef class _LegacyGenerator:
119118
self.state = state
120119

121120
def __reduce__(self):
121+
from .._pickle import __legacy_ctor
122122
return (__legacy_ctor,
123123
(self.state['brng'],),
124124
self.state)

0 commit comments

Comments
 (0)
0