Changeset 02dfcab in sasmodels

Timestamp:

Feb 24, 2015 12:21:22 PM (9 years ago)

Author:

ajj

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:

5134b2c

Parents:

43bdddc (diff), 84e01d2 (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 ​https://github.com/SasView/sasmodels

Location:

sasmodels

Files:

• core.py (modified) (1 diff)
• kernelcl.py (modified) (1 diff)
• model_test.py (modified) (2 diffs)
• models/cylinder.py (modified) (1 diff)

sasmodels/core.py

@@ -12 +12 @@
 try:
     from .kernelcl import load_model as load_model_cl
-except ImportError,exc:
+except Exception,exc:
     load_model_cl = None
 from .kerneldll import load_model as load_model_dll

sasmodels/kernelcl.py

@@ -30 +30 @@
 try:
     import pyopencl as cl
-except ImportError,exc:
+    context = cl.create_some_context(interactive=False)
+    del context
+except Exception,exc:
     warnings.warn(str(exc))
     raise RuntimeError("OpenCL not available")
-
-try:
-    context = cl.create_some_context(interactive=False)
-    del context
-except cl.RuntimeError, exc:
-    warnings.warn(str(exc))
-    raise RuntimeError("OpenCl not available")
 
 from pyopencl import mem_flags as mf

sasmodels/model_test.py

@@ -145 +145 @@
         loaders = ['dll']
         models = models[1:]
+    elif models and models[0] == 'opencl_and_dll':
+        if load_model_cl is None:
+            print >>sys.stderr, "opencl is not available"
+            sys.exit(1)
+        loaders = ['opencl', 'dll']
+        models = models[1:]
     else:
         loaders = ['opencl', 'dll']
@@ -151 +157 @@
         runner.run(suite(loaders, models))
     else:
-        print >>sys.stderr, "usage: python -m sasmodels.model_test [opencl|dll] model1 model2 ..."
+        print >>sys.stderr, "usage: python -m sasmodels.model_test [opencl|dll|opencl_and_dll] model1 model2 ..."
         print >>sys.stderr, "if model1 is 'all', then all except the remaining models will be tested"
 

sasmodels/models/cylinder.py

@@ -157 +157 @@
     sld=6, solvent_sld=1,
     #radius=5, length=20,
-    radius=260, length=290,
-    theta=30, phi=0,
+    radius=20, length=300,
+    theta=60, phi=60,
     radius_pd=.2, radius_pd_n=9,
     length_pd=.2,length_pd_n=10,
-    theta_pd=15, theta_pd_n=45,
-    phi_pd=15, phi_pd_n=1,
+    theta_pd=10, theta_pd_n=5,
+    phi_pd=10, phi_pd_n=5,
     )