diff options
author | Josh Levenberg <josh11b@tensorflow.org> | 2016-01-07 13:25:55 -0800 |
---|---|---|
committer | Vijay Vasudevan <vrv@google.com> | 2016-01-07 13:25:55 -0800 |
commit | 3ffa307e49e5b150934a71386194d7ed621e3e98 (patch) | |
tree | 19dfe799c808ed52db68a175c493e82504fe0883 /tensorflow/core | |
parent | f3d46653e9780fe640d242b3e98712ba8569168b (diff) |
#include third_party/tensorflow/core/platform/macros.h
directly so we can drop it from port.h.
Change: 111621646
Diffstat (limited to 'tensorflow/core')
25 files changed, 25 insertions, 0 deletions
diff --git a/tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.h b/tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.h index c2edf76dc0..c4754efae8 100644 --- a/tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.h +++ b/tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.h @@ -26,6 +26,7 @@ limitations under the License. #include "tensorflow/core/common_runtime/gpu/visitable_allocator.h" #include "tensorflow/core/lib/gtl/stl_util.h" #include "tensorflow/core/lib/strings/strcat.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/platform/thread_annotations.h" diff --git a/tensorflow/core/common_runtime/gpu/gpu_debug_allocator.h b/tensorflow/core/common_runtime/gpu/gpu_debug_allocator.h index 6e8b2061e4..27d2bfcbfb 100644 --- a/tensorflow/core/common_runtime/gpu/gpu_debug_allocator.h +++ b/tensorflow/core/common_runtime/gpu/gpu_debug_allocator.h @@ -23,6 +23,7 @@ limitations under the License. #include "tensorflow/stream_executor/stream_executor.h" #include "tensorflow/core/common_runtime/gpu/visitable_allocator.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/common_runtime/gpu/gpu_device.cc b/tensorflow/core/common_runtime/gpu/gpu_device.cc index c0376e29fa..271ba2eeb8 100644 --- a/tensorflow/core/common_runtime/gpu/gpu_device.cc +++ b/tensorflow/core/common_runtime/gpu/gpu_device.cc @@ -48,6 +48,7 @@ limitations under the License. #include "tensorflow/core/lib/strings/numbers.h" #include "tensorflow/core/lib/strings/strcat.h" #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/platform/tracing.h" #include "tensorflow/core/public/session_options.h" diff --git a/tensorflow/core/common_runtime/gpu/gpu_region_allocator.h b/tensorflow/core/common_runtime/gpu/gpu_region_allocator.h index c50c2fea29..8a14c6c07b 100644 --- a/tensorflow/core/common_runtime/gpu/gpu_region_allocator.h +++ b/tensorflow/core/common_runtime/gpu/gpu_region_allocator.h @@ -25,6 +25,7 @@ limitations under the License. #include "tensorflow/core/common_runtime/gpu/gpu_allocator_retry.h" #include "tensorflow/core/common_runtime/gpu/visitable_allocator.h" #include "tensorflow/core/lib/strings/strcat.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/platform/thread_annotations.h" diff --git a/tensorflow/core/common_runtime/gpu/pool_allocator.h b/tensorflow/core/common_runtime/gpu/pool_allocator.h index 9c543531c9..6a3a12a297 100644 --- a/tensorflow/core/common_runtime/gpu/pool_allocator.h +++ b/tensorflow/core/common_runtime/gpu/pool_allocator.h @@ -27,6 +27,7 @@ limitations under the License. #include "tensorflow/core/common_runtime/gpu/visitable_allocator.h" #include "tensorflow/core/lib/core/bits.h" #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/mem.h" #include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" diff --git a/tensorflow/core/lib/core/arena.cc b/tensorflow/core/lib/core/arena.cc index 422f3b8f71..e733b212e3 100644 --- a/tensorflow/core/lib/core/arena.cc +++ b/tensorflow/core/lib/core/arena.cc @@ -29,6 +29,7 @@ limitations under the License. #include <vector> #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/mem.h" namespace tensorflow { diff --git a/tensorflow/core/lib/core/arena.h b/tensorflow/core/lib/core/arena.h index 455f651343..25a214bf2f 100644 --- a/tensorflow/core/lib/core/arena.h +++ b/tensorflow/core/lib/core/arena.h @@ -23,6 +23,7 @@ limitations under the License. #include <vector> #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/lib/core/arena_test.cc b/tensorflow/core/lib/core/arena_test.cc index 2ff4009e57..76b7fe291e 100644 --- a/tensorflow/core/lib/core/arena_test.cc +++ b/tensorflow/core/lib/core/arena_test.cc @@ -16,6 +16,7 @@ limitations under the License. #include "tensorflow/core/lib/core/arena.h" #include <gtest/gtest.h> +#include "tensorflow/core/platform/macros.h" namespace tensorflow { namespace core { diff --git a/tensorflow/core/lib/core/command_line_flags.h b/tensorflow/core/lib/core/command_line_flags.h index 5e3a2b5ab8..9e10b3dd57 100644 --- a/tensorflow/core/lib/core/command_line_flags.h +++ b/tensorflow/core/lib/core/command_line_flags.h @@ -16,6 +16,7 @@ limitations under the License. #ifndef TENSORFLOW_LIB_CORE_COMMAND_LINE_FLAGS_H_ #define TENSORFLOW_LIB_CORE_COMMAND_LINE_FLAGS_H_ +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/public/status.h" diff --git a/tensorflow/core/lib/core/errors.h b/tensorflow/core/lib/core/errors.h index 50fc40e18d..0a13e81fe8 100644 --- a/tensorflow/core/lib/core/errors.h +++ b/tensorflow/core/lib/core/errors.h @@ -18,6 +18,7 @@ limitations under the License. #include "tensorflow/core/lib/strings/strcat.h" #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/public/status.h" namespace tensorflow { diff --git a/tensorflow/core/lib/core/threadpool.h b/tensorflow/core/lib/core/threadpool.h index 0c53070647..bf7363f9e5 100644 --- a/tensorflow/core/lib/core/threadpool.h +++ b/tensorflow/core/lib/core/threadpool.h @@ -20,6 +20,7 @@ limitations under the License. #include <functional> #include <thread> #include <vector> +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/public/env.h" diff --git a/tensorflow/core/lib/gtl/array_slice_test.cc b/tensorflow/core/lib/gtl/array_slice_test.cc index 07a3b02ed7..72d21f7861 100644 --- a/tensorflow/core/lib/gtl/array_slice_test.cc +++ b/tensorflow/core/lib/gtl/array_slice_test.cc @@ -23,6 +23,7 @@ limitations under the License. #include <gtest/gtest.h> #include "tensorflow/core/lib/gtl/inlined_vector.h" #include "tensorflow/core/lib/gtl/stl_util.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/lib/gtl/inlined_vector_test.cc b/tensorflow/core/lib/gtl/inlined_vector_test.cc index c99dbd0156..908611fc7f 100644 --- a/tensorflow/core/lib/gtl/inlined_vector_test.cc +++ b/tensorflow/core/lib/gtl/inlined_vector_test.cc @@ -22,6 +22,7 @@ limitations under the License. #include <gtest/gtest.h> #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/platform/test_benchmark.h" diff --git a/tensorflow/core/lib/gtl/int_type.h b/tensorflow/core/lib/gtl/int_type.h index b0f8b84b38..ae525ce7b4 100644 --- a/tensorflow/core/lib/gtl/int_type.h +++ b/tensorflow/core/lib/gtl/int_type.h @@ -158,6 +158,7 @@ limitations under the License. #include <ostream> // NOLINT #include <unordered_map> +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/lib/gtl/iterator_range_test.cc b/tensorflow/core/lib/gtl/iterator_range_test.cc index fd28203005..422356c0a5 100644 --- a/tensorflow/core/lib/gtl/iterator_range_test.cc +++ b/tensorflow/core/lib/gtl/iterator_range_test.cc @@ -17,6 +17,7 @@ limitations under the License. #include <vector> #include <gtest/gtest.h> +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/lib/gtl/manual_constructor.h b/tensorflow/core/lib/gtl/manual_constructor.h index 77f0d2aab7..1ec3c01335 100644 --- a/tensorflow/core/lib/gtl/manual_constructor.h +++ b/tensorflow/core/lib/gtl/manual_constructor.h @@ -29,6 +29,7 @@ limitations under the License. #include <new> #include <utility> +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/mem.h" // For aligned_malloc/aligned_free namespace tensorflow { diff --git a/tensorflow/core/lib/strings/numbers.cc b/tensorflow/core/lib/strings/numbers.cc index 93db04d8bb..52a67b0b79 100644 --- a/tensorflow/core/lib/strings/numbers.cc +++ b/tensorflow/core/lib/strings/numbers.cc @@ -22,6 +22,7 @@ limitations under the License. #include <cmath> #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/lib/strings/ordered_code.h b/tensorflow/core/lib/strings/ordered_code.h index aca591d6a6..18da4adfe7 100644 --- a/tensorflow/core/lib/strings/ordered_code.h +++ b/tensorflow/core/lib/strings/ordered_code.h @@ -39,6 +39,7 @@ limitations under the License. #define TENSORFLOW_LIB_STRINGS_ORDERED_CODE_H__ #include <string> +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/lib/strings/strcat.h b/tensorflow/core/lib/strings/strcat.h index 054e37641a..718bb13aff 100644 --- a/tensorflow/core/lib/strings/strcat.h +++ b/tensorflow/core/lib/strings/strcat.h @@ -24,6 +24,7 @@ limitations under the License. #include "tensorflow/core/lib/core/stringpiece.h" #include "tensorflow/core/lib/strings/numbers.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" // The AlphaNum type was designed to be used as the parameter type for StrCat(). diff --git a/tensorflow/core/lib/strings/stringprintf.h b/tensorflow/core/lib/strings/stringprintf.h index d5bff170ad..adbdd2090a 100644 --- a/tensorflow/core/lib/strings/stringprintf.h +++ b/tensorflow/core/lib/strings/stringprintf.h @@ -27,6 +27,7 @@ limitations under the License. #include <string> #include <vector> +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/util/bcast.h b/tensorflow/core/util/bcast.h index 19aee104dd..ec9a0989f9 100644 --- a/tensorflow/core/util/bcast.h +++ b/tensorflow/core/util/bcast.h @@ -19,6 +19,7 @@ limitations under the License. #include <algorithm> #include <vector> +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/lib/gtl/inlined_vector.h" diff --git a/tensorflow/core/util/events_writer.h b/tensorflow/core/util/events_writer.h index 14f2594a28..627f8771ae 100644 --- a/tensorflow/core/util/events_writer.h +++ b/tensorflow/core/util/events_writer.h @@ -19,6 +19,7 @@ limitations under the License. #include <memory> #include <string> #include "tensorflow/core/lib/io/record_writer.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/public/env.h" #include "tensorflow/core/util/event.pb.h" diff --git a/tensorflow/core/util/guarded_philox_random.h b/tensorflow/core/util/guarded_philox_random.h index a0ef043246..0440bae830 100644 --- a/tensorflow/core/util/guarded_philox_random.h +++ b/tensorflow/core/util/guarded_philox_random.h @@ -18,6 +18,7 @@ limitations under the License. #include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/lib/random/philox_random.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" diff --git a/tensorflow/core/util/tensor_slice_reader.h b/tensorflow/core/util/tensor_slice_reader.h index 721b172bb3..e52e44ceb8 100644 --- a/tensorflow/core/util/tensor_slice_reader.h +++ b/tensorflow/core/util/tensor_slice_reader.h @@ -27,6 +27,7 @@ limitations under the License. #include "tensorflow/core/lib/core/stringpiece.h" #include "tensorflow/core/lib/gtl/map_util.h" #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/platform/protobuf.h" diff --git a/tensorflow/core/util/tensor_slice_writer.h b/tensorflow/core/util/tensor_slice_writer.h index 3a7d9979f0..e78e46cc34 100644 --- a/tensorflow/core/util/tensor_slice_writer.h +++ b/tensorflow/core/util/tensor_slice_writer.h @@ -28,6 +28,7 @@ limitations under the License. #include "tensorflow/core/lib/core/stringpiece.h" #include "tensorflow/core/lib/gtl/map_util.h" #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/public/status.h" #include "tensorflow/core/public/tensor_shape.h" |