Skip to content

Commit 3b7667a

Browse files
ananthsubananthsub
committed
update more callsites
1 parent aebd039 commit 3b7667a

File tree

10 files changed

+28
-26
lines changed

10 files changed

+28
-26
lines changed

‎pl_examples/domain_templates/computer_vision_fine_tuning.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def add_arguments_to_parser(self, parser):
272272
parser.set_defaults(
273273
{
274274
"trainer.max_epochs": 15,
275-
"trainer.weights_summary": None,
275+
"trainer.enable_model_summary": False,
276276
"trainer.progress_bar_refresh_rate": 1,
277277
"trainer.num_sanity_val_steps": 0,
278278
}

‎tests/models/test_cpu.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ def __init__(self, optimizer_name, learning_rate):
160160
default_root_dir=tmpdir,
161161
max_epochs=1,
162162
progress_bar_refresh_rate=0,
163-
weights_summary="top",
164163
limit_train_batches=0.2,
165164
limit_val_batches=0.2,
166165
)

‎tests/models/test_hooks.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def train_dataloader(self):
198198
limit_train_batches=2,
199199
limit_val_batches=0,
200200
max_epochs=1,
201-
weights_summary=None,
201+
enable_model_summary=False,
202202
accelerator="ddp",
203203
gpus=2,
204204
)
@@ -455,7 +455,7 @@ def training_step(self, batch, batch_idx):
455455
limit_train_batches=train_batches,
456456
limit_val_batches=val_batches,
457457
progress_bar_refresh_rate=0,
458-
weights_summary=None,
458+
enable_model_summary=False,
459459
callbacks=[callback],
460460
**kwargs,
461461
)
@@ -566,7 +566,7 @@ def test_trainer_model_hook_system_fit_no_val_and_resume(tmpdir):
566566
max_steps=1,
567567
limit_val_batches=0,
568568
progress_bar_refresh_rate=0,
569-
weights_summary=None,
569+
enable_model_summary=False,
570570
callbacks=[HookedCallback([])],
571571
)
572572
trainer.fit(model)
@@ -583,7 +583,7 @@ def test_trainer_model_hook_system_fit_no_val_and_resume(tmpdir):
583583
max_steps=(1 + train_batches),
584584
limit_val_batches=0,
585585
progress_bar_refresh_rate=0,
586-
weights_summary=None,
586+
enable_model_summary=False,
587587
resume_from_checkpoint=best_model_path,
588588
callbacks=[callback],
589589
)
@@ -678,7 +678,7 @@ def test_trainer_model_hook_system_eval(tmpdir, batches, verb, noun, dataloader,
678678
limit_val_batches=batches,
679679
limit_test_batches=batches,
680680
progress_bar_refresh_rate=0,
681-
weights_summary=None,
681+
enable_model_summary=False,
682682
callbacks=[callback],
683683
)
684684
assert called == [
@@ -845,7 +845,7 @@ def call(hook, fn, *args, **kwargs):
845845
limit_test_batches=batches,
846846
limit_predict_batches=batches,
847847
progress_bar_refresh_rate=0,
848-
weights_summary=None,
848+
enable_model_summary=False,
849849
reload_dataloaders_every_epoch=True,
850850
)
851851

‎tests/models/test_horovod.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ def training_epoch_end(self, outputs) -> None:
316316
limit_val_batches=2,
317317
max_epochs=1,
318318
log_every_n_steps=1,
319-
weights_summary=None,
319+
enable_model_summary=False,
320320
logger=False,
321321
)
322322

‎tests/trainer/connectors/test_callback_connector.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,10 @@ def _attach_callbacks(trainer_callbacks, model_callbacks):
144144
model = LightningModule()
145145
model.configure_callbacks = lambda: model_callbacks
146146
trainer = Trainer(
147-
checkpoint_callback=False, progress_bar_refresh_rate=0, weights_summary=None, callbacks=trainer_callbacks
147+
checkpoint_callback=False,
148+
progress_bar_refresh_rate=0,
149+
enable_model_summary=False,
150+
callbacks=trainer_callbacks,
148151
)
149152
trainer.model = model
150153
cb_connector = CallbackConnector(trainer)

‎tests/trainer/logging_/test_distributed_logging.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def test_all_rank_logging_ddp_cpu(tmpdir):
7171
limit_train_batches=1,
7272
limit_val_batches=1,
7373
max_epochs=1,
74-
weights_summary=None,
74+
enable_model_summary=False,
7575
logger=all_rank_logger,
7676
log_every_n_steps=1,
7777
)
@@ -92,7 +92,7 @@ def test_all_rank_logging_ddp_spawn(tmpdir):
9292
limit_val_batches=1,
9393
max_epochs=1,
9494
logger=all_rank_logger,
95-
weights_summary=None,
95+
enable_model_summary=False,
9696
)
9797
trainer.fit(model)
9898

‎tests/trainer/optimization/test_manual_optimization.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def on_train_end(self):
118118
limit_val_batches=2,
119119
max_epochs=1,
120120
log_every_n_steps=1,
121-
weights_summary=None,
121+
enable_model_summary=False,
122122
**kwargs,
123123
)
124124

@@ -160,7 +160,7 @@ def training_epoch_end(self, outputs) -> None:
160160
limit_val_batches=2,
161161
max_epochs=1,
162162
log_every_n_steps=1,
163-
weights_summary=None,
163+
enable_model_summary=False,
164164
)
165165

166166
with mock.patch.object(Accelerator, "backward", wraps=trainer.accelerator.backward) as bwd_mock:
@@ -187,7 +187,7 @@ def training_epoch_end(self, outputs) -> None:
187187
limit_val_batches=2,
188188
max_epochs=1,
189189
log_every_n_steps=1,
190-
weights_summary=None,
190+
enable_model_summary=False,
191191
)
192192

193193
with mock.patch.object(Accelerator, "backward", wraps=trainer.accelerator.backward) as bwd_mock:
@@ -208,7 +208,7 @@ def test_multiple_optimizers_manual_native_amp(tmpdir):
208208
limit_val_batches=2,
209209
max_epochs=1,
210210
log_every_n_steps=1,
211-
weights_summary=None,
211+
enable_model_summary=False,
212212
precision=16,
213213
gpus=1,
214214
)
@@ -447,7 +447,7 @@ def training_epoch_end(self, outputs) -> None:
447447
limit_val_batches=2,
448448
max_epochs=1,
449449
log_every_n_steps=1,
450-
weights_summary=None,
450+
enable_model_summary=False,
451451
precision=16,
452452
amp_backend="native",
453453
gpus=1,
@@ -1048,7 +1048,7 @@ def configure_optimizers(self):
10481048
limit_val_batches=2,
10491049
max_epochs=1,
10501050
log_every_n_steps=1,
1051-
weights_summary=None,
1051+
enable_model_summary=False,
10521052
gpus=1,
10531053
precision=precision,
10541054
)

‎tests/trainer/test_trainer.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def test_trainer_accumulate_grad_batches_zero_grad(tmpdir, accumulate_grad_batch
183183
limit_train_batches=20,
184184
limit_val_batches=1,
185185
max_epochs=1,
186-
weights_summary=None,
186+
enable_model_summary=False,
187187
accumulate_grad_batches=accumulate_grad_batches,
188188
)
189189
assert trainer.accumulate_grad_batches == accumulate_grad_batches
@@ -208,7 +208,7 @@ def test_trainer_accumulate_grad_batches_dict_zero_grad(tmpdir, accumulate_grad_
208208
limit_train_batches=10,
209209
limit_val_batches=1,
210210
max_epochs=4,
211-
weights_summary=None,
211+
enable_model_summary=False,
212212
accumulate_grad_batches=accumulate_grad_batches,
213213
)
214214
assert trainer.accumulate_grad_batches == accumulate_grad_batches.get(0, 1)
@@ -226,7 +226,7 @@ def test_trainer_accumulate_grad_batches_with_callback(tmpdir):
226226
limit_train_batches=10,
227227
limit_val_batches=1,
228228
max_epochs=4,
229-
weights_summary=None,
229+
enable_model_summary=False,
230230
callbacks=[GradientAccumulationScheduler({1: 2, 3: 4})],
231231
)
232232
assert trainer.accumulate_grad_batches == 1
@@ -491,7 +491,7 @@ def on_load_checkpoint(self, _):
491491
val_check_interval=1.0,
492492
progress_bar_refresh_rate=0,
493493
logger=False,
494-
weights_summary=None,
494+
enable_model_summary=False,
495495
)
496496
trainer.fit(model)
497497

@@ -683,7 +683,7 @@ def test_trainer_max_steps_accumulate_batches(tmpdir):
683683
max_steps=num_train_samples + 10,
684684
accumulate_grad_batches=10,
685685
logger=False,
686-
weights_summary=None,
686+
enable_model_summary=False,
687687
progress_bar_refresh_rate=0,
688688
)
689689
trainer.fit(model)
@@ -1379,7 +1379,7 @@ def predict(
13791379
default_root_dir=tmpdir,
13801380
max_epochs=1,
13811381
log_every_n_steps=1,
1382-
weights_summary=None,
1382+
enable_model_summary=False,
13831383
accelerator=accelerator,
13841384
gpus=gpus,
13851385
num_processes=num_processes,

‎tests/utilities/test_auto_restart.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ def test_dataset_rng_states_restart_with_lightning(tmpdir, dataset_classes, mult
941941
trainer_kwargs = dict(
942942
default_root_dir=tmpdir,
943943
max_epochs=3,
944-
weights_summary=None,
944+
enable_model_summary=False,
945945
progress_bar_refresh_rate=0,
946946
multiple_trainloader_mode=multiple_trainloader_mode,
947947
)

‎tests/utilities/test_cli.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def test_lightning_cli_args(tmpdir):
337337
f"--data.data_dir={tmpdir}",
338338
f"--trainer.default_root_dir={tmpdir}",
339339
"--trainer.max_epochs=1",
340-
"--trainer.weights_summary=null",
340+
"--trainer.enable_model_summary=False",
341341
"--seed_everything=1234",
342342
]
343343

0 commit comments

Comments
 (0)