Changeset c749266 in sasmodels


Ignore:
Timestamp:
Feb 19, 2015 7:38:44 AM (9 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:
3a45c2c
Parents:
9f2cc5c (diff), afb2c78 (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:
3 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/kernelcl.py

    r87fce00 r7841376  
    3333    warnings.warn(str(exc)) 
    3434    raise RuntimeError("OpenCL not available") 
     35 
     36try: 
     37    context = cl.create_some_context(interactive=False) 
     38    del context 
     39except cl.RuntimeError, exc: 
     40    warnings.warn(str(exc)) 
     41    raise RuntimeError("OpenCl not available") 
    3542 
    3643from pyopencl import mem_flags as mf 
  • sasmodels/kerneldll.py

    r87fce00 rafb2c78  
    2424    #COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s" 
    2525    #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" 
     26    #COMPILE = "gcc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm" 
     27    COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm" 
    2728else: 
    2829    COMPILE = "cc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm" 
  • .gitignore

    r8fff00e r946cdc8e  
    11/build/ 
    22/dist/ 
     3/*.csv 
    34*.pyc 
    45*.cl 
Note: See TracChangeset for help on using the changeset viewer.