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

Remove extra unnecessary parameter to functor::ResizeBilinear

Browse Source 
This extra parameter got introduced in a previous commit as part
of some performance improvements. But because it is unused, it
should be reverted back.
Change: 144749662
This commit is contained in:
Brennan Saeta 2017-01-17 13:38:04 -08:00 committed by TensorFlower Gardener
parent da0116b015
commit bf67d0a1c5
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,9 +55,9 @@ class ResizeBilinearOp : public OpKernel {
typename TTypes<float, 4>::Tensor output_data =
st.output->tensor<float, 4>();
functor::ResizeBilinear<Device, T>()(
context, context->eigen_device<Device>(), image_data, st.height_scale,
st.width_scale, output_data);
functor::ResizeBilinear<Device, T>()(context->eigen_device<Device>(),
image_data, st.height_scale,
st.width_scale, output_data);
}
private:
@ -263,8 +263,7 @@ inline void scale_similar_image(const float* input_image, const int b,
namespace functor {
template <typename T>
struct ResizeBilinear<CPUDevice, T> {
void operator()(OpKernelContext* context, const CPUDevice& d,
typename TTypes<T, 4>::ConstTensor images,
void operator()(const CPUDevice& d, typename TTypes<T, 4>::ConstTensor images,
const float height_scale, const float width_scale,
typename TTypes<float, 4>::Tensor output) {
const int batch_size = images.dimension(0);

4
tensorflow/core/kernels/resize_bilinear_op.h
View File

@ -18,7 +18,6 @@ limitations under the License.
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/numeric_types.h"
#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/tensor_types.h"
namespace tensorflow {
@ -26,8 +25,7 @@ namespace functor {
template <typename Device, typename T>
struct ResizeBilinear {
void operator()(OpKernelContext* context, const Device& d,
typename TTypes<T, 4>::ConstTensor images,
void operator()(const Device& d, typename TTypes<T, 4>::ConstTensor images,
const float height_scale, const float width_scale,
typename TTypes<float, 4>::Tensor resized_images);
};

3
tensorflow/core/kernels/resize_bilinear_op_gpu.cu.cc
View File

@ -149,8 +149,7 @@ namespace functor {
// Partial specialization of ResizeBilinear functor for a GPUDevice.
template <typename T>
struct ResizeBilinear<GPUDevice, T> {
void operator()(OpKernelContext* context, const GPUDevice& d,
typename TTypes<T, 4>::ConstTensor images,
void operator()(const GPUDevice& d, typename TTypes<T, 4>::ConstTensor images,
const float height_scale, const float width_scale,
typename TTypes<float, 4>::Tensor output) {
const int batch = images.dimension(0);