CLN: Refactor model abstraction, fix #737 #726#753

Merged

NickleDave merged 48 commits intomainfrom refactor-model-class-to-not-subclass-lightning-module

May 6, 2024

+1,103-993

Commits on May 6, 2024

Change type annotations on models.definition.validate to just be Type, not Type[ModelDefinition]
NickleDave
committed
Rewrite models.base.Model to not subclass LightningModule, and instead to have class variables definition and family, that are *both* used by the from_config method to make a new instance of the fa…
NickleDave
committed
Change model decorator to not subclass family, and to instead subclass Model, then make a new instance of the subclass, add that instance to the registry, and then return the instance. This makes i…
NickleDave
committed
Rewrite FrameClassificationModel to subclass LightningModule directly, remove from_config method
NickleDave
committed
Rewrite ParemetricUMAPModel to subclass LightningModule directly, remove from_config method
NickleDave
committed
Rewrite base.Model class, move/rename methods so that we will get a singleton that can return new lightning.Module instances with the appropriate instances of network + loss + optimizer + metrics f…
NickleDave
committed
Add load_state_dict_from_path method to FrameClassificationModel and ParametricUmapModel
NickleDave
committed
Change model_family decorator to check if family_class is a subtype of LightningModule, not vak.base.Model
NickleDave
committed
Rewrite models.base.Model.__init__ to take definition and family attributes, that are used by from_config method
NickleDave
committed
Fix how models.decorator.model makes Model instance -- we don't subclass anymore, but we do change Model instance's __name__,__doc__, and __module__ to match those of the definition
NickleDave
committed
Fix FrameClassificationModel to subclass lightning.LightningModule (not pytorch_lightning.LightningModule :eyeroll:) and to no longer pass network, loss, etc to super().__init__ since its no longer…
NickleDave
committed
Fix ParametricUMAPModel to subclass lightning.LightningModule (not lightning.pytorch.LightningModule) and to no longer pass network, loss, etc to super().__init__ since its no longer a sub-class of…
NickleDave
committed
Fix how we add a Model instance to MODEL_REGISTRY
NickleDave
committed
Fix src/vak/models/frame_classification_model.py to set network/loss/optimizer/metrics as attributes on self
NickleDave
committed
Fix src/vak/models/parametric_umap_model.py to set network/loss/optimizer/metrics as attributes on self
NickleDave
committed
Fix how we get MODEL_FAMILY_FROM_NAME dict in models.registry.__getattr__
NickleDave
committed
Fix classes in tests/test_models/conftest.py so we can use them to run tests
NickleDave
committed
Fix tests in tests/test_models/test_base.py
NickleDave
committed
Add method from_instances to vak.models.base.Model
NickleDave
committed
Rename vak.models.base.Model -> vak.models.factory.ModelFactory
NickleDave
committed
Add tests in tests/test_models/test_factory.py from test_frame_classification_model
NickleDave
committed
Fix unit test in tests/test_models/test_convencoder_umap.py
NickleDave
committed
Fix unit tests in tests/test_models/test_decorator.py
NickleDave
committed
Fix unit tests in tests/test_models/test_tweetynet.py
NickleDave
committed
Fix adding load_from_state_dict method to ParametricUMAPModel
NickleDave
committed
Fix unit tests in tests/test_models/test_frame_classification_model.py
NickleDave
committed
Rename method in tests/test_models/test_convencoder_umap.py
NickleDave
committed
Fix unit tests in tests/test_models/test_ed_tcn.py
NickleDave
committed
Add a unit test from another test_models module to test_factory.py
NickleDave
committed
Add a unit test from another test_models module to test_factory.py
NickleDave
committed
Fix unit tests in tests/test_models/test_registry.py
NickleDave
committed
Remove unused fixture 'monkeypath' in tests/test_models/test_frame_classification_model.py
NickleDave
committed
Fix unit tests in tests/test_models/test_parametric_umap_model.py
NickleDave
committed
BUG: Fix how we check if we need to add empty dicts to model config in src/vak/config/model.py
NickleDave
committed
Rename model_class -> model_factory in src/vak/models/get.py
NickleDave
committed
Clean up docstring in src/vak/models/factory.py
NickleDave
committed
Fix how we parametrize two unit tests in tests/test_config/test_model.py
NickleDave
committed
Fix ConvEncoderUMAP configs in tests/data_for_tests/configs to have network.encoder sub-table
NickleDave
committed
Rewrite docstring, fix type annotations, rename vars for clarity in src/vak/models/decorator.py
NickleDave
committed
Revise docstring in src/vak/models/definition.py
NickleDave
committed
Revise type hinting + docstring in src/vak/models/get.py
NickleDave
committed
Revise docstring + comment in src/vak/models/registry.py
NickleDave
committed
Fix unit test in tests/test_models/test_factory.py
NickleDave
committed
Fix ParametricUMAPModel to use a ModuleDict
NickleDave
committed
Fix unit test in tests/test_models/test_convencoder_umap.py
NickleDave
committed
Fix unit test in tests/test_models/test_factory.py
NickleDave
committed
Fix unit test in tests/test_models/test_parametric_umap_model.py
NickleDave
committed
Fix common.tensorboard.events2df to avoid pandas error about re-indexing with duplicate values -- we need to not use the 'epoch' Scalar since it's all zeros
NickleDave
committed