diff --git a/tensorflow/core/framework/register_types.h b/tensorflow/core/framework/register_types.h index 3f91642064b..973ad4544a2 100644 --- a/tensorflow/core/framework/register_types.h +++ b/tensorflow/core/framework/register_types.h @@ -183,4 +183,18 @@ limitations under the License. #define TF_CALL_QUANTIZED_TYPES(m) \ TF_CALL_qint8(m) TF_CALL_quint8(m) TF_CALL_qint32(m) +#ifdef TENSORFLOW_SYCL_NO_DOUBLE +#define TF_CALL_SYCL_double(m) +#else // TENSORFLOW_SYCL_NO_DOUBLE +#define TF_CALL_SYCL_double(m) TF_CALL_double(m) +#endif // TENSORFLOW_SYCL_NO_DOUBLE + +#ifdef __ANDROID_TYPES_SLIM__ +#define TF_CALL_SYCL_NUMBER_TYPES(m) TF_CALL_float(m) +#else // __ANDROID_TYPES_SLIM__ +#define TF_CALL_SYCL_NUMBER_TYPES(m) \ + TF_CALL_float(m) \ + TF_CALL_SYCL_double(m) +#endif // __ANDROID_TYPES_SLIM__ + #endif // TENSORFLOW_FRAMEWORK_REGISTER_TYPES_H_ diff --git a/tensorflow/core/kernels/cwise_op_add_1.cc b/tensorflow/core/kernels/cwise_op_add_1.cc index acf1f2ad491..c0fe81ef553 100644 --- a/tensorflow/core/kernels/cwise_op_add_1.cc +++ b/tensorflow/core/kernels/cwise_op_add_1.cc @@ -36,7 +36,9 @@ REGISTER_KERNEL_BUILDER(Name("Add") #if TENSORFLOW_USE_SYCL -REGISTER2(BinaryOp, SYCL, "Add", functor::add, float, double); +#define REGISTER_KERNEL(type) REGISTER(BinaryOp, SYCL, "Add", functor::add, type); +TF_CALL_SYCL_NUMBER_TYPES(REGISTER_KERNEL); + REGISTER_KERNEL_BUILDER(Name("Add") .Device(DEVICE_SYCL) .HostMemory("x") diff --git a/tools/bazel.rc b/tools/bazel.rc index e67a290cf40..414ddf2e475 100644 --- a/tools/bazel.rc +++ b/tools/bazel.rc @@ -11,6 +11,9 @@ build:mkl --define=using_mkl=true build:sycl --crosstool_top=@local_config_sycl//crosstool:toolchain build:sycl --define=using_sycl=true +build:sycl_nodouble --crosstool_top=@local_config_sycl//crosstool:toolchain +build:sycl_nodouble --define=using_sycl=true --cxxopt -DTENSORFLOW_SYCL_NO_DOUBLE + build:sycl_asan --crosstool_top=@local_config_sycl//crosstool:toolchain build:sycl_asan --define=using_sycl=true --copt -fno-omit-frame-pointer --copt -fsanitize-coverage=3 --copt -DGPR_NO_DIRECT_SYSCALLS --linkopt -fPIC --linkopt -fsanitize=address