Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.

Add Op UnitTest For Mul #1530

Closed
wants to merge 17 commits into from
Closed

Add Op UnitTest For Mul #1530

Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e89c030
fix mul
enkilee Jun 20, 2023
304c8fa
fix
enkilee Jun 20, 2023
26c8f79
Merge branch 'PaddlePaddle:develop' into Add-Op-UnitTest-for-Mul
enkilee Jun 20, 2023
dda6543
fix
enkilee Jun 21, 2023
04a087b
fix
enkilee Jun 21, 2023
ae7235e
fix
enkilee Jun 21, 2023
275e713
fix
enkilee Jun 21, 2023
7782777
fix
enkilee Jun 25, 2023
d5968ab
fix
enkilee Jun 26, 2023
787c858
Merge branch 'PaddlePaddle:develop' into Add-Op-UnitTest-for-Mul
enkilee Jun 27, 2023
252fa27
fix
enkilee Jun 27, 2023
32c958e
fix
enkilee Jun 27, 2023
fc03532
fix
enkilee Jun 27, 2023
d96dc7a
fix
enkilee Jun 27, 2023
c12edec
fix
enkilee Jun 28, 2023
8446a54
fix
enkilee Jun 28, 2023
0584307
fix
enkilee Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
222 changes: 200 additions & 22 deletions python/tests/ops/test_mul_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env python3

# Copyright (c) 2021 CINN Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -16,10 +15,10 @@

import unittest
import numpy as np
from functools import reduce
from op_test import OpTest, OpTestTool
from op_test_helper import TestCaseHelper
import paddle
import paddle.nn.functional as F
import cinn
from cinn.frontend import *
from cinn.common import *
import sys
Expand All @@ -29,36 +28,215 @@
"x86 test will be skipped due to timeout.")
class TestMulOp(OpTest):
def setUp(self):
self.init_case()
print(f"\nRunning {self.__class__.__name__}: {self.case}")
self.prepare_inputs()

def init_case(self):
self.inputs = {
"x": np.random.random((16, 64)).astype("float32"),
"y": np.random.random((64, 16)).astype("float32")
}
def prepare_inputs(self):
self.x_np = self.random(
shape=self.case["x_shape"],
dtype=self.case["x_dtype"],
low=self.case["x_low"],
high=self.case["x_high"])
self.y_np = self.random(
shape=self.case["y_shape"],
dtype=self.case["y_dtype"],
low=self.case["y_low"],
high=self.case["y_high"])

def build_paddle_program(self, target):
x = paddle.to_tensor(self.inputs["x"], stop_gradient=False)
y = paddle.to_tensor(self.inputs["y"], stop_gradient=False)
x = paddle.to_tensor(self.x_np, stop_gradient=False)
y = paddle.to_tensor(self.y_np, stop_gradient=False)
x_num_col_dim = self.x_np.size
y_num_col_dim = self.y_np.size
print("x_num_col_dim", x_num_col_dim)
print("y_num_col_dim", y_num_col_dim)
x_weight = reduce(lambda x, y: x * y, x[:x_num_col_dim])
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不是x[:x_num_col_dim]而应该是x.shape呀

另外如果reduce不能规约一维list可以自己写一个，比如可以：

def accumulate(arr, start, end):
  res = 1
  for i in range(start, end):
    res = res * arr[i]
  return res

这儿

x_weight = accumulate(x.shape, 0, x_num_col_dim)
x_height = accumulate(x.shape, x_num_col_dim, len(x.shape))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

在aistudio用1.8测到的mul结果和aistudio2.4中一致，但ci这边错

x_weight.astype(int)
x_height = reduce(lambda x, y: x * y, x[x_num_col_dim:])
x_height.astype(int)
x = paddle.reshape(x, [x_weight, x_height])
y_weight = reduce(lambda y, x: x * y, y[:y_num_col_dim])
y_weight.astype(int)
y_height = reduce(lambda y, x: x * y, y[y_num_col_dim:])
y_height.astype(int)
y = paddle.reshape(y, [y_weight, y_height])
out = paddle.matmul(x, y)
self.paddle_outputs = [out]

def build_cinn_program(self, target):
builder = NetBuilder("matmul")
builder = NetBuilder("mul")
x = builder.create_input(
self.nptype2cinntype(self.case["x_dtype"]), self.case["x_shape"],
"x")
y = builder.create_input(
self.nptype2cinntype(self.case["y_dtype"]), self.case["y_shape"],
"y")
out = builder.mul(
x,
y,
x_num_col_dims=self.case["x_num_col_dims"],
y_num_col_dims=self.case["y_num_col_dims"],
is_infer=self.case["is_infer"])
prog = builder.build()
res = self.get_cinn_output(prog, target, [x, y],
[self.x_np, self.y_np], [out])
self.cinn_outputs = [res[0]]

x = builder.create_input(Float(32), self.inputs["x"].shape, "x")
y = builder.create_input(Float(32), self.inputs["y"].shape, "y")
def test_check_results(self):
max_relative_error = self.case[
"max_relative_error"] if "max_relative_error" in self.case else 1e-5
self.check_outputs_and_grads(max_relative_error=max_relative_error)

out = builder.matmul(x, y)
prog = builder.build()
forward_res = self.get_cinn_output(
prog, target, [x, y], [self.inputs["x"], self.inputs["y"]], [out])

self.cinn_outputs = forward_res
# yapf: disable
class TestMulOpBase(TestCaseHelper):
inputs = [
#{
# "x_shape": [1],
# "y_shape": [1],
# "x_num_col_dims": 1,
# "y_num_col_dims": 1,
#}, {
# "x_shape": [1024],
# "y_shape": [1024],
# "x_num_col_dims": 1,
# "y_num_col_dims": 1,
#},
{
"x_shape": [32, 64],
"y_shape": [64, 32],
"x_num_col_dims": 1,
"y_num_col_dims": 1,
}, {
"x_shape": [2, 3, 4],
"y_shape": [3, 4, 2],
"x_num_col_dims": 1,
"y_num_col_dims": 2,
}, {
"x_shape": [16, 8, 4, 2],
"y_shape": [8, 4, 2, 16],
"x_num_col_dims": 1,
"y_num_col_dims": 3,
}]
dtypes = [
{
"x_dtype": "float32",
"y_dtype": "float32",
},
]
attrs = [
{
"x_low": -10,
"x_high": 10,
"y_low": -10,
"y_high": 10,
"is_infer": False,
},
]
def init_attrs(self):
self.class_name = "TestMulOpBase"
self.cls = TestMulOp

def test_check_results(self):
self.check_outputs_and_grads()

class TestMulOpShapeTest(TestMulOpBase):
def init_attrs(self):
self.class_name = "TestMulOpShapeTest"
self.cls = TestMulOp
self.inputs = [
#{
# "x_shape": [1],
# "y_shape": [1],
# "x_num_col_dims": 1,
# "y_num_col_dims": 1,
#}, {
# "x_shape": [1024],
# "y_shape": [1024],
# "x_num_col_dims": 1,
# "y_num_col_dims": 1,
#},
{
"x_shape": [1, 1],
"y_shape": [1, 1],
"x_num_col_dims": 1,
"y_num_col_dims": 1,
},
{
"x_shape": [2, 3, 4],
"y_shape": [3, 4, 2],
"x_num_col_dims": 1,
"y_num_col_dims": 2,
},
{
"x_shape": [16, 8, 4, 2],
"y_shape": [8, 4, 2, 16],
"x_num_col_dims": 1,
"y_num_col_dims": 3,
}]


class TestMulOpDtypeTest(TestMulOpBase):
def init_attrs(self):
self.class_name = "TestMulOpDtypeTest"
self.cls = TestMulOp
self.dtypes = [{
"x_dtype": "float16",
"y_dtype": "float16",
"max_relative_error": 1e-3,
}, {
"x_dtype": "float32",
"y_dtype": "float32",
}, {
"x_dtype": "float64",
"y_dtype": "float64",
}]


class TestMulOpPolarityTest(TestMulOpBase):
def init_attrs(self):
self.class_name = "TestMulOpPolarityTest"
self.cls = TestMulOp
self.attrs = [
{
"x_low": -10,
"x_high": 10,
"y_low": -10,
"y_high": 10,
"is_infer": False,
},
]


class TestMulOpBroadcastTest(TestMulOpBase):
def init_attrs(self):
self.class_name = "TestMulOpBroadcastTest"
self.cls = TestMulOp
self.inputs = [{
"x_shape": [1, 1],
"y_shape": [1, 1],
"x_num_col_dims": 1,
"y_num_col_dims": 1,
},
{
"x_shape": [1, 64],
"y_shape": [1, 64, 1],
"x_num_col_dims": 1,
"y_num_col_dims": 2,
},
{
"x_shape": [1, 3, 4],
"y_shape": [1, 3, 4, 2],
"x_num_col_dims": 1,
"y_num_col_dims": 2,
},
{
"x_shape": [12, 1, 4, 2],
"y_shape": [4, 2, 12, 8, 1],
"x_num_col_dims": 1,
"y_num_col_dims": 2,
}]
# yapf: enable
if __name__ == "__main__":
unittest.main()
TestMulOpShapeTest().run()
TestMulOpDtypeTest().run()
TestMulOpPolarityTest().run()
TestMulOpBroadcastTest().run()