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.

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

Jump to bottom

Quantize elementwise sub #42854

Merged
merged 5 commits into from
May 22, 2022
Merged

Quantize elementwise sub #42854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a450d5
Add elementwise_sub quantization
May 16, 2022
f946ae5
Remove unnecessary comments
May 16, 2022
e083907
Specify names for tests
May 17, 2022
2ffb76b
Remove comments
May 17, 2022
4273b4e
Remove comments leftovers
May 17, 2022
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
2 changes: 1 addition & 1 deletion paddle/fluid/framework/ir/graph_pattern_detector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ struct Pool : public PatternBase {
};

// Elementwise ops
// Forward pass for element-wise operators (add, mul)
// Forward pass for element-wise operators
// elementwise_out is the result of the operator
struct Elementwise : public PatternBase {
Elementwise(PDPattern* pattern, const std::string& name_scope)
Expand Down
1 change: 1 addition & 0 deletions paddle/fluid/framework/ir/mkldnn/cpu_quantize_pass.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,6 +1188,7 @@ void CPUQuantizePass::ApplyImpl(ir::Graph* graph) const {
QuantizeMatmul(graph);
QuantizeElementwise(graph, "elementwise_add");
QuantizeElementwise(graph, "elementwise_mul");
QuantizeElementwise(graph, "elementwise_sub");
QuantizeFusionGru(graph);
QuantizeMultiGru(graph);
QuantizeFusionLSTM(graph);
Expand Down
60 changes: 30 additions & 30 deletions paddle/fluid/framework/ir/mkldnn/cpu_quantize_pass_tester.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ void SetOp(ProgramDesc* prog, const std::string& type, const std::string& name,
op->SetAttr("Scale_x", 1.0f);
op->SetAttr("Scale_y", 1.0f);
op->SetAttr("Scale_out", 1.0f);
} else if (type == "elementwise_add" || type == "elementwise_mul") {
} else if (type == "elementwise_add" || type == "elementwise_mul" ||
type == "elementwise_sub") {
op->SetInput("X", {inputs[0]});
if (inputs.size() > 1) op->SetInput("Y", {inputs[1]});
op->SetOutput("Out", {outputs[0]});
Expand Down Expand Up @@ -168,7 +169,7 @@ void CheckScales(const OpDesc* op, float scale, float shift) {
scale_names.push_back("Scale_in");
scale_names.push_back("Scale_out");
} else if (type == "matmul" || type == "elementwise_add" ||
type == "elementwise_mul") {
type == "elementwise_mul" || type == "elementwise_sub") {
scale_names.push_back("Scale_x");
scale_names.push_back("Scale_y");
scale_names.push_back("Scale_out");
Expand Down Expand Up @@ -565,60 +566,59 @@ ProgramDesc BuildProgramDescElementwise(const std::string elementwise_type,
return prog;
}

void TestElementwise(const std::string elementwise_type,
const std::string elementwise_name) {
void TestElementwise(std::vector<std::string> elementwise) {
// 2 Quant + 2 IN + 1 DeQuant + 1 OUT
int added_nodes = 6;
std::unordered_map<std::string, int> expected_operators = {
{elementwise_type, 1}, {"quantize", 2}, {"dequantize", 3}};
MainTest(BuildProgramDescElementwise(elementwise_type, elementwise_name),
{elementwise[0], 1}, {"quantize", 2}, {"dequantize", 3}};
MainTest(BuildProgramDescElementwise(elementwise[0], elementwise[1]),
variable_names_elementwise, expected_operators, added_nodes,
SCALE * S8_MAX);
}

void TestElementwiseOutputScaleMissing(const std::string elementwise_type,
const std::string elementwise_name) {
void TestElementwiseOutputScaleMissing(std::vector<std::string> elementwise) {
int added_nodes = 0;
std::unordered_map<std::string, int> expected_operators = {
{elementwise_type, 1}, {"quantize", 0}, {"dequantize", 2}};
MainTest(BuildProgramDescElementwise(elementwise_type, elementwise_name),
{elementwise[0], 1}, {"quantize", 0}, {"dequantize", 2}};
MainTest(BuildProgramDescElementwise(elementwise[0], elementwise[1]),
variable_names_elementwise, expected_operators, added_nodes, 1.f,
1.f, "e");
}

void TestElementwiseUnsignedAndSignedInput(const std::string elementwise_type,
const std::string elementwise_name) {
void TestElementwiseUnsignedAndSignedInput(
std::vector<std::string> elementwise) {
int added_nodes = 0;
std::unordered_map<std::string, int> expected_operators = {
{elementwise_type, 1}, {"quantize", 0}, {"dequantize", 2}};
MainTest(BuildProgramDescElementwise(elementwise_type, elementwise_name),
{elementwise[0], 1}, {"quantize", 0}, {"dequantize", 2}};
MainTest(BuildProgramDescElementwise(elementwise[0], elementwise[1]),
variable_names_elementwise, expected_operators, added_nodes, 1.f,
1.f, "", "b");
}

TEST(CpuQuantizePass, elementwise_add) {
TestElementwise("elementwise_add", "ElementwiseAdd");
}
const std::vector<std::vector<std::string>> elementwises = {
{"elementwise_add", "ElementwiseAdd"},
{"elementwise_mul", "ElementwiseMul"},
{"elementwise_sub", "ElementwiseSub"}};

TEST(CpuQuantizePass, elementwise_add_output_scale_missing) {
TestElementwiseOutputScaleMissing("elementwise_add", "ElementwiseAdd");
}
class TestElementwises
: public testing::TestWithParam<std::vector<std::string>> {};

TEST(CpuQuantizePass, elementwise_add_unsigned_and_signed_input) {
TestElementwiseUnsignedAndSignedInput("elementwise_add", "ElementwiseAdd");
}
TEST_P(TestElementwises, elementwise_basic) { TestElementwise(GetParam()); }

TEST(CpuQuantizePass, elementwise_mul) {
TestElementwise("elementwise_mul", "ElementwiseMul");
TEST_P(TestElementwises, elementwise_output_scale_missing) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Hi, should this highest level of name remains CpuQuantizePass? now it is changed to TestElementwises, I worry there can be conflicts with elementwise op it self tests.

Copy link
Contributor

Choose a reason for hiding this comment

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

@zuzg Please change it in next PR for post-training elementwise_sub .

TestElementwiseOutputScaleMissing(GetParam());
}

TEST(CpuQuantizePass, elementwise_mul_output_scale_missing) {
TestElementwiseOutputScaleMissing("elementwise_mul", "ElementwiseMul");
TEST_P(TestElementwises, elementwise_unsigned_and_signed_input) {
TestElementwiseUnsignedAndSignedInput(GetParam());
}

TEST(CpuQuantizePass, elementwise_mul_unsigned_and_signed_input) {
TestElementwiseUnsignedAndSignedInput("elementwise_mul", "ElementwiseMul");
}
INSTANTIATE_TEST_CASE_P(
Elementwises, TestElementwises, testing::ValuesIn(elementwises),
[](const ::testing::TestParamInfo<TestElementwises::ParamType>& info) {
std::string name = info.param[0];
return name;
});

const std::vector<std::string> churn_out_vars(ProgramDesc* prog,
const std::string& prefix,
Expand Down
7 changes: 4 additions & 3 deletions paddle/fluid/framework/ir/mkldnn/cpu_quantize_placement_pass.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ void CPUQuantizePlacementPass::ApplyImpl(ir::Graph* graph) const {
std::unordered_set<std::string> supported_op_types =
std::unordered_set<std::string>(
{"concat", "conv2d", "depthwise_conv2d", "elementwise_add",
"elementwise_mul", "fc", "matmul", "nearest_interp",
"nearest_interp_v2", "pool2d", "prior_box", "reshape2", "transpose2",
"fusion_gru", "fusion_lstm", "multi_gru", "slice"});
"elementwise_mul", "elementwise_sub", "fc", "matmul",
"nearest_interp", "nearest_interp_v2", "pool2d", "prior_box",
"reshape2", "transpose2", "fusion_gru", "fusion_lstm", "multi_gru",
"slice"});
const auto& excluded_ids_list =
Get<std::unordered_set<int>>("quantize_excluded_op_ids");
const auto& op_types_list =
Expand Down
4 changes: 0 additions & 4 deletions paddle/fluid/framework/ir/mkldnn/int8_scale_calculation_mkldnn_pass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@

#pragma once

// #include <memory>
// #include <string>
// #include <unordered_map>

#include "paddle/fluid/framework/ir/fuse_pass_base.h"

namespace paddle {
Expand Down