back-compatibility and minor fixes

GiovanniCanali · GiovanniCanali · commit ea250f8c92c9 · 2026-06-08T11:25:55.000+02:00
diff --git a/docs/source/_rst/_code.rst b/docs/source/_rst/_code.rst
@@ -14,7 +14,7 @@ The pipeline to solve differential equations with PINA follows just five steps:
     1. Define the `Problems`_ the user aim to solve
     2. Generate data using built in `Geometrical Domains`_, or load high level simulation results as :doc:`LabelTensor <label_tensor>`
     3. Choose or build one or more `Models`_ to solve the problem
-    4. Choose a solver across PINA available `Solvers and Mixins`_, or build one using the :doc:`SolverInterface <solver/solver_interface>`
+    4. Choose a solver across PINA available `Solvers`_, or build one using the :doc:`SolverInterface <solver/solver_interface>`
     5. Train the model with the PINA :doc:`Trainer <trainer>`, enhance the train with `Callbacks`_
 
 
@@ -74,7 +74,7 @@ Batch and Data Managers
     Graph Data Manager <data/manager/graph_data_manager.rst>
     Tensor Data Manager <data/manager/tensor_data_manager.rst>
 
-Solvers and Mixins
+Solvers
 ------------------------
 
 .. toctree::
@@ -96,6 +96,13 @@ Solvers and Mixins
     Gradient Physics-Informed Single-Model Solver <solver/gradient_physics_informed_single_model_solver.rst>
     RBA Physics-Informed Single-Model Solver <solver/rba_physics_informed_single_model_solver.rst>
     Causal Physics-Informed Single-Model Solver <solver/causal_physics_informed_single_model_solver.rst>
+
+Mixins
+------------------------
+
+.. toctree::
+    :titlesonly:
+
     Single-Model Mixin <solver/mixin/single_model_mixin.rst>
     Multi-Model Mixin <solver/mixin/multi_model_mixin.rst>
     Ensemble Mixin <solver/mixin/ensemble_mixin.rst>
diff --git a/docs/source/_rst/solver/mixin/autoregressive_mixin.rst b/docs/source/_rst/solver/mixin/autoregressive_mixin.rst
@@ -5,7 +5,7 @@ Autoregressive Mixin
 
 .. automodule:: pina._src.solver.mixin.autoregressive_mixin
 
-.. autoclass:: pina._src.solver.mixin.autoregressive_mixin._AutoregressiveMixin
+.. autoclass:: pina._src.solver.mixin.autoregressive_mixin.AutoregressiveMixin
     :members:
     :show-inheritance:
     :noindex:
diff --git a/docs/source/_rst/solver/mixin/condition_aggregator_mixin.rst b/docs/source/_rst/solver/mixin/condition_aggregator_mixin.rst
@@ -5,7 +5,7 @@ Condition Aggregator Mixin
 
 .. automodule:: pina._src.solver.mixin.condition_aggregator_mixin
 
-.. autoclass:: pina._src.solver.mixin.condition_aggregator_mixin._ConditionAggregatorMixin
+.. autoclass:: pina._src.solver.mixin.condition_aggregator_mixin.ConditionAggregatorMixin
     :members:
     :show-inheritance:
     :noindex:
diff --git a/docs/source/_rst/solver/mixin/ensemble_mixin.rst b/docs/source/_rst/solver/mixin/ensemble_mixin.rst
@@ -5,7 +5,7 @@ Ensemble Mixin
 
 .. automodule:: pina._src.solver.mixin.ensemble_mixin
 
-.. autoclass:: pina._src.solver.mixin.ensemble_mixin._EnsembleMixin
+.. autoclass:: pina._src.solver.mixin.ensemble_mixin.EnsembleMixin
     :members:
     :show-inheritance:
     :noindex:
diff --git a/docs/source/_rst/solver/mixin/gradient_enhanced_mixin.rst b/docs/source/_rst/solver/mixin/gradient_enhanced_mixin.rst
@@ -5,7 +5,7 @@ Gradient-Enhanced Mixin
 
 .. automodule:: pina._src.solver.mixin.gradient_enhanced_mixin
 
-.. autoclass:: pina._src.solver.mixin.gradient_enhanced_mixin._GradientEnhancedMixin
+.. autoclass:: pina._src.solver.mixin.gradient_enhanced_mixin.GradientEnhancedMixin
     :members:
     :show-inheritance:
     :noindex:
diff --git a/docs/source/_rst/solver/mixin/manual_optimization_mixin.rst b/docs/source/_rst/solver/mixin/manual_optimization_mixin.rst
@@ -5,7 +5,7 @@ Manual Optimization Mixin
 
 .. automodule:: pina._src.solver.mixin.manual_optimization_mixin
 
-.. autoclass:: pina._src.solver.mixin.manual_optimization_mixin._ManualOptimizationMixin
+.. autoclass:: pina._src.solver.mixin.manual_optimization_mixin.ManualOptimizationMixin
     :members:
     :show-inheritance:
     :noindex:
diff --git a/docs/source/_rst/solver/mixin/multi_model_mixin.rst b/docs/source/_rst/solver/mixin/multi_model_mixin.rst
@@ -5,7 +5,7 @@ Multi-Model Mixin
 
 .. automodule:: pina._src.solver.mixin.multi_model_mixin
 
-.. autoclass:: pina._src.solver.mixin.multi_model_mixin._MultiModelMixin
+.. autoclass:: pina._src.solver.mixin.multi_model_mixin.MultiModelMixin
     :members:
     :show-inheritance:
     :noindex:
diff --git a/docs/source/_rst/solver/mixin/physics_informed_mixin.rst b/docs/source/_rst/solver/mixin/physics_informed_mixin.rst
@@ -5,7 +5,7 @@ Physics-Informed Mixin
 
 .. automodule:: pina._src.solver.mixin.physics_informed_mixin
 
-.. autoclass:: pina._src.solver.mixin.physics_informed_mixin._PhysicsInformedMixin
+.. autoclass:: pina._src.solver.mixin.physics_informed_mixin.PhysicsInformedMixin
     :members:
     :show-inheritance:
     :noindex:
diff --git a/docs/source/_rst/solver/mixin/residual_based_attention_mixin.rst b/docs/source/_rst/solver/mixin/residual_based_attention_mixin.rst
@@ -5,7 +5,7 @@ Residual-Based Attention Mixin
 
 .. automodule:: pina._src.solver.mixin.residual_based_attention_mixin
 
-.. autoclass:: pina._src.solver.mixin.residual_based_attention_mixin._ResidualBasedAttentionMixin
+.. autoclass:: pina._src.solver.mixin.residual_based_attention_mixin.ResidualBasedAttentionMixin
     :members:
     :show-inheritance:
     :noindex:
diff --git a/docs/source/_rst/solver/mixin/single_model_mixin.rst b/docs/source/_rst/solver/mixin/single_model_mixin.rst
@@ -5,7 +5,7 @@ Single-Model Mixin
 
 .. automodule:: pina._src.solver.mixin.single_model_mixin
 
-.. autoclass:: pina._src.solver.mixin.single_model_mixin._SingleModelMixin
+.. autoclass:: pina._src.solver.mixin.single_model_mixin.SingleModelMixin
     :members:
     :show-inheritance:
     :noindex:
diff --git a/pina/_src/core/trainer.py b/pina/_src/core/trainer.py
@@ -4,7 +4,7 @@
 import warnings
 import torch
 import lightning
-from pina._src.solver.mixin.physics_informed_mixin import _PhysicsInformedMixin
+from pina._src.solver.mixin.physics_informed_mixin import PhysicsInformedMixin
 from pina._src.solver.base_solver import BaseSolver
 from pina._src.data.data_module import DataModule
 from pina._src.core.utils import (
@@ -133,7 +133,7 @@ def __init__(
             )
 
         # Set inference mode to false when usiing physics-informed mixin
-        if isinstance(solver, _PhysicsInformedMixin):
+        if isinstance(solver, PhysicsInformedMixin):
             kwargs["inference_mode"] = False
 
         # Set log_every_n_steps to 0 if batch_size is None, otherwise default
diff --git a/pina/_src/solver/autoregressive_ensemble_solver.py b/pina/_src/solver/autoregressive_ensemble_solver.py
@@ -1,11 +1,11 @@
 """Module for the autoregressive ensemble solver class."""
 
-from pina._src.solver.mixin.autoregressive_mixin import _AutoregressiveMixin
+from pina._src.solver.mixin.autoregressive_mixin import AutoregressiveMixin
 from pina._src.condition.time_series_condition import TimeSeriesCondition
 from pina._src.solver.ensemble_solver import EnsembleSolver
 
 
-class AutoregressiveEnsembleSolver(_AutoregressiveMixin, EnsembleSolver):
+class AutoregressiveEnsembleSolver(AutoregressiveMixin, EnsembleSolver):
     r"""
     Ensemble-model solver for autoregressive learning problems.
 
diff --git a/pina/_src/solver/autoregressive_single_model_solver.py b/pina/_src/solver/autoregressive_single_model_solver.py
@@ -1,11 +1,11 @@
 """Module for the autoregressive single model solver class."""
 
-from pina._src.solver.mixin.autoregressive_mixin import _AutoregressiveMixin
+from pina._src.solver.mixin.autoregressive_mixin import AutoregressiveMixin
 from pina._src.condition.time_series_condition import TimeSeriesCondition
 from pina._src.solver.single_model_solver import SingleModelSolver
 
 
-class AutoregressiveSingleModelSolver(_AutoregressiveMixin, SingleModelSolver):
+class AutoregressiveSingleModelSolver(AutoregressiveMixin, SingleModelSolver):
     r"""
     Single-model solver for autoregressive learning problems.
 
diff --git a/pina/_src/solver/causal_physics_informed_single_model_solver.py b/pina/_src/solver/causal_physics_informed_single_model_solver.py
@@ -2,7 +2,7 @@
 
 import torch
 from pina._src.condition.input_equation_condition import InputEquationCondition
-from pina._src.solver.mixin.physics_informed_mixin import _PhysicsInformedMixin
+from pina._src.solver.mixin.physics_informed_mixin import PhysicsInformedMixin
 from pina._src.condition.input_target_condition import InputTargetCondition
 from pina._src.core.utils import check_consistency, check_positive_integer
 from pina._src.problem.time_dependent_problem import TimeDependentProblem
@@ -14,7 +14,7 @@
 
 
 class CausalPhysicsInformedSingleModelSolver(
-    _PhysicsInformedMixin, SingleModelSolver
+    PhysicsInformedMixin, SingleModelSolver
 ):
     r"""
     Single-model solver for causal physics-informed learning problems.
diff --git a/pina/_src/solver/competitive_physics_informed_solver.py b/pina/_src/solver/competitive_physics_informed_solver.py
@@ -1,7 +1,7 @@
 """Module for the competitive physics-informed multi-model solver."""
 
 import copy
-from pina._src.solver.mixin.physics_informed_mixin import _PhysicsInformedMixin
+from pina._src.solver.mixin.physics_informed_mixin import PhysicsInformedMixin
 from pina._src.condition.input_equation_condition import InputEquationCondition
 from pina._src.condition.input_target_condition import InputTargetCondition
 from pina._src.solver.multi_model_solver import MultiModelSolver
@@ -10,7 +10,7 @@
 )
 
 
-class CompetitivePhysicsInformedSolver(_PhysicsInformedMixin, MultiModelSolver):
+class CompetitivePhysicsInformedSolver(PhysicsInformedMixin, MultiModelSolver):
     r"""
     Multi-model solver for competitive physics-informed learning problems.
 
diff --git a/pina/_src/solver/ensemble_solver.py b/pina/_src/solver/ensemble_solver.py
@@ -1,19 +1,19 @@
 """Module for the ensemble solver class."""
 
-from pina._src.solver.mixin.ensemble_mixin import _EnsembleMixin
+from pina._src.solver.mixin.ensemble_mixin import EnsembleMixin
 from pina._src.solver.base_solver import BaseSolver
 from pina._src.solver.mixin.manual_optimization_mixin import (
-    _ManualOptimizationMixin,
+    ManualOptimizationMixin,
 )
 from pina._src.solver.mixin.condition_aggregator_mixin import (
-    _ConditionAggregatorMixin,
+    ConditionAggregatorMixin,
 )
 
 
 class EnsembleSolver(
-    _ManualOptimizationMixin,
-    _EnsembleMixin,
-    _ConditionAggregatorMixin,
+    ManualOptimizationMixin,
+    EnsembleMixin,
+    ConditionAggregatorMixin,
     BaseSolver,
 ):
     """
diff --git a/pina/_src/solver/gradient_physics_informed_single_model_solver.py b/pina/_src/solver/gradient_physics_informed_single_model_solver.py
@@ -1,19 +1,19 @@
 """Module for the gradient physics-informed single-model solver class."""
 
-from pina._src.solver.mixin.physics_informed_mixin import _PhysicsInformedMixin
+from pina._src.solver.mixin.physics_informed_mixin import PhysicsInformedMixin
 from pina._src.condition.input_equation_condition import InputEquationCondition
 from pina._src.condition.input_target_condition import InputTargetCondition
 from pina._src.solver.single_model_solver import SingleModelSolver
 from pina._src.solver.mixin.gradient_enhanced_mixin import (
-    _GradientEnhancedMixin,
+    GradientEnhancedMixin,
 )
 from pina._src.condition.domain_equation_condition import (
     DomainEquationCondition,
 )
 
 
 class GradientPhysicsInformedSingleModelSolver(
-    _PhysicsInformedMixin, _GradientEnhancedMixin, SingleModelSolver
+    PhysicsInformedMixin, GradientEnhancedMixin, SingleModelSolver
 ):
     r"""
     Single-model solver for gradient-enhanced physics-informed learning
diff --git a/pina/_src/solver/mixin/autoregressive_mixin.py b/pina/_src/solver/mixin/autoregressive_mixin.py
@@ -4,7 +4,7 @@
 from pina._src.core.utils import check_consistency
 
 
-class _AutoregressiveMixin:
+class AutoregressiveMixin:
     """
     Mixin that enables the autoregressive rollout loss logic by maintaining a
     running average of step losses and computing adaptive weights for each step
diff --git a/pina/_src/solver/mixin/condition_aggregator_mixin.py b/pina/_src/solver/mixin/condition_aggregator_mixin.py
@@ -3,7 +3,7 @@
 import torch
 
 
-class _ConditionAggregatorMixin:
+class ConditionAggregatorMixin:
     """
     Mixin that logs per-condition scalar losses, weights them following the
     provided weighting scheme, and aggregates them into the total loss.
diff --git a/pina/_src/solver/mixin/ensemble_mixin.py b/pina/_src/solver/mixin/ensemble_mixin.py
@@ -1,10 +1,10 @@
 """Module for the ensemble mixin class."""
 
 import torch
-from pina._src.solver.mixin.multi_model_mixin import _MultiModelMixin
+from pina._src.solver.mixin.multi_model_mixin import MultiModelMixin
 
 
-class _EnsembleMixin(_MultiModelMixin):
+class EnsembleMixin(MultiModelMixin):
     """
     Mixin that defines the forward pass and optimizer configuration for solvers
     backed by an ensemble of models. Provides properties to access the models,
diff --git a/pina/_src/solver/mixin/gradient_enhanced_mixin.py b/pina/_src/solver/mixin/gradient_enhanced_mixin.py
@@ -6,7 +6,7 @@
 from pina._src.core.operator import grad
 
 
-class _GradientEnhancedMixin:
+class GradientEnhancedMixin:
     """
     Mixin that augments residual losses with a gradient-based regularization
     term.
diff --git a/pina/_src/solver/mixin/manual_optimization_mixin.py b/pina/_src/solver/mixin/manual_optimization_mixin.py
@@ -1,7 +1,7 @@
 """Module for the manual optimization mixin class."""
 
 
-class _ManualOptimizationMixin:
+class ManualOptimizationMixin:
     """
     Mixin that handles Lightning manual optimization loops, useful for solvers
     that require explicit control over optimization steps, such as those with
diff --git a/pina/_src/solver/mixin/multi_model_mixin.py b/pina/_src/solver/mixin/multi_model_mixin.py
@@ -4,7 +4,7 @@
 from pina._src.problem.inverse_problem import InverseProblem
 
 
-class _MultiModelMixin:
+class MultiModelMixin:
     """
     Mixin that defines the forward pass and optimizer configuration for solvers
     backed by multiple models. Provides properties to access the models,
diff --git a/pina/_src/solver/mixin/physics_informed_mixin.py b/pina/_src/solver/mixin/physics_informed_mixin.py
@@ -3,7 +3,7 @@
 import torch
 
 
-class _PhysicsInformedMixin:
+class PhysicsInformedMixin:
     """
     Mixin that enables physics-informed training by ensuring gradients are
     enabled during validation and testing, which is necessary for computing
diff --git a/pina/_src/solver/mixin/residual_based_attention_mixin.py b/pina/_src/solver/mixin/residual_based_attention_mixin.py
@@ -7,7 +7,7 @@
 )
 
 
-class _ResidualBasedAttentionMixin:
+class ResidualBasedAttentionMixin:
     """
     Mixin that augments the residual loss with an attention mechanism based on
     the residual values.
diff --git a/pina/_src/solver/mixin/single_model_mixin.py b/pina/_src/solver/mixin/single_model_mixin.py
@@ -3,7 +3,7 @@
 from pina._src.problem.inverse_problem import InverseProblem
 
 
-class _SingleModelMixin:
+class SingleModelMixin:
     """
     Mixin that defines the forward pass and optimizer configuration for solvers
     backed by exactly one model. Provides properties to access the single model,
diff --git a/pina/_src/solver/multi_model_solver.py b/pina/_src/solver/multi_model_solver.py
@@ -1,19 +1,19 @@
 """Module for the multi-model solver class."""
 
-from pina._src.solver.mixin.multi_model_mixin import _MultiModelMixin
+from pina._src.solver.mixin.multi_model_mixin import MultiModelMixin
 from pina._src.solver.base_solver import BaseSolver
 from pina._src.solver.mixin.manual_optimization_mixin import (
-    _ManualOptimizationMixin,
+    ManualOptimizationMixin,
 )
 from pina._src.solver.mixin.condition_aggregator_mixin import (
-    _ConditionAggregatorMixin,
+    ConditionAggregatorMixin,
 )
 
 
 class MultiModelSolver(
-    _ManualOptimizationMixin,
-    _MultiModelMixin,
-    _ConditionAggregatorMixin,
+    ManualOptimizationMixin,
+    MultiModelMixin,
+    ConditionAggregatorMixin,
     BaseSolver,
 ):
     """
diff --git a/pina/_src/solver/physics_informed_ensemble_solver.py b/pina/_src/solver/physics_informed_ensemble_solver.py
@@ -1,6 +1,6 @@
 """Module for the physics-informed ensemble solver class."""
 
-from pina._src.solver.mixin.physics_informed_mixin import _PhysicsInformedMixin
+from pina._src.solver.mixin.physics_informed_mixin import PhysicsInformedMixin
 from pina._src.condition.input_equation_condition import InputEquationCondition
 from pina._src.condition.input_target_condition import InputTargetCondition
 from pina._src.solver.ensemble_solver import EnsembleSolver
@@ -9,7 +9,7 @@
 )
 
 
-class PhysicsInformedEnsembleSolver(_PhysicsInformedMixin, EnsembleSolver):
+class PhysicsInformedEnsembleSolver(PhysicsInformedMixin, EnsembleSolver):
     r"""
     Ensemble-model solver for physics-informed learning problems.
 
diff --git a/pina/_src/solver/physics_informed_single_model_solver.py b/pina/_src/solver/physics_informed_single_model_solver.py
@@ -1,6 +1,6 @@
 """Module for the physics-informed single-model solver class."""
 
-from pina._src.solver.mixin.physics_informed_mixin import _PhysicsInformedMixin
+from pina._src.solver.mixin.physics_informed_mixin import PhysicsInformedMixin
 from pina._src.condition.input_equation_condition import InputEquationCondition
 from pina._src.condition.input_target_condition import InputTargetCondition
 from pina._src.solver.single_model_solver import SingleModelSolver
@@ -9,9 +9,7 @@
 )
 
 
-class PhysicsInformedSingleModelSolver(
-    _PhysicsInformedMixin, SingleModelSolver
-):
+class PhysicsInformedSingleModelSolver(PhysicsInformedMixin, SingleModelSolver):
     r"""
     Single-model solver for physics-informed learning problems.
 
diff --git a/pina/_src/solver/rba_physics_informed_single_model_solver.py b/pina/_src/solver/rba_physics_informed_single_model_solver.py
diff --git a/pina/_src/solver/self_adaptive_physics_informed_solver.py b/pina/_src/solver/self_adaptive_physics_informed_solver.py
diff --git a/pina/_src/solver/single_model_solver.py b/pina/_src/solver/single_model_solver.py
diff --git a/pina/solver/__init__.py b/pina/solver/__init__.py
diff --git a/pina/solver/mixin.py b/pina/solver/mixin.py
