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

Merge pull request #42307 from MikhailStartsev:fix_debug_dll

Browse Source 
PiperOrigin-RevId: 326789772
Change-Id: I9c9a8586cef07e9e859d82779ddf041b3ae9175f
This commit is contained in:
TensorFlower Gardener 2020-08-14 23:50:52 -07:00
commit c33dc04851
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tensorflow/core/kernels/depthtospace_op.cc
View File

@ -117,14 +117,13 @@ class DepthToSpaceOp : public OpKernel {
// NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32.
auto Tinput_v = input.template reinterpret_last_dimension<int32, 4>();
auto Toutput_v = outputs_tensor->reinterpret_last_dimension<int32, 4>();
functor::DepthToSpaceOpFunctor<GPUDevice, int32, FORMAT_NCHW> functor;
functor(context->eigen_device<GPUDevice>(), Tinput_v, block_size_,
functor::DepthToSpaceOpFunctor<Device, int32, FORMAT_NCHW> functor;
functor(context->eigen_device<Device>(), Tinput_v, block_size_,
Toutput_v);
return;
} else if (data_format_ == FORMAT_NCHW) {
functor::DepthToSpaceOpFunctor<GPUDevice, T, FORMAT_NCHW> functor;
functor(context->eigen_device<GPUDevice>(), Tinput, block_size_,
Toutput);
functor::DepthToSpaceOpFunctor<Device, T, FORMAT_NCHW> functor;
functor(context->eigen_device<Device>(), Tinput, block_size_, Toutput);
return;
}
}

12
tensorflow/core/kernels/spacetodepth_op.cc
View File

@ -132,18 +132,18 @@ class SpaceToDepthOp : public OpKernel {
// NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32.
auto Tinput_v = input.template reinterpret_last_dimension<int32, 4>();
auto Toutput_v = outputs_tensor->reinterpret_last_dimension<int32, 4>();
functor::SpaceToDepthOpFunctor<GPUDevice, int32, FORMAT_NCHW> functor;
functor(context->eigen_device<GPUDevice>(), Tinput_v, block_size_,
functor::SpaceToDepthOpFunctor<Device, int32, FORMAT_NCHW> functor;
functor(context->eigen_device<Device>(), Tinput_v, block_size_,
Toutput_v);
} else if (data_format_ == FORMAT_NCHW) {
CHECK((std::is_same<T, RT>::value));
functor::SpaceToDepthOpFunctor<GPUDevice, RT, FORMAT_NCHW> functor;
functor(context->eigen_device<GPUDevice>(), input.tensor<RT, 4>(),
functor::SpaceToDepthOpFunctor<Device, RT, FORMAT_NCHW> functor;
functor(context->eigen_device<Device>(), input.tensor<RT, 4>(),
block_size_, outputs_tensor->tensor<RT, 4>());
} else {
CHECK((std::is_same<T, RT>::value));
functor::SpaceToDepthOpFunctor<GPUDevice, RT, FORMAT_NHWC> functor;
functor(context->eigen_device<GPUDevice>(), input.tensor<RT, 4>(),
functor::SpaceToDepthOpFunctor<Device, RT, FORMAT_NHWC> functor;
functor(context->eigen_device<Device>(), input.tensor<RT, 4>(),
block_size_, outputs_tensor->tensor<RT, 4>());
}
} else {