Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/maxtext/utils/standalone_checkpointer.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ def add_entropy_to_checkpoint(state):
def main(argv: Sequence[str]) -> None:
os.environ["TF_CPP_MIN_LOG_LEVEL"] = "0"
config = pyconfig.initialize(argv)
# Match train.py: checkpoints store NNX RNG keys, whose shape depends on the PRNG impl.
jax.config.update("jax_default_prng_impl", config.prng_impl)
train_utils.validate_train_config(config)
print(f"Found {jax.device_count()} devices.")
print(f"Found {jax.process_count()} processes.")
Expand Down
32 changes: 32 additions & 0 deletions tests/unit/standalone_checkpointer_nnx_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

"""Unit tests for add_entropy_to_checkpoint on NNX state."""

import os
import unittest
from unittest import mock

Expand All @@ -23,6 +24,7 @@
from flax import nnx

from maxtext.common import train_state_nnx
from maxtext.utils import standalone_checkpointer
from maxtext.utils.standalone_checkpointer import add_entropy_to_checkpoint, checkpoint_loop


Expand Down Expand Up @@ -266,5 +268,35 @@ def test_checkpoint_loop_saves_in_linen_layout(self):
mock_to_linen.assert_called_once()


class MainTest(unittest.TestCase):
"""Tests for main()."""

def test_main_uses_configured_prng_impl(self):
"""main() restores with config.prng_impl, which train.py also uses, rather than JAX's default impl."""
seen = {}

def _record_prng_impl(_config):
seen["prng_impl"] = jax.config.jax_default_prng_impl

previous = jax.config.jax_default_prng_impl
jax.config.update("jax_default_prng_impl", "threefry2x32")
try:
with (
mock.patch.object(
standalone_checkpointer.pyconfig,
"initialize",
return_value=mock.MagicMock(prng_impl="rbg", dataset_path=""),
),
mock.patch.object(standalone_checkpointer.train_utils, "validate_train_config"),
mock.patch.object(standalone_checkpointer, "checkpoint_loop", side_effect=_record_prng_impl),
mock.patch.dict(os.environ),
):
standalone_checkpointer.main([None])
finally:
jax.config.update("jax_default_prng_impl", previous)

self.assertEqual(seen["prng_impl"], "rbg")


if __name__ == "__main__":
unittest.main()
Loading