Skip to content

support loading safetensors format. #123

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 1 commit into from
Oct 17, 2024
Merged

support loading safetensors format. #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 14 additions & 15 deletions src/maxdiffusion/checkpointing/base_stable_diffusion_checkpointer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,21 +196,20 @@ def load_diffusers_checkpoint(self):
precision=precision,
)

if len(self.config.unet_checkpoint) > 0:
unet, unet_params = FlaxUNet2DConditionModel.from_pretrained(
self.config.unet_checkpoint,
split_head_dim=self.config.split_head_dim,
norm_num_groups=self.config.norm_num_groups,
attention_kernel=self.config.attention,
flash_block_sizes=flash_block_sizes,
dtype=self.activations_dtype,
weights_dtype=self.weights_dtype,
mesh=self.mesh,
)
params["unet"] = unet_params
pipeline.unet = unet
params = jax.tree_util.tree_map(lambda x: x.astype(self.config.weights_dtype), params)

if len(self.config.unet_checkpoint) > 0:
unet, unet_params = FlaxUNet2DConditionModel.from_pretrained(
self.config.unet_checkpoint,
split_head_dim=self.config.split_head_dim,
norm_num_groups=self.config.norm_num_groups,
attention_kernel=self.config.attention,
flash_block_sizes=flash_block_sizes,
dtype=self.activations_dtype,
weights_dtype=self.weights_dtype,
mesh=self.mesh,
)
params["unet"] = unet_params
pipeline.unet = unet
params = jax.tree_util.tree_map(lambda x: x.astype(self.config.weights_dtype), params)
return pipeline, params

def save_checkpoint(self, train_step, pipeline, params, train_states):
Expand Down
8 changes: 6 additions & 2 deletions src/maxdiffusion/models/modeling_flax_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
FLAX_WEIGHTS_NAME,
HUGGINGFACE_CO_RESOLVE_ENDPOINT,
WEIGHTS_NAME,
SAFETENSORS_WEIGHTS_NAME,
PushToHubMixin,
logging,
)
Expand Down Expand Up @@ -331,9 +332,12 @@ def from_pretrained(
)
if os.path.isdir(pretrained_path_with_subfolder):
if from_pt:
if not os.path.isfile(os.path.join(pretrained_path_with_subfolder, WEIGHTS_NAME)):
if os.path.isfile(os.path.join(pretrained_path_with_subfolder, WEIGHTS_NAME)):
model_file = os.path.join(pretrained_path_with_subfolder, WEIGHTS_NAME)
elif os.path.isfile(os.path.join(pretrained_path_with_subfolder, SAFETENSORS_WEIGHTS_NAME)):
model_file = os.path.join(pretrained_path_with_subfolder, SAFETENSORS_WEIGHTS_NAME)
else:
raise EnvironmentError(f"Error no file named {WEIGHTS_NAME} found in directory {pretrained_path_with_subfolder} ")
model_file = os.path.join(pretrained_path_with_subfolder, WEIGHTS_NAME)
elif os.path.isfile(os.path.join(pretrained_path_with_subfolder, FLAX_WEIGHTS_NAME)):
# Load from a Flax checkpoint
model_file = os.path.join(pretrained_path_with_subfolder, FLAX_WEIGHTS_NAME)
Expand Down
Loading