Changeset 8a21ba3 in sasmodels for compare.py

Timestamp:

Jul 11, 2014 3:40:30 PM (10 years ago)

Author:

HMP1 <helen.park@…>

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:

09e15be

Parents:

496b252

Message:

Fixed Ellipse code, update comparison file

File:

• compare.py (modified) (3 diffs)

compare.py

@@ -38 +38 @@
     return theory
 
-def demo(N=1):
+def cyl(N=1):
     import sys
     import matplotlib.pyplot as plt
-    import numpy as np
 
     if len(sys.argv) > 1:
@@ -61 +60 @@
     cpu_time = toc()*1000./N
 
-    from cylcode import GpuCylinder
+    from code_cylinder import GpuCylinder
     model = SasModel(data, GpuCylinder, dtype='f', **pars)
+    tic()
+    for i in range(N):
+        gpu = model.theory()
+    gpu_time = toc()*1000./N
+
+    relerr = (gpu - cpu)/cpu
+    print "max(|(ocl-omp)/ocl|)", max(abs(relerr))
+    print "omp t=%.1f ms"%cpu_time
+    print "ocl t=%.1f ms"%gpu_time
+
+    plt.subplot(131); plot_data(data, cpu); plt.title("omp t=%.1f ms"%cpu_time)
+    plt.subplot(132); plot_data(data, gpu); plt.title("ocl t=%.1f ms"%gpu_time)
+    plt.subplot(133); plot_data(data, 1e8*relerr); plt.title("relerr x 10^8"); plt.colorbar()
+    plt.show()
+
+def ellipse(N=1):
+    import sys
+    import matplotlib.pyplot as plt
+
+    if len(sys.argv) > 1:
+        N = int(sys.argv[1])
+    data = load_data('JUN03289.DAT')
+    set_beam_stop(data, 0.004)
+
+    pars = dict(scale=.027, radius_a=60, radius_b=180, sldEll=.297e-6, sldSolv=5.773e-6, background=4.9,
+                axis_theta=0, axis_phi=90, radius_a_pd=0.1, radius_a_pd_n=10, radius_a_pd_nsigma=3, radius_b_pd=0.1, radius_b_pd_n=10,
+                radius_b_pd_nsigma=3, axis_theta_pd=0.1, axis_theta_pd_n=6, axis_theta_pd_nsigma=3, axis_phi_pd=0.1,
+                axis_phi_pd_n=6, axis_phi_pd_nsigma=3,)
+
+    model = sasview_model('ellipsoid', **pars)
+    tic()
+    for i in range(N):
+        cpu = sasview_eval(model, data)
+    cpu_time = toc()*1000./N
+
+    from code_ellipse import GpuEllipse
+    model = SasModel(data, GpuEllipse, dtype='f', **pars)
     tic()
     for i in range(N):
@@ -80 +116 @@
 
 if __name__ == "__main__":
-    demo()
+    ellipse()