2.9 only

Author: nihui

tools/pnnx/tests/onnx/test_F_interpolate.py

@@ -40,24 +40,15 @@ def forward(self, x, y, z, w):
 
             w = F.interpolate(w, scale_factor=(2.976744,2.976744), mode='nearest', recompute_scale_factor=False)
 
-            if version.parse(torch.__version__) >= version.parse('1.11'):
-                x = F.interpolate(x, size=12, mode='nearest-exact') + 2
-                x = F.interpolate(x, scale_factor=(3), mode='nearest-exact')
-                y = F.interpolate(y, size=(11,12), mode='nearest-exact') + 3
-                y = F.interpolate(y, scale_factor=(3,2), mode='nearest-exact')
-                z = F.interpolate(z, size=(11,12,13), mode='nearest-exact') + 4
-                z = F.interpolate(z, scale_factor=(3,1,2), mode='nearest-exact')
-
-                return x0, x1, x2, y0, y1, y2, y3, z0, z1, z2, z3, w, x, y, z
-            else:
-                return x0, x1, x2, y0, y1, y2, y3, z0, z1, z2, z3, w
+            return x0, x1, x2, y0, y1, y2, y3, z0, z1, z2, z3, w
         else:
             x = F.interpolate(x, size=16)
             x = F.interpolate(x, scale_factor=2, mode='nearest')
             x = F.interpolate(x, size=(20), mode='nearest')
             x = F.interpolate(x, scale_factor=(4), mode='nearest')
-            x = F.interpolate(x, size=12, mode='nearest-exact') + 2
-            x = F.interpolate(x, scale_factor=(3), mode='nearest-exact')
+            if version.parse(torch.__version__) >= version.parse('2.9'):
+                x = F.interpolate(x, size=12, mode='nearest-exact') + 2
+                x = F.interpolate(x, scale_factor=(3), mode='nearest-exact')
             x = F.interpolate(x, size=16, mode='linear')
             x = F.interpolate(x, scale_factor=2, mode='linear')
             x = F.interpolate(x, size=(24), mode='linear', align_corners=True)
@@ -73,8 +64,9 @@ def forward(self, x, y, z, w):
             y = F.interpolate(y, scale_factor=(4,4), mode='nearest')
             y = F.interpolate(y, size=(16,24), mode='nearest')
             y = F.interpolate(y, scale_factor=(2,3), mode='nearest')
-            y = F.interpolate(y, size=(11,12), mode='nearest-exact') + 3
-            y = F.interpolate(y, scale_factor=(3,2), mode='nearest-exact')
+            if version.parse(torch.__version__) >= version.parse('2.9'):
+                y = F.interpolate(y, size=(11,12), mode='nearest-exact') + 3
+                y = F.interpolate(y, scale_factor=(3,2), mode='nearest-exact')
             y = F.interpolate(y, size=16, mode='bilinear')
             y = F.interpolate(y, scale_factor=2, mode='bilinear')
             y = F.interpolate(y, size=(20,20), mode='bilinear', align_corners=False)
@@ -101,8 +93,9 @@ def forward(self, x, y, z, w):
             z = F.interpolate(z, scale_factor=(4,4,4), mode='nearest')
             z = F.interpolate(z, size=(16,24,20), mode='nearest')
             z = F.interpolate(z, scale_factor=(2,3,4), mode='nearest')
-            z = F.interpolate(z, size=(11,12,13), mode='nearest-exact') + 4
-            z = F.interpolate(z, scale_factor=(3,1,2), mode='nearest-exact')
+            if version.parse(torch.__version__) >= version.parse('2.9'):
+                z = F.interpolate(z, size=(11,12,13), mode='nearest-exact') + 4
+                z = F.interpolate(z, scale_factor=(3,1,2), mode='nearest-exact')
             z = F.interpolate(z, size=16, mode='trilinear')
             z = F.interpolate(z, scale_factor=2, mode='trilinear')
             z = F.interpolate(z, size=(20,20,20), mode='trilinear', align_corners=False)

tools/pnnx/tests/onnx/test_nn_Upsample.py

@@ -81,7 +81,7 @@ def __init__(self):
 
             self.up_w = nn.Upsample(scale_factor=(1.499,1.499), mode='nearest')
 
-        if version.parse(torch.__version__) >= version.parse('1.11'):
+        if version.parse(torch.__version__) >= version.parse('2.9'):
             self.up_1d_0_4 = nn.Upsample(size=12, mode='nearest-exact')
             self.up_1d_0_5 = nn.Upsample(scale_factor=(3), mode='nearest-exact')
             self.up_2d_0_6 = nn.Upsample(size=(11,12), mode='nearest-exact')
@@ -118,23 +118,14 @@ def forward(self, x, y, z, w):
 
             w = self.up_w(w)
 
-            if version.parse(torch.__version__) >= version.parse('1.11'):
-                x = self.up_1d_0_4(x) + 2
-                x = self.up_1d_0_5(x)
-                y = self.up_2d_0_6(y) + 3
-                y = self.up_2d_0_7(y)
-                z = self.up_3d_0_6(z) + 4
-                z = self.up_3d_0_7(z)
-
-                return x0, x1, x2, y0, y1, y2, y3, z0, z1, z2, z3, w, x, y, z
-            else:
-                return x0, x1, x2, y0, y1, y2, y3, z0, z1, z2, z3, w
+            return x0, x1, x2, y0, y1, y2, y3, z0, z1, z2, z3, w
         else:
             x = self.up_1d_0_0(x)
             x = self.up_1d_0_1(x)
             x = self.up_1d_0_2(x)
-            x = self.up_1d_0_3(x)
-            x = self.up_1d_0_4(x) + 2
+            if version.parse(torch.__version__) >= version.parse('2.9'):
+                x = self.up_1d_0_3(x)
+                x = self.up_1d_0_4(x) + 2
             x = self.up_1d_0_5(x)
             x = self.up_1d_1_0(x)
             x = self.up_1d_1_1(x)
@@ -146,8 +137,9 @@ def forward(self, x, y, z, w):
             y = self.up_2d_0_2(y)
             y = self.up_2d_0_3(y)
             y = self.up_2d_0_4(y)
-            y = self.up_2d_0_5(y)
-            y = self.up_2d_0_6(y) + 3
+            if version.parse(torch.__version__) >= version.parse('2.9'):
+                y = self.up_2d_0_5(y)
+                y = self.up_2d_0_6(y) + 3
             y = self.up_2d_0_7(y)
             y = self.up_2d_1_0(y)
             y = self.up_2d_1_1(y)
@@ -167,8 +159,9 @@ def forward(self, x, y, z, w):
             z = self.up_3d_0_2(z)
             z = self.up_3d_0_3(z)
             z = self.up_3d_0_4(z)
-            z = self.up_3d_0_5(z)
-            z = self.up_3d_0_6(z) + 4
+            if version.parse(torch.__version__) >= version.parse('2.9'):
+                z = self.up_3d_0_5(z)
+                z = self.up_3d_0_6(z) + 4
             z = self.up_3d_0_7(z)
             z = self.up_3d_1_0(z)
             z = self.up_3d_1_1(z)