Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ pytorch-crf = ">=0.7.2"
networkx = "^3.0.0"
# because of BartModelWithDecoderPositionIds
transformers = "^4.35.0"
ema-pytorch = "^0.4.2"

[tool.poetry.group.dev.dependencies]
torch = {version = "^2.1.0+cpu", source = "pytorch"}
Expand Down
21 changes: 19 additions & 2 deletions src/pie_modules/models/simple_generative.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from typing import Any, Dict, Optional, Tuple, Type, Union

import torch
from ema_pytorch import EMA
from pytorch_ie.core import PyTorchIEModel
from pytorch_lightning.utilities.types import OptimizerLRScheduler
from torch import FloatTensor, LongTensor
Expand All @@ -11,7 +12,7 @@
from transformers.modeling_outputs import Seq2SeqLMOutput
from typing_extensions import TypeAlias

from pie_modules.models.common import ModelWithBoilerplate
from pie_modules.models.common import TRAINING, ModelWithBoilerplate
from pie_modules.utils import resolve_type

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -65,6 +66,8 @@ def __init__(
override_generation_kwargs: Optional[Dict[str, Any]] = None,
# scheduler / optimizer
warmup_proportion: float = 0.0,
# Exponential Moving Average (EMA)
use_ema: bool = False,
# important: the following entries are only used if the base model does not have a configure_optimizer method!
learning_rate: Optional[float] = None,
optimizer_type: Optional[Union[str, Type[Optimizer]]] = None,
Expand All @@ -83,6 +86,14 @@ def __init__(
resolved_base_model_type: Type[PreTrainedModel] = resolve_type(base_model_type)
self.model = resolved_base_model_type.from_pretrained(**base_model_config)
self.generation_config = self.configure_generation(**(override_generation_kwargs or {}))
self.use_ema = use_ema
if use_ema:
self.ema = EMA(
self.model,
beta=0.9999, # exponential moving average factor
update_after_step=100, # only after this number of .update() calls will it start updating
update_every=10, # how often to actually update, to save on compute (updates every 10th .update() call)
)

def configure_generation(self, **kwargs) -> Dict[str, Any]:
if self.taskmodule is not None:
Expand All @@ -97,6 +108,12 @@ def configure_generation(self, **kwargs) -> Dict[str, Any]:
generation_config.update(kwargs)
return generation_config

def training_step(self, batch: StepInputType, batch_idx: int) -> StepOutputType:
result = self._step(stage=TRAINING, batch=batch)
if self.use_ema:
self.ema.update()
return result

def predict(self, inputs, **kwargs) -> TargetType:
is_training = self.training
self.eval()
Expand Down Expand Up @@ -149,7 +166,7 @@ def configure_optimizers(self) -> OptimizerLRScheduler:
resolved_optimizer_type = resolve_type(
self.optimizer_type, expected_super_type=Optimizer
)
optimizer = resolved_optimizer_type(self.parameters(), lr=self.learning_rate)
optimizer = resolved_optimizer_type(self.model.parameters(), lr=self.learning_rate)

if self.warmup_proportion > 0.0:
stepping_batches = self.trainer.estimated_stepping_batches
Expand Down
5 changes: 3 additions & 2 deletions tests/models/test_simple_generative.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ def taskmodule():
)


@pytest.fixture(scope="module")
def model(taskmodule) -> SimpleGenerativeModel:
@pytest.fixture(scope="module", params=[False, True])
def model(taskmodule, request) -> SimpleGenerativeModel:
return SimpleGenerativeModel(
base_model_type="transformers.AutoModelForSeq2SeqLM",
base_model_config=dict(pretrained_model_name_or_path=MODEL_ID),
Expand All @@ -36,6 +36,7 @@ def model(taskmodule) -> SimpleGenerativeModel:
# use a strange learning rate to make sure it is passed through
learning_rate=13e-3,
optimizer_type="torch.optim.Adam",
use_ema=request.param,
)


Expand Down