Fix import with Flax but without PyTorch #688
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pcuenca
commented
Sep 30, 2022
There was a problem hiding this comment.
Here SchedulerOutput is conditionally defined to use either PyTorch tensors or jax arrays.
This is a little different to what we usually do: create an alternative class FlaxSchedulerOutput, load one or the other, and the corresponding dummy versions. But this approach felt easier and I think it would touch less files. Happy to change it to the other method if this is not a good idea.
|
The documentation is not available anymore as the PR was closed or merged. |
patil-suraj
reviewed
Sep 30, 2022
src/diffusers/modeling_flax_utils.py
Outdated
Comment on lines
394
to
400
| if is_torch_available(): | ||
| from .modeling_utils import load_state_dict | ||
| else: | ||
| raise EnvironmentError( | ||
| f"Can't load the model in PyTorch format because PyTorch is not installed. " | ||
| f"Please, install PyTorch or use native Flax weights." | ||
| ) |
patil-suraj
reviewed
Sep 30, 2022
This reverts commit f653140.
|
@patil-suraj I applied your suggestions but then found additional issues after installing on a fresh environment.
|
prathikr
pushed a commit
to prathikr/diffusers
that referenced
this pull request
Oct 26, 2022
* Don't use `load_state_dict` if torch is not installed. * Define `SchedulerOutput` to use torch or flax arrays. * Don't import LMSDiscreteScheduler without torch. * Create distinct FlaxSchedulerOutput. * Additional changes required for FlaxSchedulerMixin * Do not import torch pipelines in Flax. * Revert "Define `SchedulerOutput` to use torch or flax arrays." This reverts commit f653140. * Prefix Flax scheduler outputs for consistency. * make style * FlaxSchedulerOutput is now a dataclass. * Don't use f-string without placeholders. * Add blank line. * Style (docstrings)
yoonseokjin
pushed a commit
to yoonseokjin/diffusers
that referenced
this pull request
Dec 25, 2023
* Don't use `load_state_dict` if torch is not installed. * Define `SchedulerOutput` to use torch or flax arrays. * Don't import LMSDiscreteScheduler without torch. * Create distinct FlaxSchedulerOutput. * Additional changes required for FlaxSchedulerMixin * Do not import torch pipelines in Flax. * Revert "Define `SchedulerOutput` to use torch or flax arrays." This reverts commit f653140. * Prefix Flax scheduler outputs for consistency. * make style * FlaxSchedulerOutput is now a dataclass. * Don't use f-string without placeholders. * Add blank line. * Style (docstrings)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #685.