Author: bugman Date: Wed Aug 17 16:32:45 2011 New Revision: 14396 URL: http://svn.gna.org/viewcvs/relax?rev=14396&view=rev Log: Removed some used, commented out code. Modified: 1.3/multi/multi_processor_base.py Modified: 1.3/multi/multi_processor_base.py URL: http://svn.gna.org/viewcvs/relax/1.3/multi/multi_processor_base.py?rev=14396&r1=14395&r2=14396&view=diff ============================================================================== --- 1.3/multi/multi_processor_base.py (original) +++ 1.3/multi/multi_processor_base.py Wed Aug 17 16:32:45 2011 @@ -144,47 +144,17 @@ def post_run(self): + self.restore_stdio() -# if self.processor_size() > 1: -# if id(sys.stderr) != id(sys.__stderr__): -# sys.stderr.close() -# sys.stderr = sys.__stderr__ -# -# if id(sys.stdout) != id(sys.__stdout__): -# sys.stdout.close() -# sys.stdout = sys.__stdout__ - super(Multi_processor, self).post_run() def pre_run(self): + super(Multi_processor, self).pre_run() self.capture_stdio() -# self.save_stdout = sys.stdout -# self.save_stderr = sys.stderr - -# if self.processor_size() > 1 and self.rank() == 0: -# -# pre_string = 'M'*self.rank_format_string_width() -# -# sys.stdout = PrependOut(pre_string + ' S> ', sys.stdout) -# #FIXME: seems to be that writing to stderr results leeds to incorrect serialisation of output -# sys.stderr = PrependOut(pre_string + ' E> ', sys.__stdout__) -# -# else: -# # add debug flag or extra channels that output immediately -# if self.processor_size() > 1: -# pre_string = self.rank_format_string() % self.rank() -# stderr_string = ' E> ' -# stdout_string = ' S> ' -# else: -# pre_string = '' -# stderr_string = '' -# stdout_string = '' -# sys.stdout = PrependStringIO(pre_string + stdout_string) -# sys.stderr = PrependStringIO(pre_string + stderr_string, target_stream=sys.stdout) #FIXME: fill out generic result processing move to processor