Changeset f49675c in sasmodels


Ignore:
Timestamp:
Sep 2, 2016 9:29:34 AM (6 years ago)
Author:
wojciech
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:
b6f3bbe
Parents:
d6e2f8d
Message:

No GPU forcing through opencl=True

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/core.py

    r8407d8c rf49675c  
    219219    # Assign default platform, overriding ocl with dll if OpenCL is unavailable 
    220220    # If opencl=False OpenCL is switched off 
    221     if platform is None or model_info.opencl: 
     221    # Finally one can force OpenCL calculation even if HAVE_OPENCL=False 
     222    if platform is None: 
    222223        platform = "ocl" 
    223224    if platform == "ocl" and not HAVE_OPENCL or not model_info.opencl: 
    224225        platform = "dll" 
     226    #if  model_info.opencl and not HAVE_OPENCL: 
     227    #    platform = "ocl" 
    225228 
    226229    # Check if type indicates dll regardless of which platform is given 
Note: See TracChangeset for help on using the changeset viewer.