Browse Source

Workaround for mulithread test

pull/6227/head
AtomAlpaca 11 months ago
parent
commit
d67e12c74c
No known key found for this signature in database GPG Key ID: A003E4A074A5B2CA
5 changed files with 14 additions and 14 deletions
  1. +2
    -2
      tools/pnnx/tests/numpy/test_convnext_tiny.py
  2. +3
    -3
      tools/pnnx/tests/numpy/test_convnext_tiny_endian.py
  3. +3
    -3
      tools/pnnx/tests/numpy/test_convnext_tiny_fortran_array.py
  4. +2
    -2
      tools/pnnx/tests/numpy/test_nn_Conv3d.py
  5. +4
    -4
      tools/pnnx/tests/numpy/test_pnnx_fuse_multiheadattention.py

+ 2
- 2
tools/pnnx/tests/numpy/test_convnext_tiny.py View File

@@ -18,7 +18,7 @@ def test():
x = torch.rand(1, 3, 224, 224)

np = x.numpy()
npy.save("input1.npy", np)
npy.save("test_convnext_tiny_input1.npy", np)

a = net(x)

@@ -28,7 +28,7 @@ def test():

# torchscript to pnnx
import os
os.system("../../src/pnnx test_convnext_tiny.pt input=input1.npy")
os.system("../../src/pnnx test_convnext_tiny.pt input=test_convnext_tiny_input1.npy")

# pnnx inference
import test_convnext_tiny_pnnx


+ 3
- 3
tools/pnnx/tests/numpy/test_convnext_tiny_endian.py View File

@@ -19,17 +19,17 @@ def test():

np = x.numpy()
r_np = np.astype('>f4')
npy.save("input1.npy", r_np)
npy.save("test_convnext_tiny_endian_input1.npy", r_np)

a = net(x)

# export torchscript
mod = torch.jit.trace(net, x)
mod.save("test_convnext_tiny.pt")
mod.save("test_convnext_tiny_endian.pt")

# torchscript to pnnx
import os
os.system("../../src/pnnx test_convnext_tiny.pt input=input1.npy")
os.system("../../src/pnnx test_convnext_tiny_endian.pt input=test_convnext_tiny_endian_input1.npy")

# pnnx inference
import test_convnext_tiny_pnnx


+ 3
- 3
tools/pnnx/tests/numpy/test_convnext_tiny_fortran_array.py View File

@@ -19,17 +19,17 @@ def test():

np = x.numpy()
f_np = npy.asfortranarray(np);
npy.save("input1.npy", f_np)
npy.save("test_convnext_tiny_fortran_array_input1.npy", f_np)

a = net(x)

# export torchscript
mod = torch.jit.trace(net, x)
mod.save("test_convnext_tiny.pt")
mod.save("test_convnext_tiny_fortran_array.pt")

# torchscript to pnnx
import os
os.system("../../src/pnnx test_convnext_tiny.pt input=input1.npy")
os.system("../../src/pnnx test_convnext_tiny_fortran_array.pt input=test_convnext_tiny_fortran_array_input1.npy")

# pnnx inference
import test_convnext_tiny_pnnx


+ 2
- 2
tools/pnnx/tests/numpy/test_nn_Conv3d.py View File

@@ -47,7 +47,7 @@ def test():
torch.manual_seed(0)
x = torch.rand(1, 12, 48, 48, 64)
np = x.numpy()
npy.save("input1.npy", np)
npy.save("test_nn_Conv3d_input1.npy", np)

a = net(x)

@@ -57,7 +57,7 @@ def test():

# torchscript to pnnx
import os
os.system("../../src/pnnx test_nn_Conv3d.pt input=input1.npy")
os.system("../../src/pnnx test_nn_Conv3d.pt input=test_nn_Conv3d_input1.npy")

# pnnx inference
import test_nn_Conv3d_pnnx


+ 4
- 4
tools/pnnx/tests/numpy/test_pnnx_fuse_multiheadattention.py View File

@@ -483,9 +483,9 @@ def test():
ny = y.numpy()
nz = z.numpy()

npy.save("x.npy", nx)
npy.save("y.npy", ny)
npy.save("z.npy", nz)
npy.save("test_pnnx_fuse_multiheadattention_x.npy", nx)
npy.save("test_pnnx_fuse_multiheadattention_y.npy", ny)
npy.save("test_pnnx_fuse_multiheadattention_z.npy", nz)

a = net(x, y, z)

@@ -495,7 +495,7 @@ def test():

# torchscript to pnnx
import os
os.system("../../src/pnnx test_pnnx_fuse_multiheadattention.pt input=x.npy,y.npy,z.npy")
os.system("../../src/pnnx test_pnnx_fuse_multiheadattention.pt input=test_pnnx_fuse_multiheadattention_x.npy,test_pnnx_fuse_multiheadattention_y.npy,test_pnnx_fuse_multiheadattention_z.npy")

# pnnx inference
import test_pnnx_fuse_multiheadattention_pnnx


Loading…
Cancel
Save