Changeset 9404dd3 in sasmodels for sasmodels/compare.py

Timestamp:

Dec 4, 2015 10:41:47 AM (8 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:

eaca9eb

Parents:

7bb290c

Message:

python 3.x support

File:

• sasmodels/compare.py (modified) (12 diffs)

sasmodels/compare.py

@@ -71 +71 @@
     """
     # convert model parameters from sasmodel form to sasview form
-    #print "old",sorted(pars.items())
+    #print("old",sorted(pars.items()))
     modelname, pars = revert_model(model_definition, pars)
-    #print "new",sorted(pars.items())
+    #print("new",sorted(pars.items()))
     sas = __import__('sas.models.'+modelname)
     ModelClass = getattr(getattr(sas.models,modelname,None),modelname,None)
@@ -193 +193 @@
     try:
         model = core.load_model(model_definition, dtype=dtype, platform="ocl")
-    except Exception,exc:
-        print exc
-        print "... trying again with single precision"
+    except Exception as exc:
+        print(exc)
+        print("... trying again with single precision")
         model = core.load_model(model_definition, dtype='single', platform="ocl")
     calculator = DirectModel(data, model, cutoff=cutoff)
@@ -267 +267 @@
         seed = int(opt_values['-random']) if '-random' in opt_values else None
         pars, seed = randomize_model(pars, seed=seed)
-        print "Randomize using -random=%i"%seed
+        print("Randomize using -random=%i"%seed)
     pars.update(set_pars)  # set value after random to control value
     constrain_pars(model_definition, pars)
@@ -275 +275 @@
         suppress_pd(pars)
     if '-pars' in opts:
-        print "pars",parlist(pars)
+        print("pars "+str(parlist(pars)))
 
     # Base calculation
@@ -287 +287 @@
             base, base_time = eval_sasview(model_definition, pars, data, Ncomp)
             base_name = "sasview"
-            #print "base/sasview", (base-pars['background'])/(comp-pars['background'])
-            print "sasview t=%.1f ms, intensity=%.0f"%(base_time, sum(base))
-            #print "sasview",comp
+            #print("base/sasview", (base-pars['background'])/(comp-pars['background']))
+            print("sasview t=%.1f ms, intensity=%.0f"%(base_time, sum(base)))
+            #print("sasview",comp)
         except ImportError:
             traceback.print_exc()
@@ -297 +297 @@
                                     dtype=dtype, cutoff=cutoff, Nevals=Nbase)
         base_name = "ocl"
-        print "opencl t=%.1f ms, intensity=%.0f"%(base_time, sum(base))
-        #print "base", base
-        #print max(base), min(base)
+        print("opencl t=%.1f ms, intensity=%.0f"%(base_time, sum(base)))
+        #print("base " + base)
+        #print(max(base), min(base))
 
     # Comparison calculation
@@ -306 +306 @@
                                     dtype=dtype, cutoff=cutoff, Nevals=Ncomp)
         comp_name = "ctypes"
-        print "ctypes t=%.1f ms, intensity=%.0f"%(comp_time, sum(comp))
+        print("ctypes t=%.1f ms, intensity=%.0f"%(comp_time, sum(comp)))
     elif Ncomp > 0:
         try:
             comp, comp_time = eval_sasview(model_definition, pars, data, Ncomp)
             comp_name = "sasview"
-            #print "base/sasview", (base-pars['background'])/(comp-pars['background'])
-            print "sasview t=%.1f ms, intensity=%.0f"%(comp_time, sum(comp))
-            #print "sasview",comp
+            #print("base/sasview", (base-pars['background'])/(comp-pars['background']))
+            print("sasview t=%.1f ms, intensity=%.0f"%(comp_time, sum(comp)))
+            #print("sasview",comp)
         except ImportError:
             traceback.print_exc()
@@ -320 +320 @@
     # Compare, but only if computing both forms
     if Nbase > 0 and Ncomp > 0:
-        #print "speedup %.2g"%(comp_time/base_time)
-        #print "max |base/comp|", max(abs(base/comp)), "%.15g"%max(abs(base)), "%.15g"%max(abs(comp))
+        #print("speedup %.2g"%(comp_time/base_time))
+        #print("max |base/comp|", max(abs(base/comp)), "%.15g"%max(abs(base)), "%.15g"%max(abs(comp)))
         #comp *= max(base/comp)
         resid = (base - comp)
         relerr = resid/comp
         #bad = (relerr>1e-4)
-        #print relerr[bad],comp[bad],base[bad],data.qx_data[bad],data.qy_data[bad]
+        #print(relerr[bad],comp[bad],base[bad],data.qx_data[bad],data.qy_data[bad])
         _print_stats("|%s-%s|"%(base_name,comp_name)+(" "*(3+len(comp_name))), resid)
         _print_stats("|(%s-%s)/%s|"%(base_name,comp_name,comp_name), relerr)
@@ -379 +379 @@
         "zero-offset:%+.3e"%np.mean(err),
         ]
-    print label,"  ".join(data)
+    print(label+"  ".join(data))
 
 
@@ -466 +466 @@
         sys.exit(1)
     if args[0] not in MODELS:
-        print "Model %r not available. Use one of:\n    %s"%(args[0],models)
+        print("Model %r not available. Use one of:\n    %s"%(args[0],models))
         sys.exit(1)
     if len(args) > 3:
@@ -475 +475 @@
                   and not any(o.startswith('-%s='%t) for t in VALUE_OPTIONS)]
     if invalid:
-        print "Invalid options: %s"%(", ".join(invalid))
+        print("Invalid options: %s"%(", ".join(invalid)))
         sys.exit(1)
 
@@ -500 +500 @@
             # extract base name without distribution
             s = set(p.split('_pd')[0] for p in pars)
-            print "%r invalid; parameters are: %s"%(k,", ".join(sorted(s)))
+            print("%r invalid; parameters are: %s"%(k,", ".join(sorted(s))))
             sys.exit(1)
         set_pars[k] = float(v) if not v.endswith('type') else v