diff options
-rw-r--r-- | tensorflow/compiler/xla/BUILD | 1 | ||||
-rw-r--r-- | tensorflow/compiler/xla/shape_util.h | 4 | ||||
-rw-r--r-- | tensorflow/contrib/lite/kernels/internal/BUILD | 3 | ||||
-rw-r--r-- | tensorflow/contrib/lite/kernels/internal/types.h | 3 | ||||
-rw-r--r-- | tensorflow/core/BUILD | 3 | ||||
-rw-r--r-- | tensorflow/core/example/feature_util.h | 5 | ||||
-rw-r--r-- | tensorflow/core/framework/device_base.h | 3 | ||||
-rw-r--r-- | tensorflow/core/graph/testlib.h | 2 | ||||
-rw-r--r-- | tensorflow/core/kernels/queue_base.h | 4 | ||||
-rw-r--r-- | tensorflow/core/platform/cloud/gcs_file_system.cc | 3 | ||||
-rw-r--r-- | tensorflow/core/util/sparse/sparse_tensor.h | 14 | ||||
-rw-r--r-- | tensorflow/stream_executor/device_description.h | 6 | ||||
-rw-r--r-- | tensorflow/stream_executor/plugin_registry.h | 2 | ||||
-rw-r--r-- | tensorflow/stream_executor/stream_executor_pimpl.h | 11 |
14 files changed, 40 insertions, 24 deletions
diff --git a/tensorflow/compiler/xla/BUILD b/tensorflow/compiler/xla/BUILD index ef70c1f8ac..cc7390c6e6 100644 --- a/tensorflow/compiler/xla/BUILD +++ b/tensorflow/compiler/xla/BUILD @@ -245,6 +245,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:regexp_internal", + "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/container:inlined_vector", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:optional", diff --git a/tensorflow/compiler/xla/shape_util.h b/tensorflow/compiler/xla/shape_util.h index 623ae39de8..d8bb27beae 100644 --- a/tensorflow/compiler/xla/shape_util.h +++ b/tensorflow/compiler/xla/shape_util.h @@ -22,6 +22,7 @@ limitations under the License. #include <initializer_list> #include <string> +#include "absl/base/macros.h" #include "absl/container/inlined_vector.h" #include "absl/types/optional.h" #include "absl/types/span.h" @@ -479,8 +480,7 @@ class ShapeUtil { // Shorthand for testing whether a shape is of a given element type and // sequence of dimensions. - // - // DEPRECATED: Use Equal() instead. + ABSL_DEPRECATED("Use Equal() instead.") static bool ShapeIs(const Shape& shape, PrimitiveType element_type, std::initializer_list<int64> dimensions); diff --git a/tensorflow/contrib/lite/kernels/internal/BUILD b/tensorflow/contrib/lite/kernels/internal/BUILD index a6fd4ac2dd..195474e7fd 100644 --- a/tensorflow/contrib/lite/kernels/internal/BUILD +++ b/tensorflow/contrib/lite/kernels/internal/BUILD @@ -43,6 +43,7 @@ cc_library( "compatibility.h", "types.h", ], + deps = ["@com_google_absl//absl/base:core_headers"], ) config_setting( @@ -458,7 +459,7 @@ cc_library( ], copts = NEON_FLAGS_IF_APPLICABLE, deps = [ - "//tensorflow/contrib/lite/kernels:activation_functor", + "@com_google_absl//absl/base:core_headers", "//tensorflow/contrib/lite/c:c_api_internal", "@arm_neon_2_x86_sse", "@gemmlowp", diff --git a/tensorflow/contrib/lite/kernels/internal/types.h b/tensorflow/contrib/lite/kernels/internal/types.h index b70a87d0dc..3e0308721e 100644 --- a/tensorflow/contrib/lite/kernels/internal/types.h +++ b/tensorflow/contrib/lite/kernels/internal/types.h @@ -18,6 +18,7 @@ limitations under the License. #include <cstring> #include <iterator> +#include "absl/base/macros.h" #include "tensorflow/contrib/lite/kernels/internal/compatibility.h" namespace tflite { @@ -424,7 +425,7 @@ inline int FlatSize(const Dims<N>& dims) { return flat_size; } -// Deprecated. Prefer FlatSize. +ABSL_DEPRECATED("Prefer FlatSize.") inline int RequiredBufferSizeForDims(const Dims<4>& dims) { return FlatSize(dims); } diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index 9bcf5b0865..4b2589aaeb 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -2095,6 +2095,7 @@ cc_library( deps = tf_additional_lib_deps() + [ "@com_google_absl//absl/strings", "//third_party/eigen3", + "@com_google_absl//absl/base:core_headers", "//tensorflow/core/platform/default/build_config:platformlib", ] + if_static([":lib_internal_impl"]), ) @@ -2287,6 +2288,7 @@ cc_library( deps = [ "//tensorflow/core/platform/default/build_config:jpeg", "//tensorflow/core/platform/default/build_config:logging", + "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/strings", ], ) @@ -2319,6 +2321,7 @@ cc_library( deps = [ "//tensorflow/core/platform/default/build_config:gif", "//tensorflow/core/platform/default/build_config:logging", + "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/strings", ], ) diff --git a/tensorflow/core/example/feature_util.h b/tensorflow/core/example/feature_util.h index ec93b9aad9..016d1a92c1 100644 --- a/tensorflow/core/example/feature_util.h +++ b/tensorflow/core/example/feature_util.h @@ -103,6 +103,7 @@ limitations under the License. #include <iterator> #include <type_traits> +#include "absl/base/macros.h" #include "tensorflow/core/example/example.pb.h" #include "tensorflow/core/example/feature.pb.h" #include "tensorflow/core/lib/core/stringpiece.h" @@ -113,10 +114,10 @@ namespace tensorflow { namespace internal { -// DEPRECATED: Use GetFeature instead. // TODO(gorban): Update all clients in a followup CL. // Returns a reference to a feature corresponding to the name. // Note: it will create a new Feature if it is missing in the example. +ABSL_DEPRECATED("Use GetFeature instead.") Feature& ExampleFeature(const string& name, Example* example); // Specializations of RepeatedFieldTrait define a type of RepeatedField @@ -314,9 +315,9 @@ bool HasFeature(const string& key, const Example& example) { return HasFeature<FeatureType...>(key, GetFeatures(example)); } -// DEPRECATED: use HasFeature instead. // TODO(gorban): update all clients in a followup CL. template <typename... FeatureType> +ABSL_DEPRECATED("Use HasFeature instead.") bool ExampleHasFeature(const string& key, const Example& example) { return HasFeature<FeatureType...>(key, example); } diff --git a/tensorflow/core/framework/device_base.h b/tensorflow/core/framework/device_base.h index 53ac639b4c..446c31b17f 100644 --- a/tensorflow/core/framework/device_base.h +++ b/tensorflow/core/framework/device_base.h @@ -20,6 +20,7 @@ limitations under the License. #include <string> #include <vector> +#include "absl/base/macros.h" #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/core/refcount.h" @@ -176,9 +177,9 @@ class DeviceBase { return nullptr; } - // DEPRECATED: Use `this->GetAllocator()` or `this->GetScopedAllocator()`. // This method is provided for backwards compatibility, and will be removed // in a future release. + ABSL_DEPRECATED("Use `this->GetAllocator()` or `this->GetScopedAllocator()`.") Allocator* GetStepAllocator(AllocatorAttributes attr, ResourceMgr*) { return GetAllocator(attr); } diff --git a/tensorflow/core/graph/testlib.h b/tensorflow/core/graph/testlib.h index bd0284d43a..b00196f587 100644 --- a/tensorflow/core/graph/testlib.h +++ b/tensorflow/core/graph/testlib.h @@ -32,7 +32,7 @@ namespace test { namespace graph { // Converts "g" into its corresponding GraphDef "def". -// DEPRECATED: call g->ToGraphDef(def) instead. +ABSL_DEPRECATED("Call g->ToGraphDef(def) instead.") void ToGraphDef(Graph* g, GraphDef* def); // A few helpers to construct a graph. diff --git a/tensorflow/core/kernels/queue_base.h b/tensorflow/core/kernels/queue_base.h index 5fb1c92f94..272aa3b4f5 100644 --- a/tensorflow/core/kernels/queue_base.h +++ b/tensorflow/core/kernels/queue_base.h @@ -19,6 +19,7 @@ limitations under the License. #include <deque> #include <vector> +#include "absl/base/macros.h" #include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/framework/queue_interface.h" #include "tensorflow/core/framework/tensor.h" @@ -82,6 +83,9 @@ class QueueBase : public QueueInterface { // NOTE(mrry): This method is deprecated. Use // `tensorflow::batch_util::CopySliceToElement()` defined in // "./batch_util.h" instead. + ABSL_DEPRECATED( + "Use `tensorflow::batch_util::CopySliceToElement()` defined in " + "\"./batch_util.h\" instead.") static Status CopyElementToSlice(const Tensor& element, Tensor* parent, int64 index); diff --git a/tensorflow/core/platform/cloud/gcs_file_system.cc b/tensorflow/core/platform/cloud/gcs_file_system.cc index 83228fab6f..83ea8539ed 100644 --- a/tensorflow/core/platform/cloud/gcs_file_system.cc +++ b/tensorflow/core/platform/cloud/gcs_file_system.cc @@ -25,6 +25,7 @@ limitations under the License. #ifdef _WIN32 #include <io.h> // for _mktemp #endif +#include "absl/base/macros.h" #include "include/json/json.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/gtl/map_util.h" @@ -63,7 +64,7 @@ constexpr int kGetChildrenDefaultPageSize = 1000; // The HTTP response code "308 Resume Incomplete". constexpr uint64 HTTP_CODE_RESUME_INCOMPLETE = 308; // The environment variable that overrides the size of the readahead buffer. -// DEPRECATED. Use GCS_BLOCK_SIZE_MB instead. +ABSL_DEPRECATED("Use GCS_BLOCK_SIZE_MB instead.") constexpr char kReadaheadBufferSize[] = "GCS_READAHEAD_BUFFER_SIZE_BYTES"; // The environment variable that disables the GCS block cache for reads. // This is the explicit alternative to setting BLOCK_SIZE or MAX_SIZE to 0, and diff --git a/tensorflow/core/util/sparse/sparse_tensor.h b/tensorflow/core/util/sparse/sparse_tensor.h index 0f04b65f60..b9ca8ab395 100644 --- a/tensorflow/core/util/sparse/sparse_tensor.h +++ b/tensorflow/core/util/sparse/sparse_tensor.h @@ -20,6 +20,7 @@ limitations under the License. #include <numeric> #include <vector> +#include "absl/base/macros.h" #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor" #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/tensor_types.h" @@ -95,21 +96,21 @@ class SparseTensor { SparseTensor() : dims_(0) {} - // DEPRECATED: use Create() functions instead of constructors directly. + ABSL_DEPRECATED("Use Create() functions instead of constructors directly.") SparseTensor(Tensor ix, Tensor vals, const TensorShape& shape) : SparseTensor(ix, vals, TensorShapeToVector(shape), UndefinedOrder(TensorShapeToVector(shape))) {} - // DEPRECATED: use Create() functions instead of constructors directly. + ABSL_DEPRECATED("Use Create() functions instead of constructors directly.") SparseTensor(Tensor ix, Tensor vals, const VarDimArray shape) : SparseTensor(ix, vals, shape, UndefinedOrder(shape)) {} - // DEPRECATED: use Create() functions instead of constructors directly. + ABSL_DEPRECATED("use Create() functions instead of constructors directly.") SparseTensor(Tensor ix, Tensor vals, const TensorShape& shape, const VarDimArray order) : SparseTensor(ix, vals, TensorShapeToVector(shape), order) {} - // DEPRECATED: use Create() functions instead of constructors directly. + ABSL_DEPRECATED("Use Create() functions instead of constructors directly.") SparseTensor(Tensor ix, Tensor vals, const VarDimArray shape, const VarDimArray order) : ix_(ix), @@ -237,9 +238,10 @@ class SparseTensor { static Status Split(const SparseTensor& tensor, const int split_dim, const int num_split, std::vector<SparseTensor>* result); - // DEPRECATED: use the form of Split() that takes an output pointer and - // returns a status instead. template <typename T> + ABSL_DEPRECATED( + "Use the form of Split() that takes an output pointer and returns a " + "status instead.") static std::vector<SparseTensor> Split(const SparseTensor& tensor, const int split_dim, const int num_split, diff --git a/tensorflow/stream_executor/device_description.h b/tensorflow/stream_executor/device_description.h index 7f99d81ef3..a4580d6462 100644 --- a/tensorflow/stream_executor/device_description.h +++ b/tensorflow/stream_executor/device_description.h @@ -22,8 +22,7 @@ limitations under the License. #include <map> #include <memory> -#include "tensorflow/stream_executor/platform/port.h" - +#include "absl/base/macros.h" #include "tensorflow/stream_executor/launch_dim.h" #include "tensorflow/stream_executor/platform/port.h" @@ -359,9 +358,8 @@ class DeviceDescriptionBuilder { bool ThreadDimOk(const DeviceDescription &device_description, const ThreadDim &thread_dim); -// [deprecated] Use MathUtil::CeilOfRatio directly instead. -// // Equivalent to ceil(double(element_count) / threads_per_block). +ABSL_DEPRECATED("Use MathUtil::CeilOfRatio directly instead.") uint64 DivideCeil(uint64 x, uint64 y); // Calculate the number of threads/blocks required to process element_count diff --git a/tensorflow/stream_executor/plugin_registry.h b/tensorflow/stream_executor/plugin_registry.h index 49628ecd24..3065b5cb77 100644 --- a/tensorflow/stream_executor/plugin_registry.h +++ b/tensorflow/stream_executor/plugin_registry.h @@ -18,6 +18,7 @@ limitations under the License. #include <map> +#include "absl/base/macros.h" #include "tensorflow/stream_executor/blas.h" #include "tensorflow/stream_executor/dnn.h" #include "tensorflow/stream_executor/fft.h" @@ -97,6 +98,7 @@ class PluginRegistry { // TODO(b/22689637): Deprecated/temporary. Will be deleted once all users are // on MultiPlatformManager / PlatformId. template <typename FactoryT> + ABSL_DEPRECATED("Use MultiPlatformManager / PlatformId instead.") port::StatusOr<FactoryT> GetFactory(PlatformKind platform_kind, PluginId plugin_id); diff --git a/tensorflow/stream_executor/stream_executor_pimpl.h b/tensorflow/stream_executor/stream_executor_pimpl.h index d04025b681..4a8a270afa 100644 --- a/tensorflow/stream_executor/stream_executor_pimpl.h +++ b/tensorflow/stream_executor/stream_executor_pimpl.h @@ -22,6 +22,7 @@ limitations under the License. #include <tuple> #include <vector> +#include "absl/base/macros.h" #include "tensorflow/stream_executor/lib/status.h" #include "tensorflow/stream_executor/lib/statusor.h" #include "tensorflow/stream_executor/lib/strcat.h" @@ -81,8 +82,8 @@ class StreamExecutor { port::Status Init(); port::Status Init(int device_ordinal, DeviceOptions device_options); - // DEPRECATED: Do not use; use platform() instead. // Returns the platform that this StreamExecutor is acting upon. + ABSL_DEPRECATED("Use platform() instead.") PlatformKind platform_kind() const { return platform_kind_; } // Returns a reference to the platform that created this executor. @@ -255,15 +256,15 @@ class StreamExecutor { // [deprecated] Blocks the caller while a data segment of the given size is // copied from the host source to the device destination. - // - // Deprecation: prefer explicit H2D below, to avoid error-prone API usage. + ABSL_DEPRECATED( + "Prefer SynchronousMemcpyH2D, to avoid error-prone API usage.") bool SynchronousMemcpy(DeviceMemoryBase *device_dst, const void *host_src, uint64 size) SE_MUST_USE_RESULT; // [deprecated] Blocks the caller while a data segment of the given size is // copied from the device source to the host destination. - // - // Deprecation: prefer explicit D2H below, to avoid error-prone API usage. + ABSL_DEPRECATED( + "Prefer SynchronousMemcpyD2H, to avoid error-prone API usage.") bool SynchronousMemcpy(void *host_dst, const DeviceMemoryBase &device_src, uint64 size) SE_MUST_USE_RESULT; |