Renamed "nin_shortcut" to "in_shortcut"

Author: shirayu

scripts/convert_ddpm_original_checkpoint_to_diffusers.py

@@ -22,7 +22,7 @@ def renew_resnet_paths(old_list, n_shave_prefix_segments=0):
         new_item = old_item
         new_item = new_item.replace("block.", "resnets.")
         new_item = new_item.replace("conv_shorcut", "conv1")
-        new_item = new_item.replace("nin_shortcut", "conv_shortcut")
+        new_item = new_item.replace("in_shortcut", "conv_shortcut")
         new_item = new_item.replace("temb_proj", "time_emb_proj")
 
         new_item = shave_segments(new_item, n_shave_prefix_segments=n_shave_prefix_segments)

src/diffusers/models/resnet.py

@@ -265,7 +265,7 @@ def __init__(
         time_embedding_norm="default",
         kernel=None,
         output_scale_factor=1.0,
-        use_nin_shortcut=None,
+        use_in_shortcut=None,
         up=False,
         down=False,
     ):
@@ -322,10 +322,10 @@ def __init__(
             else:
                 self.downsample = Downsample2D(in_channels, use_conv=False, padding=1, name="op")
 
-        self.use_nin_shortcut = self.in_channels != self.out_channels if use_nin_shortcut is None else use_nin_shortcut
+        self.use_in_shortcut = self.in_channels != self.out_channels if use_in_shortcut is None else use_in_shortcut
 
         self.conv_shortcut = None
-        if self.use_nin_shortcut:
+        if self.use_in_shortcut:
             self.conv_shortcut = torch.nn.Conv2d(in_channels, out_channels, kernel_size=1, stride=1, padding=0)
 
     def forward(self, x, temb):

src/diffusers/models/unet_blocks.py

@@ -807,7 +807,7 @@ def __init__(
                 non_linearity=resnet_act_fn,
                 output_scale_factor=output_scale_factor,
                 pre_norm=resnet_pre_norm,
-                use_nin_shortcut=True,
+                use_in_shortcut=True,
                 down=True,
                 kernel="fir",
             )
@@ -887,7 +887,7 @@ def __init__(
                 non_linearity=resnet_act_fn,
                 output_scale_factor=output_scale_factor,
                 pre_norm=resnet_pre_norm,
-                use_nin_shortcut=True,
+                use_in_shortcut=True,
                 down=True,
                 kernel="fir",
             )
@@ -1340,7 +1340,7 @@ def __init__(
                 non_linearity=resnet_act_fn,
                 output_scale_factor=output_scale_factor,
                 pre_norm=resnet_pre_norm,
-                use_nin_shortcut=True,
+                use_in_shortcut=True,
                 up=True,
                 kernel="fir",
             )
@@ -1437,7 +1437,7 @@ def __init__(
                 non_linearity=resnet_act_fn,
                 output_scale_factor=output_scale_factor,
                 pre_norm=resnet_pre_norm,
-                use_nin_shortcut=True,
+                use_in_shortcut=True,
                 up=True,
                 kernel="fir",
             )