Skip to content

Resolves [BUG] 'GatheredParameters' object is not callable #9614

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
merged 4 commits into from
Oct 16, 2024
Merged

Resolves [BUG] 'GatheredParameters' object is not callable #9614

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8aebdd
gatherparams bug
charchit7 Oct 9, 2024
67d1fea
calling context lib object
charchit7 Oct 12, 2024
d935b49
fix
charchit7 Oct 14, 2024
edb1d67
Merge branch 'main' into gather_params
a-r-r-o-w Oct 15, 2024
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
11 changes: 6 additions & 5 deletions src/diffusers/training_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
if is_transformers_available():
import transformers

if transformers.integrations.deepspeed.is_deepspeed_zero3_enabled():
import deepspeed

if is_peft_available():
from peft import set_peft_model_state_dict

Expand Down Expand Up @@ -430,15 +433,13 @@ def step(self, parameters: Iterable[torch.nn.Parameter]):
self.cur_decay_value = decay
one_minus_decay = 1 - decay

context_manager = contextlib.nullcontext
if is_transformers_available() and transformers.integrations.deepspeed.is_deepspeed_zero3_enabled():
import deepspeed
context_manager = contextlib.nullcontext()

if self.foreach:
if is_transformers_available() and transformers.integrations.deepspeed.is_deepspeed_zero3_enabled():
context_manager = deepspeed.zero.GatheredParameters(parameters, modifier_rank=None)

with context_manager():
with context_manager:
Copy link
Contributor

@a-r-r-o-w a-r-r-o-w Oct 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is correct for GatheredParameters but I think will fail in non-DeepSpeed scenarious where nullcontext is used. Could you create the context_manager object too?

context_manager = contextlib.nullcontext()
if deepspeed enabled:
    context_manager = GatheredParameters(...)

Copy link
Contributor Author

@charchit7 charchit7 Oct 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it.

params_grad = [param for param in parameters if param.requires_grad]
s_params_grad = [
s_param for s_param, param in zip(self.shadow_params, parameters) if param.requires_grad
Expand All @@ -460,7 +461,7 @@ def step(self, parameters: Iterable[torch.nn.Parameter]):
if is_transformers_available() and transformers.integrations.deepspeed.is_deepspeed_zero3_enabled():
context_manager = deepspeed.zero.GatheredParameters(param, modifier_rank=None)

with context_manager():
with context_manager:
if param.requires_grad:
s_param.sub_(one_minus_decay * (s_param - param))
else:
Expand Down
Loading