Merge pull request #1587 from lrzpellegrini/fix_multiple_inheritance_…

…py311

Fix multiple inheritance in Python 3.11

.github/workflows/test-coverage-coveralls.yml

@@ -46,14 +46,32 @@ jobs:
       - name: install coverage.py and coverralls
         run: |
           pip install coverage coveralls
+      - name: install pytest-xdist and pytest-cov
+        run: |
+          pip install pytest-xdist pytest-cov
+      - name: download datasets
+        env:
+          FAST_TEST: "True"
+          USE_GPU: "False"
+          PYTHONPATH: ${{ github.workspace }}
+        run: |
+          pytest ./tests/benchmarks/scenarios/deprecated/test_high_level_generators.py::HighLevelGeneratorTests::test_filelist_benchmark ./tests/benchmarks/scenarios/deprecated/test_nc_mt_scenario.py::MultiTaskTests::test_mt_single_dataset
       - name: python unit test
         id: unittest
         env:
           FAST_TEST: "True"
           USE_GPU: "False"
+          PYTHONPATH: ${{ github.workspace }}
         run: |
           mkdir coverage &&
-          coverage run -m unittest discover tests &&
+          pytest --cov=. -n 4 tests &&
+          mv .coverage coverage_unit_tests &&
+          coverage run examples/eval_plugin.py &&
+          mv .coverage coverage_eval_plugin &&
+          RUN_COVERAGE=True bash ./tests/checkpointing/test_checkpointing.sh &&
+          coverage run tests/run_dist_tests.py &&
+          mv .coverage coverage_dist_tests &&
+          coverage combine coverage_* &&
           coverage lcov -o coverage/lcov.info --omit '**/config-3.py,**/config.py'
       - name: Upload coverage data to coveralls.io
         uses: coverallsapp/github-action@master

.github/workflows/unit-test.yml

@@ -51,16 +51,15 @@ jobs:
         env:
           FAST_TEST: "True"
           USE_GPU: "False"
+          PYTHONPATH: ${{ github.workspace }}
         run: |
           python -m unittest discover tests &&
           echo "Checking that optional dependencies are not needed" &&
           pip uninstall -y higher ctrl-benchmark torchaudio gym pycocotools lvis &&
-          PYTHONPATH=. python examples/eval_plugin.py &&
+          python examples/eval_plugin.py &&
           echo "Running checkpointing tests..." &&
           bash ./tests/checkpointing/test_checkpointing.sh &&
           echo "Running distributed training tests..." &&
-          cd tests &&
-          PYTHONPATH=.. python run_dist_tests.py &&
-          cd .. &&
+          python tests/run_dist_tests.py &&
           echo "While running unit tests, the following datasets were downloaded:" &&
           ls ~/.avalanche/data

avalanche/_annotations.py

@@ -4,6 +4,7 @@
 
 only for internal use in the library.
 """
+
 import inspect
 import warnings
 import functools

avalanche/benchmarks/scenarios/deprecated/classification_scenario.py

@@ -257,12 +257,10 @@ def __len__(self) -> int:
         return len(self._benchmark.streams[self._stream])
 
     @overload
-    def __getitem__(self, exp_id: int) -> Optional[Set[int]]:
-        ...
+    def __getitem__(self, exp_id: int) -> Optional[Set[int]]: ...
 
     @overload
-    def __getitem__(self, exp_id: slice) -> Tuple[Optional[Set[int]], ...]:
-        ...
+    def __getitem__(self, exp_id: slice) -> Tuple[Optional[Set[int]], ...]: ...
 
     def __getitem__(self, exp_id: Union[int, slice]) -> LazyClassesInExpsRet:
         indexing_collate = _LazyClassesInClassificationExps._slice_collate

avalanche/benchmarks/scenarios/deprecated/dataset_scenario.py

@@ -184,17 +184,17 @@ def __init__(
             invoking the super constructor) to specialize the experience class.
         """
 
-        self.experience_factory: Callable[
-            [TCLStream, int], TDatasetExperience
-        ] = experience_factory
+        self.experience_factory: Callable[[TCLStream, int], TDatasetExperience] = (
+            experience_factory
+        )
 
-        self.stream_factory: Callable[
-            [str, TDatasetScenario], TCLStream
-        ] = stream_factory
+        self.stream_factory: Callable[[str, TDatasetScenario], TCLStream] = (
+            stream_factory
+        )
 
-        self.stream_definitions: Dict[
-            str, StreamDef[TCLDataset]
-        ] = DatasetScenario._check_stream_definitions(stream_definitions)
+        self.stream_definitions: Dict[str, StreamDef[TCLDataset]] = (
+            DatasetScenario._check_stream_definitions(stream_definitions)
+        )
         """
         A structure containing the definition of the streams.
         """

avalanche/benchmarks/scenarios/deprecated/generic_benchmark_creation.py

@@ -143,9 +143,9 @@ def create_multi_dataset_generic_benchmark(
                 "complete_test_set_only is True"
             )
 
-    stream_definitions: Dict[
-        str, Tuple[Iterable[TaskAwareClassificationDataset]]
-    ] = dict()
+    stream_definitions: Dict[str, Tuple[Iterable[TaskAwareClassificationDataset]]] = (
+        dict()
+    )
 
     for stream_name, dataset_list in input_streams.items():
         initial_transform_group = "train"

avalanche/benchmarks/scenarios/deprecated/lazy_dataset_sequence.py

@@ -99,9 +99,9 @@ def __init__(
         now, including the ones of dropped experiences.
         """
 
-        self.task_labels_field_sequence: Dict[
-            int, Optional[Sequence[int]]
-        ] = defaultdict(lambda: None)
+        self.task_labels_field_sequence: Dict[int, Optional[Sequence[int]]] = (
+            defaultdict(lambda: None)
+        )
         """
         A dictionary mapping each experience to its `targets_task_labels` field.
 
@@ -118,12 +118,10 @@ def __len__(self) -> int:
         return self._stream_length
 
     @overload
-    def __getitem__(self, exp_idx: int) -> TCLDataset:
-        ...
+    def __getitem__(self, exp_idx: int) -> TCLDataset: ...
 
     @overload
-    def __getitem__(self, exp_idx: slice) -> Sequence[TCLDataset]:
-        ...
+    def __getitem__(self, exp_idx: slice) -> Sequence[TCLDataset]: ...
 
     def __getitem__(
         self, exp_idx: Union[int, slice]
@@ -135,9 +133,9 @@ def __getitem__(
         :return: The dataset associated to the experience.
         """
         # A lot of unuseful lines needed for MyPy -_-
-        indexing_collate: Callable[
-            [Iterable[TCLDataset]], Sequence[TCLDataset]
-        ] = lambda x: list(x)
+        indexing_collate: Callable[[Iterable[TCLDataset]], Sequence[TCLDataset]] = (
+            lambda x: list(x)
+        )
         result = manage_advanced_indexing(
             exp_idx,
             self._get_experience_and_load_if_needed,

avalanche/benchmarks/scenarios/deprecated/new_classes/nc_scenario.py

@@ -34,7 +34,6 @@ class NCScenario(
         "NCStream", "NCExperience", TaskAwareSupervisedClassificationDataset
     ]
 ):
-
     """
     This class defines a "New Classes" scenario. Once created, an instance
     of this class can be iterated in order to obtain the experience sequence
@@ -328,9 +327,9 @@ class "34" will be mapped to "1", class "11" to "2" and so on.
                 # used, the user may have defined an amount of classes less than
                 # the overall amount of classes in the dataset.
                 if class_id in self.classes_order_original_ids:
-                    self.class_mapping[
-                        class_id
-                    ] = self.classes_order_original_ids.index(class_id)
+                    self.class_mapping[class_id] = (
+                        self.classes_order_original_ids.index(class_id)
+                    )
         elif self.class_ids_from_zero_in_each_exp:
             # Method 2: remap class IDs so that they appear in range [0, N] in
             # each experience

avalanche/benchmarks/scenarios/detection_scenario.py

@@ -254,12 +254,10 @@ def __len__(self):
         return len(self._benchmark.streams[self._stream])
 
     @overload
-    def __getitem__(self, exp_id: int) -> Optional[Set[int]]:
-        ...
+    def __getitem__(self, exp_id: int) -> Optional[Set[int]]: ...
 
     @overload
-    def __getitem__(self, exp_id: slice) -> Tuple[Optional[Set[int]], ...]:
-        ...
+    def __getitem__(self, exp_id: slice) -> Tuple[Optional[Set[int]], ...]: ...
 
     def __getitem__(self, exp_id: Union[int, slice]) -> LazyClassesInExpsRet:
         indexing_collate = _LazyClassesInDetectionExps._slice_collate

avalanche/benchmarks/scenarios/generic_scenario.py

@@ -427,12 +427,10 @@ def __iter__(self) -> Iterator[TCLExperience]:
             yield exp
 
     @overload
-    def __getitem__(self, item: int) -> TCLExperience:
-        ...
+    def __getitem__(self, item: int) -> TCLExperience: ...
 
     @overload
-    def __getitem__(self: TSequenceCLStream, item: slice) -> TSequenceCLStream:
-        ...
+    def __getitem__(self: TSequenceCLStream, item: slice) -> TSequenceCLStream: ...
 
     @final
     def __getitem__(

avalanche/benchmarks/utils/classification_dataset.py

@@ -175,8 +175,7 @@ def _make_taskaware_classification_dataset(
     task_labels: Optional[Union[int, Sequence[int]]] = None,
     targets: Optional[Sequence[TTargetType]] = None,
     collate_fn: Optional[Callable[[List], Any]] = None
-) -> TaskAwareSupervisedClassificationDataset:
-    ...
+) -> TaskAwareSupervisedClassificationDataset: ...
 
 
 @overload
@@ -190,8 +189,7 @@ def _make_taskaware_classification_dataset(
     task_labels: Union[int, Sequence[int]],
     targets: Sequence[TTargetType],
     collate_fn: Optional[Callable[[List], Any]] = None
-) -> TaskAwareSupervisedClassificationDataset:
-    ...
+) -> TaskAwareSupervisedClassificationDataset: ...
 
 
 @overload
@@ -205,8 +203,7 @@ def _make_taskaware_classification_dataset(
     task_labels: Optional[Union[int, Sequence[int]]] = None,
     targets: Optional[Sequence[TTargetType]] = None,
     collate_fn: Optional[Callable[[List], Any]] = None
-) -> TaskAwareClassificationDataset:
-    ...
+) -> TaskAwareClassificationDataset: ...
 
 
 def _make_taskaware_classification_dataset(
@@ -386,8 +383,7 @@ def _taskaware_classification_subset(
     task_labels: Optional[Union[int, Sequence[int]]] = None,
     targets: Optional[Sequence[TTargetType]] = None,
     collate_fn: Optional[Callable[[List], Any]] = None
-) -> TaskAwareSupervisedClassificationDataset:
-    ...
+) -> TaskAwareSupervisedClassificationDataset: ...
 
 
 @overload
@@ -403,8 +399,7 @@ def _taskaware_classification_subset(
     task_labels: Union[int, Sequence[int]],
     targets: Sequence[TTargetType],
     collate_fn: Optional[Callable[[List], Any]] = None
-) -> TaskAwareSupervisedClassificationDataset:
-    ...
+) -> TaskAwareSupervisedClassificationDataset: ...
 
 
 @overload
@@ -420,8 +415,7 @@ def _taskaware_classification_subset(
     task_labels: Optional[Union[int, Sequence[int]]] = None,
     targets: Optional[Sequence[TTargetType]] = None,
     collate_fn: Optional[Callable[[List], Any]] = None
-) -> TaskAwareClassificationDataset:
-    ...
+) -> TaskAwareClassificationDataset: ...
 
 
 def _taskaware_classification_subset(
@@ -619,8 +613,7 @@ def _make_taskaware_tensor_classification_dataset(
     task_labels: Union[int, Sequence[int]],
     targets: Union[Sequence[TTargetType], int],
     collate_fn: Optional[Callable[[List], Any]] = None
-) -> TaskAwareSupervisedClassificationDataset:
-    ...
+) -> TaskAwareSupervisedClassificationDataset: ...
 
 
 @overload
@@ -633,8 +626,9 @@ def _make_taskaware_tensor_classification_dataset(
     task_labels: Optional[Union[int, Sequence[int]]] = None,
     targets: Optional[Union[Sequence[TTargetType], int]] = None,
     collate_fn: Optional[Callable[[List], Any]] = None
-) -> Union[TaskAwareClassificationDataset, TaskAwareSupervisedClassificationDataset]:
-    ...
+) -> Union[
+    TaskAwareClassificationDataset, TaskAwareSupervisedClassificationDataset
+]: ...
 
 
 def _make_taskaware_tensor_classification_dataset(
@@ -759,8 +753,7 @@ def _concat_taskaware_classification_datasets(
         Union[Sequence[TTargetType], Sequence[Sequence[TTargetType]]]
     ] = None,
     collate_fn: Optional[Callable[[List], Any]] = None
-) -> TaskAwareSupervisedClassificationDataset:
-    ...
+) -> TaskAwareSupervisedClassificationDataset: ...
 
 
 @overload
@@ -774,8 +767,7 @@ def _concat_taskaware_classification_datasets(
     task_labels: Union[int, Sequence[int], Sequence[Sequence[int]]],
     targets: Union[Sequence[TTargetType], Sequence[Sequence[TTargetType]]],
     collate_fn: Optional[Callable[[List], Any]] = None
-) -> TaskAwareSupervisedClassificationDataset:
-    ...
+) -> TaskAwareSupervisedClassificationDataset: ...
 
 
 @overload
@@ -791,8 +783,7 @@ def _concat_taskaware_classification_datasets(
         Union[Sequence[TTargetType], Sequence[Sequence[TTargetType]]]
     ] = None,
     collate_fn: Optional[Callable[[List], Any]] = None
-) -> TaskAwareClassificationDataset:
-    ...
+) -> TaskAwareClassificationDataset: ...
 
 
 def _concat_taskaware_classification_datasets(

avalanche/benchmarks/utils/data.py

@@ -344,12 +344,10 @@ def __eq__(self, other: object):
         )
 
     @overload
-    def __getitem__(self, exp_id: int) -> T_co:
-        ...
+    def __getitem__(self, exp_id: int) -> T_co: ...
 
     @overload
-    def __getitem__(self: TAvalancheDataset, exp_id: slice) -> TAvalancheDataset:
-        ...
+    def __getitem__(self: TAvalancheDataset, exp_id: slice) -> TAvalancheDataset: ...
 
     def __getitem__(
         self: TAvalancheDataset, idx: Union[int, slice]

avalanche/benchmarks/utils/data_attribute.py

@@ -62,12 +62,10 @@ def __iter__(self):
             yield self[i]
 
     @overload
-    def __getitem__(self, item: int) -> T_co:
-        ...
+    def __getitem__(self, item: int) -> T_co: ...
 
     @overload
-    def __getitem__(self, item: slice) -> Sequence[T_co]:
-        ...
+    def __getitem__(self, item: slice) -> Sequence[T_co]: ...
 
     def __getitem__(self, item: Union[int, slice]) -> Union[T_co, Sequence[T_co]]:
         return self.data[item]

avalanche/benchmarks/utils/dataset_definitions.py

@@ -38,11 +38,9 @@ class IDataset(Protocol[T_co]):
     Note: no __add__ method is defined.
     """
 
-    def __getitem__(self, index: int) -> T_co:
-        ...
+    def __getitem__(self, index: int) -> T_co: ...
 
-    def __len__(self) -> int:
-        ...
+    def __len__(self) -> int: ...
 
 
 class IDatasetWithTargets(IDataset[T_co], Protocol[T_co, TTargetType_co]):

avalanche/benchmarks/utils/dataset_utils.py

@@ -64,12 +64,10 @@ def __iter__(self) -> Iterator[TData]:
             yield el
 
     @overload
-    def __getitem__(self, item: int) -> TData:
-        ...
+    def __getitem__(self, item: int) -> TData: ...
 
     @overload
-    def __getitem__(self: TSliceSequence, item: slice) -> TSliceSequence:
-        ...
+    def __getitem__(self: TSliceSequence, item: slice) -> TSliceSequence: ...
 
     @final
     def __getitem__(