Distributed support (rework)

.github/workflows/environment-update.yml

@@ -56,7 +56,11 @@ jobs:
         id: unittest
         shell: bash -l -c "conda run -n avalanche-env --no-capture-output bash {0}"
         run: |
-          python -m unittest discover tests
+          python -m unittest discover tests &&
+          echo "Running checkpointing tests..." &&
+          bash ./tests/checkpointing/test_checkpointing.sh &&
+          echo "Running distributed training tests..." &&
+          python ./tests/run_dist_tests.py &&
       - name: checkout avalanche-docker repo
         if: always()
         uses: actions/checkout@v3

.github/workflows/unit-test.yml

@@ -55,6 +55,8 @@ jobs:
           python -m unittest discover tests &&
           echo "Running checkpointing tests..." &&
           bash ./tests/checkpointing/test_checkpointing.sh &&
+          echo "Running distributed training tests..." &&
+          python ./tests/run_dist_tests.py &&
           echo "While running unit tests, the following datasets were downloaded:" &&
           ls ~/.avalanche/data
 

avalanche/benchmarks/scenarios/classification_scenario.py

@@ -1,5 +1,6 @@
 import copy
 import re
+import warnings
 from abc import ABC
 from typing import (
     Generic,
@@ -18,10 +19,8 @@
     Mapping,
 )
 
-from typing_extensions import Protocol
-
-import warnings
 from torch.utils.data.dataset import Dataset
+from typing_extensions import Protocol
 
 from avalanche.benchmarks.scenarios.generic_definitions import (
     TCLExperience,
@@ -32,10 +31,8 @@
 from avalanche.benchmarks.scenarios.lazy_dataset_sequence import (
     LazyDatasetSequence,
 )
-from avalanche.benchmarks.utils import make_classification_dataset
-from avalanche.benchmarks.utils.classification_dataset import (
-    ClassificationDataset,
-)
+from avalanche.benchmarks.utils import \
+    make_classification_dataset, AvalancheDataset
 from avalanche.benchmarks.utils.dataset_utils import manage_advanced_indexing
 
 TGenericCLClassificationScenario = TypeVar(
@@ -494,7 +491,7 @@ def _check_and_adapt_user_stream_def(
                 # exp_data[0] must contain the generator
                 stream_length = exp_data[1]
             is_lazy = True
-        elif isinstance(exp_data, ClassificationDataset):
+        elif isinstance(exp_data, AvalancheDataset):
             # Single element
             exp_data = [exp_data]
             is_lazy = False
@@ -506,7 +503,7 @@ def _check_and_adapt_user_stream_def(
 
         if not is_lazy:
             for i, dataset in enumerate(exp_data):
-                if not isinstance(dataset, ClassificationDataset):
+                if not isinstance(dataset, AvalancheDataset):
                     raise ValueError(
                         "All experience datasets must be subclasses of"
                         " AvalancheDataset"