Changeset 2d1b700 in sasview for sansmodels/src/python_wrapper

Timestamp:

Jan 5, 2012 8:52:13 AM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

dd60b45

Parents:

7ffa8196

Message:

refactor refl model and auto-generate c++ wrapper at compile time.

Location:

sansmodels/src/python_wrapper

Files:

• CReflModel.cpp (deleted)
• WrapperGenerator.py (modified) (4 diffs)
• wrapping.py (modified) (1 diff)

sansmodels/src/python_wrapper/WrapperGenerator.py

@@ -56 +56 @@
     """
     
-    def __init__(self, filename):
+    def __init__(self, filename, output_dir='.'):
         """ Initialization """
         
@@ -90 +90 @@
         ## parameters with orientation
         self.orientation_params =[]
+        ## output directory for wrappers
+        self.output_dir = output_dir
         
         
@@ -289 +291 @@
             The file is written in C[PYTHONCLASS].c
         """
-        
-        file = open("C"+self.pythonClass+'.cpp', 'w')
-        template = open("classTemplate.txt", 'r')
+        file_path = os.path.join(self.output_dir, "C"+self.pythonClass+'.cpp')
+        file = open(file_path, 'w')
+        
+        template = open(os.path.join(os.path.dirname(__file__), "classTemplate.txt"), 'r')
         
         tmp_buf = template.read()
@@ -414 +417 @@
             The file is written in ../[PYTHONCLASS].py
         """
-        
-        file = open("../sans/models/"+self.pythonClass+'.py', 'w')
-        template = open("modelTemplate.txt", 'r')
+        file_path = os.path.join(self.output_dir, "../sans/models/"+self.pythonClass+'.py')
+        file = open(file_path, 'w')
+        template = open(os.path.join(os.path.dirname(__file__), "modelTemplate.txt"), 'r')
         
         tmp_buf = template.read()

sansmodels/src/python_wrapper/wrapping.py

@@ -4 +4 @@
 from WrapperGenerator import WrapperGenerator
 
+def generate_wrappers(header_dir, output_dir='.'):
+    nModels=0
+    for item in os.listdir(header_dir):
+        toks = os.path.splitext(os.path.basename(item))
+        if toks[1]=='.h':
+            nModels += 1
+            name = toks[0]
+            app = WrapperGenerator(os.path.join(header_dir, name+".h"), output_dir=output_dir)
+            app.read()
+            app.write_c_wrapper()
+            app.write_python_wrapper()
+            #print app
+    print "Total number of model  wrappers created is %s" % nModels
 
-header_dir = os.path.join('..', 'c_extensions')
+if __name__ == '__main__':
+    header_dir = os.path.join('..', 'c_extensions')
+    generate_wrappers(header_dir)
 
-nModels=0
-for item in os.listdir(header_dir):
-    toks = os.path.splitext(os.path.basename(item))
-    if toks[1]=='.h':
-        nModels += 1
-        name = toks[0]
-        app = WrapperGenerator(os.path.join(header_dir, name+".h"))
-        app.read()
-        app.write_c_wrapper()
-        app.write_python_wrapper()
-        print app
-print "Number total of models is %s" % nModels
+