Author: tlinnet
Date: Sun Jun 8 22:44:17 2014
New Revision: 23744
URL: http://svn.gna.org/viewcvs/relax?rev=23744&view=rev
Log:
Merged revisions 23743 via svnmerge from
svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk
........
r23743 | tlinnet | 2014-06-08 22:42:55 +0200 (Sun, 08 Jun 2014) | 6 lines
Updated profiling text for CR72 model.
Now it is tested for 3 fields.
This is related to:
Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion
models for Clustered analysis.
........
Modified:
branches/disp_spin_speed/ (props changed)
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.txt
Propchange: branches/disp_spin_speed/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jun 8 22:44:17 2014
@@ -1 +1 @@
-/trunk:1-23720
+/trunk:1-23743
Modified:
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.txt
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.txt?rev=23744&r1=23743&r2=23744&view=diff
==============================================================================
---
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.txt
(original)
+++
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.txt
Sun Jun 8 22:44:17 2014
@@ -4,47 +4,115 @@
Python Distribution -- Python 2.7.3 |EPD 7.3-2 (32-bit)|
Timing for:
-2 fields
-20 dispersion points
+3 fields
+('sfrq: ', 600000000.0, 'number of cpmg frq', 15, array([ 2., 6., 10., 14.,
18., 22., 26., 30., 34., 38., 42., 46., 50., 54., 58.]))
+('sfrq: ', 800000000.0, 'number of cpmg frq', 20, array([ 2., 6., 10., 14.,
18., 22., 26., 30., 34., 38., 42., 46., 50., 54., 58., 62., 66., 70., 74.,
78.]))
+('sfrq: ', 900000000.0, 'number of cpmg frq', 22, array([ 2., 6., 10., 14.,
18., 22., 26., 30., 34., 38., 42., 46., 50., 54., 58., 62., 66., 70., 74.,
78., 82., 86.]))
+
iterations of function call: 1000
Timed for simulating 1 or 100 clustered spins.
+Find tags:
svn ls "^/tags"
+svn switch ^/tags/3.2.2
-########
-For tag 3.2.2
-svn switch ^/tags/3.2.2
-########
+##############################################################################################
+ ncalls tottime percall cumtime percall filename:lineno(function)
+
+############################
+For disp_spin_speed r23742 #
+############################
+1 spin:
+ 1 0.000 0.000 0.687 0.687 <string>:1(<module>)
+ 1 0.001 0.001 0.687 0.687 pf:419(single)
+ 1000 0.002 0.000 0.682 0.001 pf:405(calc)
+ 1000 0.008 0.000 0.680 0.001
relax_disp.py:981(func_CR72_full)
+ 1000 0.121 0.000 0.666 0.001
relax_disp.py:503(calc_CR72_chi2)
+ 1003 0.157 0.000 0.360 0.000 cr72.py:101(r2eff_CR72)
+ 23029 0.187 0.000 0.187 0.000 {numpy.core.multiarray.array}
+ 4003 0.118 0.000 0.180 0.000 numeric.py:1862(allclose)
+
+100 spins:
+ 1 0.000 0.000 29.834 29.834 <string>:1(<module>)
+ 1 0.003 0.003 29.834 29.834 pf:441(cluster)
+ 1000 0.003 0.000 29.712 0.030 pf:405(calc)
+ 1000 0.012 0.000 29.709 0.030
relax_disp.py:981(func_CR72_full)
+ 1000 9.752 0.010 29.682 0.030
relax_disp.py:503(calc_CR72_chi2)
+ 1510108 17.942 0.000 17.942 0.000 {numpy.core.multiarray.array}
+ 1300 1.300 0.001 1.990 0.002 cr72.py:101(r2eff_CR72)
+ 4300 0.489 0.000 0.625 0.000 numeric.py:1862(allclose)
+
+############################
+For trunk r23720 #
+############################
+1 spin:
+ 1 0.000 0.000 0.565 0.565 <string>:1(<module>)
+ 1 0.001 0.001 0.565 0.565 pf:419(single)
+ 1000 0.002 0.000 0.561 0.001 pf:405(calc)
+ 1000 0.008 0.000 0.558 0.001
relax_disp.py:908(func_CR72_full)
+ 1000 0.054 0.000 0.545 0.001
relax_disp.py:456(calc_CR72_chi2)
+ 3003 0.387 0.000 0.430 0.000 cr72.py:100(r2eff_CR72)
+ 3000 0.042 0.000 0.057 0.000 chi2.py:32(chi2)
+ 6003 0.007 0.000 0.030 0.000 fromnumeric.py:1379(sum)
+ 6003 0.019 0.000 0.019 0.000 {method 'sum' of
'numpy.ndarray' objects}
+
+100 spins:
+ 1 0.000 0.000 54.982 54.982 <string>:1(<module>)
+ 1 0.002 0.002 54.982 54.982 pf:441(cluster)
+ 1000 0.004 0.000 54.895 0.055 pf:405(calc)
+ 1000 0.012 0.000 54.892 0.055
relax_disp.py:908(func_CR72_full)
+ 1000 5.353 0.005 54.865 0.055
relax_disp.py:456(calc_CR72_chi2)
+ 300300 39.112 0.000 43.429 0.000 cr72.py:100(r2eff_CR72)
+ 300000 4.218 0.000 5.740 0.000 chi2.py:32(chi2)
+ 600300 0.700 0.000 3.049 0.000 fromnumeric.py:1379(sum)
+ 600300 1.952 0.000 1.952 0.000 {method 'sum' of
'numpy.ndarray' objects}
+
+############################
+For tag 3.2.2 #
+svn switch ^/tags/3.2.2 #
+############################
1 spin:
- ncalls tottime percall cumtime percall filename:lineno(function)
- 2000 0.168 0.000 0.198 0.000 cr72.py:100(r2eff_CR72)
- 1000 0.040 0.000 0.280 0.000
relax_disp.py:456(calc_CR72_chi2)
- 2000 0.028 0.000 0.039 0.000 chi2.py:32(chi2)
+ 1 0.000 0.000 0.544 0.544 <string>:1(<module>)
+ 1 0.001 0.001 0.544 0.544 pf:419(single)
+ 1000 0.002 0.000 0.539 0.001 pf:405(calc)
+ 1000 0.004 0.000 0.537 0.001
relax_disp.py:907(func_CR72_full)
+ 1000 0.052 0.000 0.534 0.001
relax_disp.py:456(calc_CR72_chi2)
+ 3003 0.379 0.000 0.422 0.000 cr72.py:100(r2eff_CR72)
+ 3000 0.041 0.000 0.056 0.000 chi2.py:32(chi2)
+ 6003 0.007 0.000 0.030 0.000 fromnumeric.py:1379(sum)
100 spins:
- ncalls tottime percall cumtime percall filename:lineno(function)
- 200000 16.810 0.000 19.912 0.000 cr72.py:100(r2eff_CR72)
- 1000 4.185 0.004 28.518 0.029
relax_disp.py:456(calc_CR72_chi2)
- 200000 3.018 0.000 4.144 0.000 chi2.py:32(chi2)
+ 1 0.000 0.000 55.271 55.271 <string>:1(<module>)
+ 1 0.002 0.002 55.271 55.271 pf:441(cluster)
+ 1000 0.003 0.000 55.168 0.055 pf:405(calc)
+ 1000 0.005 0.000 55.165 0.055
relax_disp.py:907(func_CR72_full)
+ 1000 5.417 0.005 55.160 0.055
relax_disp.py:456(calc_CR72_chi2)
+ 300300 39.179 0.000 43.577 0.000 cr72.py:100(r2eff_CR72)
+ 300000 4.293 0.000 5.823 0.000 chi2.py:32(chi2)
+ 600300 0.706 0.000 3.076 0.000 fromnumeric.py:1379(sum)
-
-########
-For tag 3.2.1
-svn switch ^/tags/3.2.1
-########
-
+############################
+For tag 3.2.1 #
+svn switch ^/tags/3.2.1 #
+############################
1 spin:
- ncalls tottime percall cumtime percall filename:lineno(function)
- 2000 0.696 0.000 0.697 0.000 cr72.py:98(r2eff_CR72)
- 1000 0.038 0.000 0.781 0.001
relax_disp.py:456(calc_CR72_chi2)
- 2000 0.031 0.000 0.043 0.000 chi2.py:32(chi2)
+ 1 0.000 0.000 1.183 1.183 <string>:1(<module>)
+ 1 0.001 0.001 1.183 1.183 pf:419(single)
+ 1000 0.002 0.000 1.178 0.001 pf:405(calc)
+ 1000 0.004 0.000 1.176 0.001
relax_disp.py:907(func_CR72_full)
+ 1000 0.057 0.000 1.172 0.001
relax_disp.py:456(calc_CR72_chi2)
+ 3003 1.041 0.000 1.044 0.000 cr72.py:98(r2eff_CR72)
+ 3000 0.049 0.000 0.067 0.000 chi2.py:32(chi2)
+ 3000 0.004 0.000 0.019 0.000 fromnumeric.py:1379(sum)
100 spins:
- ncalls tottime percall cumtime percall filename:lineno(function)
- 200000 75.880 0.000 76.078 0.000 cr72.py:98(r2eff_CR72)
- 1000 4.201 0.004 85.519 0.086
relax_disp.py:456(calc_CR72_chi2)
- 200000 3.513 0.000 4.940 0.000 chi2.py:32(chi2)
-
-
+ 1 0.000 0.000 102.754 102.754 <string>:1(<module>)
+ 1 0.002 0.002 102.754 102.754 pf:441(cluster)
+ 1000 0.003 0.000 102.576 0.103 pf:405(calc)
+ 1000 0.006 0.000 102.574 0.103
relax_disp.py:907(func_CR72_full)
+ 1000 4.999 0.005 102.568 0.103
relax_disp.py:456(calc_CR72_chi2)
+ 300300 91.151 0.000 91.401 0.000 cr72.py:98(r2eff_CR72)
+ 300000 4.316 0.000 5.952 0.000 chi2.py:32(chi2)
+ 300000 0.369 0.000 1.636 0.000 fromnumeric.py:1379(sum)
r23744 - in /branches/disp_spin_speed: ./ test_suite/shared_data/dispersion/profiling/profiling_cr72.txt