r7723 - in /branches/multi_processor_merge/multi: commands.py mpi4py_processor.py processor.py -- October 15, 2008 - 23:05

Author: bugman
Date: Wed Oct 15 23:05:57 2008
New Revision: 7723

URL: http://svn.gna.org/viewcvs/relax?rev=7723&view=rev
Log:
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
.....


Modified:
    branches/multi_processor_merge/multi/commands.py
    branches/multi_processor_merge/multi/mpi4py_processor.py
    branches/multi_processor_merge/multi/processor.py

Modified: branches/multi_processor_merge/multi/commands.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/commands.py?rev=7723&r1=7722&r2=7723&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/commands.py (original)
+++ branches/multi_processor_merge/multi/commands.py Wed Oct 15 23:05:57 2008
@@ -26,7 +26,7 @@
         processor.return_object(result)
 
 #not quite a momento so a memo
-class MF_completion_memo(Memo):
+class MF_memo(Memo):
     def __init__(self,model_free,index,sim_index,run,param_set,scaling):
         self.index = index
         self.sim_index=sim_index
@@ -36,7 +36,7 @@
         self.scaling=scaling
 
 
-class MF_completion_command(Result_command):
+class MF_result_command(Result_command):
     def __init__(self,memo_id,param_vector, func, iter, fc, gc, hc, warning):
         
super(MF_completion_command,self).__init__(completed=True,memo_id=memo_id)
         self.memo_id=memo_id

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=7723&r1=7722&r2=7723&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/mpi4py_processor.py (original)
+++ branches/multi_processor_merge/multi/mpi4py_processor.py Wed Oct 15 
23:05:57 2008
@@ -27,6 +27,7 @@
 
                  3. choose another multi processor method to give to the
                     --multi command line flag\n'''
+    #FIXME dedent not working
     msg=textwrap.dedent(msg)
     sys.stderr.write(msg)
     sys.stderr.write('exiting...\n\n')

Modified: branches/multi_processor_merge/multi/processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/processor.py?rev=7723&r1=7722&r2=7723&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/processor.py (original)
+++ branches/multi_processor_merge/multi/processor.py Wed Oct 15 23:05:57 2008
@@ -38,7 +38,6 @@
     def run(self,processor):
         pass
 
-#FIXME do some inheritance
 
 
 class Memo(object):