Add argument parser in main.py and fix severl type mapping error

Author: Kilik Kuo

dsFileBuilder.py

@@ -3,7 +3,8 @@
 from pprint import pprint
 from utilityFunc import splitNameToWords, \
                         getStructFileName, \
-                        DS_TYPE_TO_NUMPY_TYPE
+                        DS_TYPE_TO_NUMPY_TYPE, \
+                        KERNEL_TYPE_MAP
 
 class DSFileBuilder:
     def __init__(self, strName, lstTypes, strFolder='out'):
@@ -21,17 +22,6 @@ def __init__(self, strName, lstTypes, strFolder='out'):
     def getGeneratedNumpyDS(self):
         return self.dicNumpyDS
 
-    def __generateNumpyDS(self, dsName, lstData):
-        lstNumpyData = []
-        for dicVar in lstData:
-            varName = dicVar.get('name', 'UnknownVar')
-            varType = dicVar.get('type', 'int')
-            # unicode string is not acceptable in dtype
-            tupData = (str(varName), DS_TYPE_TO_NUMPY_TYPE[varType])
-            lstNumpyData.append(tupData)
-
-        self.dicNumpyDS[str(dsName)] = numpy.dtype(lstNumpyData)
-
     def __getDefineString(self, strName):
         lstSplitWords = splitNameToWords(strName)
         ret = '__'
@@ -53,21 +43,26 @@ def buildDS(self):
                 lstBody = ds.get('fields', [])
                 if len(lstBody) == 0: continue
 
+                lstNumpyData = []
                 fDS.write('#ifndef %s'%(self.__getDefineString(dsName)) + sep)
                 fDS.write('#define %s'%(self.__getDefineString(dsName)) + sep)
                 fDS.write(sep)
                 fDS.write(strTypeDefHead)
                 for dicVar in lstBody:
                     varName = dicVar.get('name', 'UnknownVar')
-                    varType = dicVar.get('type', 'int')
-                    strLineInput = tabSpace + '%s'%(varType) + ' ' + \
+                    varKernelType = KERNEL_TYPE_MAP[dicVar.get('type', 'int')]
+                    strLineInput = tabSpace + '%s'%(varKernelType) + ' ' + \
                                    '%s'%(varName) + ';' + sep
                     fDS.write(strLineInput)
+                    # unicode string is not acceptable in dtype
+                    tupData = (str(varName), DS_TYPE_TO_NUMPY_TYPE[dicVar.get('type', 'int')])
+                    lstNumpyData.append(tupData)
+
                 strTypeDefTail = '} %s;'%(dsName) + sep
                 fDS.write(strTypeDefTail)
                 fDS.write(sep)
 
-                self.__generateNumpyDS(dsName, lstBody)
+                self.dicNumpyDS[str(dsName)] = numpy.dtype(lstNumpyData)
 
             fDS.write("#endif" + sep)
-        pass
+        pass

main.py

@@ -1,25 +1,40 @@
 import os
 import json
 import sys
-from pprint import pprint
+import argparse
 
 def loadJSON(fInput):
     with open(fInput) as f:
         return json.load(f)
     return None
 
 if __name__ == '__main__':
-    filePath = os.path.join(os.path.dirname(__file__), 'data/example.json')
+    parser = argparse.ArgumentParser(description="Enter your .json definition file & output folder path,\
+        default data/example.json will be executed either input or output is not set")
+    parser.add_argument('-i', help="Relative path to your definition .json file")
+    parser.add_argument('-o', help="Relative path to your output folder")
+    args = parser.parse_args()
+
+    filePath = None
+    strOutFolder = None
+    if args.i == None or args.o == None:
+        filePath = os.path.join(os.path.dirname(__file__), 'data/example.json')
+        strOutFolder = os.path.join(os.path.dirname(__file__), 'out')
+    else:
+        filePath = os.path.join(os.path.dirname(__file__), args.i)
+        strOutFolder = os.path.join(os.path.dirname(__file__), args.o)
+
+    print "Input file here : %s"%(os.path.abspath(filePath))
+    print "Output files to : %s"%(os.path.abspath(strOutFolder))
+
     data = loadJSON(filePath)
+
     # check if the data is loaded correctly
     if data is None:
         sys.exit('wrong json file');
-
     name = data.get('name')
     lstTypes = data.get('types')
     lstFuncs = data.get('functions')
-    strOutFolder = os.path.join(os.path.dirname(__file__), 'out')
-    print "Output files to : %s"%(os.path.abspath(strOutFolder))
 
     from dsFileBuilder import DSFileBuilder
     dsb = DSFileBuilder(name, lstTypes, strOutFolder)

oclPyObjGenerator.py

@@ -1,5 +1,4 @@
 import os
-from pprint import pprint
 from utilityFunc import splitNameToWords, \
                         getStructFileName, \
                         getPyFileName, \

utilityFunc.py

@@ -9,7 +9,7 @@
     'int': 'int',\
     'uint': 'unsigned int',\
     'float': 'float',\
-    'ufloat': 'unsigned float',\
+    'long': 'long',\
     'string': 'char*'\
 }