Changeset 18e7309 in sasview

Timestamp:

Aug 4, 2016 11:54:35 AM (8 years ago)

Author:

lewis

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2760662

Parents:

3931ea14

Message:

Add C extension for reading 2d BSL files

Files:

• run.py (modified) (2 diffs)
• setup.py (modified) (10 diffs)
• src/sas/sascalc/file_converter/BSLLoader.py (added)
• src/sas/sascalc/file_converter/__init__.py (added)
• src/sas/sascalc/file_converter/c_ext/__init__.py (added)
• src/sas/sascalc/file_converter/c_ext/bsl_loader.c (added)
• src/sas/sascalc/file_converter/c_ext/bsl_loader.h (added)

run.py

@@ -72 +72 @@
     platform = '%s-%s'%(get_platform(),sys.version[:3])
     build_path = joinpath(root, 'build','lib.'+platform)
-    
-    # Notify the help menu that the Sphinx documentation is in a different 
+
+    # Notify the help menu that the Sphinx documentation is in a different
     # place than it otherwise would be.
     os.environ['SASVIEW_DOC_PATH'] = joinpath(build_path, "doc")
@@ -123 +123 @@
     # Compiled modules need to be pulled from the build directory.
     # Some packages are not where they are needed, so load them explicitly.
+    import sas.sascalc.file_converter
+    sas.sascalc.file_converter.core = import_package('sas.sascalc.file_converter.core',
+                                  joinpath(build_path, 'sas', 'sascalc', 'file_converter', 'core'))                    
+
+    # Compiled modules need to be pulled from the build directory.
+    # Some packages are not where they are needed, so load them explicitly.
     import sas.sascalc.calculator
     sas.sascalc.calculator.core = import_package('sas.sascalc.calculator.core',

setup.py

@@ -9 +9 @@
 from distutils.command.build_ext import build_ext
 from distutils.core import Command
+import numpy
 
 # Manage version number ######################################
@@ -54 +55 @@
         print "Removing existing build directory", SASVIEW_BUILD, "for a clean build"
         shutil.rmtree(SASVIEW_BUILD)
-                    
+
 # 'sys.maxsize' and 64bit: Not supported for python2.5
 is_64bits = False
 if sys.version_info >= (2, 6):
     is_64bits = sys.maxsize > 2**32
-    
+
 enable_openmp = False
 
@@ -118 +119 @@
         c = self.compiler.compiler_type
         print "Compiling with %s (64bit=%s)" % (c, str(is_64bits))
-        
+
         # OpenMP build options
         if enable_openmp:
@@ -127 +128 @@
                 for e in self.extensions:
                     e.extra_link_args = lopt[ c ]
-                    
+
         # Platform-specific build options
         if platform_lopt.has_key(c):
@@ -205 +206 @@
 )
 
-    
+
 # sas.sascalc.pr
 srcdir  = os.path.join("src", "sas", "sascalc", "pr", "c_extensions")
@@ -217 +218 @@
                               include_dirs=[],
                               ) )
-        
+
+# sas.sascalc.file_converter
+mydir = os.path.join("src", "sas", "sascalc", "file_converter", "c_ext")
+package_dir["sas.sascalc.file_converter.core"] = mydir
+package_dir["sas.sascalc.file_converter"] = os.path.join("src","sas", "sascalc", "file_converter")
+packages.extend(["sas.sascalc.file_converter","sas.sascalc.file_converter.core"])
+ext_modules.append( Extension("sas.sascalc.file_converter.core.bsl_loader",
+                              sources = [os.path.join(mydir, "bsl_loader.c")],
+                              include_dirs=[numpy.get_include()],
+                              ) )
+
 # sas.sascalc.fit
 package_dir["sas.sascalc.fit"] = os.path.join("src", "sas", "sascalc", "fit")
@@ -239 +250 @@
 packages.extend(["sas.sasgui.perspectives", "sas.sasgui.perspectives.calculator"])
 package_data['sas.sasgui.perspectives.calculator'] = ['images/*', 'media/*']
-    
+
 # Data util
 package_dir["sas.sascalc.data_util"] = os.path.join("src", "sas", "sascalc", "data_util")
@@ -294 +305 @@
                                'test/2d_data/*',
                                'test/save_states/*',
-                               'test/upcoming_formats/*', 
+                               'test/upcoming_formats/*',
                                  'default_categories.json']
 packages.append("sas.sasview")
@@ -316 +327 @@
     required.extend(['pillow'])
 
-# Set up SasView    
+# Set up SasView
 setup(
     name="sasview",
@@ -341 +352 @@
                 'docs': BuildSphinxCommand,
                 'disable_openmp': DisableOpenMPCommand}
-    )   
+    )