Skip to content

N
ngraph
Commit c8288d48 authored by nishant.b.patel's avatar nishant.b.patel
Browse files
Options

Make input, filter and output axes optional for QuantizedConv op

parent ada5c18f
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 33 deletions
src/ngraph/builder/quantized_conv_builder.hpp
View file @ c8288d48
...@@ -25,22 +25,23 @@ namespace ngraph ...@@ -25,22 +25,23 @@ namespace ngraph
{ {
namespace builder namespace builder
{ {
std::shared_ptr<Node> QuantizedConvolutionBuilder(const std::shared_ptr<Node>& input, std::shared_ptr<Node>
const std::shared_ptr<Node>& filters, QuantizedConvolutionBuilder(const std::shared_ptr<Node>& input,
const Strides& window_movement_strides, const std::shared_ptr<Node>& filters,
const Strides& window_dilation_strides, const Strides& window_movement_strides,
const CoordinateDiff& padding_below, const Strides& window_dilation_strides,
const CoordinateDiff& padding_above, const CoordinateDiff& padding_below,
const Strides& data_dilation_strides, const CoordinateDiff& padding_above,
const std::shared_ptr<Node>& min_input, const Strides& data_dilation_strides,
const std::shared_ptr<Node>& max_input, const std::shared_ptr<Node>& min_input,
const std::shared_ptr<Node>& min_filter, const std::shared_ptr<Node>& max_input,
const std::shared_ptr<Node>& max_filter, const std::shared_ptr<Node>& min_filter,
const std::shared_ptr<Node>& min_output, const std::shared_ptr<Node>& max_filter,
const std::shared_ptr<Node>& max_output, const std::shared_ptr<Node>& min_output,
const ngraph::element::Type& output_type, const std::shared_ptr<Node>& max_output,
const ngraph::AxisSet& input_axes, const ngraph::element::Type& output_type,
const ngraph::AxisSet& filter_axes, const ngraph::AxisSet& input_axes = ngraph::AxisSet{},
const ngraph::AxisSet& output_axes); const ngraph::AxisSet& filter_axes = ngraph::AxisSet{},
const ngraph::AxisSet& output_axes = ngraph::AxisSet{});
} }
} }
src/ngraph/op/quantized_convolution.cpp
View file @ c8288d48
...@@ -141,6 +141,12 @@ void op::QuantizedConvolution::validate_and_infer_types() ...@@ -141,6 +141,12 @@ void op::QuantizedConvolution::validate_and_infer_types()
get_input_partial_shape(7).compatible(PartialShape{}), get_input_partial_shape(7).compatible(PartialShape{}),
"Output scale and output zero point shape must be same and 1"); "Output scale and output zero point shape must be same and 1");
// AxisSet should be empty till we support channel wise quantization
NODE_VALIDATION_CHECK(this,
m_input_axes == AxisSet{} && m_filter_axes == AxisSet{} &&
m_output_axes == AxisSet{},
"Input, filter and output AxisSet should be empty");
const PartialShape& input_shape = get_input_partial_shape(0); const PartialShape& input_shape = get_input_partial_shape(0);
const PartialShape& filters_shape = get_input_partial_shape(1); const PartialShape& filters_shape = get_input_partial_shape(1);
......
src/ngraph/op/quantized_convolution.hpp
View file @ c8288d48
...@@ -59,9 +59,9 @@ namespace ngraph ...@@ -59,9 +59,9 @@ namespace ngraph
const std::shared_ptr<Node>& output_scale, const std::shared_ptr<Node>& output_scale,
const std::shared_ptr<Node>& output_zero_point, const std::shared_ptr<Node>& output_zero_point,
const ngraph::element::Type& output_type, const ngraph::element::Type& output_type,
const ngraph::AxisSet& input_axes, const ngraph::AxisSet& input_axes = ngraph::AxisSet{},
const ngraph::AxisSet& filter_axes, const ngraph::AxisSet& filter_axes = ngraph::AxisSet{},
const ngraph::AxisSet& output_axes); const ngraph::AxisSet& output_axes = ngraph::AxisSet{});
const Strides& get_window_movement_strides() const { return m_window_movement_strides; } const Strides& get_window_movement_strides() const { return m_window_movement_strides; }
const Strides& get_window_dilation_strides() const { return m_window_dilation_strides; } const Strides& get_window_dilation_strides() const { return m_window_dilation_strides; }
......
test/backend_test.in.cpp
View file @ c8288d48
...@@ -7557,10 +7557,7 @@ NGRAPH_TEST(${BACKEND_NAME}, quantized_convolution) ...@@ -7557,10 +7557,7 @@ NGRAPH_TEST(${BACKEND_NAME}, quantized_convolution)
F, F,
G, G,
H, H,
element::i8, element::i8);
AxisSet{},
AxisSet{},
AxisSet{});
auto f = make_shared<Function>(NodeVector{CV}, ParameterVector{A, B, C, D, E, F, G, H}); auto f = make_shared<Function>(NodeVector{CV}, ParameterVector{A, B, C, D, E, F, G, H});
auto backend = runtime::Backend::create("${BACKEND_NAME}"); auto backend = runtime::Backend::create("${BACKEND_NAME}");
// Create some tensors for input/output // Create some tensors for input/output
...@@ -7692,10 +7689,7 @@ NGRAPH_TEST(${BACKEND_NAME}, quantized_conv_non_zero_zero_point) ...@@ -7692,10 +7689,7 @@ NGRAPH_TEST(${BACKEND_NAME}, quantized_conv_non_zero_zero_point)
rhs_zero_point, rhs_zero_point,
result_scale, result_scale,
result_zero_point, result_zero_point,
element::u8, element::u8);
AxisSet{},
AxisSet{},
AxisSet{});
auto f = make_shared<Function>(NodeVector{CV}, ParameterVector{A, B}); auto f = make_shared<Function>(NodeVector{CV}, ParameterVector{A, B});
// Create some tensors for input/output // Create some tensors for input/output
auto a = backend->create_tensor(element::u8, shape_a); auto a = backend->create_tensor(element::u8, shape_a);
...@@ -7713,7 +7707,7 @@ NGRAPH_TEST(${BACKEND_NAME}, quantized_conv_non_zero_zero_point) ...@@ -7713,7 +7707,7 @@ NGRAPH_TEST(${BACKEND_NAME}, quantized_conv_non_zero_zero_point)
} }
} }
TEST(${BACKEND_NAME}, quantized_conv_int32_output) NGRAPH_TEST(${BACKEND_NAME}, quantized_conv_int32_output)
{ {
Shape shape_a{1, 1, 3, 4}; Shape shape_a{1, 1, 3, 4};
Shape shape_b{1, 1, 3, 3}; Shape shape_b{1, 1, 3, 3};
...@@ -7741,10 +7735,7 @@ TEST(${BACKEND_NAME}, quantized_conv_int32_output) ...@@ -7741,10 +7735,7 @@ TEST(${BACKEND_NAME}, quantized_conv_int32_output)
F, F,
G, G,
H, H,
element::i32, element::i32);
AxisSet{},
AxisSet{},
AxisSet{});
auto f = make_shared<Function>(NodeVector{CV}, ParameterVector{A, B, C, E, G}); auto f = make_shared<Function>(NodeVector{CV}, ParameterVector{A, B, C, E, G});
auto backend = runtime::Backend::create("${BACKEND_NAME}"); auto backend = runtime::Backend::create("${BACKEND_NAME}");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment