Changeset 7621d5a in sasmodels

Timestamp:

Feb 24, 2015 11:35:16 AM (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:

84e01d2

Parents:

664c8e7 (diff), c48d0c6 (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:

• setup.py (modified) (1 diff)
• sasmodels/kernelcl.py (modified) (1 diff)

setup.py

@@ +1 @@
+from setuptools import setup,find_packages
+
+packages = find_packages(exclude=['contrib', 'docs', 'tests*'])
+package_data = {
+    'sasmodels.models': ['*.c'],
+}
+required = []
+
+setup(
+    name="sasmodels",
+    version = "1.0.0a",
+    description = "sasmodels package",
+    long_description=open('README.rst').read(),
+    author = "SasView Collaboration",
+    author_email = "management@sasview.org",
+    url = "http://www.sasview.org",
+    keywords = "small-angle x-ray and neutron scattering analysis",
+    download_url = "https://github.com/SasView/sasmodels",
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Intended Audience :: Science/Research',
+        'License :: Public Domain',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Scientific/Engineering',
+        'Topic :: Scientific/Engineering :: Chemistry',
+        'Topic :: Scientific/Engineering :: Physics',
+    ],
+    packages=packages,
+    package_data=package_data,
+    install_requires = required,
+    extras_require = {
+        'OpenCL': ["pyopencl"],
+        'Bumps': ["bumps"],
+        }
+
+    )

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