Changeset a42fec0 in sasmodels for compare.py

Timestamp:

Aug 4, 2014 3:20:07 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:

8cdb9f1

Parents:

099e053

Message:

Speed-up of 3X, compare.py working

File:

• compare.py (modified) (10 diffs)

compare.py

@@ -4 +4 @@
 import datetime
 
-from Models.sasmodel import SasModel, load_data, set_beam_stop, plot_data
+from sasmodel import SasModel, load_data, set_beam_stop, plot_data
 
 
@@ -46 +46 @@
     if len(sys.argv) > 1:
         N = int(sys.argv[1])
-    data = load_data('JUN03289.DAT')
+    data = load_data('December/DEC07098.DAT')
     set_beam_stop(data, 0.004)
 
+    dtype = "float"
     pars = dict(
-        scale=1, radius=64.1, length=266.96, sldCyl=.291e-6, sldSolv=5.77e-6, background=0,
-        cyl_theta=0, cyl_phi=0, radius_pd=0.1, radius_pd_n=10, radius_pd_nsigma=3,length_pd=0.1,
-        length_pd_n=5, length_pd_nsigma=3, cyl_theta_pd=0.1, cyl_theta_pd_n=5, cyl_theta_pd_nsigma=3,
+        scale=.08, radius=64.1, length=266.96, sldCyl=.291e-6, sldSolv=5.77e-6, background=.1,
+        cyl_theta=0, cyl_phi=0,
+        radius_pd=0.1, radius_pd_n=10, radius_pd_nsigma=3,
+        length_pd=0.1,length_pd_n=5, length_pd_nsigma=3,
+        cyl_theta_pd=0.1, cyl_theta_pd_n=5, cyl_theta_pd_nsigma=3,
         cyl_phi_pd=0.1, cyl_phi_pd_n=10, cyl_phi_pd_nsigma=3,
         )
@@ -62 +65 @@
     cpu_time = toc()*1000./N
 
-    from code_cylinder import GpuCylinder
+
+    from Models.code_cylinder import GpuCylinder
     model = SasModel(data, GpuCylinder, dtype='f', **pars)
     tic()
@@ -69 +73 @@
     gpu_time = toc()*1000./N
 
+    print "gpu/cpu", max(gpu/cpu)
+    cpu *= max(gpu/cpu)
     relerr = (gpu - cpu)/cpu
     print "max(|(ocl-omp)/ocl|)", max(abs(relerr))
@@ -76 +82 @@
     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.subplot(133); plot_data(data, relerr); plt.title("relerr x 10^8"); plt.colorbar()
     plt.show()
 
@@ -85 +91 @@
     if len(sys.argv) > 1:
         N = int(sys.argv[1])
-    data = load_data('DEC07133.DAT')
+    data = load_data('DEC07106.DAT')
     set_beam_stop(data, 0.004)
 
@@ -99 +105 @@
     cpu_time = toc()*1000./N
 
-    from code_ellipse import GpuEllipse
+    from Models.code_ellipse import GpuEllipse
     model = SasModel(data, GpuEllipse, dtype='f', **pars)
     tic()
@@ -116 +122 @@
     plt.show()
 
-def coreshell(N=4):
+def coreshell(N=1):
     import sys
     import matplotlib.pyplot as plt
@@ -122 +128 @@
     if len(sys.argv) > 1:
         N = int(sys.argv[1])
-    data = load_data('DEC07133.DAT')
+    data = load_data('December/DEC07098.DAT')
     set_beam_stop(data, 0.004)
 
@@ -141 +147 @@
     cpu_time = toc()*1000./N
 
-    from code_coreshellcyl import GpuCoreShellCylinder
+    from Models.code_coreshellcyl import GpuCoreShellCylinder
     model = SasModel(data, GpuCoreShellCylinder, dtype='f', **pars)
     tic()