Changeset f173599 in sasmodels

Timestamp:

Feb 18, 2015 6:07:27 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:

c97724e

Parents:

56fc97a (diff), 87fce00 (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:

• CylinderModel.py (modified) (1 diff)
• compare.py (modified) (1 diff)
• sasmodels/kernelcl.py (modified) (1 diff)
• sasmodels/kerneldll.py (modified) (1 diff)
• sasmodels/models/barbell.c (added)
• sasmodels/models/barbell.py (added)
• sasmodels/models/bcc.c (added)
• sasmodels/models/bcc.py (added)
• sasmodels/models/cylinder_clone.c (deleted)
• sasmodels/models/cylinder_clone.py (deleted)
• sasmodels/models/img/barbell_1d.jpg (added)
• sasmodels/models/img/barbell_2d.jpg (added)
• doc/developer/index.rst (added)

CylinderModel.py

@@ -5 +5 @@
 """
 from sasmodels.sasview_model import make_class
-from sasmodels.models import cylinder_clone as cylinder
+from sasmodels.models import cylinder
 CylinderModel = make_class(cylinder, dtype='single')

compare.py

@@ -10 +10 @@
 
 from sasmodels.bumps_model import BumpsModel, plot_data, tic
-from sasmodels import kernelcl, kerneldll
+try: from sasmodels import kernelcl
+except: from sasmodels import kerneldll as kernelcl
+from sasmodels import kerneldll
 from sasmodels.convert import revert_model
 

sasmodels/kernelcl.py

@@ -30 +30 @@
 try:
     import pyopencl as cl
-except ImportError,exc:
+except RuntimeError,exc:
     warnings.warn(str(exc))
     raise RuntimeError("OpenCL not available")

sasmodels/kerneldll.py

@@ -23 +23 @@
     # Can't find VCOMP90.DLL (don't know why), so remove openmp support from windows compiler build
     #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 = "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"
 else:
     COMPILE = "cc -shared -fPIC -std=c99 -fopenmp -O2 -Wall %(source)s -o %(output)s -lm"