diff options
| author |  Jonathan Hseu <jhseu@google.com> | 2017-07-19 15:04:52 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-07-19 15:12:25 -0700 |
| commit | 9cc871e81c04ed11829c3364546b4500742140eb (patch) | |
| tree | 15c55ff29356bddd5a4f252630a9dffc8ac43c4c /tensorflow/compiler/tf2xla/xla_op_registry.h | |
| parent | 1fefe92f47ff4149428409847592ec443f1279dd (diff) | |
Merge changes from github.
END_PUBLIC
---
Commit daa67ad17 authored by Jonathan Hseu<vomjom@vomjom.net>
Committed by Frank Chen<frankchn@gmail.com>:
Remove unittest import (#11596)
---
Commit 491beb74c authored by A. Unique TensorFlower<gardener@tensorflow.org>
Committed by TensorFlower Gardener<gardener@tensorflow.org>:
BEGIN_PUBLIC
Automated g4 rollback of changelist 162423171
PiperOrigin-RevId: 162541442
Diffstat (limited to 'tensorflow/compiler/tf2xla/xla_op_registry.h')
| -rw-r--r-- | tensorflow/compiler/tf2xla/xla_op_registry.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tensorflow/compiler/tf2xla/xla_op_registry.h b/tensorflow/compiler/tf2xla/xla_op_registry.h index 9a39cc9675..47d61a21a1 100644 --- a/tensorflow/compiler/tf2xla/xla_op_registry.h +++ b/tensorflow/compiler/tf2xla/xla_op_registry.h @@ -45,9 +45,10 @@ extern const char* const DEVICE_XLA_CPU; extern const char* const DEVICE_XLA_GPU; constexpr std::array<DataType, 2> kIntTypes = {{DT_INT32, DT_INT64}}; -constexpr std::array<DataType, 2> kFloatTypes = {{DT_FLOAT, DT_DOUBLE}}; -constexpr std::array<DataType, 4> kNumericTypes = { - {DT_INT32, DT_INT64, DT_FLOAT, DT_DOUBLE}}; +constexpr std::array<DataType, 3> kFloatTypes = { + {DT_HALF, DT_FLOAT, DT_DOUBLE}}; +constexpr std::array<DataType, 5> kNumericTypes = { + {DT_INT32, DT_INT64, DT_HALF, DT_FLOAT, DT_DOUBLE}}; constexpr std::array<DataType, 5> kCpuAllTypes = { {DT_INT32, DT_INT64, DT_FLOAT, DT_DOUBLE, DT_BOOL}}; |