Changeset f173599 in sasmodels


Ignore:
Timestamp:
Feb 18, 2015 6:07:27 AM (5 years ago)
Author:
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:
c97724e
Parents:
56fc97a (diff), 87fce00 (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:
7 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • CylinderModel.py

    r32c160a ra1542aae  
    55""" 
    66from sasmodels.sasview_model import make_class 
    7 from sasmodels.models import cylinder_clone as cylinder 
     7from sasmodels.models import cylinder 
    88CylinderModel = make_class(cylinder, dtype='single') 
  • compare.py

    r373d1b6 rf173599  
    1010 
    1111from sasmodels.bumps_model import BumpsModel, plot_data, tic 
    12 from sasmodels import kernelcl, kerneldll 
     12try: from sasmodels import kernelcl 
     13except: from sasmodels import kerneldll as kernelcl 
     14from sasmodels import kerneldll 
    1315from sasmodels.convert import revert_model 
    1416 
  • sasmodels/kernelcl.py

    r250fa25 r87fce00  
    3030try: 
    3131    import pyopencl as cl 
    32 except ImportError,exc: 
     32except RuntimeError,exc: 
    3333    warnings.warn(str(exc)) 
    3434    raise RuntimeError("OpenCL not available") 
  • sasmodels/kerneldll.py

    rf786ff3 r87fce00  
    2323    # Can't find VCOMP90.DLL (don't know why), so remove openmp support from windows compiler build 
    2424    #COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s" 
    25     COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /openmp /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s" 
    26     #COMPILE = "gcc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm" 
     25    #COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /openmp /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s" 
     26    COMPILE = "gcc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm" 
    2727else: 
    2828    COMPILE = "cc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm" 
Note: See TracChangeset for help on using the changeset viewer.