diff options
Diffstat (limited to 'tensorflow/core/kernels/concat_lib_cpu.cc')
| -rw-r--r-- | tensorflow/core/kernels/concat_lib_cpu.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tensorflow/core/kernels/concat_lib_cpu.cc b/tensorflow/core/kernels/concat_lib_cpu.cc index 258ce15456..b0bec0c5dc 100644 --- a/tensorflow/core/kernels/concat_lib_cpu.cc +++ b/tensorflow/core/kernels/concat_lib_cpu.cc @@ -74,11 +74,14 @@ REGISTER(qint16) REGISTER(qint32) REGISTER(bfloat16) -#if defined(IS_MOBILE_PLATFORM) && !defined(SUPPORT_SELECTIVE_REGISTRATION) -// Primarily used for SavedModel support on mobile. +#if defined(IS_MOBILE_PLATFORM) && !defined(SUPPORT_SELECTIVE_REGISTRATION) && \ + !defined(__ANDROID_TYPES_FULL__) +// Primarily used for SavedModel support on mobile. Registering it here only if +// __ANDROID_TYPES_FULL__ is not defined, as that already register strings REGISTER(string); #endif // defined(IS_MOBILE_PLATFORM) && - // !defined(SUPPORT_SELECTIVE_REGISTRATION) + // !defined(SUPPORT_SELECTIVE_REGISTRATION) && + // !defined(__ANDROID_TYPES_FULL__) #ifdef TENSORFLOW_USE_SYCL template <typename T> |