Support int16 numpy conversions

Teaonly · soumith · commit f366e5fc81eb · 2017-03-02T09:15:57.000-05:00
issue #891
diff --git a/test/test_torch.py b/test/test_torch.py
@@ -2849,6 +2849,7 @@ def test_from_numpy(self):
             np.float,
             np.int64,
             np.int32,
+            np.int16,
             np.uint8
         ]
         for dtype in dtypes:
diff --git a/torch/csrc/Module.cpp b/torch/csrc/Module.cpp
@@ -141,6 +141,8 @@ PyObject * THPModule_fromNumpy(PyObject *_unused, PyObject *array)
     return PyObject_CallFunctionObjArgs(THPLongTensorClass, array, NULL);
   } else if (type == NPY_INT32) {
     return PyObject_CallFunctionObjArgs(THPIntTensorClass, array, NULL);
+  } else if (type == NPY_INT16) {
+    return PyObject_CallFunctionObjArgs(THPShortTensorClass, array, NULL);
   } else if (type == NPY_UINT8) {
     return PyObject_CallFunctionObjArgs(THPByteTensorClass, array, NULL);
   }
diff --git a/torch/csrc/generic/Tensor.cpp b/torch/csrc/generic/Tensor.cpp
@@ -16,6 +16,9 @@
 #ifdef TH_REAL_IS_INT
 #define NUMPY_TYPE_ENUM NPY_INT32
 #endif
+#ifdef TH_REAL_IS_SHORT
+#define NUMPY_TYPE_ENUM NPY_INT16
+#endif
 #ifdef TH_REAL_IS_BYTE
 #define NUMPY_TYPE_ENUM NPY_UINT8
 #endif

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,8 @@ PyObject * THPModule_fromNumpy(PyObject _unused, PyObject array)`
`141`	`141`	`return PyObject_CallFunctionObjArgs(THPLongTensorClass, array, NULL);`
`142`	`142`	`} else if (type == NPY_INT32) {`
`143`	`143`	`return PyObject_CallFunctionObjArgs(THPIntTensorClass, array, NULL);`
	`144`	`+ } else if (type == NPY_INT16) {`
	`145`	`+ return PyObject_CallFunctionObjArgs(THPShortTensorClass, array, NULL);`
`144`	`146`	`} else if (type == NPY_UINT8) {`
`145`	`147`	`return PyObject_CallFunctionObjArgs(THPByteTensorClass, array, NULL);`
`146`	`148`	`}`