experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor clang fix

Browse Source
This commit is contained in:
xiaohong1031 2020-11-12 23:19:54 -08:00
parent 3f3b46333b
commit 264c259dca
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tensorflow/core/kernels/mkl/mkl_conv_ops.cc
View File

@ -291,9 +291,8 @@ class MklConvFwdPrimitive : public MklPrimitive {
// Create convolution primitive and add it to net // Create convolution primitive and add it to net
if (!convFwdDims.bias_dims.empty()) { if (!convFwdDims.bias_dims.empty()) {
context_.bias_mem.reset( context_.bias_mem.reset(new memory(
new memory({{convFwdDims.bias_dims}, MklDnnType<Tbias>(), {{convFwdDims.bias_dims}, MklDnnType<Tbias>(), memory::format_tag::x},
memory::format_tag::x},
cpu_engine_, DummyData)); cpu_engine_, DummyData));
context_.conv_fwd.reset(new convolution_forward(*context_.fwd_pd)); context_.conv_fwd.reset(new convolution_forward(*context_.fwd_pd));
context_.fwd_primitives_args.push_back( context_.fwd_primitives_args.push_back(
@ -465,13 +464,15 @@ class MklConvOp : public OpKernel {
OP_REQUIRES(context, dilations_.size() == 5, OP_REQUIRES(context, dilations_.size() == 5,
errors::InvalidArgument("Dilation rates field must " errors::InvalidArgument("Dilation rates field must "
"specify 5 dimensions")); "specify 5 dimensions"));
OP_REQUIRES(context, (GetTensorDim(dilations_, data_format_, 'N') == 1 && OP_REQUIRES(context,
(GetTensorDim(dilations_, data_format_, 'N') == 1 &&
GetTensorDim(dilations_, data_format_, 'C') == 1), GetTensorDim(dilations_, data_format_, 'C') == 1),
errors::InvalidArgument( errors::InvalidArgument(
"Current implementation does not yet support " "Current implementation does not yet support "
"dilations rates in the batch and depth dimensions.")); "dilations rates in the batch and depth dimensions."));
OP_REQUIRES( OP_REQUIRES(
context, (GetTensorDim(dilations_, data_format_, '0') > 0 && context,
(GetTensorDim(dilations_, data_format_, '0') > 0 &&
GetTensorDim(dilations_, data_format_, '1') > 0 && GetTensorDim(dilations_, data_format_, '1') > 0 &&
GetTensorDim(dilations_, data_format_, '2') > 0), GetTensorDim(dilations_, data_format_, '2') > 0),
errors::InvalidArgument("Dilated rates should be larger than 0.")); errors::InvalidArgument("Dilated rates should be larger than 0."));
@ -1749,9 +1750,10 @@ class MklQuantizedConv2DSumReluOp
summand_mkl_shape.SetElemType(MklDnnType<Toutput>()); summand_mkl_shape.SetElemType(MklDnnType<Toutput>());
} }
// TODO(intel-tf): Support cases when summand cannot be forwarded. // TODO(intel-tf): Support cases when summand cannot be forwarded.
OP_REQUIRES(context, ForwardMklTensorInToOutWithMklShape( OP_REQUIRES(
context, summand_idx, 0, output_tensor, context,
summand_mkl_shape, false), ForwardMklTensorInToOutWithMklShape(
context, summand_idx, 0, output_tensor, summand_mkl_shape, false),
errors::InvalidArgument( errors::InvalidArgument(
"Summand cannot be forwarded in the current fusion.")); "Summand cannot be forwarded in the current fusion."));
return; return;