Author: bugman
Date: Fri Jun 6 09:52:48 2014
New Revision: 23679
URL: http://svn.gna.org/viewcvs/relax?rev=23679&view=rev
Log:
Merged revisions 23651,23654,23657-23658,23662,23666-23667 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r23651 | tlinnet | 2014-06-05 14:19:55 +0200 (Thu, 05 Jun 2014) | 52 lines
Added profiling script for testing the lib/dispersion/cr72.py file.
This script creates the relax datastructures, and issues the call to the
target function.
It was discussed in:
http://thread.gmane.org/gmane.science.nmr.relax.devel/6022.
--------
Checked on MacBook Pro
2.4 GHz Intel Core i5
8 GB 1067 Mhz DDR3 RAM.
Python Distribution -- Python 2.7.3 |EPD 7.3-2 (32-bit)|
Timing for:
2 fields
20 dispersion points
iterations of function call: 1000
Timed for simulating 1 or 100 clustered spins.
svn ls "^/tags"
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)
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)
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)
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)
........
r23654 | bugman | 2014-06-05 14:47:46 +0200 (Thu, 05 Jun 2014) | 3 lines
Changed the order of some instructions in the release checklist document.
........
r23657 | bugman | 2014-06-05 15:09:54 +0200 (Thu, 05 Jun 2014) | 6 lines
Backported the relax 3.2.2 CHANGES file changes to trunk.
The command used was:
svn merge -r23651:23652 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/3.2.2 .
........
r23658 | bugman | 2014-06-05 15:10:38 +0200 (Thu, 05 Jun 2014) | 3 lines
Added proper sectioning to the release checklist document.
........
r23662 | bugman | 2014-06-05 15:54:30 +0200 (Thu, 05 Jun 2014) | 3 lines
Added the upload script to the release checklist document.
........
r23666 | bugman | 2014-06-05 18:55:47 +0200 (Thu, 05 Jun 2014) | 6 lines
Modified the Sequence GUI input element used for the user function list
arguments.
The first column is now of fixed with when titles are supplied. Previously
when supplying titles,
the width would be tiny and no text would be visible.
........
r23667 | bugman | 2014-06-05 18:57:37 +0200 (Thu, 05 Jun 2014) | 6 lines
Added titles for all 3D coordinate user function arguments.
This is for the Sequence GUI input element, and affects the
frame_order.average_position,
n_state_model.CoM and paramag.centre user functions.
........
Added:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/
- copied from r23667, trunk/test_suite/shared_data/dispersion/profiling/
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/docs/CHANGES
branches/frame_order_cleanup/docs/Release_Checklist
branches/frame_order_cleanup/gui/input_elements/sequence.py
branches/frame_order_cleanup/user_functions/n_state_model.py
branches/frame_order_cleanup/user_functions/paramag.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/frame_order_cleanup/docs/CHANGES
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/CHANGES?rev=23679&r1=23678&r2=23679&view=diff
Modified: branches/frame_order_cleanup/docs/Release_Checklist
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/Release_Checklist?rev=23679&r1=23678&r2=23679&view=diff
Modified: branches/frame_order_cleanup/gui/input_elements/sequence.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/gui/input_elements/sequence.py?rev=23679&r1=23678&r2=23679&view=diff
Modified: branches/frame_order_cleanup/user_functions/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/user_functions/n_state_model.py?rev=23679&r1=23678&r2=23679&view=diff
Modified: branches/frame_order_cleanup/user_functions/paramag.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/user_functions/paramag.py?rev=23679&r1=23678&r2=23679&view=diff
r23679 - in /branches/frame_order_cleanup: ./ docs/ gui/input_elements/ test_suite/shared_data/dispersion/profiling/ user_fu...