From 8878a5c4761c025d47faa123fe4978f173f950c9 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Wed, 19 Sep 2018 14:16:14 -0700 Subject: Added ABSL_DEPRECATED annotations to various deprecated TensorFlow functions. PiperOrigin-RevId: 213693027 --- tensorflow/stream_executor/device_description.h | 6 ++---- tensorflow/stream_executor/plugin_registry.h | 2 ++ tensorflow/stream_executor/stream_executor_pimpl.h | 11 ++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'tensorflow/stream_executor') 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 #include -#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 +#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 + ABSL_DEPRECATED("Use MultiPlatformManager / PlatformId instead.") port::StatusOr 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 #include +#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; -- cgit v1.2.3