New mixin-based template structure

avalanche/core.py

@@ -193,3 +193,33 @@ def after_eval_dataset_adaptation(
     ) -> CallbackResult:
         """Called after `eval_dataset_adaptation` by the `BaseTemplate`."""
         pass
+
+
+class SupervisedMetaLearningPlugin(SupervisedPlugin[Template], ABC):
+    """ABC for SupervisedMetaLearningTemplate plugins.
+
+        See `BaseTemplate` for complete description of the train/eval loop.
+    """
+    def before_inner_updates(
+        self, strategy: Template, *args, **kwargs
+    ) -> CallbackResult:
+        """Called before `_inner_updates` by the `BaseTemplate`."""
+        pass
+
+    def after_inner_updates(
+        self, strategy: Template, *args, **kwargs
+    ) -> CallbackResult:
+        """Called before `_outer_updates` by the `BaseTemplate`."""
+        pass
+
+    def before_outer_update(
+        self, strategy: Template, *args, **kwargs
+    ) -> CallbackResult:
+        """Called before `_outer_updates` by the `BaseTemplate`."""
+        pass
+
+    def after_outer_update(
+        self, strategy: Template, *args, **kwargs
+    ) -> CallbackResult:
+        """Called before `_outer_updates` by the `BaseTemplate`."""
+        pass

avalanche/evaluation/metric_definitions.py

@@ -21,7 +21,7 @@
 
 if TYPE_CHECKING:
     from .metric_results import MetricResult
-    from ..training.templates.supervised import SupervisedTemplate
+    from ..training.templates import SupervisedTemplate
 
 TResult = TypeVar("TResult")
 TAggregated = TypeVar("TAggregated", bound="PluginMetric")

avalanche/evaluation/metric_utils.py

@@ -28,7 +28,7 @@
 from torch import Tensor
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
     from avalanche.benchmarks.scenarios import ClassificationExperience
     from avalanche.evaluation import PluginMetric
 

avalanche/evaluation/metrics/checkpoint.py

@@ -19,7 +19,7 @@
 from avalanche.evaluation.metric_utils import get_metric_name
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class WeightCheckpoint(PluginMetric[Tensor]):

avalanche/evaluation/metrics/confusion_matrix.py

@@ -41,7 +41,7 @@
 )
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class ConfusionMatrix(Metric[Tensor]):

avalanche/evaluation/metrics/forgetting_bwt.py

@@ -21,7 +21,7 @@
 )
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class Forgetting(Metric[Union[float, None, Dict[int, float]]]):

avalanche/evaluation/metrics/forward_transfer.py

@@ -21,7 +21,7 @@
 )
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class ForwardTransfer(Metric[Union[float, None, Dict[int, float]]]):

avalanche/evaluation/metrics/gpu_usage.py

@@ -20,7 +20,7 @@
 from avalanche.evaluation.metric_results import MetricResult
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class MaxGPU(Metric[float]):

avalanche/evaluation/metrics/images_samples.py

@@ -22,7 +22,7 @@
 
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
     from avalanche.benchmarks.utils import make_classification_dataset
 
 

avalanche/evaluation/metrics/labels_repartition.py

@@ -26,7 +26,7 @@
 
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
     from avalanche.evaluation.metric_results import MetricResult
 
 

avalanche/evaluation/metrics/mean_scores.py

@@ -32,7 +32,7 @@
     from typing_extensions import Literal
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
     from avalanche.evaluation.metric_results import MetricResult
 
 

avalanche/evaluation/metrics/ram_usage.py

@@ -19,7 +19,7 @@
 from avalanche.evaluation.metric_results import MetricResult
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class MaxRAM(Metric[float]):

avalanche/evaluation/metrics/timing.py

@@ -18,7 +18,7 @@
 from avalanche.evaluation.metrics.mean import Mean
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class ElapsedTime(Metric[float]):

avalanche/logging/base_logger.py

@@ -4,7 +4,7 @@
 
 if TYPE_CHECKING:
     from avalanche.evaluation.metric_results import MetricValue
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class BaseLogger(ABC):

avalanche/logging/interactive_logging.py

@@ -19,7 +19,7 @@
 from tqdm import tqdm
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class InteractiveLogger(TextLogger, SupervisedPlugin):
@@ -61,6 +61,8 @@ def before_training_epoch(
         metric_values: List["MetricValue"],
         **kwargs
     ):
+        if isinstance(strategy.experience, OnlineCLExperience):
+            return
         super().before_training_epoch(strategy, metric_values, **kwargs)
         self._progress.total = len(strategy.dataloader)
 
@@ -70,6 +72,8 @@ def after_training_epoch(
         metric_values: List["MetricValue"],
         **kwargs
     ):
+        if isinstance(strategy.experience, OnlineCLExperience):
+            return
         self._end_progress()
         super().after_training_epoch(strategy, metric_values, **kwargs)
 

avalanche/logging/wandb_logger.py

@@ -34,7 +34,7 @@
 
 if TYPE_CHECKING:
     from avalanche.evaluation.metric_results import MetricValue
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class WandBLogger(BaseLogger, SupervisedPlugin):

avalanche/training/plugins/evaluation.py

@@ -10,7 +10,7 @@
 if TYPE_CHECKING:
     from avalanche.evaluation import PluginMetric
     from avalanche.logging import BaseLogger
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class EvaluationPlugin:

avalanche/training/plugins/gdumb.py

@@ -5,7 +5,7 @@
 from avalanche.training.storage_policy import ClassBalancedBuffer
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class GDumbPlugin(SupervisedPlugin):

avalanche/training/plugins/gss_greedy.py

@@ -6,7 +6,7 @@
 from avalanche.training.plugins.strategy_plugin import SupervisedPlugin
 
 if TYPE_CHECKING:
-    from ..templates.supervised import SupervisedTemplate
+    from ..templates import SupervisedTemplate
 
 
 class GSS_greedyPlugin(SupervisedPlugin):

avalanche/training/plugins/lr_scheduling.py

@@ -8,7 +8,7 @@
 import inspect
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class LRSchedulerPlugin(SupervisedPlugin):

avalanche/training/plugins/replay.py

@@ -9,7 +9,7 @@
 )
 
 if TYPE_CHECKING:
-    from avalanche.training.templates.supervised import SupervisedTemplate
+    from avalanche.training.templates import SupervisedTemplate
 
 
 class ReplayPlugin(SupervisedPlugin):

avalanche/training/plugins/synaptic_intelligence.py

@@ -13,7 +13,7 @@
 from avalanche.training.utils import get_layers_and_params
 
 if TYPE_CHECKING:
-    from ..templates.supervised import SupervisedTemplate
+    from ..templates import SupervisedTemplate
 
 SynDataType = Dict[str, Dict[str, Tensor]]
 

avalanche/training/storage_policy.py

@@ -17,7 +17,7 @@
 from ..benchmarks.utils.utils import concat_datasets
 
 if TYPE_CHECKING:
-    from .templates.supervised import SupervisedTemplate
+    from .templates import SupervisedTemplate
 
 
 class ExemplarsBuffer(ABC):

avalanche/training/supervised/ar1.py

@@ -16,7 +16,7 @@
     SynapticIntelligencePlugin,
     CWRStarPlugin,
 )
-from avalanche.training.templates.supervised import SupervisedTemplate
+from avalanche.training.templates import SupervisedTemplate
 from avalanche.training.utils import (
     replace_bn_with_brn,
     get_last_fc_layer,

avalanche/training/supervised/cumulative.py

@@ -8,7 +8,7 @@
 from avalanche.benchmarks.utils.utils import concat_datasets
 from avalanche.training.plugins.evaluation import default_evaluator
 from avalanche.training.plugins import SupervisedPlugin, EvaluationPlugin
-from avalanche.training.templates.supervised import SupervisedTemplate
+from avalanche.training.templates import SupervisedTemplate
 
 
 class Cumulative(SupervisedTemplate):

avalanche/training/supervised/deep_slda.py

@@ -5,7 +5,7 @@
 import torch
 
 from avalanche.training.plugins import SupervisedPlugin
-from avalanche.training.templates.supervised import SupervisedTemplate
+from avalanche.training.templates import SupervisedTemplate
 from avalanche.training.plugins.evaluation import default_evaluator
 from avalanche.models.dynamic_modules import MultiTaskModule
 from avalanche.models import FeatureExtractorBackbone

avalanche/training/supervised/icarl.py

@@ -19,7 +19,7 @@
 from avalanche.training.plugins.strategy_plugin import SupervisedPlugin
 from torch.nn import Module
 from torch.utils.data import DataLoader
-from avalanche.training.templates.supervised import SupervisedTemplate
+from avalanche.training.templates import SupervisedTemplate
 
 
 class ICaRL(SupervisedTemplate):

avalanche/training/supervised/joint_training.py

@@ -18,7 +18,7 @@
 from avalanche.benchmarks.utils import concat_classification_datasets
 from avalanche.benchmarks.utils.utils import concat_datasets
 from avalanche.training.plugins.evaluation import default_evaluator
-from avalanche.training.templates.supervised import SupervisedTemplate
+from avalanche.training.templates import SupervisedTemplate
 from avalanche.models import DynamicModule
 
 if TYPE_CHECKING: