- Timestamp:
- Feb 13, 2015 3:53:03 AM (9 years ago)
- 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:
- 8c9ffde
- Parents:
- 79492222
- Location:
- sasmodels
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/CMakeLists.txt
r79492222 r3a39c2e 1 # CMakeLists for SA NS models1 # CMakeLists for SAS models 2 2 cmake_minimum_required (VERSION 2.6) 3 project (Sa nsModels)3 project (SasModels) 4 4 5 5 # Version number 6 set (Sa nsModels_VERSION_MAJOR 1)7 set (Sa nsModels_VERSION_MAJOR 0)6 set (SasModels_VERSION_MAJOR 1) 7 set (SasModels_VERSION_MAJOR 0) 8 8 9 9 set (SRC_FILES … … 123 123 src/libigor/GaussWeights.h 124 124 src/libigor/libCylinder.h 125 src/libigor/libSA NSAnalysis.h125 src/libigor/libSASAnalysis.h 126 126 src/libigor/libSphere.h 127 127 src/libigor/libStructureFactor.h -
sasmodels/MANIFEST.IN
r79492222 r3a39c2e 1 1 2 graft src/sa ns/models/libigor3 graft src/sa ns/models/c_smearer4 graft src/sa ns/models/c_models5 graft src/sa ns/models/c_extensions6 recursive-include sa ns *.h7 recursive-include sa ns *.hh2 graft src/sas/models/libigor 3 graft src/sas/models/c_smearer 4 graft src/sas/models/c_models 5 graft src/sas/models/c_extensions 6 recursive-include sas *.h 7 recursive-include sas *.hh 8 8 include README.txt 9 9 include license.txt -
sasmodels/generate_cmake.py
r79492222 r3a39c2e 12 12 f = open("CMakeLists.txt", "w") 13 13 14 cmakelist = """# CMakeLists for SA NS models14 cmakelist = """# CMakeLists for SAS models 15 15 cmake_minimum_required (VERSION 2.6) 16 project (Sa nsModels)16 project (SasModels) 17 17 18 18 # Version number 19 set (Sa nsModels_VERSION_MAJOR 1)20 set (Sa nsModels_VERSION_MAJOR 0)19 set (SasModels_VERSION_MAJOR 1) 20 set (SasModels_VERSION_MAJOR 0) 21 21 22 22 set (SRC_FILES -
sasmodels/setup.py
r79492222 r3a39c2e 1 1 """ 2 Installation script for SA NS models2 Installation script for SAS models 3 3 """ 4 4 … … 14 14 15 15 # Manage version number ###################################### 16 sys.path.append(os.path.join("src", "sa ns"))16 sys.path.append(os.path.join("src", "sas")) 17 17 import models 18 18 VERSION = models.__version__ … … 66 66 from wrapping import generate_wrappers 67 67 generate_wrappers(header_dir=includedir, 68 output_dir=os.path.join("src", "sa ns", "models"),68 output_dir=os.path.join("src", "sas", "models"), 69 69 c_wrapper_dir=wrapper_dir) 70 70 … … 108 108 109 109 dist = setup( 110 name="sa nsmodels",110 name="sasmodels", 111 111 version = VERSION, 112 description = "Python module for SA NS scattering models",113 author = "SA NS/DANSE",112 description = "Python module for SAS scattering models", 113 author = "SAS/DANSE", 114 114 author_email = "sansdanse@gmail.gov", 115 115 url = "http://sansviewproject.svn.sourceforge.net", 116 116 117 # Place this module under the sa ns package118 #ext_package = "sa ns",117 # Place this module under the sas package 118 #ext_package = "sas", 119 119 120 120 # Use the pure python modules 121 package_dir = {"sa ns":os.path.join("src", "sans"),122 "sa ns.models":os.path.join("src", "sans", "models"),123 "sa ns.models.sans_extension":os.path.join("src", "sans", "models", "sans_extension"),121 package_dir = {"sas":os.path.join("src", "sas"), 122 "sas.models":os.path.join("src", "sas", "models"), 123 "sas.models.sas_extension":os.path.join("src", "sas", "models", "sas_extension"), 124 124 }, 125 package_data={'sa ns.models': [os.path.join('media', "*")]},126 packages = ["sa ns","sans.models",127 "sa ns.models.sans_extension",],125 package_data={'sas.models': [os.path.join('media', "*")]}, 126 packages = ["sas","sas.models", 127 "sas.models.sas_extension",], 128 128 129 129 ext_modules = [ 130 130 131 Extension("sa ns.models.sans_extension.c_models",131 Extension("sas.models.sas_extension.c_models", 132 132 sources=model_sources, 133 133 include_dirs=[igordir, includedir, c_model_dir, numpy_incl_path], … … 135 135 136 136 # Smearer extension 137 Extension("sa ns.models.sans_extension.smearer",137 Extension("sas.models.sas_extension.smearer", 138 138 sources = smearer_sources, 139 139 include_dirs=[igordir, smear_dir, numpy_incl_path], 140 140 ), 141 141 142 Extension("sa ns.models.sans_extension.smearer2d_helper",142 Extension("sas.models.sas_extension.smearer2d_helper", 143 143 sources = [os.path.join(smear_dir, 144 144 "smearer2d_helper_module.cpp"),
Note: See TracChangeset
for help on using the changeset viewer.