From e85d3df92deb9d717befdf173966a2913ac2aea0 Mon Sep 17 00:00:00 2001 From: Geoffrey Irving Date: Thu, 29 Jun 2017 11:44:13 -0700 Subject: Prepare to remove a bunch of proto.h includes from tensorflow/core headers The goal is to make kernels mostly independent of proto headers, which will let us lock down our .so imports. This CL does not remove any actual headers, but changes a bunch of files so that header removal is possible in a followup CL. It also marks the headers that will be removed with // TODO(b/62899350): Remove RELNOTES: n/a PiperOrigin-RevId: 160552878 --- .../kernels/single_image_random_dot_stereograms_ops.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tensorflow/contrib/image') diff --git a/tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc b/tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc index 6efcc29654..9f0bf37aed 100755 --- a/tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc +++ b/tensorflow/contrib/image/kernels/single_image_random_dot_stereograms_ops.cc @@ -54,8 +54,8 @@ class SingleImageRandomDotStereogramsOp : public OpKernel { float normalize_min; float border_level; int number_colors; - ::tensorflow::TensorShapeProto output_image_shape; - ::tensorflow::TensorShapeProto output_data_window; + ::tensorflow::PartialTensorShape output_image_shape; + ::tensorflow::PartialTensorShape output_data_window; uint8 Cblack = 0; uint8 Cwhite = 255; @@ -109,15 +109,15 @@ class SingleImageRandomDotStereogramsOp : public OpKernel { input_Yvalue = input_tensor.shape().dim_size(0); // Y value is the number of rows - output_Ximage = output_image_shape.dim(0).size(); - output_Yimage = output_image_shape.dim(1).size(); - output_Cimage = output_image_shape.dim(2).size(); + output_Ximage = output_image_shape.dim_size(0); + output_Yimage = output_image_shape.dim_size(1); + output_Cimage = output_image_shape.dim_size(2); if (number_colors > 256) // Go to full color image output_Cimage = 3; - int data_Xwindow = output_data_window.dim(0).size(); - int data_Ywindow = output_data_window.dim(1).size(); + int data_Xwindow = output_data_window.dim_size(0); + int data_Ywindow = output_data_window.dim_size(1); int deltaX_border_image = output_Ximage - data_Xwindow; int deltaY_border_image = output_Yimage - data_Ywindow; -- cgit v1.2.3