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

batch_util.h is generally useful so moved to util/ from kernels/ where it will be included in the pip package.

Browse Source 
PiperOrigin-RevId: 197532524
This commit is contained in:
A. Unique TensorFlower 2018-05-22 02:21:30 -07:00 committed by TensorFlower Gardener
parent f5cb20e5ea
commit a5f13f793d
18 changed files with 73 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tensorflow/contrib/makefile/tf_op_files.txt
View File

@ -300,7 +300,6 @@ tensorflow/core/kernels/spacetobatch_op.cc
tensorflow/core/kernels/batchtospace_op.cc
tensorflow/core/kernels/warn_about_ints.cc
tensorflow/core/kernels/segment_reduction_ops.cc
tensorflow/core/kernels/batch_util.cc
tensorflow/core/ops/audio_ops.cc
tensorflow/core/kernels/decode_proto_op.cc
tensorflow/core/kernels/encode_proto_op.cc

1
tensorflow/core/BUILD
View File

@ -586,6 +586,7 @@ tf_cuda_library(
"framework/types.h",
"public/version.h",
"util/activation_mode.h",
"util/batch_util.h",
"util/bcast.h",
"util/cuda_kernel_helper.h",
"util/device_name_utils.h",

9
tensorflow/core/kernels/BUILD
View File

@ -360,7 +360,6 @@ cc_library(
srcs = ["queue_base.cc"],
hdrs = ["queue_base.h"],
deps = [
":batch_util",
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:protos_all_cc",
@ -382,7 +381,6 @@ cc_library(
srcs = ["priority_queue.cc"],
hdrs = ["priority_queue.h"],
deps = [
":batch_util",
":queue_base",
":typed_queue",
"//tensorflow/core:framework",
@ -1697,7 +1695,6 @@ tf_kernel_library(
name = "random_shuffle_queue_op",
prefix = "random_shuffle_queue_op",
deps = DATA_FLOW_DEPS + [
":batch_util",
"//tensorflow/core:protos_all_cc",
],
)
@ -1890,7 +1887,6 @@ cc_library(
hdrs = ["fifo_queue.h"],
visibility = ["//visibility:private"],
deps = [
":batch_util",
":queue_base",
":typed_queue",
"//tensorflow/core:framework",
@ -1905,7 +1901,6 @@ cc_library(
hdrs = ["padding_fifo_queue.h"],
visibility = ["//visibility:private"],
deps = [
":batch_util",
":fifo_queue",
":queue_base",
":typed_queue",
@ -5004,7 +4999,6 @@ filegroup(
filegroup(
name = "android_extended_ops_group2",
srcs = [
"batch_util.cc",
"batchtospace_op.cc",
"ctc_decoder_ops.cc",
"decode_bmp_op.cc",
@ -6131,9 +6125,10 @@ tf_mkl_kernel_library(
],
)
# NOTE(lespeholt): This rule is deprecated, please use:
# tensorflow/core/util/batch_util.h
cc_library(
name = "batch_util",
srcs = ["batch_util.cc"],
hdrs = ["batch_util.h"],
deps = [
"//tensorflow/core:framework",

39
tensorflow/core/kernels/batch_util.h
View File

@ -12,43 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
// NOTE(lespeholt): This file is deprecated. Use
// "tensorflow/core/util/batch_util.h" instead.
#ifndef TENSORFLOW_CORE_KERNELS_BATCH_UTIL_H_
#define TENSORFLOW_CORE_KERNELS_BATCH_UTIL_H_
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/lib/core/status.h"
namespace tensorflow {
namespace batch_util {
// Copies element into the index^th slice of parent (in the 0th dimension).
//
// NOTE(mrry): The `element` argument is taken by value. Use `std::move()`
// to move the `element` argument into this function, and the implementation
// may be able to optimize the copy to a move. This is particularly important
// for DT_STRING tensors.
Status CopyElementToSlice(Tensor element, Tensor* parent, int64 index);
// Copies the index^th slice of parent (in the 0th dimension) into element.
Status CopySliceToElement(const Tensor& parent, Tensor* element, int64 index);
// Copies the index^th slice of parent (in the 0th dimension) into element.
//
// NOTE(mrry): The implementation may be able to optimize the copy to a move.
// This is particularly important for DT_STRING tensors.
Status MaybeMoveSliceToElement(Tensor* parent, Tensor* element, int64 index);
// Zero-initializes the tensor `element` using the scalar stored in `padding`.
// Both `element` and `padding` must have matching `dtype`.
Status SetElementZero(Tensor* element, const Tensor& padding);
// Copies `element` into a (0th dimension) slice of `parent`, assuming
// the shape of `element` is strictly not larger along any axis than a
// slice.
Status CopyElementToLargerSlice(const Tensor& element, Tensor* parent,
int index);
} // namespace batch_util
} // namespace tensorflow
#include "tensorflow/core/util/batch_util.h"
#endif // TENSORFLOW_CORE_KERNELS_BATCH_UTIL_H_

6
tensorflow/core/kernels/data/BUILD
View File

@ -81,7 +81,6 @@ tf_kernel_library(
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core/kernels:batch_util",
],
)
@ -94,7 +93,6 @@ tf_kernel_library(
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core/kernels:batch_util",
],
)
@ -107,7 +105,6 @@ tf_kernel_library(
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core/kernels:batch_util",
],
)
@ -443,7 +440,6 @@ tf_kernel_library(
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core/kernels:batch_util",
],
)
@ -456,7 +452,6 @@ tf_kernel_library(
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core/kernels:batch_util",
],
)
@ -469,7 +464,6 @@ tf_kernel_library(
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core/kernels:batch_util",
],
)

2
tensorflow/core/kernels/data/batch_dataset_op.cc
View File

@ -14,8 +14,8 @@ limitations under the License.
==============================================================================*/
#include "tensorflow/core/framework/partial_tensor_shape.h"
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/kernels/batch_util.h"
#include "tensorflow/core/kernels/data/dataset.h"
#include "tensorflow/core/util/batch_util.h"
namespace tensorflow {

2
tensorflow/core/kernels/data/padded_batch_dataset_op.cc
View File

@ -15,8 +15,8 @@ limitations under the License.
#include "tensorflow/core/framework/partial_tensor_shape.h"
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/framework/tensor_util.h"
#include "tensorflow/core/kernels/batch_util.h"
#include "tensorflow/core/kernels/data/dataset.h"
#include "tensorflow/core/util/batch_util.h"
namespace tensorflow {

2
tensorflow/core/kernels/data/slide_dataset_op.cc
View File

@ -14,8 +14,8 @@ limitations under the License.
==============================================================================*/
#include "tensorflow/core/framework/partial_tensor_shape.h"
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/kernels/batch_util.h"
#include "tensorflow/core/kernels/data/dataset.h"
#include "tensorflow/core/util/batch_util.h"
namespace tensorflow {

2
tensorflow/core/kernels/data/tensor_queue_dataset_op.cc
View File

@ -20,8 +20,8 @@ limitations under the License.
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/framework/variant.h"
#include "tensorflow/core/framework/variant_encode_decode.h"
#include "tensorflow/core/kernels/batch_util.h"
#include "tensorflow/core/kernels/data/dataset.h"
#include "tensorflow/core/util/batch_util.h"
namespace tensorflow {

2
tensorflow/core/kernels/data/tensor_slice_dataset_op.cc
View File

@ -14,8 +14,8 @@ limitations under the License.
==============================================================================*/
#include "tensorflow/core/framework/partial_tensor_shape.h"
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/kernels/batch_util.h"
#include "tensorflow/core/kernels/data/dataset.h"
#include "tensorflow/core/util/batch_util.h"
namespace tensorflow {

2
tensorflow/core/kernels/data/unbatch_dataset_op.cc
View File

@ -14,8 +14,8 @@ limitations under the License.
==============================================================================*/
#include "tensorflow/core/framework/partial_tensor_shape.h"
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/kernels/batch_util.h"
#include "tensorflow/core/kernels/data/dataset.h"
#include "tensorflow/core/util/batch_util.h"
namespace tensorflow {

2
tensorflow/core/kernels/fifo_queue.cc
View File

@ -23,13 +23,13 @@ limitations under the License.
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/framework/tensor_shape.h"
#include "tensorflow/core/framework/types.h"
#include "tensorflow/core/kernels/batch_util.h"
#include "tensorflow/core/kernels/fifo_queue.h"
#include "tensorflow/core/kernels/queue_base.h"
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/mutex.h"
#include "tensorflow/core/platform/types.h"
#include "tensorflow/core/util/batch_util.h"
namespace tensorflow {

2
tensorflow/core/kernels/padding_fifo_queue.cc
View File

@ -23,13 +23,13 @@ limitations under the License.
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/framework/tensor_shape.h"
#include "tensorflow/core/framework/types.h"
#include "tensorflow/core/kernels/batch_util.h"
#include "tensorflow/core/kernels/padding_fifo_queue.h"
#include "tensorflow/core/kernels/queue_base.h"
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/mutex.h"
#include "tensorflow/core/platform/types.h"
#include "tensorflow/core/util/batch_util.h"
namespace tensorflow {

2
tensorflow/core/kernels/priority_queue.cc
View File

@ -22,7 +22,6 @@ limitations under the License.
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/framework/tensor_shape.h"
#include "tensorflow/core/framework/types.h"
#include "tensorflow/core/kernels/batch_util.h"
#include "tensorflow/core/kernels/priority_queue.h"
#include "tensorflow/core/kernels/queue_base.h"
#include "tensorflow/core/lib/core/errors.h"
@ -30,6 +29,7 @@ limitations under the License.
#include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/mutex.h"
#include "tensorflow/core/platform/types.h"
#include "tensorflow/core/util/batch_util.h"
namespace tensorflow {

2
tensorflow/core/kernels/queue_base.cc
View File

@ -18,10 +18,10 @@ limitations under the License.
#include <vector>
#include "tensorflow/core/framework/node_def.pb.h"
#include "tensorflow/core/framework/tensor_shape.h"
#include "tensorflow/core/kernels/batch_util.h"
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/platform/mutex.h"
#include "tensorflow/core/platform/types.h"
#include "tensorflow/core/util/batch_util.h"
namespace tensorflow {

2
tensorflow/core/kernels/random_shuffle_queue_op.cc
View File

@ -24,7 +24,6 @@ limitations under the License.
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/framework/tensor_shape.h"
#include "tensorflow/core/framework/types.h"
#include "tensorflow/core/kernels/batch_util.h"
#include "tensorflow/core/kernels/queue_op.h"
#include "tensorflow/core/kernels/typed_queue.h"
#include "tensorflow/core/lib/core/errors.h"
@ -36,6 +35,7 @@ limitations under the License.
#include "tensorflow/core/platform/mutex.h"
#include "tensorflow/core/platform/thread_annotations.h"
#include "tensorflow/core/platform/types.h"
#include "tensorflow/core/util/batch_util.h"
namespace tensorflow {

2
tensorflow/core/kernels/batch_util.cc → tensorflow/core/util/batch_util.cc
View File

@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
#include "tensorflow/core/kernels/batch_util.h"
#include "tensorflow/core/util/batch_util.h"
#include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/framework/types.h"

54
tensorflow/core/util/batch_util.h Normal file
View File

@ -0,0 +1,54 @@
/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
#ifndef TENSORFLOW_CORE_UTIL_BATCH_UTIL_H_
#define TENSORFLOW_CORE_UTIL_BATCH_UTIL_H_
#include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/lib/core/status.h"
namespace tensorflow {
namespace batch_util {
// Copies element into the index^th slice of parent (in the 0th dimension).
//
// NOTE(mrry): The `element` argument is taken by value. Use `std::move()`
// to move the `element` argument into this function, and the implementation
// may be able to optimize the copy to a move. This is particularly important
// for DT_STRING tensors.
Status CopyElementToSlice(Tensor element, Tensor* parent, int64 index);
// Copies the index^th slice of parent (in the 0th dimension) into element.
Status CopySliceToElement(const Tensor& parent, Tensor* element, int64 index);
// Copies the index^th slice of parent (in the 0th dimension) into element.
//
// NOTE(mrry): The implementation may be able to optimize the copy to a move.
// This is particularly important for DT_STRING tensors.
Status MaybeMoveSliceToElement(Tensor* parent, Tensor* element, int64 index);
// Zero-initializes the tensor `element` using the scalar stored in `padding`.
// Both `element` and `padding` must have matching `dtype`.
Status SetElementZero(Tensor* element, const Tensor& padding);
// Copies `element` into a (0th dimension) slice of `parent`, assuming
// the shape of `element` is strictly not larger along any axis than a
// slice.
Status CopyElementToLargerSlice(const Tensor& element, Tensor* parent,
int index);
} // namespace batch_util
} // namespace tensorflow
#endif // TENSORFLOW_CORE_UTIL_BATCH_UTIL_H_