Changes in / [5f5c596:b85502d] in sasview

Files:

• run.py (modified) (1 diff)
• setup.py (modified) (5 diffs)
• src/__init__.py (added)
• src/sas/models/c_extension/c_gen/sld2i.cpp (deleted)
• src/sas/models/c_extension/c_gen/sld2i.hh (deleted)
• src/sas/models/c_extension/c_gen/sld2i_module.cpp (deleted)
• src/sas/models/c_extension/c_models/libfunc.c (deleted)
• src/sas/models/c_extension/c_models/librefl.c (deleted)
• src/sas/models/c_extension/libigor/winFuncs.c (deleted)
• src/sas/models/c_extension/libigor/winFuncs.h (deleted)
• src/sas/models/include/libmultifunc/libfunc.h (deleted)
• src/sas/models/include/libmultifunc/librefl.h (deleted)
• src/sas/sascalc/calculator/BaseComponent.py (added)
• src/sas/sascalc/calculator/c_extensions/__init__.py (added)
• src/sas/sascalc/calculator/c_extensions/libfunc.c (added)
• src/sas/sascalc/calculator/c_extensions/libfunc.h (added)
• src/sas/sascalc/calculator/c_extensions/librefl.c (added)
• src/sas/sascalc/calculator/c_extensions/librefl.h (added)
• src/sas/sascalc/calculator/c_extensions/sld2i.cpp (added)
• src/sas/sascalc/calculator/c_extensions/sld2i.hh (added)
• src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (added)
• src/sas/sascalc/calculator/c_extensions/winFuncs.c (added)
• src/sas/sascalc/calculator/c_extensions/winFuncs.h (added)
• src/sas/sascalc/calculator/sas_gen.py (modified) (1 diff)
• src/sas/sascalc/fit/pluginmodel.py (added)
• src/sas/sasgui/perspectives/fitting/__init__.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/models.py (modified) (1 diff)

run.py

@@ -121 +121 @@
                                   joinpath(build_path, 'sas', 'sascalc', 'pr', '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',
+                                  joinpath(build_path, 'sas', 'sascalc', 'calculator', 'core'))
 
     # Pull the entire sas.models package from the build directory since it contains
     # a mixture of autogenerated python and C.  Any changes in models will require
     # a rebuild with setup.py build
-    sas.models = import_package('sas.models', joinpath(build_path, 'sas', 'models'))
+    # sas.models = import_package('sas.models', joinpath(build_path, 'sas', 'models'))
 
     sys.path.append(build_path)

setup.py

@@ -195 +195 @@
 
 # sas.sascalc.calculator
-package_dir["sas.sascalc.calculator"] =os.path.join("src", "sas", "sascalc", "calculator")
-packages.extend(["sas.sascalc.calculator"])
+numpy_incl_path = os.path.join(NUMPY_INC, "numpy")
+gen_dir = os.path.join("src", "sas", "sascalc", "calculator", "c_extensions")
+package_dir["sas.sascalc.calculator.core"] = gen_dir
+package_dir["sas.sascalc.calculator"] = os.path.join("src", "sas", "sascalc", "calculator")
+packages.extend(["sas.sascalc.calculator","sas.sascalc.calculator.core"])
+ext_modules.append( Extension("sas.sascalc.calculator.core.sld2i",
+        sources = [
+            os.path.join(gen_dir, "sld2i_module.cpp"),
+            os.path.join(gen_dir, "sld2i.cpp"),
+            os.path.join(gen_dir, "libfunc.c"),
+            os.path.join(gen_dir, "librefl.c"),
+            os.path.join(gen_dir, "winFuncs.c"),
+        ],
+        include_dirs=[numpy_incl_path, gen_dir],
+    )
+)
+
     
 # sas.sascalc.pr
-numpy_incl_path = os.path.join(NUMPY_INC, "numpy")
 srcdir  = os.path.join("src", "sas", "sascalc", "pr", "c_extensions")
 package_dir["sas.sascalc.pr.core"] = srcdir
@@ -226 +240 @@
 
 package_dir["sas.sasgui.perspectives.fitting"] = os.path.join("src", "sas", "sasgui", "perspectives", "fitting")
-# package_dir["sas.sasgui.perspectives.fitting.plugin_models"] = os.path.join("src", "sas", "sasgui", "perspectives", "fitting", "plugin_models")
-packages.extend(["sas.sasgui.perspectives.fitting",#"sas.sasgui.perspectives.fitting.plugin_models"
-                 ])
+packages.extend(["sas.sasgui.perspectives.fitting"])
 package_data['sas.sasgui.perspectives.fitting'] = ['media/*']
 
-packages.extend(["sas.sasgui.perspectives", "sas.sasgui.perspectives.calculator"])    
+packages.extend(["sas.sasgui.perspectives", "sas.sasgui.perspectives.calculator"])
 package_data['sas.sasgui.perspectives.calculator'] = ['images/*', 'media/*']
     
@@ -242 +254 @@
 packages.append("sas.sasgui.plottools")
 
-# sas models
-includedir  = os.path.join("src", "sas", "models", "include")
-igordir = os.path.join("src", "sas", "models", "c_extension", "libigor")
-cephes_dir = os.path.join("src", "sas", "models", "c_extension", "cephes")
-c_model_dir = os.path.join("src", "sas", "models", "c_extension", "c_models")
-smear_dir  = os.path.join("src", "sas", "models", "c_extension", "c_smearer")
-gen_dir  = os.path.join("src", "sas", "models", "c_extension", "c_gen")
-# wrapper_dir  = os.path.join("src", "sas", "models", "c_extension", "python_wrapper", "generated")
-model_dir = os.path.join("src", "sas","models")
-
-#if os.path.isdir(wrapper_dir):
-#    for file in os.listdir(wrapper_dir):
-#        file_path =  os.path.join(wrapper_dir, file)
-#        os.remove(file_path)
-#else:
-#    os.makedirs(wrapper_dir)
-#sys.path.append(os.path.join("src", "sas", "models", "c_extension", "python_wrapper"))
-#from wrapping import generate_wrappers
-#generate_wrappers(header_dir = includedir,
-#                  output_dir = model_dir,
-#                  c_wrapper_dir = wrapper_dir)
 
 IGNORED_FILES = [".svn"]
@@ -278 +269 @@
             _, ext = os.path.splitext(f)
             if ext.lower() in EXTENSIONS and f not in IGNORED_FILES:
-                file_list.append(os.path.join(dir_path, f)) 
+                file_list.append(os.path.join(dir_path, f))
         elif os.path.isdir(os.path.join(dir_path, f)) and \
                 not f.startswith("."):
@@ -287 +278 @@
                     if ext.lower() in EXTENSIONS and\
                          new_f not in IGNORED_FILES:
-                        file_list.append(os.path.join(sub_dir, new_f)) 
-        
-model_sources = []
-append_file(file_list=model_sources, dir_path=igordir)
-append_file(file_list=model_sources, dir_path=c_model_dir)
-# append_file(file_list=model_sources, dir_path=wrapper_dir)
-
-# smear_sources = []
-# append_file(file_list=smear_sources, dir_path=smear_dir)
-        
-package_dir["sas.models"] = model_dir
-package_dir["sas.models.sas_extension"] = os.path.join("src", "sas", "models", "sas_extension")
-package_data['sas.models'] = [os.path.join('media', "*.*")]
-package_data['sas.models'] += [os.path.join('media','img', "*.*")]
-packages.extend(["sas.models","sas.models.sas_extension"])
-    
-# smearer_sources = [os.path.join(smear_dir, "smearer.cpp"),
-#                   os.path.join(smear_dir, "smearer_module.cpp")]
-geni_sources = [os.path.join(gen_dir, "sld2i_module.cpp")]
-if os.name=='nt':
-#     smearer_sources.append(os.path.join(igordir, "winFuncs.c"))
-    geni_sources.append(os.path.join(igordir, "winFuncs.c"))
-
-c_models = [ 
-    # Extension("sas.models.sas_extension.c_models",
-    #    sources=model_sources,
-    #    include_dirs=[
-    #        igordir, includedir, c_model_dir, numpy_incl_path, cephes_dir
-    #    ],
-    # ),
-
-    # Smearer extension
-    # Extension("sas.models.sas_extension.smearer",
-    #     sources = smearer_sources,
-    #     include_dirs=[igordir,  smear_dir, numpy_incl_path],
-    # ),
-    #
-    # Extension("sas.models.sas_extension.smearer2d_helper",
-    #     sources = [
-    #         os.path.join(smear_dir, "smearer2d_helper_module.cpp"),
-    #         os.path.join(smear_dir, "smearer2d_helper.cpp"),
-    #         os.path.join(igordir, "winFuncs.c"),
-    #     ],
-    #     include_dirs=[smear_dir, numpy_incl_path],
-    # ),
-    #
-    Extension("sas.models.sas_extension.sld2i",
-        sources = [
-            os.path.join(gen_dir, "sld2i_module.cpp"),
-            os.path.join(gen_dir, "sld2i.cpp"),
-            os.path.join(c_model_dir, "libfunc.c"),
-            os.path.join(c_model_dir, "librefl.c"),
-            os.path.join(igordir, "winFuncs.c"),
-        ],
-        include_dirs=[gen_dir, includedir,  c_model_dir, numpy_incl_path],
-    ),
-]
+                        file_list.append(os.path.join(sub_dir, new_f))
 
 # Comment out the following to avoid rebuilding all the models
-ext_modules.extend(c_models)
-
-packages.append("sas.models")
+file_sources = []
+append_file(file_sources, gen_dir)
+
 # SasView
-
 package_dir["sas.sasview"] = "sasview"
 package_data['sas.sasview'] = ['images/*', 

src/sas/sascalc/calculator/sas_gen.py

@@ -3 +3 @@
 SAS generic computation and sld file readers
 """
-from sas.models.BaseComponent import BaseComponent
-import sas.models.sas_extension.sld2i as mod
+from sas.sascalc.calculator.BaseComponent import BaseComponent
+import sas.sascalc.calculator.core.sld2i as mod
 from periodictable import formula
 from periodictable import nsf

src/sas/sasgui/perspectives/fitting/__init__.py

@@ -39 +39 @@
     data_files = []
     path = os.path.dirname(__file__)
-    p_path = os.path.join(path, 'plugin_models')
-    for f in findall(p_path):
-        data_files.append(('plugin_models', [f]))
-    path = get_data_path(media="media")
+    # p_path = os.path.join(path, 'plugin_models')
+    # for f in findall(p_path):
+    #     data_files.append(('plugin_models', [f]))
+    # path = get_data_path(media="media")
     for f in findall(path):
         data_files.append(('media/fitting_media', [f]))

src/sas/sasgui/perspectives/fitting/models.py

@@ -17 +17 @@
 # places it in the distribution. The Model1DPlugin class is used
 # as the base class of plug-in models.
-from sas.models.pluginmodel import Model1DPlugin
-from sas.models.BaseComponent import BaseComponent
+from sas.sascalc.fit.pluginmodel import Model1DPlugin
+from sas.sascalc.calculator.BaseComponent import BaseComponent
 from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
 from sasmodels import sasview_model,core