Handle NPY_INT for numpy conversion case. This enum is used on Windows and unbreaks int32 ndarray support on Windows.
PiperOrigin-RevId: 324281712
Change-Id: Ibef344d1480b86649e80077627a269160405648f
diff --git a/tensorflow/python/kernel_tests/array_ops/BUILD b/tensorflow/python/kernel_tests/array_ops/BUILD
index 19fe3af..df48258 100644
--- a/tensorflow/python/kernel_tests/array_ops/BUILD
+++ b/tensorflow/python/kernel_tests/array_ops/BUILD
@@ -37,7 +37,6 @@
name = "slice_op_test",
size = "medium",
srcs = ["slice_op_test.py"],
- tags = ["no_windows"], # b/126916429
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
diff --git a/tensorflow/python/lib/core/ndarray_tensor.cc b/tensorflow/python/lib/core/ndarray_tensor.cc
index 7314fec..7be05c0 100644
--- a/tensorflow/python/lib/core/ndarray_tensor.cc
+++ b/tensorflow/python/lib/core/ndarray_tensor.cc
@@ -181,6 +181,16 @@
// might be different on certain platforms.
*out_tf_datatype = TF_INT64;
break;
+ } else if (pyarray_type == NPY_INT) {
+ // NPY_INT is equivalent to NPY_INT32, while their enum values might be
+ // different on certain platforms.
+ *out_tf_datatype = TF_INT32;
+ break;
+ } else if (pyarray_type == NPY_UINT) {
+ // NPY_UINT is equivalent to NPY_UINT32, while their enum values might
+ // be different on certain platforms.
+ *out_tf_datatype = TF_UINT32;
+ break;
}
return errors::Internal("Unsupported numpy type: ",
numpy_type_name(pyarray_type));
