Can pass tables to lua functions now ,from python

Author: hughperkins

README.md

@@ -125,6 +125,11 @@ from __future__ import print_function, division
 
 # Recent news
 
+5 March:
+* added `PyTorchHelpers.load_lua_class(lua_filename, lua_classname)` to easily import a lua class from a lua file
+* can pass parameters to lua class constructors, from python
+* can pass tables to lua functions, from python (pass in as python dictionaries, become lua tables)
+
 2 March:
 * removed requirements on Cython, Jinja2 for installation
 

setup.py

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

simpleexample/luabit.lua

@@ -21,3 +21,9 @@ function Luabit:getOut(inTensor, outSize, kernelSize)
   return out
 end
 
+function Luabit:printTable(sometable)
+  for k, v in pairs(sometable) do
+    print('Luabit:printTable ', k, v)
+  end
+end
+

simpleexample/pybit.py

@@ -23,3 +23,5 @@
 outTensor = luaout.asNumpyTensor()
 print('outTensor', outTensor)
 
+luabit.printTable({'color': 'red', 'weather': 'sunny', 'anumber': 10, 'afloat': 1.234})
+

src/PyTorch.cpp

@@ -68,21 +68,50 @@ def torchType(lua, pos):
     lua.call(1, 1)
     return popString(lua)
 
+def pushSomething(lua, something):
+    if isinstance(something, int):
+        lua.pushNumber(something)
+        return
+
+    if isinstance(something, float):
+        lua.pushNumber(something)
+        return
+
+    if isinstance(something, str):
+        lua.pushString(something)
+        return
+
+    if isinstance(something, dict):
+        pushTable(lua, something)
+        return
+
+    for pythonClass in pushFunctionByPythonClass:
+        if isinstance(something, pythonClass):
+            pushFunctionByPythonClass[pythonClass](something)
+            return
+
+    if type(something) in luaClassesReverse:
+        pushObject(lua, something)
+        return
+
+    raise Exception('pushing type ' + str(type(something)) + ' not implemented, value ', something)
+
+def pushTable(lua, table):
+    lua.newTable()
+    for k, v in table.items():
+        pushSomething(lua, k)
+        pushSomething(lua, v)
+        lua.setTable(3)
+
 class LuaClass(object):
     def __init__(self, *args, nameList):
-        # print('LuaClass.__init__()')
         lua = PyTorch.getGlobalState().getLua()
 #        self.luaclass = luaclass
         self.__dict__['__objectId'] = getNextObjectId()
         topStart = lua.getTop()
         pushGlobalFromList(lua, nameList)
         for arg in args:
-            if isinstance(arg, int):
-                lua.pushNumber(arg)
-            elif isinstance(arg, str):
-                lua.pushString(arg)
-            else:
-                raise Exception('arg type ' + str(type(arg)) + ' not implemented')
+            pushSomething(lua, arg)
         lua.call(len(args), 1)
         registerObject(lua, self)
 
@@ -160,29 +189,8 @@ def mymethod(*args):
                 pushObject(lua, self)
                 lua.getField(-1, name)
                 lua.insert(-2)
-#                pushObject(lua, self)
                 for arg in args:
-#                    print('arg', arg, type(arg))
-                    pushedArg = False
-                    for pythonClass in pushFunctionByPythonClass:
-                        if isinstance(arg, pythonClass):
-                            pushFunctionByPythonClass[pythonClass](arg)
-                            pushedArg = True
-                            break
-                    if not pushedArg and type(arg) in luaClassesReverse:
-                        pushObject(lua, arg)
-                        pushedArg = True
-                    if not pushedArg and isinstance(arg, float):
-                        lua.pushNumber(arg)
-                        pushedArg = True
-                    if not pushedArg and isinstance(arg, int):
-                        lua.pushNumber(arg)
-                        pushedArg = True
-                    if not pushedArg and isinstance(arg, str):
-                        lua.pushString(arg)
-                        pushedArg = True
-                    if not pushedArg:
-                        raise Exception('arg type ' + str(type(arg)) + ' not implemented')
+                    pushSomething(lua, arg)
                 lua.call(len(args) + 1, 1)   # +1 for self
                 lua.pushValue(-1)
                 pushGlobal(lua, 'torch', 'type')