Merge pull request #30354 from ROCmSoftwarePlatform:google_upstream_functional_ops

PiperOrigin-RevId: 257018002
This commit is contained in:
TensorFlower Gardener 2019-07-08 12:42:21 -07:00
commit 152d1822f6

View File

@ -15,7 +15,7 @@ limitations under the License.
#define EIGEN_USE_THREADS #define EIGEN_USE_THREADS
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor" #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#if GOOGLE_CUDA #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
#include "tensorflow/core/common_runtime/device.h" #include "tensorflow/core/common_runtime/device.h"
#include "tensorflow/core/framework/device_base.h" #include "tensorflow/core/framework/device_base.h"
#endif #endif
@ -424,7 +424,7 @@ class WhileOp : public AsyncOpKernel {
return Finish(s); return Finish(s);
} }
Tensor cond_t; Tensor cond_t;
#if GOOGLE_CUDA #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
const DeviceBase::GpuDeviceInfo* gpu_device_info = const DeviceBase::GpuDeviceInfo* gpu_device_info =
ctx_->device()->tensorflow_gpu_device_info(); ctx_->device()->tensorflow_gpu_device_info();
const bool is_hostmem_dtype = const bool is_hostmem_dtype =