Author: bugman
Date: Wed Jun 18 15:18:50 2014
New Revision: 24087
URL: http://svn.gna.org/viewcvs/relax?rev=24087&view=rev
Log:
Modified all of the dispersion model profiling scripts.
The single() function for timing the single spin target function speed has
been modified to include
a second outer loop over 100 'spins'. This means that the timing numbers are
equivalent to the
cluster timings, as both are then over 100 spins. This now allows not only
relax version
differences and model differences to be compared, but also the non-clustered
and clustered analysis
speeds.
Modified:
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_dpl94.py
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_expanded.py
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_tsmfk01.py
Modified:
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py?rev=24087&r1=24086&r2=24087&view=diff
==============================================================================
---
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py
(original)
+++
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py
Wed Jun 18 15:18:50 2014
@@ -452,9 +452,11 @@
# Instantiate class
C1 = Profile(num_spins=num_spins, model=model, r2a=5.0, r2b=10.0,
dw=3.0, pA=0.9, kex=1000.0, spins_params=['r2a', 'r2b', 'dw', 'pA', 'kex'])
- # Repeat the function call, to simulate minimisation.
- for i in xrange(iter):
- chi2 = C1.calc(C1.params)
+ # Loop 100 times for each spin in the clustered analysis (to make the
timing numbers equivalent).
+ for spin_index in xrange(100):
+ # Repeat the function call, to simulate minimisation.
+ for i in xrange(iter):
+ chi2 = C1.calc(C1.params)
print("chi2 single:", chi2)
Modified:
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py?rev=24087&r1=24086&r2=24087&view=diff
==============================================================================
---
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py
(original)
+++
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py
Wed Jun 18 15:18:50 2014
@@ -444,9 +444,11 @@
# Instantiate class
C1 = Profile(num_spins=num_spins, model=model, r2a=5.0, r2b=10.0,
dw=3.0, pA=0.9, kex=1000.0, spins_params=['r2a', 'r2b', 'dw', 'pA', 'kex'])
- # Repeat the function call, to simulate minimisation.
- for i in xrange(iter):
- chi2 = C1.calc(C1.params)
+ # Loop 100 times for each spin in the clustered analysis (to make the
timing numbers equivalent).
+ for spin_index in xrange(100):
+ # Repeat the function call, to simulate minimisation.
+ for i in xrange(iter):
+ chi2 = C1.calc(C1.params)
print("chi2 single:", chi2)
Modified:
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_dpl94.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_dpl94.py?rev=24087&r1=24086&r2=24087&view=diff
==============================================================================
---
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_dpl94.py
(original)
+++
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_dpl94.py
Wed Jun 18 15:18:50 2014
@@ -440,9 +440,11 @@
# Instantiate class
C1 = Profile(num_spins=num_spins, model=model, r2a=5.0, r2b=10.0,
dw=3.0, pA=0.9, kex=1000.0, spins_params=['r2a', 'r2b', 'dw', 'pA', 'kex'])
- # Repeat the function call, to simulate minimisation.
- for i in xrange(iter):
- chi2 = C1.calc(C1.params)
+ # Loop 100 times for each spin in the clustered analysis (to make the
timing numbers equivalent).
+ for spin_index in xrange(100):
+ # Repeat the function call, to simulate minimisation.
+ for i in xrange(iter):
+ chi2 = C1.calc(C1.params)
print("chi2 single:", chi2)
@@ -505,4 +507,4 @@
#model = C1.calc(params)
#print(model)
-test_reshape()
+test_reshape()
Modified:
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_expanded.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_expanded.py?rev=24087&r1=24086&r2=24087&view=diff
==============================================================================
---
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_expanded.py
(original)
+++
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_ns_cpmg_2site_expanded.py
Wed Jun 18 15:18:50 2014
@@ -444,9 +444,11 @@
# Instantiate class
C1 = Profile(num_spins=num_spins, model=model, r2a=5.0, r2b=10.0,
dw=3.0, pA=0.9, kex=1000.0, spins_params=['r2a', 'r2b', 'dw', 'pA', 'kex'])
- # Repeat the function call, to simulate minimisation.
- for i in xrange(iter):
- chi2 = C1.calc(C1.params)
+ # Loop 100 times for each spin in the clustered analysis (to make the
timing numbers equivalent).
+ for spin_index in xrange(100):
+ # Repeat the function call, to simulate minimisation.
+ for i in xrange(iter):
+ chi2 = C1.calc(C1.params)
print("chi2 single:", chi2)
Modified:
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_tsmfk01.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_tsmfk01.py?rev=24087&r1=24086&r2=24087&view=diff
==============================================================================
---
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_tsmfk01.py
(original)
+++
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_tsmfk01.py
Wed Jun 18 15:18:50 2014
@@ -443,9 +443,11 @@
# Instantiate class
C1 = Profile(num_spins=num_spins, model=model, r2a=5.0, r2b=10.0,
dw=3.0, pA=0.9, kex=1000.0, spins_params=['r2a', 'r2b', 'dw', 'pA', 'kex'])
- # Repeat the function call, to simulate minimisation.
- for i in xrange(iter):
- chi2 = C1.calc(C1.params)
+ # Loop 100 times for each spin in the clustered analysis (to make the
timing numbers equivalent).
+ for spin_index in xrange(100):
+ # Repeat the function call, to simulate minimisation.
+ for i in xrange(iter):
+ chi2 = C1.calc(C1.params)
print("chi2 single:", chi2)
r24087 - /branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/