Changeset 09e15be in sasmodels for compare.py

Timestamp:

Jul 18, 2014 2:25:00 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:

79fcc40

Parents:

8a21ba3

Message:

Attempt at faster kernel for TEST,
updated fit.py,
errors in the kernels fixed

File:

• compare.py (modified) (3 diffs)

compare.py

@@ -77 +77 @@
     plt.show()
 
-def ellipse(N=1):
+def ellipse(N=4):
     import sys
     import matplotlib.pyplot as plt
@@ -83 +83 @@
     if len(sys.argv) > 1:
         N = int(sys.argv[1])
-    data = load_data('JUN03289.DAT')
+    data = load_data('DEC07133.DAT')
     set_beam_stop(data, 0.004)
 
@@ -114 +114 @@
     plt.show()
 
+def coreshell(N=4):
+    import sys
+    import matplotlib.pyplot as plt
+
+    if len(sys.argv) > 1:
+        N = int(sys.argv[1])
+    data = load_data('DEC07133.DAT')
+    set_beam_stop(data, 0.004)
+
+    pars = dict(scale= 1.77881e-06, radius=325, thickness=25, length=34.2709,
+                 core_sld=1e-6, shell_sld=.291e-6, solvent_sld=7.105e-6,
+                 background=223.827, axis_theta=90, axis_phi=0,
+                 axis_theta_pd=15.8,
+                 radius_pd=0.1, radius_pd_n=1, radius_pd_nsigma=0,
+                 length_pd=0.1, length_pd_n=1, length_pd_nsigma=0,
+                 thickness_pd=0.1, thickness_pd_n=1, thickness_pd_nsigma=0,
+                 axis_theta_pd_n=10, axis_theta_pd_nsigma=3,
+                 axis_phi_pd=0.0008748, axis_phi_pd_n=10, axis_phi_pd_nsigma=3,)
+
+    model = sasview_model('CoreShellCylinder', **pars)
+    tic()
+    for i in range(N):
+        cpu = sasview_eval(model, data)
+    cpu_time = toc()*1000./N
+
+    from code_coreshellcyl import GpuCoreShellCylinder
+    model = SasModel(data, GpuCoreShellCylinder, 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()
 
 if __name__ == "__main__":
-    ellipse()
+    coreshell()