Merge pull request #332 from asi1024/mypy-ignore

Add 'mypy: ignore-errors' in untyped files

.flexci/linux/unittest.sh

@@ -25,10 +25,13 @@ MASTER_ADDR=127.0.0.1 MASTER_PORT=1236 mpirun -n 2 --allow-run-as-root python ex
 python example/mnist_custom_logic.py --batch-size 2048 --test-batch-size 2048 --epochs 1
 
 # Run pysen
+pysen generate .
 pysen run lint 2> /output/pysen.txt || true
 
 # Run flake8
-pysen generate .
 flake8 .
 
+# Run mypy
+mypy pytorch_pfn_extras
+
 mv htmlcov /output/htmlcov

pytorch_pfn_extras/config_types.py

@@ -8,7 +8,7 @@
     import optuna
 
 
-def optuna_types(trial: 'optuna.trial.Trial'):
+def optuna_types(trial: 'optuna.trial.Trial') -> Dict[str, Any]:
     types = {
         "optuna_suggest_categorical": trial.suggest_categorical,
         "optuna_suggest_discrete_uniform": trial.suggest_discrete_uniform,
@@ -25,7 +25,7 @@ def load_path_with_optuna_types(
         trial: 'optuna.trial.Trial',
         loader: Optional[config.Loader] = None,
         types: Optional[Dict[str, Callable[..., Any]]] = None,
-):
+) -> config.Config:
     if types is None:
         types = {}
     for key, value in optuna_types(trial).items():

pytorch_pfn_extras/dataloaders/utils.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import torch
 
 

pytorch_pfn_extras/engine.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from typing import (
     Any, Callable, Dict, List, Optional, Tuple, Type, Union, TYPE_CHECKING
 )

pytorch_pfn_extras/handler.py

@@ -283,7 +283,7 @@ def train_step(
             batch (torch.Tensor, list of torch.Tensor, dict of torch.Tensor):
                 Input tensors feeded to the model of the current step.
         """
-        with torch_autocast(enabled=self._autocast):  # type: ignore[no-untyped-call] # NOQA
+        with torch_autocast(enabled=self._autocast):
             optimizers[self.model_name].zero_grad()
             outs = self._forward(models[self.model_name], batch)
             to_back_outs = outs
@@ -374,7 +374,7 @@ def __init__(
         self._logic = logic
         self.consume_options(options)
 
-    def consume_options(self, options):
+    def consume_options(self, options: Dict[str, Any]) -> None:
         """A method to update options of Handler.
 
         Note that the given dict will be modified.

pytorch_pfn_extras/nn/parallel/distributed.py

@@ -83,7 +83,8 @@ def _reduce(
     # flatten values to improve the runtime perfomance of all-reduce
     coalesced = torch.empty(size, device=values[0].device,
                             dtype=values[0].dtype)
-    coalesced_views = get_foreach_wrapper().unflatten(coalesced, values)
+    coalesced_views = get_foreach_wrapper().unflatten(  # type: ignore[no-untyped-call]
+        coalesced, values)
     get_foreach_wrapper().multi_tensor_scale(values, coalesced_views, 1.0)
 
     with record(
@@ -103,12 +104,14 @@ def _broadcast(
         group: Optional[dist.ProcessGroup]
 ) -> None:
     with torch.no_grad():  # type: ignore[no-untyped-call]
-        coalesced = get_foreach_wrapper().flatten(values)
+        coalesced = get_foreach_wrapper().flatten(  # type: ignore[no-untyped-call]
+            values)
         with record(
             "torch.distributed.broadcast", use_cuda=torch.cuda.is_available()
         ):
             dist.broadcast(coalesced, 0, group=group)  # type: ignore[no-untyped-call]
-        src = get_foreach_wrapper().unflatten(coalesced, values)
+        src = get_foreach_wrapper().unflatten(  # type: ignore[no-untyped-call]
+            coalesced, values)
         get_foreach_wrapper().multi_tensor_scale(src, values, 1.0)
 
 

pytorch_pfn_extras/profiler/_time_summary.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import atexit
 from contextlib import contextmanager
 import os

pytorch_pfn_extras/reporting.py

@@ -310,10 +310,9 @@ def make_statistics(self) -> Tuple[Scalar, Scalar]:
         mean = x / n
         var = self._x2 / n - mean * mean
         if isinstance(var, torch.Tensor):
-            std = torch.sqrt(var)
+            return mean, torch.sqrt(var)
         else:
-            std = numpy.sqrt(var)
-        return mean, std
+            return mean, numpy.sqrt(var)
 
     def state_dict(self) -> Dict[str, Any]:
         state = {}

pytorch_pfn_extras/runtime/_runtime.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from typing import (
     Any, Dict, Generator, Iterable, List, Optional, Tuple, Union, TYPE_CHECKING
 )

pytorch_pfn_extras/training/_evaluator.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import contextlib
 import queue
 from typing import (

pytorch_pfn_extras/training/_trainer.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import queue
 import time
 from typing import Optional

pytorch_pfn_extras/training/_transform_model.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from torch.nn.parallel import DistributedDataParallel
 
 from pytorch_pfn_extras.nn.parallel import (

pytorch_pfn_extras/training/extensions/_snapshot.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import os
 
 import torch

pytorch_pfn_extras/training/extensions/fail_on_non_number.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import torch
 
 from pytorch_pfn_extras.training import extension

pytorch_pfn_extras/training/extensions/log_report.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import collections
 import json
 

pytorch_pfn_extras/training/extensions/lr_scheduler.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from pytorch_pfn_extras.training import extension
 from pytorch_pfn_extras.training import trigger as trigger_module
 from torch.optim.lr_scheduler import ReduceLROnPlateau

pytorch_pfn_extras/training/extensions/micro_average.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from pytorch_pfn_extras import reporting
 from pytorch_pfn_extras.training import extension
 from pytorch_pfn_extras.training import trigger as trigger_module

pytorch_pfn_extras/training/extensions/parameter_statistics.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import torch
 
 from pytorch_pfn_extras import reporting

pytorch_pfn_extras/training/extensions/plot_report.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import json
 import warnings
 

pytorch_pfn_extras/training/extensions/print_report.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from copy import deepcopy
 import os
 import sys

pytorch_pfn_extras/training/extensions/print_report_notebook.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import sys
 from typing import Any, IO, List, Optional, Union
 

pytorch_pfn_extras/training/extensions/profile_report.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import json
 from collections import OrderedDict
 

pytorch_pfn_extras/training/extensions/progress_bar.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import datetime
 import sys
 

pytorch_pfn_extras/training/extensions/progress_bar_notebook.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import datetime
 import sys
 import time

pytorch_pfn_extras/training/extensions/value_observation.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from pytorch_pfn_extras.training import extension
 
 

pytorch_pfn_extras/training/extensions/variable_statistics_plot.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import warnings
 
 import numpy

pytorch_pfn_extras/training/manager.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import collections
 import contextlib
 import copy

pytorch_pfn_extras/training/triggers/early_stopping_trigger.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import operator
 from typing import Tuple, TYPE_CHECKING
 import warnings

pytorch_pfn_extras/training/triggers/interval_trigger.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from typing import Tuple, TYPE_CHECKING
 
 from pytorch_pfn_extras.training import trigger

pytorch_pfn_extras/training/triggers/manual_schedule_trigger.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from typing import List, Union, TYPE_CHECKING
 
 from pytorch_pfn_extras.training import trigger

pytorch_pfn_extras/training/triggers/minmax_value_trigger.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from typing import Any, Callable, Dict, Optional, TYPE_CHECKING
 
 from pytorch_pfn_extras import reporting

pytorch_pfn_extras/training/triggers/once_trigger.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 from typing import Any, Dict, TYPE_CHECKING
 
 from pytorch_pfn_extras.training import trigger

pytorch_pfn_extras/utils/comparer.py

@@ -1,3 +1,5 @@
+# mypy: ignore-errors
+
 import threading
 import concurrent.futures