Merge branch 'main' of https://github.com/huggingface/diffusers into main

models/vision/glide/convert_weights.py

@@ -3,12 +3,11 @@ from torch import nn
 
 from diffusers import (
     ClassifierFreeGuidanceScheduler,
-    CLIPTextModel,
     GlideDDIMScheduler,
     GLIDESuperResUNetModel,
     GLIDETextToImageUNetModel,
 )
-from modeling_glide import GLIDE
+from modeling_glide import GLIDE, CLIPTextModel
 from transformers import CLIPTextConfig, GPT2Tokenizer
 
 

models/vision/glide/run_glide.py

@@ -13,9 +13,10 @@ model_id = "fusing/glide-base"
 pipeline = DiffusionPipeline.from_pretrained(model_id)
 
 # run inference (text-conditioned denoising + upscaling)
-img = pipeline("a clip art of a hugging face", generator)
+img = pipeline("a crayon drawing of a corgi", generator)
 
 # process image to PIL
+img = img.squeeze(0)
 img = ((img + 1) * 127.5).round().clamp(0, 255).to(torch.uint8).cpu().numpy()
 image_pil = PIL.Image.fromarray(img)
 

src/diffusers/__init__.py

@@ -5,7 +5,6 @@
 __version__ = "0.0.1"
 
 from .modeling_utils import ModelMixin
-from .models.clip_text_transformer import CLIPTextModel
 from .models.unet import UNetModel
 from .models.unet_glide import GLIDESuperResUNetModel, GLIDETextToImageUNetModel
 from .models.unet_ldm import UNetLDMModel

src/diffusers/models/__init__.py

@@ -16,7 +16,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .clip_text_transformer import CLIPTextModel
 from .unet import UNetModel
 from .unet_glide import GLIDESuperResUNetModel, GLIDETextToImageUNetModel
 from .unet_ldm import UNetLDMModel

src/diffusers/pipeline_utils.py

@@ -34,7 +34,6 @@ logger = logging.get_logger(__name__)
 LOADABLE_CLASSES = {
     "diffusers": {
         "ModelMixin": ["save_pretrained", "from_pretrained"],
-        "CLIPTextModel": ["save_pretrained", "from_pretrained"],  # TODO (Anton): move to transformers
         "GaussianDDPMScheduler": ["save_config", "from_config"],
         "ClassifierFreeGuidanceScheduler": ["save_config", "from_config"],
         "GlideDDIMScheduler": ["save_config", "from_config"],