From 911cec6b808e841fee7c742c85bac8c4b4a3113e Mon Sep 17 00:00:00 2001 From: Josh Levenberg Date: Wed, 6 Jan 2016 12:54:38 -0800 Subject: Change: 111526818 --- .../core/platform/default/dynamic_annotations.h | 3 +++ tensorflow/core/platform/default/integral_types.h | 3 +++ tensorflow/core/platform/default/logging.h | 3 +++ tensorflow/core/platform/default/mutex.h | 3 +++ tensorflow/core/platform/default/protobuf.h | 3 +++ .../core/platform/default/stream_executor_util.h | 28 ++++++++++++---------- .../core/platform/default/thread_annotations.h | 3 +++ tensorflow/core/platform/default/tracing_impl.h | 3 +++ 8 files changed, 36 insertions(+), 13 deletions(-) diff --git a/tensorflow/core/platform/default/dynamic_annotations.h b/tensorflow/core/platform/default/dynamic_annotations.h index 1cd820d88f..9aa6022478 100644 --- a/tensorflow/core/platform/default/dynamic_annotations.h +++ b/tensorflow/core/platform/default/dynamic_annotations.h @@ -16,6 +16,9 @@ limitations under the License. #ifndef THIRD_PARTY_TENSORFLOW_CORE_PLATFORM_DEFAULT_DYNAMIC_ANNOTATIONS_H_ #define THIRD_PARTY_TENSORFLOW_CORE_PLATFORM_DEFAULT_DYNAMIC_ANNOTATIONS_H_ +// IWYU pragma: private, include "third_party/tensorflow/core/platform/mem.h" +// IWYU pragma: friend third_party/tensorflow/core/platform/mem.h + // Do nothing for this platform #define TF_ANNOTATE_MEMORY_IS_INITIALIZED(ptr, bytes) \ do { \ diff --git a/tensorflow/core/platform/default/integral_types.h b/tensorflow/core/platform/default/integral_types.h index 3ab4c0d0ae..52e8f91a74 100644 --- a/tensorflow/core/platform/default/integral_types.h +++ b/tensorflow/core/platform/default/integral_types.h @@ -16,6 +16,9 @@ limitations under the License. #ifndef TENSORFLOW_PLATFORM_DEFAULT_INTEGRAL_TYPES_H_ #define TENSORFLOW_PLATFORM_DEFAULT_INTEGRAL_TYPES_H_ +// IWYU pragma: private, include "third_party/tensorflow/core/platform/types.h" +// IWYU pragma: friend third_party/tensorflow/core/platform/types.h + namespace tensorflow { typedef signed char int8; diff --git a/tensorflow/core/platform/default/logging.h b/tensorflow/core/platform/default/logging.h index 37fdc04218..057c96ab53 100644 --- a/tensorflow/core/platform/default/logging.h +++ b/tensorflow/core/platform/default/logging.h @@ -16,6 +16,9 @@ limitations under the License. #ifndef TENSORFLOW_PLATFORM_DEFAULT_LOGGING_H_ #define TENSORFLOW_PLATFORM_DEFAULT_LOGGING_H_ +// IWYU pragma: private, include "third_party/tensorflow/core/platform/logging.h" +// IWYU pragma: friend third_party/tensorflow/core/platform/logging.h + #include #include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/port.h" diff --git a/tensorflow/core/platform/default/mutex.h b/tensorflow/core/platform/default/mutex.h index 5547f20e89..d8ba37babc 100644 --- a/tensorflow/core/platform/default/mutex.h +++ b/tensorflow/core/platform/default/mutex.h @@ -16,6 +16,9 @@ limitations under the License. #ifndef TENSORFLOW_PLATFORM_DEFAULT_MUTEX_H_ #define TENSORFLOW_PLATFORM_DEFAULT_MUTEX_H_ +// IWYU pragma: private, include "third_party/tensorflow/core/platform/mutex.h" +// IWYU pragma: friend third_party/tensorflow/core/platform/mutex.h + #include #include #include diff --git a/tensorflow/core/platform/default/protobuf.h b/tensorflow/core/platform/default/protobuf.h index f0116071ac..f033e0c45e 100644 --- a/tensorflow/core/platform/default/protobuf.h +++ b/tensorflow/core/platform/default/protobuf.h @@ -16,6 +16,9 @@ limitations under the License. #ifndef THIRD_PARTY_TENSORFLOW_CORE_PLATFORM_DEFAULT_PROTOBUF_H_ #define THIRD_PARTY_TENSORFLOW_CORE_PLATFORM_DEFAULT_PROTOBUF_H_ +// IWYU pragma: private, include "third_party/tensorflow/core/platform/protobuf.h" +// IWYU pragma: friend third_party/tensorflow/core/platform/protobuf.h + #include "google/protobuf/descriptor.h" #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/io/zero_copy_stream.h" diff --git a/tensorflow/core/platform/default/stream_executor_util.h b/tensorflow/core/platform/default/stream_executor_util.h index 4c35975073..39c5b4d636 100644 --- a/tensorflow/core/platform/default/stream_executor_util.h +++ b/tensorflow/core/platform/default/stream_executor_util.h @@ -1,24 +1,26 @@ -/* Copyright 2015 Google Inc. All Rights Reserved. +q /* Copyright 2015 Google Inc. 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 + 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. -==============================================================================*/ + 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_PLATFORM_DEFAULT_STREAM_EXECUTOR_UTIL_H_ #define TENSORFLOW_PLATFORM_DEFAULT_STREAM_EXECUTOR_UTIL_H_ +// IWYU pragma: private, include "third_party/tensorflow/core/platform/stream_executor_util.h" +// IWYU pragma: friend third_party/tensorflow/core/platform/stream_executor_util.h + #include "tensorflow/stream_executor/lib/status.h" -namespace tensorflow { + namespace tensorflow { namespace gpu = ::perftools::gputools; diff --git a/tensorflow/core/platform/default/thread_annotations.h b/tensorflow/core/platform/default/thread_annotations.h index 35a196d840..d8a9253926 100644 --- a/tensorflow/core/platform/default/thread_annotations.h +++ b/tensorflow/core/platform/default/thread_annotations.h @@ -35,6 +35,9 @@ limitations under the License. #ifndef TENSORFLOW_PLATFORM_DEFAULT_THREAD_ANNOTATIONS_H_ #define TENSORFLOW_PLATFORM_DEFAULT_THREAD_ANNOTATIONS_H_ +// IWYU pragma: private, include "third_party/tensorflow/core/platform/thread_annotations.h" +// IWYU pragma: friend third_party/tensorflow/core/platform/thread_annotations.h + #if defined(__clang__) && (!defined(SWIG)) #define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x)) #else diff --git a/tensorflow/core/platform/default/tracing_impl.h b/tensorflow/core/platform/default/tracing_impl.h index 10e38467ce..fbc55d4dd8 100644 --- a/tensorflow/core/platform/default/tracing_impl.h +++ b/tensorflow/core/platform/default/tracing_impl.h @@ -18,6 +18,9 @@ limitations under the License. // Stub implementations of tracing functionality. +// IWYU pragma: private, include "third_party/tensorflow/core/platform/tracing.h" +// IWYU pragma: friend third_party/tensorflow/core/platform/tracing.h + #include "tensorflow/core/lib/core/threadpool.h" #include "tensorflow/core/lib/random/random.h" #include "tensorflow/core/platform/tracing.h" -- cgit v1.2.3