Changeset e1ace4d in sasmodels

Timestamp:

Nov 25, 2015 9:25:28 AM (9 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:

3a45c2c

Parents:

7f7f99f

Message:

long doubles not supported in every version of numpy

Location:

sasmodels

Files:

• compare.py (modified) (2 diffs)
• generate.py (modified) (1 diff)

sasmodels/compare.py

@@ -254 +254 @@
 
     # modelling accuracy is determined by dtype and cutoff
-    dtype = ('longdouble' if '-longdouble' in opts
+    dtype = ('longdouble' if '-quad' in opts
              else 'double' if '-double' in opts
              else 'single')
@@ -379 +379 @@
 
     -plot*/-noplot plots or suppress the plot of the model
-    -single*/-double/-longdouble uses double precision for comparison
+    -single*/-double/-quad use single/double/quad precision for comparison
     -lowq*/-midq/-highq/-exq use q values up to 0.05, 0.2, 1.0, 10.0
     -Nq=128 sets the number of Q points in the data set

sasmodels/generate.py

@@ -206 +206 @@
 C_KERNEL_TEMPLATE_PATH = joinpath(dirname(__file__), 'kernel_template.c')
 
-F128 = np.dtype('float128')
+F32 = np.dtype('float32')
 F64 = np.dtype('float64')
-F32 = np.dtype('float32')
+try:  # CRUFT: older numpy does not support float128
+    F128 = np.dtype('float128')
+except TypeError:
+    F128 = None
+
 
 # Scale and background, which are parameters common to every form factor