File tree Expand file tree Collapse file tree 3 files changed +5
-10
lines changed Expand file tree Collapse file tree 3 files changed +5
-10
lines changed Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ from numpy import (
17
17
uint32 ,
18
18
uint64 ,
19
19
)
20
- from numpy .random import BitGenerator , SeedSequence
20
+ from numpy .random import BitGenerator , SeedSequence , RandomState
21
21
from numpy ._typing import (
22
22
ArrayLike ,
23
23
NDArray ,
@@ -782,5 +782,5 @@ class Generator:
782
782
def shuffle (self , x : ArrayLike , axis : int = ...) -> None : ...
783
783
784
784
def default_rng (
785
- seed : None | _ArrayLikeInt_co | SeedSequence | BitGenerator | Generator = ...
785
+ seed : None | _ArrayLikeInt_co | SeedSequence | BitGenerator | Generator | RandomState = ...
786
786
) -> Generator : ...
Original file line number Diff line number Diff line change @@ -5073,11 +5073,7 @@ def default_rng(seed=None):
5073
5073
# Pass through a Generator.
5074
5074
return seed
5075
5075
elif isinstance (seed , np .random .RandomState ):
5076
- rs_state = seed .get_state (legacy = False )
5077
- klass = getattr (np .random , rs_state ['bit_generator' ])
5078
- bg = klass ()
5079
- bg .state = rs_state
5080
- gen = np .random .Generator (bg )
5076
+ gen = np .random .Generator (seed ._bit_generator )
5081
5077
return gen
5082
5078
5083
5079
# Otherwise we need to instantiate a new BitGenerator and Generator as
Original file line number Diff line number Diff line change @@ -565,16 +565,15 @@ def test_coercion_RandomState_Generator(self):
565
565
rs = RandomState (1234 )
566
566
rg = default_rng (rs )
567
567
assert isinstance (rg .bit_generator , MT19937 )
568
-
569
- assert_allclose (rg .random (), rs .rand ())
568
+ assert rg .bit_generator is rs ._bit_generator
570
569
571
570
# RandomState with a non MT19937 bit generator
572
571
_original = np .random .get_bit_generator ()
573
572
bg = PCG64 (12342298 )
574
573
np .random .set_bit_generator (bg )
575
574
rs = np .random .mtrand ._rand
576
575
rg = default_rng (rs )
577
- assert_allclose ( rg .random (), rs . rand ())
576
+ assert rg .bit_generator is bg
578
577
579
578
# vital to get global state back to original, otherwise
580
579
# other tests start to fail.
You can’t perform that action at this time.
0 commit comments