r7738 - in /branches/multi_processor_merge: ./ multi/ -- October 16, 2008 - 00:33

Author: bugman
Date: Thu Oct 16 00:33:21 2008
New Revision: 7738

URL: http://svn.gna.org/viewcvs/relax?rev=7738&view=rev
Log:
Manually merged the last of the multi_processor branch.

The command used was:
svn merge -r3274:3296 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .

.....
  r3296 | varioustoxins | 2007-05-16 23:46:21 +0200 (Wed, 16 May 2007) | 2 
lines
  Changed paths:
     M /branches/multi_processor/multi/processor.py

  more documentation strings (completed if buggy for multi.processor)

  ------------------------------------------------------------------------
  r3295 | varioustoxins | 2007-05-15 23:12:10 +0200 (Tue, 15 May 2007) | 2 
lines
  Changed paths:
     M /branches/multi_processor/multi/multi_processor.py
     M /branches/multi_processor/multi/processor.py
     M /branches/multi_processor/specific_fns/model_free.py

  minor improvements and much documentation of the Processor class

  ------------------------------------------------------------------------
  r3283 | varioustoxins | 2007-05-08 21:45:48 +0200 (Tue, 08 May 2007) | 3 
lines
  Changed paths:
     M /branches/multi_processor/multi/mpi4py_processor.py
     M /branches/multi_processor/multi/multi_processor.py
     M /branches/multi_processor/multi/processor.py
     M /branches/multi_processor/relax

  final separation between the multi framework and relax and initial
  documentation of multi.processor

  ------------------------------------------------------------------------
  r3280 | varioustoxins | 2007-05-04 01:07:07 +0200 (Fri, 04 May 2007) | 3 
lines
  Changed paths:
     D /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/multi_processor.py
     A /branches/multi_processor/multi/prependStringIO.py (from 
/branches/multi_processor/multi/PrependStringIO.py:3275)
     M /branches/multi_processor/multi/processor.py
     M /branches/multi_processor/multi/uni_processor.py

  threaded multi processor support written, multi is now beta!
  multi now supports three substrates: mpi4py, uniprocessor, and threads

  ------------------------------------------------------------------------
  r3279 | varioustoxins | 2007-05-02 00:23:25 +0200 (Wed, 02 May 2007) | 3 
lines
  Changed paths:
     M /branches/multi_processor/multi/commands.py
     M /branches/multi_processor/multi/mpi4py_processor.py
     A /branches/multi_processor/multi/multi_processor.py
     M /branches/multi_processor/multi/processor.py
     M /branches/multi_processor/multi/uni_processor.py

  major restructuring to create generic multiprocessor framework legacy
  string based exception handling supported

  ------------------------------------------------------------------------
  r3278 | varioustoxins | 2007-05-01 00:24:05 +0200 (Tue, 01 May 2007) | 3 
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

  correct use of -n command line option, work to give general processor
  base class and simple processor implimentations

  ------------------------------------------------------------------------
  r3277 | varioustoxins | 2007-04-30 15:40:54 +0200 (Mon, 30 Apr 2007) | 3 
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

  Addition of processor based intro string, correction of error in
  Application_callback exceptio_handler named error_handler

  ------------------------------------------------------------------------
  r3276 | varioustoxins | 2007-04-29 23:20:42 +0200 (Sun, 29 Apr 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/processor.py
     M /branches/multi_processor/multi/uni_processor.py
     M /branches/multi_processor/relax

  modifications to make the multi hierachy indepndant of relax; multi can
  now be used to run other multiprocessor tasks (uni processor and mpi
  work)

  ------------------------------------------------------------------------
  r3275 | varioustoxins | 2007-04-28 19:59:04 +0200 (Sat, 28 Apr 2007) | 2 
lines
  Changed paths:
     M /branches/multi_processor/minimise/generic.py
     M /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

  improved output and exception handling
.....


Added:
    branches/multi_processor_merge/multi/multi_processor.py
      - copied unchanged from r3296, 
branches/multi_processor/multi/multi_processor.py
    branches/multi_processor_merge/multi/prependStringIO.py
      - copied unchanged from r3296, 
branches/multi_processor/multi/prependStringIO.py
Removed:
    branches/multi_processor_merge/multi/PrependStringIO.py
Modified:
    branches/multi_processor_merge/multi/commands.py
    branches/multi_processor_merge/multi/mpi4py_processor.py
    branches/multi_processor_merge/multi/processor.py
    branches/multi_processor_merge/multi/uni_processor.py
    branches/multi_processor_merge/relax

[This mail would be too long, it was shortened to contain the URLs only.]

Removed: branches/multi_processor_merge/multi/PrependStringIO.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/PrependStringIO.py?rev=7737&view=auto

Modified: branches/multi_processor_merge/multi/commands.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/commands.py?rev=7738&r1=7737&r2=7738&view=diff

Modified: branches/multi_processor_merge/multi/mpi4py_processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/mpi4py_processor.py?rev=7738&r1=7737&r2=7738&view=diff

Modified: branches/multi_processor_merge/multi/processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/processor.py?rev=7738&r1=7737&r2=7738&view=diff

Modified: branches/multi_processor_merge/multi/uni_processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/uni_processor.py?rev=7738&r1=7737&r2=7738&view=diff

Modified: branches/multi_processor_merge/relax
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/relax?rev=7738&r1=7737&r2=7738&view=diff