add .toNumpyTensor() method

Author: hughperkins

README.md

@@ -78,6 +78,7 @@ pip install numpy
 pip install Cython
 pip install Jinja2
 pip install pytest
+pip install numpy
 ```
 - lua51 headers should be installed, ie something like `sudo apt-get install lua5.1 liblua5.1-dev`
 
@@ -130,6 +131,8 @@ from __future__ import print_function, division
 * modified `/` to be the div operation for float and double tensors, and `//` for int-type tensors, such as
 byte, long, int
 * since the div change is incompatible with 1.0.0 div operators, jumping radically from `1.0.0` to `2.0.0-SNAPSHOT` ...
+* added dependency on `numpy`
+* added `.asNumpyTensor()` to convert a torch tensor to a numpy tensor
 
 24th February:
 * added support for passing strings to methods

setup.py

@@ -120,7 +120,7 @@ def get_file_datetime(filepath):
 
 setup(
     name='PyTorch',
-    version='2.1.0-SNAPSHOT',
+    version='2.1.0',
     author='Hugh Perkins',
     author_email='hughperkins@gmail.com',
     description=(

simpleexample/luabit.lua

@@ -10,6 +10,8 @@ function Luabit:getOut(inTensor, outSize, kernelSize)
   local inSize = inTensor:size(3)
   local m = nn.TemporalConvolution(inSize, outSize, kernelSize)
   m:float()
-  return m:forward(inTensor)
+  local out = m:forward(inTensor)
+  print('out from lua', out)
+  return out
 end
 

simpleexample/pybit.py

@@ -24,10 +24,10 @@ def __init__(self, _fromLua=False):
 luabit = Luabit()
 
 inTensor = np.random.randn(batchSize, numFrames, inSize).astype('float32')
+luain = PyTorch.asFloatTensor(inTensor)
 
-luaout = luabit.getOut(PyTorch.asFloatTensor(inTensor), outSize, kernelSize)
+luaout = luabit.getOut(luain, outSize, kernelSize)
 
-print('luaout.size()', luaout.size())
-for b in range(batchSize):
-  print('luaout[' + str(b) + ']', luaout[b])
+outTensor = luaout.asNumpyTensor()
+print('outTensor', outTensor)
 

src/PyTorch.cpp

@@ -27,6 +27,8 @@ cdef extern from "THTensor.h":
 
 cdef class _{{Real}}Tensor(object):
     cdef TH{{Real}}Tensor *native
+    cdef {{real}} *data(self)
+    # cpdef _{{Real}}Tensor contiguous(self)
     cpdef int dims(self)
     cpdef set1d(self, int x0, {{real}} value)
     cpdef set2d(self, int x0, int x1, {{real}} value)

src/PyTorch.jinja2.pxd

@@ -6,6 +6,8 @@ import numbers
 import cython
 cimport cython
 
+import numpy as np
+
 cimport cpython.array
 import array
 
@@ -64,6 +66,8 @@ cdef extern from "THTensor.h":
     cdef struct TH{{Real}}Tensor
     TH{{Real}}Tensor *TH{{Real}}Tensor_new()
     TH{{Real}}Tensor *TH{{Real}}Tensor_newClone(TH{{Real}}Tensor *self)
+    {{real}} *TH{{Real}}Tensor_data(TH{{Real}}Tensor *self)
+    TH{{Real}}Tensor *TH{{Real}}Tensor_newContiguous(TH{{Real}}Tensor *self)
     TH{{Real}}Tensor *TH{{Real}}Tensor_newWithSize1d(long size0)
     TH{{Real}}Tensor *TH{{Real}}Tensor_newWithSize2d(long size0, long size1)
     TH{{Real}}Tensor *TH{{Real}}Tensor_newWithSize3d(long size0, long size1, long size2)
@@ -217,10 +221,35 @@ cdef class _{{Real}}Tensor(object):
     def nElement(_{{Real}}Tensor self):
         return TH{{Real}}Tensor_nElement(self.native)
 
+    def asNumpyTensor(_{{Real}}Tensor self):
+        cdef Storage._{{Real}}Storage storage
+        cdef {{real}} *data
+        cdef _{{Real}}Tensor contig
+        size = self.size()
+        dims = len(size)
+        if dims >= 1:
+            totalSize = 1
+            for d in range(dims - 1, -1, -1):
+                totalSize *= size[d]
+            myarray = np.zeros(totalSize, dtype=np.float32)
+            contig = self.contiguous()
+            data = contig.data()
+            for i in range(totalSize):
+                myarray[i] = data[i]
+            shape = []
+            for d in range(dims):
+                shape.append(size[d])
+            return myarray.reshape(shape)
+        else:
+            raise Exception('Not implemented for dims = {dims}'.format(dims=dims))
+
     @property
     def refCount(_{{Real}}Tensor self):
         return TH{{Real}}Tensor_getRefCount(self.native)
 
+    cdef {{real}} *data(_{{Real}}Tensor self):
+        return TH{{Real}}Tensor_data(self.native)
+
     cpdef int dims(self):
         return TH{{Real}}Tensor_nDimension(self.native)
 
@@ -334,6 +363,11 @@ cdef class _{{Real}}Tensor(object):
         cdef TH{{Real}}Tensor *narrowedC = TH{{Real}}Tensor_newNarrow(self.native, dimension, firstIndex, size)
         return _{{Real}}Tensor_fromNative(narrowedC, retain=False)
 
+
+    def contiguous(_{{Real}}Tensor self):
+        cdef TH{{Real}}Tensor *newTensorC = TH{{Real}}Tensor_newContiguous(self.native)
+        return _{{Real}}Tensor_fromNative(newTensorC)
+
     def resize1d(_{{Real}}Tensor self, int size0):
         TH{{Real}}Tensor_resize1d(self.native, size0)
         return self
@@ -457,7 +491,6 @@ cdef class _{{Real}}Tensor(object):
         return res
 
     def __itruediv__(_{{Real}}Tensor self, second):
-        # print('__idiv__')
         cdef _{{Real}}Tensor secondTensor
         if isinstance(second, numbers.Number):
             TH{{Real}}Tensor_div(self.native, self.native, second)
@@ -467,7 +500,6 @@ cdef class _{{Real}}Tensor(object):
         return self
     {% else %}
     def __floordiv__(_{{Real}}Tensor self, second):
-        # print('__div__')
         cdef _{{Real}}Tensor res = _{{Real}}Tensor.new()
         cdef _{{Real}}Tensor secondTensor
         if isinstance(second, numbers.Number):
@@ -478,7 +510,6 @@ cdef class _{{Real}}Tensor(object):
         return res
 
     def __ifloordiv__(_{{Real}}Tensor self, second):
-        # print('__idiv__')
         cdef _{{Real}}Tensor secondTensor
         if isinstance(second, numbers.Number):
             TH{{Real}}Tensor_div(self.native, self.native, second)
@@ -614,15 +645,11 @@ def _as{{Real}}Tensor(myarray):
 {% endfor %}
 
 cdef class GlobalState(object):
-    # properties are in the PyTorch.pxd file
-
     def __cinit__(GlobalState self):
         pass
-#        # print('GlobalState.__cinit__')
 
     def __dealloc__(self):
         pass
-#        # print('GlobalState.__dealloc__')
 
     def getLua(self):
         return LuaState_fromNative(self.L)

src/PyTorch.jinja2.pyx

@@ -21,6 +21,8 @@ cdef extern from "THTensor.h":
 
 cdef class _LongTensor(object):
     cdef THLongTensor *native
+    cdef long *data(self)
+    # cpdef _LongTensor contiguous(self)
     cpdef int dims(self)
     cpdef set1d(self, int x0, long value)
     cpdef set2d(self, int x0, int x1, long value)
@@ -37,6 +39,8 @@ cdef extern from "THTensor.h":
 
 cdef class _FloatTensor(object):
     cdef THFloatTensor *native
+    cdef float *data(self)
+    # cpdef _FloatTensor contiguous(self)
     cpdef int dims(self)
     cpdef set1d(self, int x0, float value)
     cpdef set2d(self, int x0, int x1, float value)
@@ -53,6 +57,8 @@ cdef extern from "THTensor.h":
 
 cdef class _DoubleTensor(object):
     cdef THDoubleTensor *native
+    cdef double *data(self)
+    # cpdef _DoubleTensor contiguous(self)
     cpdef int dims(self)
     cpdef set1d(self, int x0, double value)
     cpdef set2d(self, int x0, int x1, double value)
@@ -69,6 +75,8 @@ cdef extern from "THTensor.h":
 
 cdef class _ByteTensor(object):
     cdef THByteTensor *native
+    cdef unsigned char *data(self)
+    # cpdef _ByteTensor contiguous(self)
     cpdef int dims(self)
     cpdef set1d(self, int x0, unsigned char value)
     cpdef set2d(self, int x0, int x1, unsigned char value)