experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #26774 from ROCmSoftwarePlatform:google_upstream_framework_types

Browse Source 
PiperOrigin-RevId: 240179132
This commit is contained in:
TensorFlower Gardener 2019-03-25 11:30:58 -07:00
commit e6ee14fb0e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tensorflow/core/framework/types.cc
View File

@ -40,9 +40,9 @@ const char* const DEVICE_GPU = "GPU";
const char* const DEVICE_SYCL = "SYCL"; const char* const DEVICE_SYCL = "SYCL";
const std::string DeviceName<Eigen::ThreadPoolDevice>::value = DEVICE_CPU; const std::string DeviceName<Eigen::ThreadPoolDevice>::value = DEVICE_CPU;
#if GOOGLE_CUDA #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
const std::string DeviceName<Eigen::GpuDevice>::value = DEVICE_GPU; const std::string DeviceName<Eigen::GpuDevice>::value = DEVICE_GPU;
#endif // GOOGLE_CUDA #endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
#ifdef TENSORFLOW_USE_SYCL #ifdef TENSORFLOW_USE_SYCL
const std::string DeviceName<Eigen::SyclDevice>::value = DEVICE_SYCL; const std::string DeviceName<Eigen::SyclDevice>::value = DEVICE_SYCL;
#endif // TENSORFLOW_USE_SYCL #endif // TENSORFLOW_USE_SYCL

4
tensorflow/core/framework/types.h
View File

@ -83,12 +83,12 @@ struct DeviceName<Eigen::ThreadPoolDevice> {
static const std::string value; static const std::string value;
}; };
#if GOOGLE_CUDA #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
template <> template <>
struct DeviceName<Eigen::GpuDevice> { struct DeviceName<Eigen::GpuDevice> {
static const std::string value; static const std::string value;
}; };
#endif // GOOGLE_CUDA #endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
#ifdef TENSORFLOW_USE_SYCL #ifdef TENSORFLOW_USE_SYCL
template <> template <>