Author: bugman
Date: Tue Aug 16 21:05:26 2011
New Revision: 14393
URL: http://svn.gna.org/viewcvs/relax?rev=14393&view=rev
Log:
Merged revisions 14372,14374,14376,14386-14388,14390-14391 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
................
r14372 | bugman | 2011-08-12 12:40:58 +0200 (Fri, 12 Aug 2011) | 14 lines
Merged the changes to the CHANGES file from the 1.3.11 tag.
The command used was:
svn merge -r14370:14371 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/1.3.11
.....
r14371 | bugman | 2011-08-12 12:36:47 +0200 (Fri, 12 Aug 2011) | 3 lines
Changed paths:
M /tags/1.3.11/docs/CHANGES
Updated the CHANGES file for relax version 1.3.11.
.....
................
r14374 | bugman | 2011-08-12 14:26:44 +0200 (Fri, 12 Aug 2011) | 3 lines
Fix to the structure.read_xyz user function docstring so that the user
manual can be compiled.
................
r14376 | bugman | 2011-08-12 14:47:07 +0200 (Fri, 12 Aug 2011) | 3 lines
Updated the release checklist to include the bundling of bmrblib
(http://gna.org/projects/bmrblib).
................
r14386 | bugman | 2011-08-16 11:40:55 +0200 (Tue, 16 Aug 2011) | 3 lines
Initialized merge tracking via "svnmerge" with revisions "1-5969" from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor_merge
................
r14387 | bugman | 2011-08-16 13:41:16 +0200 (Tue, 16 Aug 2011) | 1608 lines
Merged revisions
7709-7727,7729,7732,7734-7738,7740,7745-7783,7794,7808-7836,7838-7851,7853-7865,7875,9408,9448-9453,9997,10119-10156,10159-10177,10189-10196,10198-10203,10758,10760-10765,10790-10793,10830-10837,10840,10844,10861,10864,10867-10870,12420-12421
via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor_merge
........
r7709 | bugman | 2008-10-15 21:40:06 +0200 (Wed, 15 Oct 2008) | 18 lines
Manually merged r3208 from the multi_processor branch.
The command used was:
svn merge -r3207:3208
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
This marks the start of an interesting porting experience!
.....
r3208 | varioustoxins | 2007-03-16 12:47:30 +0100 (Fri, 16 Mar 2007) |
3 lines
Changed paths:
M /branches/multi_processor/relax
initial work to add multiprocessor startup and refactoring of main Relax
class
.....
........
r7710 | bugman | 2008-10-15 21:46:10 +0200 (Wed, 15 Oct 2008) | 18 lines
Manually ported r3210 from the multi_processor branch.
The command used was:
svn merge -r3209:3210
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
.....
r3210 | varioustoxins | 2007-03-16 15:22:49 +0100 (Fri, 16 Mar 2007) |
2 lines
Changed paths:
A /branches/multi_processor/multi
A /branches/multi_processor/multi/__init__.py
A /branches/multi_processor/multi/mpi4py_processor.py
A /branches/multi_processor/multi/uni_processor.py
M /branches/multi_processor/relax
updates to get first mpi initialization working
.....
........
r7711 | bugman | 2008-10-15 21:48:43 +0200 (Wed, 15 Oct 2008) | 3 lines
Added a change which occurred in r3208 of the multi_processor branch but
was somehow not ported.
........
r7712 | bugman | 2008-10-15 21:51:39 +0200 (Wed, 15 Oct 2008) | 15 lines
Manually merge r3235 from the multi_processor branch.
The command used was:
svn merge -r3234:3235
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
.....
r3235 | varioustoxins | 2007-03-19 11:57:19 +0100 (Mon, 19 Mar 2007) |
4 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
consoles and scripts now exit cleanly (override sys.exit) interactive
console works!
.....
........
r7713 | bugman | 2008-10-15 21:54:17 +0200 (Wed, 15 Oct 2008) | 16 lines
Manually merged r3236 from the multi_processor branch.
The command used was:
svn merge -r3235:3236
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
This contains a bit more than the log message indicates, hence why this
was ported!
.....
r3236 | varioustoxins | 2007-03-19 11:58:24 +0100 (Mon, 19 Mar 2007) |
3 lines
Changed paths:
M /branches/multi_processor/relax
marked more threading code for reletion
.....
........
r7714 | bugman | 2008-10-15 21:55:41 +0200 (Wed, 15 Oct 2008) | 15 lines
Manually ported r3237 from the multi_processor branch.
The command used was:
svn merge -r3236:3237
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
.....
r3237 | varioustoxins | 2007-03-19 16:13:15 +0100 (Mon, 19 Mar 2007) |
2 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/relax
implimentation of basic command structure and simplistic processor name
command
.....
........
r7715 | bugman | 2008-10-15 22:04:11 +0200 (Wed, 15 Oct 2008) | 16 lines
Manually ported r3238 from the multi_processor branch.
The command used was:
svn merge -r3237:3238
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
.....
r3238 | varioustoxins | 2007-03-19 23:23:33 +0100 (Mon, 19 Mar 2007) |
3 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/relax
updates to create a better inter process command passing mechanism
and initiate relax in what might possibly be a sane state!
.....
........
r7716 | bugman | 2008-10-15 22:05:14 +0200 (Wed, 15 Oct 2008) | 16 lines
Manually ported r3239 from the multi_processor branch.
The command used was:
svn merge -r3238:3239
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
.....
r3239 | varioustoxins | 2007-03-22 09:20:55 +0100 (Thu, 22 Mar 2007) |
3 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/relax
multi processor fixes for proper command queing with optional
load balancing iexception support and segmented results
.....
........
r7717 | bugman | 2008-10-15 22:10:31 +0200 (Wed, 15 Oct 2008) | 17 lines
Partially ported r3241 from the multi_processor branch.
The command used was:
svn merge -r3240:3241
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
The changes to maths_fns/mf.py didn't need to be ported across.
.....
r3241 | varioustoxins | 2007-03-27 15:35:16 +0200 (Tue, 27 Mar 2007) |
2 lines
Changed paths:
M /branches/multi_processor/maths_fns/mf.py
M /branches/multi_processor/multi/mpi4py_processor.py
installation of simplistic remote minimisation command
.....
........
r7718 | bugman | 2008-10-15 22:40:20 +0200 (Wed, 15 Oct 2008) | 16 lines
Manually ported r3242 from the multi_processor branch.
The command used was:
svn merge -r3241:3242
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor/specific_fns/model_free.py
specific_fns/model_free/mf_minimise.py
This was a bugger!
....
r3242 | varioustoxins | 2007-03-27 17:04:02 +0200 (Tue, 27 Mar 2007) |
3 lines
Changed paths:
M /branches/multi_processor/specific_fns/model_free.py
changes to add minimise command processing for multiprocessing
....
........
r7719 | bugman | 2008-10-15 22:53:04 +0200 (Wed, 15 Oct 2008) | 23 lines
Manually ported r3243 from the multi_processor branch.
The 2 commands used were:
svn merge -r3242:3243
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
svn merge -r3242:3243
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor/specific_fns/model_free.py
specific_fns/model_free/mf_minimise.py
This code is becoming horribly broken. This can't be fixed yet as it
will make porting impossible!
.....
r3243 | varioustoxins | 2007-03-29 11:45:22 +0200 (Thu, 29 Mar 2007) |
4 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/multi/uni_processor.py
M /branches/multi_processor/prompt/interpreter.py
M /branches/multi_processor/relax
M /branches/multi_processor/specific_fns/model_free.py
First fully working multi branch with both uniprocessor and mpi4py
support
communication overhead for 18 residues (test_short.py from chris) with
in memory io ~25%
.....
........
r7720 | bugman | 2008-10-15 22:55:11 +0200 (Wed, 15 Oct 2008) | 17 lines
Manually ported r3246 from the multi_processor branch.
The command used was:
svn merge -r3245:3246
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
.....
r3246 | varioustoxins | 2007-03-29 19:43:49 +0200 (Thu, 29 Mar 2007) |
3 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
A /branches/multi_processor/multi/processor.py
M /branches/multi_processor/multi/uni_processor.py
corrections to remove unexpected calls of from mpi4py import MPI in
mpi4py_processor from uniprocessor leading to an unexpected requirement
of mpi4py
.....
........
r7721 | bugman | 2008-10-15 22:57:55 +0200 (Wed, 15 Oct 2008) | 19 lines
Manually ported r3248 from the multi_processor branch.
The 2 commands used were:
svn merge -r3247:3248
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
svn merge -r3247:3248
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor/specific_fns/model_free.py
specific_fns/model_free/mf_minimise.py
.....
r3248 | varioustoxins | 2007-03-29 21:47:17 +0200 (Thu, 29 Mar 2007) |
4 lines
Changed paths:
A /branches/multi_processor/multi/commands.py
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/multi/processor.py
M /branches/multi_processor/specific_fns/model_free.py
more modifications to remove accidental dependances on mpi4py in
uni_processor
creation of command module
.....
........
r7722 | bugman | 2008-10-15 23:04:33 +0200 (Wed, 15 Oct 2008) | 19 lines
Manually ported r3249 from the multi_processor branch.
The 2 commands used were:
svn merge -r3248:3249
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
svn merge -r3248:3249
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor/specific_fns/model_free.py
specific_fns/model_free/mf_minimise.py
.....
r3249 | varioustoxins | 2007-03-30 09:00:39 +0200 (Fri, 30 Mar 2007) |
4 lines
Changed paths:
M /branches/multi_processor/multi/commands.py
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/multi/uni_processor.py
M /branches/multi_processor/specific_fns/model_free.py
more work to remove specious calls to module mpi4py when starting
uniprocessor version feedback prints correctly
.....
........
r7723 | bugman | 2008-10-15 23:05:57 +0200 (Wed, 15 Oct 2008) | 16 lines
Manually ported r3250 from the multi_processor branch.
The command used was:
svn merge -r3249:3250
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
.....
r3250 | varioustoxins | 2007-03-30 09:32:44 +0200 (Fri, 30 Mar 2007) |
3 lines
Changed paths:
M /branches/multi_processor/multi/commands.py
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/multi/processor.py
Minor name changes on MF memo slave and result commands
.....
........
r7724 | bugman | 2008-10-15 23:09:28 +0200 (Wed, 15 Oct 2008) | 17 lines
Manually ported r3251 from the multi_processor branch.
The 2 commands used were:
svn merge -r3250:3251
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
svn merge -r3250:3251
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor/specific_fns/model_free.py
specific_fns/model_free/mf_minimise.py
.....
r3251 | varioustoxins | 2007-03-30 09:53:32 +0200 (Fri, 30 Mar 2007) |
2 lines
Changed paths:
M /branches/multi_processor/multi/commands.py
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/specific_fns/model_free.py
MF class name fixes also now works on python 2.3.3
.....
........
r7725 | bugman | 2008-10-15 23:10:22 +0200 (Wed, 15 Oct 2008) | 17 lines
Manually ported r3252 from the multi_processor branch.
The command used was:
svn merge -r3251:3252
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
.....
r3252 | varioustoxins | 2007-03-30 09:57:54 +0200 (Fri, 30 Mar 2007) |
2 lines
Changed paths:
M /branches/multi_processor/multi/commands.py
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/multi/processor.py
M /branches/multi_processor/multi/uni_processor.py
applied GPL v2 licenses
.....
........
r7726 | bugman | 2008-10-15 23:12:00 +0200 (Wed, 15 Oct 2008) | 17 lines
Manually ported r3253 from the multi_processor branch.
The command used was:
svn merge -r3252:3253
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
.....
r3253 | varioustoxins | 2007-03-30 10:58:03 +0200 (Fri, 30 Mar 2007) |
2 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/multi/processor.py
M /branches/multi_processor/multi/uni_processor.py
M /branches/multi_processor/relax
'classification' of Processor classes
.....
........
r7727 | bugman | 2008-10-15 23:12:52 +0200 (Wed, 15 Oct 2008) | 15 lines
Manually ported r3254 from the multi_processor branch.
The command used was:
svn merge -r3253:3254
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
.....
r3254 | varioustoxins | 2007-03-30 11:26:11 +0200 (Fri, 30 Mar 2007) |
2 lines
Changed paths:
M /branches/multi_processor/multi/commands.py
M /branches/multi_processor/multi/uni_processor.py
corrections to keyword passing to dict.update()
.....
........
r7729 | bugman | 2008-10-15 23:32:04 +0200 (Wed, 15 Oct 2008) | 23 lines
Manually ported r3261 from the multi_processor branch.
The 2 commands used were:
svn merge -r3260:3261
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
svn merge -r3260:3261
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor/specific_fns/model_free.py
specific_fns/model_free/mf_minimise.py
.....
r3261 | varioustoxins | 2007-04-07 22:11:21 +0200 (Sat, 07 Apr 2007) |
4 lines
Changed paths:
M /branches/multi_processor/generic_fns/minimise.py
A /branches/multi_processor/multi/PrependStringIO.py
M /branches/multi_processor/multi/commands.py
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/multi/processor.py
M /branches/multi_processor/prompt/minimisation.py
M /branches/multi_processor/specific_fns/model_free.py
Major update - monte carlo simulations supported (trivially)
also implimented: chunky queues, exception throwing on slaves, and rank
annotated output. note uniprocessor support currently broken.
.....
........
r7732 | bugman | 2008-10-16 00:15:01 +0200 (Thu, 16 Oct 2008) | 19 lines
Merged all that could be merged from r3266.
The 2 commands used were:
svn merge -r3265:3266
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
svn merge -r3265:3266
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor/specific_fns/model_free.py
specific_fns/model_free/mf_minimise.py
The grid search code was skipped as it is in minfx
(https://gna.org/projects/minfx/).
.....
r3266 | varioustoxins | 2007-04-12 18:48:28 +0200 (Thu, 12 Apr 2007) |
2 lines
Changed paths:
M /branches/multi_processor/minimise/grid.py
M /branches/multi_processor/multi/commands.py
M /branches/multi_processor/specific_fns/model_free.py
partial integration of distributed grid code (everything broken)
.....
........
r7734 | bugman | 2008-10-16 00:17:30 +0200 (Thu, 16 Oct 2008) | 20 lines
Merged all that could be merged from r3267.
The 2 commands used were:
svn merge -r3266:3267
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
svn merge -r3266:3267
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor/specific_fns/model_free.py
specific_fns/model_free/mf_minimise.py
The grid search code was skipped as it is in minfx
(https://gna.org/projects/minfx/).
.....
r3267 | varioustoxins | 2007-04-17 00:54:48 +0200 (Tue, 17 Apr 2007) |
2 lines
Changed paths:
M /branches/multi_processor/minimise/generic.py
M /branches/multi_processor/minimise/grid.py
M /branches/multi_processor/multi/commands.py
M /branches/multi_processor/specific_fns/model_free.py
fully operative grid search (uniprocessor broken)
.....
........
r7735 | bugman | 2008-10-16 00:21:57 +0200 (Thu, 16 Oct 2008) | 19 lines
Manually ported r3268 from the multi_processor branch.
The 2 commands used were:
svn merge -r3267:3268
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
svn merge -r3267:3268
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor/specific_fns/model_free.py
specific_fns/model_free/mf_minimise.py
.....
r3268 | varioustoxins | 2007-04-17 14:39:25 +0200 (Tue, 17 Apr 2007) |
2 lines
Changed paths:
M /branches/multi_processor/multi/commands.py
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/multi/processor.py
M /branches/multi_processor/multi/uni_processor.py
M /branches/multi_processor/specific_fns/model_free.py
almost feature complete mpi4py and uni processor versions of relax
.....
........
r7736 | bugman | 2008-10-16 00:24:12 +0200 (Thu, 16 Oct 2008) | 32 lines
Manually ported r3269, r3270, and r3271 from the multi_processor branch.
The command used was:
svn merge -r3268:3271
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .
.....
r3271 | varioustoxins | 2007-04-23 13:06:57 +0200 (Mon, 23 Apr 2007) |
3 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
threaded results output to _TRY_ to avoid starving multiprocessor while
waiting for stdio
------------------------------------------------------------------------
r3270 | varioustoxins | 2007-04-21 03:18:39 +0200 (Sat, 21 Apr 2007) |
2 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
forgot to remove sys.exit used in testing
------------------------------------------------------------------------
r3269 | varioustoxins | 2007-04-21 03:17:26 +0200 (Sat, 21 Apr 2007) |
2 lines
Changed paths:
M /branches/multi_processor/multi/PrependStringIO.py
[... 1235 lines stripped ...]
r14393 - in /branches/gui_testing: ./ docs/ generic_fns/ multi/ prompt/ specific_fns/model_free/ test_suite/ test_suite/unit...