Skip to content

Add support to the dictionary batch in LitModular. #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mzweilin merged 4 commits into from
May 1, 2025
Merged

Add support to the dictionary batch in LitModular. #269

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6663ce6
Add support to the dictionary batch in LitModular.
mzweilin May 1, 2025
16c769a
Merge branch 'main' into mzweilin/litmodular_dict_batch
mzweilin May 1, 2025
5454d0a
First assume the batch is a dictionary.
mzweilin May 1, 2025
f246574
Merge branch 'main' into mzweilin/litmodular_dict_batch
mzweilin May 1, 2025
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
22 changes: 15 additions & 7 deletions mart/models/modular.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import logging
from operator import attrgetter
from typing import Sequence

import torch
from lightning.pytorch import LightningModule
Expand Down Expand Up @@ -137,9 +138,12 @@ def attack_step(self, batch, batch_idx):
# Training
#
def training_step(self, batch, batch_idx):
# FIXME: Would be much nicer if batch was a dict!
input, target = batch
output = self(input=input, target=target, model=self.model, step="training")
# FIXME: Would be much nicer if batch is always a dictionary!
# We are going to feed the raw batch of a dictionary to self.model, but also making it backward-compatible with the tuple batch format.
input = target = None
if isinstance(batch, Sequence) and len(batch) == 2:
input, target = batch
output = self(input=input, target=target, batch=batch, model=self.model, step="training")

for log_name, output_key in self.training_step_log.items():
self.log(f"training/{log_name}", output[output_key])
Expand Down Expand Up @@ -172,8 +176,10 @@ def on_train_epoch_end(self):
#
def validation_step(self, batch, batch_idx):
# FIXME: Would be much nicer if batch was a dict!
input, target = batch
output = self(input=input, target=target, model=self.model, step="validation")
input = target = None
if isinstance(batch, Sequence) and len(batch) == 2:
input, target = batch
output = self(input=input, target=target, batch=batch, model=self.model, step="validation")

for log_name, output_key in self.validation_step_log.items():
self.log(f"validation/{log_name}", output[output_key])
Expand All @@ -194,8 +200,10 @@ def on_validation_epoch_end(self):
#
def test_step(self, batch, batch_idx):
# FIXME: Would be much nicer if batch was a dict!
input, target = batch
output = self(input=input, target=target, model=self.model, step="test")
input = target = None
if isinstance(batch, Sequence) and len(batch) == 2:
input, target = batch
output = self(input=input, target=target, batch=batch, model=self.model, step="test")

for log_name, output_key in self.test_step_log.items():
self.log(f"test/{log_name}", output[output_key])
Expand Down
Loading