aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/python/lib/core/py_func.cc
diff options
context:
space:
mode:
authorGravatar Yifei Feng <yifeif@google.com>2018-04-23 21:19:14 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-04-23 21:21:38 -0700
commit22f3a97b8b089202f60bb0c7697feb0c8e0713cc (patch)
treed16f95826e4be15bbb3b0f22bed0ca25d3eb5897 /tensorflow/python/lib/core/py_func.cc
parent24b7c9a800ab5086d45a7d83ebcd6218424dc9e3 (diff)
Merge changes from github.
PiperOrigin-RevId: 194031845
Diffstat (limited to 'tensorflow/python/lib/core/py_func.cc')
-rw-r--r--tensorflow/python/lib/core/py_func.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/tensorflow/python/lib/core/py_func.cc b/tensorflow/python/lib/core/py_func.cc
index 22317a348c..8c6bb7955a 100644
--- a/tensorflow/python/lib/core/py_func.cc
+++ b/tensorflow/python/lib/core/py_func.cc
@@ -126,6 +126,9 @@ Status NumericNpDTypeToTfDType(const int np, DataType* tf) {
case NPY_INT8:
*tf = DT_INT8;
break;
+ case NPY_UINT16:
+ *tf = DT_UINT16;
+ break;
case NPY_INT16:
*tf = DT_INT16;
break;