Skip to content
Draft
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
5 changes: 4 additions & 1 deletion src/pruna/engine/handler/handler_diffuser.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ def prepare_inputs(
Any
The prepared inputs.
"""
if "prompt" in self.call_signature.parameters or "args" in self.call_signature.parameters:
if "prompt" in self.call_signature.parameters:
x, _ = batch
return x if isinstance(x, dict) else {"prompt": x}
elif "args" in self.call_signature.parameters:
x, _ = batch
return x
else: # Unconditional generation models
Expand Down
10 changes: 8 additions & 2 deletions src/pruna/evaluation/metrics/metric_energy.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,17 @@ def compute(self, model: PrunaModel, dataloader: DataLoader) -> Dict[str, Any] |

# Warmup
for _ in tqdm(range(self.n_warmup_iterations), desc="Warm-up for energy consumption metric", unit="iter"):
model(inputs, **model.inference_handler.model_args)
if isinstance(inputs, dict):
model(**inputs, **model.inference_handler.model_args)
else:
model(inputs, **model.inference_handler.model_args)

tracker.start_task("Inference")
for _ in tqdm(range(self.n_iterations), desc="Measuring energy consumption", unit="iter"):
model(inputs, **model.inference_handler.model_args)
if isinstance(inputs, dict):
model(**inputs, **model.inference_handler.model_args)
else:
model(inputs, **model.inference_handler.model_args)
tracker.stop_task()

# Make sure all the operations are finished before stopping the tracker
Expand Down
5 changes: 4 additions & 1 deletion src/pruna/evaluation/metrics/metric_model_architecture.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ def compute(self, model: PrunaModel, dataloader: DataLoader) -> Dict[str, Any] |
batch = model.inference_handler.move_inputs_to_device(batch, self.device)
inputs = model.inference_handler.prepare_inputs(batch)

model(inputs, **model.inference_handler.model_args)
if isinstance(inputs, dict):
model(**inputs, **model.inference_handler.model_args)
else:
model(inputs, **model.inference_handler.model_args)

total_macs = 0
self.module_macs = {}
Expand Down
Loading