Changeset 84e01d2 in sasmodels


Ignore:
Timestamp:
Feb 24, 2015 9:44:45 AM (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
Parents:
7621d5a
Message:

force test of opencl and dll, or fail if opencl is not available

Location:
sasmodels
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/core.py

    rf734e7d r84e01d2  
    1212try: 
    1313    from .kernelcl import load_model as load_model_cl 
    14 except ImportError,exc: 
     14except Exception,exc: 
    1515    load_model_cl = None 
    1616from .kerneldll import load_model as load_model_dll 
  • sasmodels/model_test.py

    r6137124 r84e01d2  
    145145        loaders = ['dll'] 
    146146        models = models[1:] 
     147    elif models and models[0] == 'opencl_and_dll': 
     148        if load_model_cl is None: 
     149            print >>sys.stderr, "opencl is not available" 
     150            sys.exit(1) 
     151        loaders = ['opencl', 'dll'] 
     152        models = models[1:] 
    147153    else: 
    148154        loaders = ['opencl', 'dll'] 
     
    151157        runner.run(suite(loaders, models)) 
    152158    else: 
    153         print >>sys.stderr, "usage: python -m sasmodels.model_test [opencl|dll] model1 model2 ..." 
     159        print >>sys.stderr, "usage: python -m sasmodels.model_test [opencl|dll|opencl_and_dll] model1 model2 ..." 
    154160        print >>sys.stderr, "if model1 is 'all', then all except the remaining models will be tested" 
    155161 
Note: See TracChangeset for help on using the changeset viewer.