Skip to content

Support quantizing to and dequantizing from uint16_t (Bits16) #5839

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

Closed
wants to merge 1 commit into from
Closed

Support quantizing to and dequantizing from uint16_t (Bits16) #5839

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: 3 additions & 0 deletions kernels/quantized/cpu/op_dequantize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ void check_dequantize_per_tensor_args(
ET_CHECK_MSG(
input.scalar_type() == ScalarType::Byte ||
input.scalar_type() == ScalarType::Char ||
input.scalar_type() == ScalarType::Bits16 ||
input.scalar_type() == ScalarType::Short ||
input.scalar_type() == ScalarType::Int,
"input.scalar_type() %" PRId8 " is not supported:",
Expand Down Expand Up @@ -118,6 +119,7 @@ Tensor& dequantize_per_tensor_out(

switch (input.scalar_type()) {
ET_FORALL_INT_TYPES(CALCULATE_INT_TYPE);
CALCULATE_INT_TYPE(uint16_t, Bits16);
default:
ET_CHECK_MSG(
false,
Expand Down Expand Up @@ -312,6 +314,7 @@ Tensor& dequantize_per_channel_out(

switch (input.scalar_type()) {
ET_FORALL_INT_TYPES(CALCULATE_FLOAT_TYPE);
CALCULATE_INT_TYPE(uint16_t, Bits16);
default:
ET_CHECK_MSG(
false,
Expand Down
5 changes: 5 additions & 0 deletions kernels/quantized/cpu/op_quantize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ void check_quantize_per_tensor_args(
static_cast<int32_t>(std::numeric_limits<int8_t>::min());
quant_max_upper_bound =
static_cast<int32_t>(std::numeric_limits<int8_t>::max());
} else if (dtype == ScalarType::Bits16) {
quant_min_lower_bound = std::numeric_limits<uint16_t>::min();
quant_max_upper_bound = std::numeric_limits<uint16_t>::max();
} else if (dtype == ScalarType::Short) {
quant_min_lower_bound = std::numeric_limits<int16_t>::min();
quant_max_upper_bound = std::numeric_limits<int16_t>::max();
Expand Down Expand Up @@ -135,6 +138,7 @@ Tensor& quantize_per_tensor_out(
case ScalarType::in_dtype: \
switch (out.scalar_type()) { \
ET_FORALL_INT_TYPES_WITH(IN_CTYPE, QUANTIZE_IMPL); \
QUANTIZE_IMPL(IN_CTYPE, uint16_t, Bits16) \
default: \
ET_CHECK_MSG( \
false, \
Expand Down Expand Up @@ -329,6 +333,7 @@ Tensor& quantize_per_channel_out(
case ScalarType::in_dtype: \
switch (out.scalar_type()) { \
ET_FORALL_INT_TYPES_WITH(CTYPE_IN, QUANTIZE_IMPL); \
QUANTIZE_IMPL(CTYPE_IN, uint16_t, Bits16) \
default: \
ET_CHECK_MSG( \
false, \
Expand Down
4 changes: 4 additions & 0 deletions kernels/quantized/test/op_dequantize_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ void test_dtype() {
TEST(OpDequantizeOutTest, AllDtypesSupported) {
et_pal_init();
test_dtype<ScalarType::Byte>();
test_dtype<ScalarType::Char>();
test_dtype<ScalarType::Short>();
test_dtype<ScalarType::Bits16>();
test_dtype<ScalarType::Int>();
}

TEST(OpDequantizeOutTest, NonWholeNumbers) {
Expand Down
10 changes: 7 additions & 3 deletions kernels/quantized/test/op_quantize_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ void test_dtype() {
Tensor input = tf.full({3, 5}, 4);
double scale = 0.5;

int64_t zero_point = 127;
int64_t zero_point = 108;
int64_t quant_min = 0;
int64_t quant_max = 255;
int64_t quant_max = 127;

TensorFactory<DTYPE> tfo;
Tensor out = tfo.zeros({3, 5});
// 4 / 0.5 + 127
Tensor expected = tfo.full({3, 5}, 135);
Tensor expected = tfo.full({3, 5}, 116);
quantize_per_tensor_out(
input, scale, zero_point, quant_min, quant_max, DTYPE, out);

Expand All @@ -51,6 +51,10 @@ void test_dtype() {

TEST(OpQuantizeOutTest, AllDtypesSupported) {
test_dtype<ScalarType::Byte>();
test_dtype<ScalarType::Char>();
test_dtype<ScalarType::Short>();
test_dtype<ScalarType::Bits16>();
test_dtype<ScalarType::Int>();
}

TEST(OpQuantizeOutTest, TensorArgOverload) {
Expand Down
7 changes: 7 additions & 0 deletions runtime/core/exec_aten/testing_util/tensor_factory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,13 @@ struct ScalarTypeToCppTypeWrapper<torch::executor::ScalarType::Bool> {
using ctype = uint8_t;
};

// Use a C type of `uint16_t` instead of `Bits16` to simplify code reuse when
// testing multiple integer types.
template <>
struct ScalarTypeToCppTypeWrapper<torch::executor::ScalarType::Bits16> {
using ctype = uint16_t;
};

// To allow implicit conversion between simple types to `ctype`
#define SPECIALIZE_ScalarTypeToCppTypeWrapper(CTYPE, DTYPE) \
template <> \
Expand Down
Loading