Skip to content

Commit 11c8be4

Browse files
authored
Merge branch 'master' into chualan/fix-19658
2 parents 1d8ef66 + 333d1cf commit 11c8be4

File tree

4 files changed

+25
-8
lines changed

4 files changed

+25
-8
lines changed

docs/source-pytorch/community/governance.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Role: All final decisions related to Lightning.
1818

1919
Maintainers
2020
-----------
21-
- Adrian Wälchli (`awaelchli <https://github.com/awaelchli>`_)
21+
- Luca Antiga (`lantiga <https://github.com/lantiga>`_)
2222
- Jirka Borovec (`Borda <https://github.com/Borda>`_)
2323
- Justus Schock (`justusschock <https://github.com/justusschock>`_)
2424

@@ -32,6 +32,7 @@ Emeritus Maintainers
3232

3333
Alumni
3434
------
35+
- Adrian Wälchli (`awaelchli <https://github.com/awaelchli>`_)
3536
- Carlos Mocholí (`carmocca <https://github.com/carmocca>`_)
3637
- Akihiro Nitta (`akihironitta <https://github.com/akihironitta>`_)
3738
- Ananth Subramaniam (`ananthsub <https://github.com/ananthsub>`_)

src/lightning/fabric/utilities/seed.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,10 @@ def pl_worker_init_function(worker_id: int, rank: Optional[int] = None) -> None:
104104
if _NUMPY_AVAILABLE:
105105
import numpy as np
106106

107-
np.random.seed(seed_sequence[3] & 0xFFFFFFFF) # numpy takes 32-bit seed only
107+
ss = np.random.SeedSequence([base_seed, worker_id, global_rank])
108+
np_rng_seed = ss.generate_state(4)
109+
110+
np.random.seed(np_rng_seed)
108111

109112

110113
def _generate_seed_sequence(base_seed: int, worker_id: int, global_rank: int, count: int) -> list[int]:
Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,15 @@
1-
from lightning.pytorch.demos.lstm import LightningLSTM, SequenceSampler, SimpleLSTM # noqa: F401
2-
from lightning.pytorch.demos.transformer import LightningTransformer, Transformer, WikiText2 # noqa: F401
1+
from lightning.pytorch.demos.boring_classes import BoringDataModule, BoringModel, DemoModel
2+
from lightning.pytorch.demos.lstm import LightningLSTM, SequenceSampler, SimpleLSTM
3+
from lightning.pytorch.demos.transformer import LightningTransformer, Transformer, WikiText2
4+
5+
__all__ = [
6+
"LightningLSTM",
7+
"SequenceSampler",
8+
"SimpleLSTM",
9+
"LightningTransformer",
10+
"Transformer",
11+
"WikiText2",
12+
"BoringModel",
13+
"BoringDataModule",
14+
"DemoModel",
15+
]

tests/tests_pytorch/test_cli.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,8 @@ def test_lightning_cli_print_config():
478478
"any.py",
479479
"predict",
480480
"--seed_everything=1234",
481-
"--model=lightning.pytorch.demos.boring_classes.BoringModel",
482-
"--data=lightning.pytorch.demos.boring_classes.BoringDataModule",
481+
"--model=lightning.pytorch.demos.BoringModel",
482+
"--data=lightning.pytorch.demos.BoringDataModule",
483483
"--print_config",
484484
]
485485
out = StringIO()
@@ -492,8 +492,8 @@ def test_lightning_cli_print_config():
492492

493493
outval = yaml.safe_load(text)
494494
assert outval["seed_everything"] == 1234
495-
assert outval["model"]["class_path"] == "lightning.pytorch.demos.boring_classes.BoringModel"
496-
assert outval["data"]["class_path"] == "lightning.pytorch.demos.boring_classes.BoringDataModule"
495+
assert outval["model"]["class_path"] == "lightning.pytorch.demos.BoringModel"
496+
assert outval["data"]["class_path"] == "lightning.pytorch.demos.BoringDataModule"
497497
assert outval["ckpt_path"] is None
498498

499499

0 commit comments

Comments
 (0)