From 3e9beeb2f8dc621ca5951e1ecc99c4b25b638b3c Mon Sep 17 00:00:00 2001
From: Deven Desai <deven.desai.amd@gmail.com>
Date: Sun, 19 May 2019 18:48:47 +0000
Subject: [PATCH] renaming namespace cuda_helper to gpu_helper.

Also adding a `cuda_helper` as an alias for `gpu_helper` in non ROCm mode (for backwards compatibility)
---
 tensorflow/core/util/gpu_kernel_helper.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tensorflow/core/util/gpu_kernel_helper.h b/tensorflow/core/util/gpu_kernel_helper.h
index 133092540b7..abf0faa3f20 100644
--- a/tensorflow/core/util/gpu_kernel_helper.h
+++ b/tensorflow/core/util/gpu_kernel_helper.h
@@ -160,7 +160,7 @@ __device__ EIGEN_ALWAYS_INLINE Eigen::half GpuShuffleXorSync(
 // Aliased in gpu_device_functions.h
 #endif
 
-namespace cuda_helper {
+namespace gpu_helper {
 template <typename T, typename OutType = int32>
 __device__ OutType upper_bound(const T* first, OutType count, T val) {
   const T* orig = first;
@@ -202,6 +202,11 @@ __device__ OutType lower_bound(const T* first, OutType count, T val) {
 }
 
 }  // namespace cuda_helper
+
+#ifndef TENSORFLOW_USE_ROCM
+  namespace cuda_helper = gpu_helper;
+#endif
+
 }  // namespace tensorflow
 
 #endif  // GOOGLE_CUDA || TENSORFLOW_USE_ROCM