Skip to content

[PIR-3][36] Adapt apply_per_channel_scale api #63472

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.

Sign up for GitHub

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

Merged
0x45f merged 1 commit into from
Apr 18, 2024
Merged

[PIR-3][36] Adapt apply_per_channel_scale api #63472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions python/paddle/nn/quant/quantized_linear.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from paddle.device.cuda import get_device_capability
from paddle.framework import (
LayerHelper,
in_dynamic_mode,
in_dynamic_or_pir_mode,
)

Expand Down Expand Up @@ -326,7 +325,7 @@ def apply_per_channel_scale(x, scales):
>>> out = apply_per_channel_scale(x, scales)
"""

if in_dynamic_mode():
if in_dynamic_or_pir_mode():
return _C_ops.apply_per_channel_scale(x, scales)
else:
type = "apply_per_channel_scale"
Expand Down
23 changes: 14 additions & 9 deletions test/quantization/test_apply_per_channel_scale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

import paddle
import paddle.nn.quant as Q
from paddle import base
from paddle.base import core
from paddle.pir_utils import test_with_pir_api


def get_cuda_version():
Expand Down Expand Up @@ -71,9 +71,9 @@ def setUp(self):

def get_out_static(self):
paddle.enable_static()
main = base.Program()
start = base.Program()
with base.program_guard(main, start):
main = paddle.static.Program()
start = paddle.static.Program()
with paddle.static.program_guard(main, start):
x = paddle.static.data("x", self.x.shape, dtype=self.dtype)
scales = paddle.static.data(
"scales", self.scales.shape, dtype=self.dtype
Expand All @@ -86,26 +86,31 @@ def get_out_static(self):
'scales': self.scales.numpy(),
}

exe = base.Executor(paddle.CUDAPlace(0))
exe = paddle.static.Executor(paddle.CUDAPlace(0))
exe.run(start)
(out,) = exe.run(main, feed=feed_dict, fetch_list=[out])
paddle.disable_static()
return out

@test_with_pir_api
def test_apply_per_channel_scale(self):
if self.static:
self.out_real = self.get_out_static()
else:
paddle.disable_static()
self.out_real = Q.apply_per_channel_scale(
x=self.x,
scales=self.scales,
)

if self.dtype == 'bfloat16':
out_expected = self.out_expected
if self.dtype == 'bfloat16' and isinstance(
self.out_real, paddle.Tensor
):
self.out_real = convert_uint16_to_float(self.out_real)
self.out_expected = convert_uint16_to_float(self.out_expected)
out_expected = convert_uint16_to_float(self.out_expected)

np.testing.assert_allclose(
self.out_expected, self.out_real, rtol=self.rtol, atol=self.atol
out_expected, self.out_real, rtol=self.rtol, atol=self.atol
)


Expand Down