Changeset 78356b31 in sasmodels

Timestamp:

Oct 4, 2014 4:25:14 PM (10 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:

2d0aced

Parents:

6798848

Message:

fix warning that pyopencl failed

Location:

sasmodels

Files:

• bumps_model.py (modified) (1 diff)
• gen.py (modified) (1 diff)

sasmodels/bumps_model.py

@@ -10 +10 @@
     from .gpu import load_model as _loader
 except ImportError,exc:
+    import warnings
     warnings.warn(str(exc))
     warnings.warn("OpenCL not available --- using ctypes instead")

sasmodels/gen.py

@@ -482 +482 @@
         weights = [p+"_w" for p in pd_pars]+['spherical_correction']
         sasview_spherical = ""
-    elif "theta" in pd_pars:
+    elif True and "theta" in pd_pars:
         spherical_correction = [indent(SASVIEW_SPHERICAL_CORRECTION,depth)]
         weights = [p+"_w" for p in pd_pars]