diff options
| author |  Yifei Feng <yifeif@google.com> | 2018-04-19 19:39:04 -0700 |
|---|---|---|
| committer | Yifei Feng <yifeif@google.com> | 2018-04-19 19:39:04 -0700 |
| commit | b1f78498659bd17c2d897a224eb19476d1efce60 (patch) | |
| tree | dccb2ba37396e2980c098e9d2ea4bc1668ca6f9c /tensorflow/stream_executor/platform | |
| parent | a734919fd8fd6d74edf1e7c3abec3ee11fec83fd (diff) | |
| parent | b001827146ff95c9e0ce5668c85d8cc2daf6b78d (diff) | |
Merge commit for internal changes
Diffstat (limited to 'tensorflow/stream_executor/platform')
| -rw-r--r-- | tensorflow/stream_executor/platform/default/mutex.h | 6 | ||||
| -rw-r--r-- | tensorflow/stream_executor/platform/port.h | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/tensorflow/stream_executor/platform/default/mutex.h b/tensorflow/stream_executor/platform/default/mutex.h index 62de0cbce0..c9f5a7c609 100644 --- a/tensorflow/stream_executor/platform/default/mutex.h +++ b/tensorflow/stream_executor/platform/default/mutex.h @@ -18,8 +18,7 @@ limitations under the License. #include "tensorflow/stream_executor/platform/mutex.h" -namespace perftools { -namespace gputools { +namespace stream_executor { #undef mutex_lock #undef tf_shared_lock @@ -35,7 +34,6 @@ using tensorflow::tf_shared_lock; #define tf_shared_lock(x) \ static_assert(0, "tf_shared_lock_decl_missing_var_name"); -} // namespace gputools -} // namespace perftools +} // namespace stream_executor #endif // TENSORFLOW_STREAM_EXECUTOR_PLATFORM_DEFAULT_MUTEX_H_ diff --git a/tensorflow/stream_executor/platform/port.h b/tensorflow/stream_executor/platform/port.h index db62100435..57ad965ef1 100644 --- a/tensorflow/stream_executor/platform/port.h +++ b/tensorflow/stream_executor/platform/port.h @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -// IWYU pragma: private, include "perftools/gputools/executor/stream_executor.h" +// IWYU pragma: private, include "third_party/tensorflow/stream_executor/stream_executor.h" #ifndef TENSORFLOW_STREAM_EXECUTOR_PLATFORM_PORT_H_ #define TENSORFLOW_STREAM_EXECUTOR_PLATFORM_PORT_H_ @@ -22,8 +22,7 @@ limitations under the License. #include "tensorflow/core/platform/mutex.h" #include "tensorflow/core/platform/types.h" -namespace perftools { -namespace gputools { +namespace stream_executor { using tensorflow::int8; using tensorflow::int16; @@ -44,8 +43,7 @@ using tensorflow::LINKER_INITIALIZED; #define SE_FALLTHROUGH_INTENDED TF_FALLTHROUGH_INTENDED -} // namespace gputools -} // namespace perftools +} // namespace stream_executor #define SE_DISALLOW_COPY_AND_ASSIGN TF_DISALLOW_COPY_AND_ASSIGN #define SE_MUST_USE_RESULT TF_MUST_USE_RESULT |