Changeset 0a9686d in sasview for sansmodels/src/python_wrapper

Timestamp:

Jun 25, 2012 9:07:41 AM (13 years ago)

Author:

Kieran Campbell <kieranrcampbell@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

33c671e

Parents:

f8be87d

Message:

Updated python wrapping to automatically generate c_models.cpp

Location:

sansmodels/src/python_wrapper

Files:

• WrapperGenerator.py (modified) (5 diffs)
• wrapping.py (modified) (3 diffs)

sansmodels/src/python_wrapper/WrapperGenerator.py

@@ -93 +93 @@
         self.output_dir = output_dir
         self.c_wrapper_dir = c_wrapper_dir
+
         
         
@@ -201 +202 @@
                     
                 
-                
+     
         for line in lines:
             
@@ -209 +210 @@
                 try:
                     index = line.index(key)
-                    #toks = string.split( line[index:], "=" )
                     toks = line[index:].split("=" )
                     self.pythonClass = toks[1].lstrip().rstrip()
+
                 except:
                     raise ValueError, "Could not parse file %s" % self.file
@@ -287 +288 @@
                 except:
                     raise ValueError, "Could not parse file %s" % self.file
-               
-        
-                
+
     def write_c_wrapper(self):
         """ Writes the C file to create the python extension class 
@@ -495 +494 @@
         return newline
         
-        
+    def getModelName(self):
+        return self.pythonClass
+        
+
+
 # main
 if __name__ == '__main__':

sansmodels/src/python_wrapper/wrapping.py

@@ -6 +6 @@
 def generate_wrappers(header_dir, output_dir='.', c_wrapper_dir='.'):
     nModels=0
+    model_list = list()
+
     for item in os.listdir(header_dir):
         toks = os.path.splitext(os.path.basename(item))
@@ -17 +19 @@
             app.write_c_wrapper()
             app.write_python_wrapper()
-            #print app
+            model_list.append(app.getModelName())
+    write_c_models(model_list)
     print "Total number of model  wrappers created is %s" % nModels
+
+def write_c_models(model_list):
+    # simultaneously generates 'sansmodels/installed_models.txt'
+    # and 'sansmodels/src/c_models/c_models.cpp'
+    model_list_file = open(os.path.join("sansmodels","installed_models.txt"),"w")
+    for model in model_list:
+        model_list_file.write(model + "\n")
+
+    model_list_file.close()
+    
+
+    template_file = open(os.path.join("sansmodels","src","c_models","c_models.cpp.template"),"r")
+    write_file = open(os.path.join("sansmodels","src","c_models","c_models.cpp"),"w")
+    buf = template_file.read()
+    lines = buf.split('\n')
+    
+    tag1 = "[TAG_1]"
+    tag2 = "[TAG_2]"
+    
+    for line in lines:
+        
+        if line.count(tag1) > 0:
+            write_file.write("\n // adding generated code \n")
+            for pyclass in model_list:
+                write_file.write("void addC" + pyclass
+                                 + "(PyObject *module); \n")
+            write_file.write(" // end generated code \n")
+                
+
+        elif line.count(tag2) > 0:
+            write_file.write("\n // adding generated code \n")
+
+            for pyclass in model_list:
+                write_file.write("addC" + pyclass + "(m); \n")
+
+            write_file.write("addDisperser(m); \n")
+            write_file.write("\n // end generated code \n")
+                
+                
+        else:
+            write_file.write(line + "\n")
+
+
 
 if __name__ == '__main__':
@@ -25 +71 @@
 
 
+
+