Skip to content

Commit ee21110

Browse files
Remove redundant stmts after pytest parametrize
1 parent 48ea731 commit ee21110

1 file changed

Lines changed: 1 addition & 43 deletions

File tree

tests/ignite/engine/test_create_supervised.py

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def _test_create_supervised_trainer_have_grad_after_iteration(
148148

149149
@trainer.on(Events.ITERATION_COMPLETED)
150150
def _():
151-
assert model.weight.data.grad != 0
151+
assert model.weight.grad != 0
152152

153153
trainer.run(data)
154154

@@ -373,7 +373,6 @@ def _test_create_evaluation_step(
373373
def test_create_supervised_trainer(gradient_accumulation_steps):
374374
_test_create_supervised_trainer_wrong_accumulation()
375375
_test_create_supervised_trainer(gradient_accumulation_steps=gradient_accumulation_steps)
376-
_test_create_supervised_trainer(gradient_accumulation_steps=gradient_accumulation_steps)
377376
_test_create_mocked_supervised_trainer()
378377
_test_create_supervised_trainer_have_grad_after_iteration(gradient_accumulation_steps=gradient_accumulation_steps)
379378

@@ -382,7 +381,6 @@ def test_create_supervised_trainer(gradient_accumulation_steps):
382381
def test_create_supervised_trainer_with_cpu(gradient_accumulation_steps):
383382
_test_create_supervised_trainer_wrong_accumulation(trainer_device="cpu")
384383
_test_create_supervised_trainer(gradient_accumulation_steps=gradient_accumulation_steps, trainer_device="cpu")
385-
_test_create_supervised_trainer(gradient_accumulation_steps=gradient_accumulation_steps, trainer_device="cpu")
386384
_test_create_mocked_supervised_trainer(trainer_device="cpu")
387385
_test_create_supervised_trainer_have_grad_after_iteration(
388386
trainer_device="cpu", gradient_accumulation_steps=gradient_accumulation_steps
@@ -395,9 +393,6 @@ def test_create_supervised_trainer_traced_with_cpu(gradient_accumulation_steps):
395393
_test_create_supervised_trainer(
396394
gradient_accumulation_steps=gradient_accumulation_steps, trainer_device="cpu", trace=True
397395
)
398-
_test_create_supervised_trainer(
399-
gradient_accumulation_steps=gradient_accumulation_steps, trainer_device="cpu", trace=True
400-
)
401396
_test_create_mocked_supervised_trainer(trainer_device="cpu", trace=True)
402397
_test_create_supervised_trainer_have_grad_after_iteration(
403398
trainer_device="cpu", trace=True, gradient_accumulation_steps=gradient_accumulation_steps
@@ -458,11 +453,6 @@ def test_create_supervised_trainer_on_cuda(gradient_accumulation_steps):
458453
model_device=model_device,
459454
trainer_device=trainer_device,
460455
)
461-
_test_create_supervised_trainer(
462-
gradient_accumulation_steps=gradient_accumulation_steps,
463-
model_device=model_device,
464-
trainer_device=trainer_device,
465-
)
466456
_test_create_mocked_supervised_trainer(model_device=model_device, trainer_device=trainer_device)
467457
_test_create_supervised_trainer_have_grad_after_iteration(
468458
model_device=model_device,
@@ -485,12 +475,6 @@ def test_create_supervised_trainer_on_cuda_amp(gradient_accumulation_steps):
485475
trainer_device=trainer_device,
486476
amp_mode="amp",
487477
)
488-
_test_create_supervised_trainer(
489-
gradient_accumulation_steps=gradient_accumulation_steps,
490-
model_device=model_device,
491-
trainer_device=trainer_device,
492-
amp_mode="amp",
493-
)
494478
_test_create_mocked_supervised_trainer(model_device=model_device, trainer_device=trainer_device, amp_mode="amp")
495479
_test_create_supervised_trainer_have_grad_after_iteration(
496480
model_device=model_device,
@@ -515,13 +499,6 @@ def test_create_supervised_trainer_on_cuda_amp_scaler(gradient_accumulation_step
515499
amp_mode="amp",
516500
scaler=True,
517501
)
518-
_test_create_supervised_trainer(
519-
gradient_accumulation_steps=gradient_accumulation_steps,
520-
model_device=model_device,
521-
trainer_device=trainer_device,
522-
amp_mode="amp",
523-
scaler=True,
524-
)
525502
_test_create_mocked_supervised_trainer(
526503
model_device=model_device, trainer_device=trainer_device, amp_mode="amp", scaler=True
527504
)
@@ -533,13 +510,6 @@ def test_create_supervised_trainer_on_cuda_amp_scaler(gradient_accumulation_step
533510
amp_mode="amp",
534511
scaler=scaler,
535512
)
536-
_test_create_supervised_trainer(
537-
gradient_accumulation_steps=gradient_accumulation_steps,
538-
model_device=model_device,
539-
trainer_device=trainer_device,
540-
amp_mode="amp",
541-
scaler=scaler,
542-
)
543513
_test_create_mocked_supervised_trainer(
544514
model_device=model_device, trainer_device=trainer_device, amp_mode="amp", scaler=scaler
545515
)
@@ -567,12 +537,6 @@ def test_create_supervised_trainer_on_cuda_apex(gradient_accumulation_steps):
567537
trainer_device=trainer_device,
568538
amp_mode="apex",
569539
)
570-
_test_create_supervised_trainer(
571-
gradient_accumulation_steps=gradient_accumulation_steps,
572-
model_device=model_device,
573-
trainer_device=trainer_device,
574-
amp_mode="apex",
575-
)
576540
_test_create_mocked_supervised_trainer(model_device=model_device, trainer_device=trainer_device, amp_mode="apex")
577541
_test_create_supervised_trainer_have_grad_after_iteration(
578542
model_device=model_device,
@@ -608,11 +572,6 @@ def test_create_supervised_trainer_on_tpu(gradient_accumulation_steps):
608572
model_device=model_device,
609573
trainer_device=trainer_device,
610574
)
611-
_test_create_supervised_trainer(
612-
gradient_accumulation_steps=gradient_accumulation_steps,
613-
model_device=model_device,
614-
trainer_device=trainer_device,
615-
)
616575
_test_create_mocked_supervised_trainer(model_device=model_device, trainer_device=trainer_device)
617576
_test_create_supervised_trainer_have_grad_after_iteration(
618577
model_device=model_device,
@@ -634,7 +593,6 @@ def test_create_supervised_trainer_on_tpu_amp():
634593
def test_create_supervised_trainer_on_cuda_with_model_on_cpu(gradient_accumulation_steps):
635594
_test_create_supervised_trainer_wrong_accumulation(trainer_device="cuda")
636595
_test_create_supervised_trainer(gradient_accumulation_steps=gradient_accumulation_steps, trainer_device="cuda")
637-
_test_create_supervised_trainer(gradient_accumulation_steps=gradient_accumulation_steps, trainer_device="cuda")
638596
_test_create_mocked_supervised_trainer(trainer_device="cuda")
639597
_test_create_supervised_trainer_have_grad_after_iteration(
640598
trainer_device="cuda", gradient_accumulation_steps=gradient_accumulation_steps

0 commit comments

Comments
 (0)