Skip to content

Commit 80a089d

Browse files
committed
try drop pickle warning
1 parent 272605d commit 80a089d

File tree

7 files changed

+10
-24
lines changed

7 files changed

+10
-24
lines changed

tests/tests_pytorch/callbacks/test_early_stopping.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,11 @@ def test_pickling():
193193
early_stopping = EarlyStopping(monitor="foo")
194194

195195
early_stopping_pickled = pickle.dumps(early_stopping)
196-
with pytest.warns(FutureWarning, match="`weights_only=False`") if _TORCH_EQUAL_2_4_0 else nullcontext():
197-
early_stopping_loaded = pickle.loads(early_stopping_pickled)
196+
early_stopping_loaded = pickle.loads(early_stopping_pickled)
198197
assert vars(early_stopping) == vars(early_stopping_loaded)
199198

200199
early_stopping_pickled = cloudpickle.dumps(early_stopping)
201-
with pytest.warns(FutureWarning, match="`weights_only=False`") if _TORCH_EQUAL_2_4_0 else nullcontext():
202-
early_stopping_loaded = cloudpickle.loads(early_stopping_pickled)
200+
early_stopping_loaded = cloudpickle.loads(early_stopping_pickled)
203201
assert vars(early_stopping) == vars(early_stopping_loaded)
204202

205203

tests/tests_pytorch/checkpointing/test_model_checkpoint.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,13 +352,11 @@ def test_pickling(tmp_path):
352352
ckpt = ModelCheckpoint(dirpath=tmp_path)
353353

354354
ckpt_pickled = pickle.dumps(ckpt)
355-
with pytest.warns(FutureWarning, match="`weights_only=False`") if _TORCH_EQUAL_2_4_0 else nullcontext():
356-
ckpt_loaded = pickle.loads(ckpt_pickled)
355+
ckpt_loaded = pickle.loads(ckpt_pickled)
357356
assert vars(ckpt) == vars(ckpt_loaded)
358357

359358
ckpt_pickled = cloudpickle.dumps(ckpt)
360-
with pytest.warns(FutureWarning, match="`weights_only=False`") if _TORCH_EQUAL_2_4_0 else nullcontext():
361-
ckpt_loaded = cloudpickle.loads(ckpt_pickled)
359+
ckpt_loaded = cloudpickle.loads(ckpt_pickled)
362360
assert vars(ckpt) == vars(ckpt_loaded)
363361

364362

tests/tests_pytorch/core/test_metric_result_integration.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,7 @@ def lightning_log(fx, *args, **kwargs):
254254
}
255255

256256
# make sure can be pickled
257-
with pytest.warns(FutureWarning, match="`weights_only=False`") if _TORCH_EQUAL_2_4_0 else nullcontext():
258-
pickle.loads(pickle.dumps(result))
257+
pickle.loads(pickle.dumps(result))
259258
# make sure can be torch.loaded
260259
filepath = str(tmp_path / "result")
261260
torch.save(result, filepath)

tests/tests_pytorch/helpers/test_datasets.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ def test_pickling_dataset_mnist(dataset_cls, args):
4444
mnist = dataset_cls(**args)
4545

4646
mnist_pickled = pickle.dumps(mnist)
47-
with pytest.warns(FutureWarning, match="`weights_only=False`") if _TORCH_EQUAL_2_4_0 else nullcontext():
48-
pickle.loads(mnist_pickled)
47+
pickle.loads(mnist_pickled)
4948

5049
mnist_pickled = cloudpickle.dumps(mnist)
51-
with pytest.warns(FutureWarning, match="`weights_only=False`") if _TORCH_EQUAL_2_4_0 else nullcontext():
52-
cloudpickle.loads(mnist_pickled)
50+
cloudpickle.loads(mnist_pickled)

tests/tests_pytorch/loggers/test_all.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,7 @@ def _test_loggers_pickle(tmp_path, monkeypatch, logger_class: Logger):
184184
trainer = Trainer(max_epochs=1, logger=logger)
185185
pkl_bytes = pickle.dumps(trainer)
186186

187-
with (
188-
pytest.warns(FutureWarning, match="`weights_only=False`")
189-
if _TORCH_EQUAL_2_4_0 or (_TORCH_GREATER_EQUAL_2_4_1 and logger_class not in (CSVLogger, TensorBoardLogger))
190-
else nullcontext()
191-
):
192-
trainer2 = pickle.loads(pkl_bytes)
187+
trainer2 = pickle.loads(pkl_bytes)
193188
trainer2.logger.log_metrics({"acc": 1.0})
194189

195190
# make sure we restored properly

tests/tests_pytorch/loggers/test_logger.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@ def test_multiple_loggers_pickle(tmp_path):
124124

125125
trainer = Trainer(logger=[logger1, logger2])
126126
pkl_bytes = pickle.dumps(trainer)
127-
with pytest.warns(FutureWarning, match="`weights_only=False`") if _TORCH_EQUAL_2_4_0 else nullcontext():
128-
trainer2 = pickle.loads(pkl_bytes)
127+
trainer2 = pickle.loads(pkl_bytes)
129128
for logger in trainer2.loggers:
130129
logger.log_metrics({"acc": 1.0}, 0)
131130

tests/tests_pytorch/loggers/test_wandb.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ def name(self):
162162
assert trainer.logger.experiment, "missing experiment"
163163
assert trainer.log_dir == logger.save_dir
164164
pkl_bytes = pickle.dumps(trainer)
165-
with pytest.warns(FutureWarning, match="`weights_only=False`") if _TORCH_EQUAL_2_4_0 else nullcontext():
166-
trainer2 = pickle.loads(pkl_bytes)
165+
trainer2 = pickle.loads(pkl_bytes)
167166

168167
assert os.environ["WANDB_MODE"] == "dryrun"
169168
assert trainer2.logger.__class__.__name__ == WandbLogger.__name__

0 commit comments

Comments
 (0)