Changeset fa227d3 in sasmodels

Timestamp:

Apr 25, 2016 12:29:14 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c, bfdfb23

Parents:

abdd01c (diff), e1454ab (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:sasview/sasmodels

Files:

• gen_so.py (added)
• sasmodels/kerneldll.py (modified) (4 diffs)
• sasmodels/models/dll/__init__.py (added)
• setup.py (modified) (2 diffs)
• sasmodels/models/core_multi_shell.c (modified) (1 diff)
• sasmodels/models/core_shell_parallelepiped.c (modified) (1 diff)
• sasmodels/models/elliptical_cylinder.c (modified) (1 diff)
• sasmodels/models/onion.c (modified) (1 diff)
• sasmodels/models/rpa.c (modified) (2 diffs)

sasmodels/kerneldll.py

@@ -79 +79 @@
             COMPILE = " ".join((CC, LN))
     else:
-        COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
+        # fPIC is unused on windows
+        # COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
+        COMPILE = "gcc -shared -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
         if "SAS_OPENMP" in os.environ:
             COMPILE = COMPILE + " -fopenmp"
@@ -85 +87 @@
     COMPILE = "cc -shared -fPIC -fopenmp -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
 
-DLL_PATH = tempfile.gettempdir()
+# Assume the default location of module DLLs is within the sasmodel directory.
+DLL_PATH = os.path.join(os.path.split(os.path.realpath(__file__))[0], "models", "dll")
 
 ALLOW_SINGLE_PRECISION_DLLS = True
@@ -103 +106 @@
         basename += "128"
     return joinpath(DLL_PATH, basename+'.so')
-
 
 def make_dll(source, model_info, dtype="double"):
@@ -143 +145 @@
     source_files = generate.model_sources(model_info) + [model_info['filename']]
     dll = dll_path(model_info, dtype)
-    newest = max(os.path.getmtime(f) for f in source_files)
-    if not os.path.exists(dll) or os.path.getmtime(dll) < newest:
+
+    #newest = max(os.path.getmtime(f) for f in source_files)
+    #if not os.path.exists(dll) or os.path.getmtime(dll) < newest:
+    if not os.path.exists(dll):
         # Replace with a proper temp file
         fid, filename = tempfile.mkstemp(suffix=".c", prefix=tempfile_prefix)

setup.py

@@ +1 @@
+import os
 from setuptools import setup,find_packages
+
+# Create the model .so's
+os.system("python gen_so.py")
 
 packages = find_packages(exclude=['contrib', 'docs', 'tests*'])
@@ -5 +9 @@
     'sasmodels.models': ['*.c','lib/*.c'],
     'sasmodels': ['*.c'],
+    'sasmodels.models.dll': ['*.so'],
 }
 required = []

sasmodels/models/core_multi_shell.c

@@ -182 +182 @@
     if (r == r0) {
       // no thickness, so nothing to add
-    } else if (fabs(A[i]) < 1e-16 || sld_out[i] == sld_in[i]) {
+    } else if (fabs(A[i]) < 1.0e-16 || sld_out[i] == sld_in[i]) {
       f -= f_constant(q, r0, sld_in[i]);
       f += f_constant(q, r, sld_in[i]);
-    } else if (fabs(A[i]) < 1e-4) {
+    } else if (fabs(A[i]) < 1.0e-4) {
       const double slope = (sld_out[i] - sld_in[i])/thickness[i];
       f -= f_linear(q, r0, sld_in[i], slope);

sasmodels/models/core_shell_parallelepiped.c

@@ -48 +48 @@
     double a_scaled = a_side / b_side;
     double c_scaled = c_side / b_side;
-    double arim_scaled = arim_thickness / b_side;
-    double brim_scaled = brim_thickness / b_side;
-       
+
     // DelRho values (note that drC is not used later)       
         double dr0 = core_sld-solvent_sld;

sasmodels/models/elliptical_cylinder.c

@@ -87 +87 @@
 
     const double vol = form_volume(r_minor, r_ratio, length);
-    return answer*vol*vol*1e-4;
+    return answer*vol*vol*1.0e-4;
 }
 

sasmodels/models/onion.c

@@ -80 +80 @@
     if (r == r0) {
       // no thickness, so nothing to add
-    } else if (fabs(A[i]) < 1e-16 || sld_out[i] == sld_in[i]) {
+    } else if (fabs(A[i]) < 1.0e-16 || sld_out[i] == sld_in[i]) {
       f -= f_constant(q, r0, sld_in[i]);
       f += f_constant(q, r, sld_in[i]);
-    } else if (fabs(A[i]) < 1e-4) {
+    } else if (fabs(A[i]) < 1.0e-4) {
       const double slope = (sld_out[i] - sld_in[i])/thickness[i];
       f -= f_linear(q, r0, sld_in[i], slope);

sasmodels/models/rpa.c

@@ -39 +39 @@
     Phia=Phib=0.0000001;
     Kab=Kac=Kad=Kbc=Kbd=-0.0004;
-    La=Lb=1e-12;
+    La=Lb=1.0e-12;
     va=vb=100.0;
     ba=bb=5.0;
@@ -45 +45 @@
     Phia=0.0000001;
     Kab=Kac=Kad=-0.0004;
-    La=1e-12;
+    La=1.0e-12;
     va=100.0;
     ba=5.0;