IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CPU] Clamp reduces float boundaries in the case of integer data (#6668)

Browse Source
This commit is contained in:
Yury Gaydaychuk
2022-02-08 19:50:45 +03:00
committed by GitHub
parent b47b8ad4bf
commit 0dfdadb531
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/tests/runtime/ie/unit_test.manifest
View File

@@ -909,9 +909,6 @@ roll_negative_axes
#-------------------------------------------------------------------------------
# Clamp op:
# Issue 51676: Output mismatch due to wrong conversion of bounds
IE_CPU.clamp_integral
IE_CPU.clamp_integral_negative
# Issue 51679: CI failure on Ubuntu 20. Overflow handling -inf lower bound
IE_CPU.clamp_int32
# Precision mismatch

11
src/plugins/intel_cpu/src/nodes/mkldnn_eltwise_node.cpp
View File

@@ -962,8 +962,15 @@ const std::map<const ngraph::DiscreteTypeInfo, MKLDNNEltwiseNode::Initializer> M
{ngraph::op::v0::Clamp::get_type_info_static(), [](const std::shared_ptr<ngraph::Node>& op, MKLDNNEltwiseNode& node) {
auto clampOp = getNgraphOpAs<ngraph::op::v0::Clamp>(op);
node.alpha = static_cast<float>(clampOp->get_min());
node.beta = static_cast<float>(clampOp->get_max());
float alpha_ = static_cast<float>(clampOp->get_min());
float beta_ = static_cast<float>(clampOp->get_max());
if (clampOp->get_input_element_type(0).is_integral_number()) {
// according to spec, when Clamp has integer element type, min and max mist be converted to integer
alpha_ = std::ceil(alpha_);
beta_ = std::floor(beta_);
}
node.alpha = alpha_;
node.beta = beta_;
node.algorithm = EltwiseClamp;
node.mkldnnAlgorithm = mkldnn::algorithm::eltwise_clip;
}},

2
src/tests/functional/plugin/cpu/shared_tests_instances/skip_tests_config.cpp
View File

@@ -42,8 +42,6 @@ std::vector<std::string> disabledTestPatterns() {
R"(.*(BF|bf)16.*(jit_avx(?!5)|jit_sse|ref).*)",
// TODO: Incorrect blob sizes for node BinaryConvolution_X
R"(.*BinaryConvolutionLayerTest.*)",
R"(.*ClampLayerTest.*netPrc=(I64|I32).*)",
R"(.*ClampLayerTest.*netPrc=U64.*)",
// TODO: 53618. BF16 gemm ncsp convolution crash
R"(.*_GroupConv.*_inFmts=nc.*_primitive=jit_gemm.*ENFORCE_BF16=YES.*)",
// TODO: 53578. fork DW bf16 convolution does not support 3d cases yet