core renaming (#835)

catalyst/contrib/dl/callbacks/alchemy_logger.py

@@ -9,7 +9,7 @@
     CallbackOrder,
     CallbackScope,
 )
-from catalyst.core.runner import _Runner
+from catalyst.core.runner import IRunner
 
 
 class AlchemyLogger(Callback):
@@ -101,7 +101,7 @@ def _log_metrics(
                     name=metric_name, value=metric_value, step=step,
                 )
 
-    def on_batch_end(self, runner: _Runner):
+    def on_batch_end(self, runner: IRunner):
         """Translate batch metrics to Alchemy."""
         if self.log_on_batch_end:
             mode = runner.loader_name
@@ -113,7 +113,7 @@ def on_batch_end(self, runner: _Runner):
                 suffix=self.batch_log_suffix,
             )
 
-    def on_loader_end(self, runner: _Runner):
+    def on_loader_end(self, runner: IRunner):
         """Translate loader metrics to Alchemy."""
         if self.log_on_epoch_end:
             mode = runner.loader_name
@@ -125,7 +125,7 @@ def on_loader_end(self, runner: _Runner):
                 suffix=self.epoch_log_suffix,
             )
 
-    def on_epoch_end(self, runner: _Runner):
+    def on_epoch_end(self, runner: IRunner):
         """Translate epoch metrics to Alchemy."""
         extra_mode = "_base"
         splitted_epoch_metrics = utils.split_dict_to_subdicts(

catalyst/contrib/dl/callbacks/cutmix_callback.py

@@ -5,7 +5,7 @@
 import torch
 
 from catalyst.core.callbacks import CriterionCallback
-from catalyst.core.runner import _Runner
+from catalyst.core.runner import IRunner
 
 
 class CutmixCallback(CriterionCallback):
@@ -52,14 +52,14 @@ def __init__(
         self.index = None
         self.is_needed = True
 
-    def _compute_loss(self, runner: _Runner, criterion):
+    def _compute_loss(self, runner: IRunner, criterion):
         """Computes loss.
 
         If self.is_needed is ``False`` then calls ``_compute_loss``
         from ``CriterionCallback``, otherwise computes loss value.
 
         Args:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
             criterion: that is used to compute loss
         """
         if not self.is_needed:
@@ -101,19 +101,19 @@ def _rand_bbox(self, size, lam):
 
         return bbx1, bby1, bbx2, bby2
 
-    def on_loader_start(self, runner: _Runner) -> None:
+    def on_loader_start(self, runner: IRunner) -> None:
         """Checks if it is needed for the loader.
 
         Args:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         self.is_needed = not self.on_train_only or runner.is_train_loader
 
-    def on_batch_start(self, runner: _Runner) -> None:
+    def on_batch_start(self, runner: IRunner) -> None:
         """Mixes data according to Cutmix algorithm.
 
         Args:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         if not self.is_needed:
             return

catalyst/contrib/dl/callbacks/gradnorm_logger.py

@@ -4,7 +4,7 @@
 from torch.nn.parallel import DistributedDataParallel
 
 from catalyst.core.callback import Callback, CallbackNode, CallbackOrder
-from catalyst.core.runner import _Runner
+from catalyst.core.runner import IRunner
 from catalyst.tools.typing import Model
 
 
@@ -65,11 +65,11 @@ def grad_norm(*, model: Model, prefix: str, norm_type: int,) -> Dict:
 
         return grad_norm
 
-    def on_batch_end(self, runner: _Runner) -> None:
+    def on_batch_end(self, runner: IRunner) -> None:
         """On batch end event
 
         Args:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         if not runner.is_train_loader:
             return

catalyst/contrib/dl/callbacks/knn_metric.py

@@ -14,7 +14,7 @@
 import torch
 
 from catalyst.core.callback import Callback, CallbackOrder
-from catalyst.core.runner import _Runner
+from catalyst.core.runner import IRunner
 
 
 class KNNMetricCallback(Callback):
@@ -165,11 +165,11 @@ def _knn(self, train_set, test_set=None):
 
         return result
 
-    def on_batch_end(self, runner: _Runner) -> None:
+    def on_batch_end(self, runner: IRunner) -> None:
         """Batch end hook.
 
         Args:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         features: torch.Tensor = runner.output[
             self.features_key
@@ -181,11 +181,11 @@ def on_batch_end(self, runner: _Runner) -> None:
         self.features.extend(features)
         self.targets.extend(targets)
 
-    def on_loader_end(self, runner: _Runner) -> None:
+    def on_loader_end(self, runner: IRunner) -> None:
         """Loader end hook.
 
         Args:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         self.features = np.stack(self.features)
         self.targets = np.stack(self.targets)
@@ -216,11 +216,11 @@ def on_loader_end(self, runner: _Runner) -> None:
 
         self._reset_cache()
 
-    def on_epoch_end(self, runner: _Runner) -> None:
+    def on_epoch_end(self, runner: IRunner) -> None:
         """Epoch end hook.
 
         Args:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         if self.cv_loader_names is not None:
             for k, vs in self.cv_loader_names.items():

catalyst/contrib/dl/callbacks/mask_inference.py

@@ -8,7 +8,7 @@
 import torch.nn.functional as F
 
 from catalyst.core.callback import Callback, CallbackOrder
-from catalyst.core.runner import _Runner
+from catalyst.core.runner import IRunner
 from catalyst.dl import utils
 
 
@@ -48,11 +48,11 @@ def __init__(
         self.counter = 0
         self._keys_from_runner = ["out_dir", "out_prefix"]
 
-    def on_stage_start(self, runner: _Runner):
+    def on_stage_start(self, runner: IRunner):
         """Stage start hook.
 
         Args:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         for key in self._keys_from_runner:
             value = getattr(runner, key, None)
@@ -66,20 +66,20 @@ def on_stage_start(self, runner: _Runner):
             self.out_prefix = str(self.out_dir) + "/" + str(self.out_prefix)
         os.makedirs(os.path.dirname(self.out_prefix), exist_ok=True)
 
-    def on_loader_start(self, runner: _Runner):
+    def on_loader_start(self, runner: IRunner):
         """Loader start hook.
 
         Args:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         lm = runner.loader_name
         os.makedirs(f"{self.out_prefix}/{lm}/", exist_ok=True)
 
-    def on_batch_end(self, runner: _Runner):
+    def on_batch_end(self, runner: IRunner):
         """Batch end hook.
 
         Args:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         lm = runner.loader_name
         names = runner.input.get(self.name_key, [])

catalyst/contrib/dl/callbacks/neptune_logger.py

@@ -8,7 +8,7 @@
     CallbackOrder,
     CallbackScope,
 )
-from catalyst.core.runner import _Runner
+from catalyst.core.runner import IRunner
 
 
 class NeptuneLogger(Callback):
@@ -135,7 +135,7 @@ def _log_metrics(
                 metric_value = metrics[name]
                 self.experiment.log_metric(metric_name, y=metric_value, x=step)
 
-    def on_batch_end(self, runner: _Runner):
+    def on_batch_end(self, runner: IRunner):
         """Log batch metrics to Neptune."""
         if self.log_on_batch_end:
             mode = runner.loader_name
@@ -147,7 +147,7 @@ def on_batch_end(self, runner: _Runner):
                 suffix=self.batch_log_suffix,
             )
 
-    def on_loader_end(self, runner: _Runner):
+    def on_loader_end(self, runner: IRunner):
         """Translate epoch metrics to Neptune."""
         if self.log_on_epoch_end:
             mode = runner.loader_name

catalyst/contrib/dl/callbacks/periodic_loader_callback.py

@@ -5,7 +5,7 @@
 from torch.utils.data import DataLoader
 
 from catalyst.core.callback import Callback, CallbackOrder
-from catalyst.core.runner import _Runner
+from catalyst.core.runner import IRunner
 
 
 class PeriodicLoaderCallback(Callback):
@@ -41,11 +41,11 @@ def __init__(self, **kwargs):
                 )
             self.loader_periods[loader] = int(period)
 
-    def on_stage_start(self, runner: _Runner) -> None:
+    def on_stage_start(self, runner: IRunner) -> None:
         """Collect information about loaders.
 
         Arguments:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         # store pointers to data loader objects
         for name, loader in runner.loaders.items():
@@ -75,7 +75,7 @@ def on_stage_start(self, runner: _Runner) -> None:
                     f"There will be no loaders in epoch {epoch_with_err}!"
                 )
 
-    def on_epoch_start(self, runner: _Runner) -> None:
+    def on_epoch_start(self, runner: IRunner) -> None:
         """Set loaders for current epoch.
         If validation is not required then the first loader
         from loaders used in current epoch will be used
@@ -85,7 +85,7 @@ def on_epoch_start(self, runner: _Runner) -> None:
         in the epochs where this loader is missing.
 
         Arguments:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         epoch_num = runner.epoch
         # loaders to use in current epoch
@@ -105,12 +105,12 @@ def on_epoch_start(self, runner: _Runner) -> None:
         )
         runner.loaders = epoch_loaders
 
-    def on_epoch_end(self, runner: _Runner) -> None:
+    def on_epoch_end(self, runner: IRunner) -> None:
         """Store validation metrics and use latest validation score
         when validation loader is not required.
 
         Arguments:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         if self.valid_loader in runner.loaders:
             self.valid_metrics = {

catalyst/contrib/dl/callbacks/telegram_logger.py

@@ -5,7 +5,7 @@
 
 from catalyst import utils
 from catalyst.core.callback import Callback, CallbackNode, CallbackOrder
-from catalyst.core.runner import _Runner
+from catalyst.core.runner import IRunner
 from catalyst.tools import settings
 
 
@@ -69,14 +69,14 @@ def _send_text(self, text: str):
         except Exception as e:
             logging.getLogger(__name__).warning(f"telegram.send.error:{e}")
 
-    def on_stage_start(self, runner: _Runner):
+    def on_stage_start(self, runner: IRunner):
         """Notify about starting a new stage."""
         if self.log_on_stage_start:
             text = f"{runner.stage_name} stage was started"
 
             self._send_text(text)
 
-    def on_loader_start(self, runner: _Runner):
+    def on_loader_start(self, runner: IRunner):
         """Notify about starting running the new loader."""
         if self.log_on_loader_start:
             text = (
@@ -85,7 +85,7 @@ def on_loader_start(self, runner: _Runner):
 
             self._send_text(text)
 
-    def on_loader_end(self, runner: _Runner):
+    def on_loader_end(self, runner: IRunner):
         """Translate ``runner.metric_manager`` to telegram channel."""
         if self.log_on_loader_end:
             metrics = runner.loader_metrics
@@ -108,14 +108,14 @@ def on_loader_end(self, runner: _Runner):
 
             self._send_text(text)
 
-    def on_stage_end(self, runner: _Runner):
+    def on_stage_end(self, runner: IRunner):
         """Notify about finishing a stage."""
         if self.log_on_stage_end:
             text = f"{runner.stage_name} stage was finished"
 
             self._send_text(text)
 
-    def on_exception(self, runner: _Runner):
+    def on_exception(self, runner: IRunner):
         """Notify about raised ``Exception``."""
         if self.log_on_exception:
             exception = runner.exception

catalyst/contrib/dl/callbacks/tests/test_gradnorm_logger.py

@@ -14,7 +14,7 @@
 from catalyst.contrib.dl.callbacks.gradnorm_logger import GradNormLogger
 from catalyst.core.callback import Callback, CallbackOrder
 from catalyst.core.callbacks import CriterionCallback, OptimizerCallback
-from catalyst.core.runner import _Runner
+from catalyst.core.runner import IRunner
 from catalyst.dl import SupervisedRunner
 
 
@@ -103,7 +103,7 @@ def __init__(self, prefix: str):
         super().__init__(CallbackOrder.External)
         self.prefix = prefix
 
-    def on_batch_end(self, runner: _Runner):
+    def on_batch_end(self, runner: IRunner):
         if not runner.is_train_loader:
             return
 

catalyst/contrib/dl/callbacks/tests/test_tracer_callback.py

@@ -14,7 +14,7 @@
 from catalyst.contrib.dl.callbacks.tracer_callback import TracerCallback
 from catalyst.core.callback import Callback, CallbackOrder
 from catalyst.core.callbacks import CriterionCallback, OptimizerCallback
-from catalyst.core.runner import _Runner
+from catalyst.core.runner import IRunner
 from catalyst.dl import SupervisedRunner
 from catalyst.dl.utils import get_device, get_trace_name
 
@@ -144,10 +144,10 @@ def __init__(self, path: Union[str, Path], inputs: torch.Tensor):
         self.inputs: torch.Tensor = inputs
         self.device = get_device()
 
-    def on_stage_end(self, runner: _Runner):
+    def on_stage_end(self, runner: IRunner):
         """
         Args:
-            runner (_Runner): current runner
+            runner (IRunner): current runner
         """
         assert self.path.exists(), "Traced model was not found"