From eec5477ab6e5f05a7e6a2d3e1f9549bafd7dfa09 Mon Sep 17 00:00:00 2001 From: Josh Levenberg Date: Thu, 25 Feb 2016 12:54:59 -0800 Subject: [PATCH] Execute TODO to rename io.* to save_restore_tensor.*. This will hopefully reduce confusion since io.* is not the implementation of the ".../kernels:io" build target. Change: 115593814 --- tensorflow/core/BUILD | 2 +- tensorflow/core/kernels/BUILD | 9 ++++----- tensorflow/core/kernels/restore_op.cc | 2 +- tensorflow/core/kernels/save_op.cc | 2 +- .../core/kernels/{io.cc => save_restore_tensor.cc} | 3 +-- tensorflow/core/kernels/{io.h => save_restore_tensor.h} | 6 +++--- 6 files changed, 11 insertions(+), 13 deletions(-) rename tensorflow/core/kernels/{io.cc => save_restore_tensor.cc} (99%) rename tensorflow/core/kernels/{io.h => save_restore_tensor.h} (92%) diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index 9ec3d9266ec..c19122a9e22 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -405,11 +405,11 @@ cc_library( "//tensorflow/core/kernels:conv_2d.h", "//tensorflow/core/kernels:fill_functor.h", "//tensorflow/core/kernels:initializable_lookup_table.h", - "//tensorflow/core/kernels:io.h", "//tensorflow/core/kernels:lookup_util.h", "//tensorflow/core/kernels:ops_util.h", "//tensorflow/core/kernels:queue_base.h", "//tensorflow/core/kernels:reader_base.h", + "//tensorflow/core/kernels:save_restore_tensor.h", "//tensorflow/core/kernels:typed_queue.h", ], deprecation = "Use libraries from .../kernels instead.", diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD index 0f8a787e9f4..16521cd2562 100644 --- a/tensorflow/core/kernels/BUILD +++ b/tensorflow/core/kernels/BUILD @@ -170,9 +170,8 @@ cc_library( cc_library( name = "save_restore_tensor", - # TODO(josh11b): Rename io.* -> save_restore_tensor.* - srcs = ["io.cc"], - hdrs = ["io.h"], + srcs = ["save_restore_tensor.cc"], + hdrs = ["save_restore_tensor.h"], deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", @@ -1031,11 +1030,11 @@ filegroup( "avgpooling_op.h", "control_flow_ops.h", "conv_2d.h", - "io.h", "maxpooling_op.h", "reduction_ops.h", "reduction_ops_common.h", "relu_op.h", + "save_restore_tensor.h", "softplus_op.h", "softsign_op.h", "tile_ops.h", @@ -1083,7 +1082,6 @@ filegroup( srcs = [ "dynamic_stitch_op.cc", "in_topk_op.cc", - "io.cc", "lrn_op.cc", "maxpooling_op.cc", "reduction_ops_common.cc", @@ -1095,6 +1093,7 @@ filegroup( "relu_op.cc", "restore_op.cc", "save_op.cc", + "save_restore_tensor.cc", "softplus_op.cc", "softsign_op.cc", "sparse_to_dense_op.cc", diff --git a/tensorflow/core/kernels/restore_op.cc b/tensorflow/core/kernels/restore_op.cc index 4b795d58cd5..aeaa01f5d94 100644 --- a/tensorflow/core/kernels/restore_op.cc +++ b/tensorflow/core/kernels/restore_op.cc @@ -14,7 +14,7 @@ limitations under the License. ==============================================================================*/ // See docs in ../ops/io_ops.cc. -#include "tensorflow/core/kernels/io.h" +#include "tensorflow/core/kernels/save_restore_tensor.h" #include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/lib/core/errors.h" diff --git a/tensorflow/core/kernels/save_op.cc b/tensorflow/core/kernels/save_op.cc index dc53cd476d6..946ce96c893 100644 --- a/tensorflow/core/kernels/save_op.cc +++ b/tensorflow/core/kernels/save_op.cc @@ -14,7 +14,7 @@ limitations under the License. ==============================================================================*/ // See docs in ../ops/io_ops.cc -#include "tensorflow/core/kernels/io.h" +#include "tensorflow/core/kernels/save_restore_tensor.h" #include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/framework/types.h" diff --git a/tensorflow/core/kernels/io.cc b/tensorflow/core/kernels/save_restore_tensor.cc similarity index 99% rename from tensorflow/core/kernels/io.cc rename to tensorflow/core/kernels/save_restore_tensor.cc index 547e9395553..2e4e83a1bb8 100644 --- a/tensorflow/core/kernels/io.cc +++ b/tensorflow/core/kernels/save_restore_tensor.cc @@ -13,11 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -// See docs in ../ops/io_ops.cc #include #include -#include "tensorflow/core/kernels/io.h" +#include "tensorflow/core/kernels/save_restore_tensor.h" #include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/framework/register_types.h" diff --git a/tensorflow/core/kernels/io.h b/tensorflow/core/kernels/save_restore_tensor.h similarity index 92% rename from tensorflow/core/kernels/io.h rename to tensorflow/core/kernels/save_restore_tensor.h index 04b543ec004..b3cec0eada2 100644 --- a/tensorflow/core/kernels/io.h +++ b/tensorflow/core/kernels/save_restore_tensor.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_KERNELS_IO_H_ -#define TENSORFLOW_KERNELS_IO_H_ +#ifndef TENSORFLOW_KERNELS_SAVE_RESTORE_TENSOR_H_ +#define TENSORFLOW_KERNELS_SAVE_RESTORE_TENSOR_H_ #include "tensorflow/core/util/tensor_slice_reader.h" #include "tensorflow/core/util/tensor_slice_writer.h" @@ -50,4 +50,4 @@ void RestoreTensor(OpKernelContext* context, } // namespace tensorflow -#endif // TENSORFLOW_KERNELS_IO_H_ +#endif // TENSORFLOW_KERNELS_SAVE_RESTORE_TENSOR_H_