Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PIR] pir onednn support prelu #61664

Merged
merged 1 commit into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 10 additions & 6 deletions paddle/fluid/pir/dialect/operator/ir/ops_onednn_extra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,20 +184,24 @@

# - op : pool2d_grad

# - op : prelu
# extra_args : bool is_test=false, str mkldnn_data_type="float32"
- op : prelu
extra_args : bool is_test=false, str mkldnn_data_type="float32"

# - op : prelu_grad
- op : prelu_grad
extra_args : bool is_test=false, str mkldnn_data_type="float32"

# - op : prior_box
- op : prior_box
extra_args : bool use_quantizer=false, str mkldnn_data_type="float32"

- op : relu

- op : relu_grad

# - op : relu6
- op : relu6
extra_args : float threshold=6.0

# - op : relu6_grad
- op : relu6_grad
extra_args : float threshold=6.0

# - op : reshape

Expand Down
1 change: 1 addition & 0 deletions test/mkldnn/test_activation_bf16_mkldnn_op.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ def op_grad(self, dout, x):
class TestMKLDNNRelu6BF16Op(MKLDNNBF16ActivationOp, TestActivation):
def config(self):
self.op_type = "relu6"
self.check_pir_onednn = True

def op_forward(self, x):
return np.clip(x, 0, 6)
Expand Down
2 changes: 2 additions & 0 deletions test/mkldnn/test_activation_mkldnn_op.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class TestMKLDNNRelu6Dim2(TestRelu6):
def setUp(self):
super().setUp()
self.attrs.update({"use_mkldnn": True})
self.check_pir_onednn = True

def init_dtype(self):
self.dtype = np.float32
Expand All @@ -82,6 +83,7 @@ class TestMKLDNNRelu6_ZeroDim(TestRelu6_ZeroDim):
def setUp(self):
super().setUp()
self.attrs.update({"use_mkldnn": True})
self.check_pir_onednn = True

def init_dtype(self):
self.dtype = np.float32
Expand Down
15 changes: 11 additions & 4 deletions test/mkldnn/test_prelu_mkldnn_op.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,12 @@ def setUp(self):
self.outputs = {'Out': ref_prelu(self.x, self.alpha, self.mode)}

def test_check_output(self):
self.check_output(check_dygraph=False)
self.check_output(check_dygraph=False, check_pir_onednn=True)

def test_check_grad(self):
self.check_grad(['X', 'Alpha'], 'Out', check_dygraph=False)
self.check_grad(
['X', 'Alpha'], 'Out', check_dygraph=False, check_pir_onednn=True
)


class TestPReluModeAllOneDNNOp(TestPReluModeChannelOneDNNOp):
Expand All @@ -79,7 +81,9 @@ def init_attrs(self):
# Skip 'Alpha' input check because in mode = 'all' it has to be a single
# 1D value so checking if it has at least 100 values will cause an error
def test_check_grad(self):
self.check_grad(['X'], 'Out', check_dygraph=False)
self.check_grad(
['X'], 'Out', check_dygraph=False, check_pir_onednn=True
)


class TestPReluModeElementOneDNNOp(TestPReluModeChannelOneDNNOp):
Expand Down Expand Up @@ -169,7 +173,9 @@ def calculate_grads(self):
self.dout = dout

def test_check_output(self):
self.check_output_with_place(core.CPUPlace(), check_dygraph=False)
self.check_output_with_place(
core.CPUPlace(), check_dygraph=False, check_pir_onednn=True
)

def test_check_grad(self):
self.calculate_grads()
Expand All @@ -180,6 +186,7 @@ def test_check_grad(self):
user_defined_grads=[self.dx, self.dalpha],
user_defined_grad_outputs=[convert_float_to_uint16(self.dout)],
check_dygraph=False,
check_pir_onednn=True,
)

cls_name = "{}_{}".format(parent.__name__, "BF16")
Expand Down