diff options
25 files changed, 27 insertions, 4 deletions
diff --git a/tensorflow/core/common_runtime/device_factory.cc b/tensorflow/core/common_runtime/device_factory.cc index 24b818780c..371862a015 100644 --- a/tensorflow/core/common_runtime/device_factory.cc +++ b/tensorflow/core/common_runtime/device_factory.cc @@ -21,6 +21,7 @@ limitations under the License. #include "tensorflow/core/lib/strings/strcat.h" #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/public/session_options.h" diff --git a/tensorflow/core/common_runtime/direct_session.cc b/tensorflow/core/common_runtime/direct_session.cc index 202cbe0b65..d7bf8fea64 100644 --- a/tensorflow/core/common_runtime/direct_session.cc +++ b/tensorflow/core/common_runtime/direct_session.cc @@ -44,6 +44,7 @@ limitations under the License. #include "tensorflow/core/lib/strings/strcat.h" #include "tensorflow/core/platform/host_info.h" #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/public/status.h" #include "tensorflow/core/public/tensor.h" diff --git a/tensorflow/core/common_runtime/direct_session.h b/tensorflow/core/common_runtime/direct_session.h index 0e24290ff9..886636861e 100644 --- a/tensorflow/core/common_runtime/direct_session.h +++ b/tensorflow/core/common_runtime/direct_session.h @@ -28,6 +28,7 @@ limitations under the License. #include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/lib/core/errors.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" #include "tensorflow/core/public/session.h" diff --git a/tensorflow/core/common_runtime/executor.cc b/tensorflow/core/common_runtime/executor.cc index dd574b37f4..0537294ceb 100644 --- a/tensorflow/core/common_runtime/executor.cc +++ b/tensorflow/core/common_runtime/executor.cc @@ -46,6 +46,7 @@ limitations under the License. #include "tensorflow/core/lib/strings/stringprintf.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/thread_annotations.h" #include "tensorflow/core/platform/tracing.h" diff --git a/tensorflow/core/common_runtime/rendezvous_mgr.cc b/tensorflow/core/common_runtime/rendezvous_mgr.cc index 353575ddc9..95c11c075d 100644 --- a/tensorflow/core/common_runtime/rendezvous_mgr.cc +++ b/tensorflow/core/common_runtime/rendezvous_mgr.cc @@ -28,6 +28,7 @@ limitations under the License. #include "tensorflow/core/lib/strings/numbers.h" #include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/common_runtime/rendezvous_mgr.h b/tensorflow/core/common_runtime/rendezvous_mgr.h index 6e911ea884..39fee42ae3 100644 --- a/tensorflow/core/common_runtime/rendezvous_mgr.h +++ b/tensorflow/core/common_runtime/rendezvous_mgr.h @@ -22,6 +22,7 @@ limitations under the License. #include "tensorflow/core/common_runtime/device_mgr.h" #include "tensorflow/core/framework/rendezvous.h" #include "tensorflow/core/platform/macros.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/public/status.h" #include "tensorflow/core/public/tensor.h" diff --git a/tensorflow/core/common_runtime/session_factory.cc b/tensorflow/core/common_runtime/session_factory.cc index 8a6742c4bd..9b31036755 100644 --- a/tensorflow/core/common_runtime/session_factory.cc +++ b/tensorflow/core/common_runtime/session_factory.cc @@ -18,6 +18,7 @@ limitations under the License. #include <unordered_map> #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { namespace { diff --git a/tensorflow/core/common_runtime/step_stats_collector.h b/tensorflow/core/common_runtime/step_stats_collector.h index a5ff47a849..c0b587a03e 100644 --- a/tensorflow/core/common_runtime/step_stats_collector.h +++ b/tensorflow/core/common_runtime/step_stats_collector.h @@ -15,10 +15,9 @@ limitations under the License. #ifndef THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_STEP_STATS_COLLECTOR_H_ #define THIRD_PARTY_TENSORFLOW_CORE_DISTRIBUTED_RUNTIME_STEP_STATS_COLLECTOR_H_ -#include <string> - -#include "tensorflow/core/platform/port.h" // Must be first. +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/thread_annotations.h" +#include "tensorflow/core/platform/types.h" namespace tensorflow { diff --git a/tensorflow/core/lib/core/blocking_counter.h b/tensorflow/core/lib/core/blocking_counter.h index 9d5cc36161..de8d8cfbcf 100644 --- a/tensorflow/core/lib/core/blocking_counter.h +++ b/tensorflow/core/lib/core/blocking_counter.h @@ -17,6 +17,7 @@ limitations under the License. #define TENSORFLOW_LIB_CORE_BLOCKING_COUNTER_H_ #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/lib/core/notification.h b/tensorflow/core/lib/core/notification.h index f73fe29566..c47ac757b3 100644 --- a/tensorflow/core/lib/core/notification.h +++ b/tensorflow/core/lib/core/notification.h @@ -18,6 +18,7 @@ limitations under the License. #include <assert.h> +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/lib/core/notification_test.cc b/tensorflow/core/lib/core/notification_test.cc index d03139675e..7af59c3f01 100644 --- a/tensorflow/core/lib/core/notification_test.cc +++ b/tensorflow/core/lib/core/notification_test.cc @@ -17,6 +17,7 @@ limitations under the License. #include "tensorflow/core/lib/core/notification.h" #include "tensorflow/core/lib/core/threadpool.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/lib/core/threadpool.cc b/tensorflow/core/lib/core/threadpool.cc index be1ede18f3..870526a9f1 100644 --- a/tensorflow/core/lib/core/threadpool.cc +++ b/tensorflow/core/lib/core/threadpool.cc @@ -16,6 +16,7 @@ limitations under the License. #include "tensorflow/core/lib/core/threadpool.h" #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/platform/tracing.h" diff --git a/tensorflow/core/lib/core/threadpool.h b/tensorflow/core/lib/core/threadpool.h index 8410ca6ec4..0c53070647 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/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/public/env.h" diff --git a/tensorflow/core/lib/histogram/histogram.cc b/tensorflow/core/lib/histogram/histogram.cc index e35c6b3009..6da972dcb0 100644 --- a/tensorflow/core/lib/histogram/histogram.cc +++ b/tensorflow/core/lib/histogram/histogram.cc @@ -19,6 +19,7 @@ limitations under the License. #include "tensorflow/core/framework/summary.pb.h" #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { namespace histogram { diff --git a/tensorflow/core/lib/histogram/histogram.h b/tensorflow/core/lib/histogram/histogram.h index 14c332f2b2..c1f65a2a98 100644 --- a/tensorflow/core/lib/histogram/histogram.h +++ b/tensorflow/core/lib/histogram/histogram.h @@ -19,6 +19,7 @@ limitations under the License. #include <string> #include "tensorflow/core/lib/gtl/array_slice.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/lib/random/random.cc b/tensorflow/core/lib/random/random.cc index 8bb7730cfc..d06b917d82 100644 --- a/tensorflow/core/lib/random/random.cc +++ b/tensorflow/core/lib/random/random.cc @@ -16,6 +16,7 @@ limitations under the License. #include "tensorflow/core/lib/random/random.h" #include <random> +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/platform/tracing.h b/tensorflow/core/platform/tracing.h index a8d6a7cb76..78c516ede1 100644 --- a/tensorflow/core/platform/tracing.h +++ b/tensorflow/core/platform/tracing.h @@ -25,7 +25,8 @@ limitations under the License. #include "tensorflow/core/lib/core/stringpiece.h" #include "tensorflow/core/lib/strings/strcat.h" #include "tensorflow/core/platform/macros.h" -#include "tensorflow/core/platform/port.h" // Must be first +#include "tensorflow/core/platform/mutex.h" +#include "tensorflow/core/platform/types.h" namespace tensorflow { diff --git a/tensorflow/core/util/guarded_philox_random.h b/tensorflow/core/util/guarded_philox_random.h index 57ddf1d2b5..a0ef043246 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/mutex.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/core/util/tensor_slice_reader.h b/tensorflow/core/util/tensor_slice_reader.h index 3286622d02..721b172bb3 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/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/platform/protobuf.h" #include "tensorflow/core/public/status.h" diff --git a/tensorflow/core/util/tensor_slice_reader_cache.h b/tensorflow/core/util/tensor_slice_reader_cache.h index 0a9fd454d4..d083402396 100644 --- a/tensorflow/core/util/tensor_slice_reader_cache.h +++ b/tensorflow/core/util/tensor_slice_reader_cache.h @@ -22,6 +22,7 @@ limitations under the License. #include <unordered_map> +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/public/status.h" #include "tensorflow/core/util/tensor_slice_reader.h" diff --git a/tensorflow/core/util/work_sharder_test.cc b/tensorflow/core/util/work_sharder_test.cc index 07ed5eac9c..176fe02d2c 100644 --- a/tensorflow/core/util/work_sharder_test.cc +++ b/tensorflow/core/util/work_sharder_test.cc @@ -18,6 +18,7 @@ limitations under the License. #include <gtest/gtest.h> #include "tensorflow/core/lib/core/threadpool.h" #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/platform/test_benchmark.h" diff --git a/tensorflow/examples/android/jni/tensorflow_jni.cc b/tensorflow/examples/android/jni/tensorflow_jni.cc index 1198494a52..5cacd760bf 100644 --- a/tensorflow/examples/android/jni/tensorflow_jni.cc +++ b/tensorflow/examples/android/jni/tensorflow_jni.cc @@ -28,6 +28,7 @@ limitations under the License. #include "tensorflow/core/framework/types.pb.h" #include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" #include "tensorflow/core/public/env.h" #include "tensorflow/core/public/session.h" diff --git a/tensorflow/python/lib/core/py_func.cc b/tensorflow/python/lib/core/py_func.cc index 4702413b47..5da997e655 100644 --- a/tensorflow/python/lib/core/py_func.cc +++ b/tensorflow/python/lib/core/py_func.cc @@ -21,6 +21,7 @@ limitations under the License. #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/core/threadpool.h" #include "tensorflow/core/platform/macros.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" namespace tensorflow { diff --git a/tensorflow/stream_executor/platform/mutex.h b/tensorflow/stream_executor/platform/mutex.h index a640b5077b..f6d0219c20 100644 --- a/tensorflow/stream_executor/platform/mutex.h +++ b/tensorflow/stream_executor/platform/mutex.h @@ -16,6 +16,7 @@ limitations under the License. #ifndef TENSORFLOW_STREAM_EXECUTOR_PLATFORM_MUTEX_H_ #define TENSORFLOW_STREAM_EXECUTOR_PLATFORM_MUTEX_H_ +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" #if defined(PLATFORM_GOOGLE) diff --git a/tensorflow/stream_executor/platform/port.h b/tensorflow/stream_executor/platform/port.h index 6ad9246418..aafd0609f2 100644 --- a/tensorflow/stream_executor/platform/port.h +++ b/tensorflow/stream_executor/platform/port.h @@ -19,6 +19,7 @@ limitations under the License. #define TENSORFLOW_STREAM_EXECUTOR_PLATFORM_PORT_H_ #include "tensorflow/core/platform/macros.h" +#include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/port.h" namespace perftools { |