Changes in / [cebbb5a:639c4e3] in sasmodels


Ignore:
Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/kerneldll.py

    r8d62008 re1454ab  
    8787            COMPILE = " ".join((CC, LN)) 
    8888    else: 
    89         COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm" 
     89        # fPIC is unused on windows 
     90        # COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm" 
     91        COMPILE = "gcc -shared -std=c99 -O2 -Wall %(source)s -o %(output)s -lm" 
    9092        if "SAS_OPENMP" in os.environ: 
    9193            COMPILE += " -fopenmp" 
    … …  
    9395    COMPILE = "cc -shared -fPIC -fopenmp -std=c99 -O2 -Wall %(source)s -o %(output)s -lm" 
    9496 
    95 DLL_PATH = tempfile.gettempdir() 
     97# Assume the default location of module DLLs is within the sasmodel directory. 
     98DLL_PATH = os.path.join(os.path.split(os.path.realpath(__file__))[0], "models", "dll") 
    9699 
    97100ALLOW_SINGLE_PRECISION_DLLS = True 

  • sasmodels/model_test.py

    r82923a6 r81cd2a2  
    288288    Returns 0 if success or 1 if any tests fail. 
    289289    """ 
    290     import xmlrunner 
     290    try: 
     291        from xmlrunner import XMLTestRunner as TestRunner 
     292        test_args = { 'output': 'logs' } 
     293    except ImportError: 
     294        from unittest import TextTestRunner as TestRunner 
     295        test_args = { } 
    291296 
    292297    models = sys.argv[1:] 
    … …  
    327332        return 1 
    328333 
    329     #runner = unittest.TextTestRunner() 
    330     runner = xmlrunner.XMLTestRunner(output='logs', verbosity=verbosity) 
     334    runner = TestRunner(verbosity=verbosity, **test_args) 
    331335    result = runner.run(make_suite(loaders, models)) 
    332336    return 1 if result.failures or result.errors else 0 

  • sasmodels/models/core_multi_shell.c

    rf7930be rabdd01c  
    182182    if (r == r0) { 
    183183      // no thickness, so nothing to add 
    184     } else if (fabs(A[i]) < 1e-16 || sld_out[i] == sld_in[i]) { 
     184    } else if (fabs(A[i]) < 1.0e-16 || sld_out[i] == sld_in[i]) { 
    185185      f -= f_constant(q, r0, sld_in[i]); 
    186186      f += f_constant(q, r, sld_in[i]); 
    187     } else if (fabs(A[i]) < 1e-4) { 
     187    } else if (fabs(A[i]) < 1.0e-4) { 
    188188      const double slope = (sld_out[i] - sld_in[i])/thickness[i]; 
    189189      f -= f_linear(q, r0, sld_in[i], slope); 

  • sasmodels/models/core_shell_parallelepiped.c

    r44bd2be rabdd01c  
    4848    double a_scaled = a_side / b_side; 
    4949    double c_scaled = c_side / b_side; 
    50     double arim_scaled = arim_thickness / b_side; 
    51     double brim_scaled = brim_thickness / b_side; 
    52         
     50 
    5351    // DelRho values (note that drC is not used later)        
    5452        double dr0 = core_sld-solvent_sld; 

  • sasmodels/models/elliptical_cylinder.c

    r43b7eea rabdd01c  
    8787 
    8888    const double vol = form_volume(r_minor, r_ratio, length); 
    89     return answer*vol*vol*1e-4; 
     89    return answer*vol*vol*1.0e-4; 
    9090} 
    9191 

  • sasmodels/models/onion.c

    rce896fd rabdd01c  
    8080    if (r == r0) { 
    8181      // no thickness, so nothing to add 
    82     } else if (fabs(A[i]) < 1e-16 || sld_out[i] == sld_in[i]) { 
     82    } else if (fabs(A[i]) < 1.0e-16 || sld_out[i] == sld_in[i]) { 
    8383      f -= f_constant(q, r0, sld_in[i]); 
    8484      f += f_constant(q, r, sld_in[i]); 
    85     } else if (fabs(A[i]) < 1e-4) { 
     85    } else if (fabs(A[i]) < 1.0e-4) { 
    8686      const double slope = (sld_out[i] - sld_in[i])/thickness[i]; 
    8787      f -= f_linear(q, r0, sld_in[i], slope); 

  • sasmodels/models/rpa.c

    rd2bb604 rabdd01c  
    1717    Phi[0]=Phi[1]=0.0000001; 
    1818    Kab=Kac=Kad=Kbc=Kbd=-0.0004; 
    19     L[0]=L[1]=1e-12; 
    20     v[0]=v[1]=100.0; 
    21     b[0]=b[1]=5.0; 
     19    La=Lb=1.0e-12; 
     20    va=vb=100.0; 
     21    ba=bb=5.0; 
    2222  } else if (icase <= 4) { 
    2323    Phi[0]=0.0000001; 
    2424    Kab=Kac=Kad=-0.0004; 
    25     L[0]=1e-12; 
    26     v[0]=100.0; 
    27     b[0]=5.0; 
     25    La=1.0e-12; 
     26    va=100.0; 
     27    ba=5.0; 
    2828  } 
    2929#else 

  • setup.py

    rf903f0a re1454ab  
     1import os 
    12from setuptools import setup,find_packages 
     3 
     4# Create the model .so's 
     5os.system("python gen_so.py") 
    26 
    37packages = find_packages(exclude=['contrib', 'docs', 'tests*']) 
    … …  
    59    'sasmodels.models': ['*.c','lib/*.c'], 
    610    'sasmodels': ['*.c'], 
     11    'sasmodels.models.dll': ['*.so'], 
    712} 
    813required = [] 
Note: See TracChangeset for help on using the changeset viewer.