Changeset c749266 in sasmodels

Timestamp:

Feb 19, 2015 9:38:44 AM (10 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:

• sasmodels/kernelcl.py (modified) (1 diff)
• sasmodels/kerneldll.py (modified) (1 diff)
• .gitignore (modified) (1 diff)

sasmodels/kernelcl.py

@@ -33 +33 @@
     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/kerneldll.py

@@ -24 +24 @@
     #COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
     #COMPILE = "cl /nologo /Ox /MD /W3 /GS- /DNDEBUG /Tp%(source)s /openmp /link /DLL /INCREMENTAL:NO /MANIFEST /OUT:%(output)s"
-    COMPILE = "gcc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm"
+    #COMPILE = "gcc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm"
+    COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
 else:
     COMPILE = "cc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm"

.gitignore

@@ -1 +1 @@
 /build/
 /dist/
+/*.csv
 *.pyc
 *.cl