Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[MKLDNN] Fix uint quantized fc when not fusing with requantize #16523

Merged
merged 1 commit into from
Oct 18, 2019
Merged

[MKLDNN] Fix uint quantized fc when not fusing with requantize #16523

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
9 changes: 7 additions & 2 deletions src/operator/quantization/mkldnn/mkldnn_quantized_fully_connected.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,13 @@ void MKLDNNQuantizedFullyConnectedForward(const nnvm::NodeAttrs &attrs,
}

Stream<cpu> *s = ctx.get_stream<cpu>();
mxnet_op::Kernel<QuantizationRangeForS8S8MultiplicationStruct, cpu>::Launch(s, 1,
min_output_ptr, max_output_ptr, &min_data, &max_data, &min_weight, &max_weight);
if (data.dtype() == mshadow::kInt8) {
mxnet_op::Kernel<QuantizationRangeForS8S8MultiplicationStruct, cpu>::Launch(
s, 1, min_output_ptr, max_output_ptr, &min_data, &max_data, &min_weight, &max_weight);
} else {
mxnet_op::Kernel<QuantizationRangeForS8U8MultiplicationStruct, cpu>::Launch(
s, 1, min_output_ptr, max_output_ptr, &min_data, &max_data, &min_weight, &max_weight);
}

bool is_train = false;
mkldnn::memory::desc out_md = GetMemDesc(out_data[fullc::kOut]);
Expand Down
12 changes: 9 additions & 3 deletions src/operator/subgraph/mkldnn/mkldnn_fc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,15 @@ void SgMKLDNNFCOp::Forward(const OpContext &ctx,
MaxAbs(cached_min_output_, cached_max_output_) / data_scale / weight_scale;
} else {
Stream<cpu> *s = ctx.get_stream<cpu>();
mxnet_op::Kernel<QuantizationRangeForS8S8MultiplicationStruct, cpu>::Launch(
s, 1, &cached_min_output_, &cached_max_output_,
&min_data, &max_data, &min_weight, &max_weight);
if (data.dtype() == mshadow::kInt8) {
mxnet_op::Kernel<QuantizationRangeForS8S8MultiplicationStruct, cpu>::Launch(
s, 1, &cached_min_output_, &cached_max_output_, &min_data, &max_data, &min_weight,
&max_weight);
} else {
mxnet_op::Kernel<QuantizationRangeForS8U8MultiplicationStruct, cpu>::Launch(
s, 1, &cached_min_output_, &cached_max_output_, &min_data, &max_data, &min_weight,
&max_weight);
}
}
}

Expand Down