r3277 - in /branches/multi_processor: multi/mpi4py_processor.py multi/processor.py multi/uni_processor.py relax -- April 30, 2007 - 15:41

Author: varioustoxins
Date: Mon Apr 30 15:40:54 2007
New Revision: 3277

URL: http://svn.gna.org/viewcvs/relax?rev=3277&view=rev
Log:
Addition of processor based intro string, correction of error in
Application_callback exceptio_handler named error_handler

Modified:
    branches/multi_processor/multi/mpi4py_processor.py
    branches/multi_processor/multi/processor.py
    branches/multi_processor/multi/uni_processor.py
    branches/multi_processor/relax

Modified: branches/multi_processor/multi/mpi4py_processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor/multi/mpi4py_processor.py?rev=3277&r1=3276&r2=3277&view=diff
==============================================================================
--- branches/multi_processor/multi/mpi4py_processor.py (original)
+++ branches/multi_processor/multi/mpi4py_processor.py Mon Apr 30 15:40:54 
2007
@@ -232,6 +232,11 @@
     def processor_size(self):
         return MPI.size -1
 
+    def get_intro_string(self):
+        version_info = MPI.Get_version()
+        return '''MPI running via mpi4py with %d slave processors, mpi 
version = %s.%s''' % (self.processor_size(),version_info[0],version_info[1])
+
+
     def chunk_queue(self,queue):
         lqueue=copy(queue)
         result = []

Modified: branches/multi_processor/multi/processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor/multi/processor.py?rev=3277&r1=3276&r2=3277&view=diff
==============================================================================
--- branches/multi_processor/multi/processor.py (original)
+++ branches/multi_processor/multi/processor.py Mon Apr 30 15:40:54 2007
@@ -49,12 +49,12 @@
     def __init__(self,master):
         self.master=master
         self.init_master = self.default_init_master
-        self.handle_error= self.default_handle_error
+        self.handle_exception= self.default_handle_exception
 
     def default_init_master(self,processor):
         self.master.run()
 
-    def default_handle_error(self,processor,exception):
+    def default_handle_exception(self,processor,exception):
         traceback.print_exc(file=sys.stdout)
         processor.abort()
 
@@ -107,6 +107,10 @@
 
     def processor_size(self):
         raise_unimplimented(self.processor_size())
+
+    def get_intro_string(self):
+        raise_unimplimented(self.get_intro_string)
+
 
     def restore_stdio(self):
         sys.stderr = self.save_stderr

Modified: branches/multi_processor/multi/uni_processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor/multi/uni_processor.py?rev=3277&r1=3276&r2=3277&view=diff
==============================================================================
--- branches/multi_processor/multi/uni_processor.py (original)
+++ branches/multi_processor/multi/uni_processor.py Mon Apr 30 15:40:54 2007
@@ -132,6 +132,8 @@
     def processor_size(self):
         return 1
 
+    def get_intro_string(self):
+        return '''uniprocessor'''
 
 
 

Modified: branches/multi_processor/relax
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor/relax?rev=3277&r1=3276&r2=3277&view=diff
==============================================================================
--- branches/multi_processor/relax (original)
+++ branches/multi_processor/relax Mon Apr 30 15:40:54 2007
@@ -471,6 +471,8 @@
             self.intro_string = self.intro_string + "and comes with 
absolutely no warranty.  For details type 'GPL'.  Assistance in using this 
program\n"
             self.intro_string = self.intro_string + "can be accessed by 
typing 'help'.\n"
 
+        self.intro_string  = self.intro_string  + '\nprocessor = ' + 
self.processor.get_intro_string() + '\n'
+
 
     def spacing(self, string, width=100):
         """Function for formatting the string to be centred to 100 spaces."""