Fixed other things due to reverted commits

Author: vfdev-5

ignite/contrib/handlers/__init__.py

@@ -1,9 +1,5 @@
 from ignite.contrib.handlers.clearml_logger import ClearMLLogger
-<<<<<<< HEAD
-=======
 from ignite.contrib.handlers.custom_events import CustomPeriodicEvent
-from ignite.contrib.handlers.lr_finder import FastaiLRFinder
->>>>>>> Revert "Issue #1247 (#1252)"
 from ignite.contrib.handlers.mlflow_logger import MLflowLogger
 from ignite.contrib.handlers.neptune_logger import NeptuneLogger
 from ignite.contrib.handlers.polyaxon_logger import PolyaxonLogger

ignite/engine/engine.py

@@ -818,16 +818,13 @@ def _run_once_on_dataset(self) -> float:
                     # Should exit while loop if we can not iterate
                     if should_exit:
                         if not self._is_done(self.state):
-                            total_iters = (
-                                self.state.epoch_length * self.state.max_epochs
-                                if self.state.max_epochs is not None
-                                else self.state.max_iters
-                            )
-
                             warnings.warn(
                                 "Data iterator can not provide data anymore but required total number of "
                                 "iterations to run is not reached. "
-                                f"Current iteration: {self.state.iteration} vs Total iterations to run : {total_iters}"
+                                "Current iteration: {} vs Total iterations to run : {}".format(
+                                    self.state.iteration,
+                                    self.state.epoch_length * self.state.max_epochs,  # type: ignore[operator]
+                                )
                             )
                         break
 

ignite/handlers/checkpoint.py

@@ -822,7 +822,7 @@ def __init__(
         self,
         dirname: str,
         filename_prefix: str,
-        save_interval: Optional[Callable] = None,
+        save_interval: Optional[int] = None,
         score_function: Optional[Callable] = None,
         score_name: Optional[str] = None,
         n_saved: Union[int, None] = 1,

ignite/handlers/lr_finder.py

@@ -105,7 +105,6 @@ def _run(
             max_iter = trainer.state.epoch_length * trainer.state.max_epochs  # type: ignore[operator]
             if max_iter < num_iter:
                 max_iter = num_iter
-                trainer.state.max_iters = num_iter
                 trainer.state.max_epochs = ceil(num_iter / trainer.state.epoch_length)  # type: ignore[operator]
 
         if not trainer.has_event_handler(self._reached_num_iterations):

mypy.ini

@@ -77,3 +77,6 @@ ignore_missing_imports = True
 
 [mypy-torchvision.*]
 ignore_missing_imports = True
+
+[mypy-ignite.contrib.handlers.custom_events]
+ignore_errors = True

tests/ignite/contrib/handlers/test_base_logger.py

@@ -1,6 +1,6 @@
+import math
 from unittest.mock import MagicMock, call
 
-import math
 import pytest
 import torch
 

tests/ignite/handlers/test_checkpoint.py

@@ -559,9 +559,6 @@ def test_model_checkpoint_args_validation(dirname):
     with pytest.raises(ValueError, match=r"Argument save_as_state_dict is deprecated and should be True"):
         ModelCheckpoint(existing, _PREFIX, create_dir=False, save_as_state_dict=False)
 
-    with pytest.raises(ValueError, match=r"If `score_name` is provided, then `score_function` "):
-        ModelCheckpoint(existing, _PREFIX, create_dir=False, score_name="test")
-
     with pytest.raises(TypeError, match=r"global_step_transform should be a function"):
         ModelCheckpoint(existing, _PREFIX, create_dir=False, global_step_transform=1234)
 

tests/ignite/handlers/test_lr_finder.py

@@ -309,7 +309,7 @@ def test_num_iter_is_not_enough(lr_finder, to_save, dummy_engine, dataloader):
             trainer_with_finder.run(dataloader)
         assert_output_sizes(lr_finder, dummy_engine)
         assert dummy_engine.state.iteration != len(dataloader)
-        assert dummy_engine.state.iteration == 150
+        assert dummy_engine.state.iteration == 150 + 1
 
 
 def test_detach_terminates(lr_finder, to_save, dummy_engine, dataloader):