Skip to content

Dev #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Dev #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9f38d2
disable hpc checkpoint if ckpt_path == 'last'
rustamzh May 14, 2024
42a2558
test hpc and ckpt_path='last'
rustamzh May 14, 2024
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
6 changes: 4 additions & 2 deletions src/lightning/pytorch/trainer/connectors/signal_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ def _slurm_sigusr_handler_fn(self, signum: _SIGNUM, _: FrameType) -> None:
for logger in self.trainer.loggers:
logger.finalize("finished")

hpc_save_path = self.trainer._checkpoint_connector.hpc_save_path(self.trainer.default_root_dir)
self.trainer.save_checkpoint(hpc_save_path)
if self.trainer._checkpoint_connector._ckpt_path != "last":
log.info(f"Detecting SLURM environment and ckpt_path=='last'. Disabling hpc ckpt")
hpc_save_path = self.trainer._checkpoint_connector.hpc_save_path(self.trainer.default_root_dir)
self.trainer.save_checkpoint(hpc_save_path)

if self.trainer.is_global_zero:
# find job id
Expand Down
14 changes: 14 additions & 0 deletions tests/tests_pytorch/trainer/connectors/test_signal_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,20 @@ def training_step(self, batch, batch_idx):
signal.signal(signal.SIGTERM, signal.SIG_DFL)


@RunIf(skip_windows=True)
@mock.patch("lightning.fabric.plugins.environments.slurm.SLURMEnvironment.detect", return_value=True)
@mock.patch("lightning.pytorch.trainer.Trainer.save_checkpoint", mock.MagicMock())
def test_hpc_ckpt_last_not_created(_, save_checkpoint, tmp_path):
"""Test that when ckpt_path='last' hpc_ckpt is not created"""
model = BoringModel()
trainer = Trainer(default_root_dir=tmp_path, max_steps=1, logger=False)
trainer.fit(model, ckpt_path="last")

connector = _SignalConnector(trainer)
connector._slurm_sigusr_handler_fn(None, None)
save_checkpoint.assert_not_called()


@RunIf(skip_windows=True)
@pytest.mark.parametrize("auto_requeue", [True, False])
@pytest.mark.parametrize("requeue_signal", [signal.SIGUSR1, signal.SIGUSR2, signal.SIGHUP] if not _IS_WINDOWS else [])
Expand Down
Loading