experimental performance changes

TNTwise · Aug 27, 2024 · e34421b · e34421b
1 parent 66f6eaf
commit e34421b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 29 deletions.
diff --git a/backend/src/InterpolateArchs/RIFE/rife413IFNET.py b/backend/src/InterpolateArchs/RIFE/rife413IFNET.py
@@ -2,10 +2,8 @@
 import torch.nn as nn
 import math
 
-try:
-    from .interpolate import interpolate
-except ImportError:
-    from torch.nn.functional import interpolate
+
+from torch.nn.functional import interpolate
 
 
 def conv(in_planes, out_planes, kernel_size=3, stride=1, padding=1, dilation=1):
@@ -106,7 +104,7 @@ def __init__(self, in_planes, c=64):
             ResConv(c),
         )
         self.lastconv = nn.Sequential(
-            nn.ConvTranspose2d(c, 4 * 6, 4, 2, 1), MyPixelShuffle(2)
+            nn.ConvTranspose2d(c, 4 * 6, 4, 2, 1), nn.PixelShuffle(2)
         )
 
     def forward(self, x, flow=None, scale=1):

diff --git a/backend/src/InterpolateArchs/RIFE/rife420IFNET.py b/backend/src/InterpolateArchs/RIFE/rife420IFNET.py
@@ -1,10 +1,8 @@
 import torch
 import torch.nn as nn
 
-try:
-    from .interpolate import interpolate
-except ImportError:
-    from torch.nn.functional import interpolate
+
+from torch.nn.functional import interpolate
 
 
 def conv(in_planes, out_planes, kernel_size=3, stride=1, padding=1, dilation=1):
@@ -105,7 +103,7 @@ def __init__(self, in_planes, c=64):
             ResConv(c),
         )
         self.lastconv = nn.Sequential(
-            nn.ConvTranspose2d(c, 4 * 6, 4, 2, 1), MyPixelShuffle(2)
+            nn.ConvTranspose2d(c, 4 * 6, 4, 2, 1), nn.PixelShuffle(2)
         )
 
     def forward(self, x, flow=None, scale=1):

diff --git a/backend/src/InterpolateArchs/RIFE/rife421IFNET.py b/backend/src/InterpolateArchs/RIFE/rife421IFNET.py
@@ -1,10 +1,8 @@
 import torch
 import torch.nn as nn
 
-try:
-    from .interpolate import interpolate
-except ImportError:
-    from torch.nn.functional import interpolate
+
+from torch.nn.functional import interpolate
 
 
 class MyPixelShuffle(nn.Module):
@@ -92,7 +90,7 @@ def __init__(self, in_planes, c=64):
             nn.ConvTranspose2d(
                 in_channels=c, out_channels=4 * 13, kernel_size=4, stride=2, padding=1
             ),
-            MyPixelShuffle(upscale_factor=2),
+            nn.PixelShuffle(upscale_factor=2),
         )
         self.in_planes = in_planes
 

diff --git a/backend/src/InterpolateArchs/RIFE/rife422_liteIFNET.py b/backend/src/InterpolateArchs/RIFE/rife422_liteIFNET.py
@@ -1,10 +1,8 @@
 import torch
 import torch.nn as nn
 
-try:
-    from .interpolate import interpolate
-except ImportError:
-    from torch.nn.functional import interpolate
+
+from torch.nn.functional import interpolate
 
 
 class MyPixelShuffle(nn.Module):

diff --git a/backend/src/InterpolateArchs/RIFE/rife46IFNET.py b/backend/src/InterpolateArchs/RIFE/rife46IFNET.py
@@ -2,10 +2,8 @@
 import torch.nn as nn
 import torch.nn.functional as F
 
-try:
-    from .interpolate import interpolate
-except ImportError:
-    from torch.nn.functional import interpolate
+
+from torch.nn.functional import interpolate
 
 from .warplayer import warp
 
@@ -72,7 +70,7 @@ def __init__(self, in_planes, c=64):
             ResConv(c),
         )
         self.lastconv = nn.Sequential(
-            nn.ConvTranspose2d(c, 4 * 6, 4, 2, 1), MyPixelShuffle(2)
+            nn.ConvTranspose2d(c, 4 * 6, 4, 2, 1), nn.PixelShuffle(2)
         )
 
     def forward(self, x, flow=None, scale=1):

diff --git a/backend/src/InterpolateArchs/RIFE/rife47IFNET.py b/backend/src/InterpolateArchs/RIFE/rife47IFNET.py
@@ -2,10 +2,8 @@
 import torch.nn as nn
 import math
 
-try:
-    from .interpolate import interpolate
-except ImportError:
-    from torch.nn.functional import interpolate
+
+from torch.nn.functional import interpolate
 
 
 def conv(in_planes, out_planes, kernel_size=3, stride=1, padding=1, dilation=1):
@@ -106,7 +104,7 @@ def __init__(self, in_planes, c=64):
             ResConv(c),
         )
         self.lastconv = nn.Sequential(
-            nn.ConvTranspose2d(c, 4 * 6, 4, 2, 1), MyPixelShuffle(2)
+            nn.ConvTranspose2d(c, 4 * 6, 4, 2, 1), nn.PixelShuffle(2)
         )
 
     def forward(self, x, flow=None, scale=1):