Hi, I think that with the number of functions and methods in the 'multi' directory (71 as of r3254), writing unit tests will significantly help in debugging. With the unit test framework you have set up Gary, writing these tests is very easy. I've actually started to use the framework to write the tests before I even implement the code. That's what I did with the tokenise() and parse_token() functions in the 1.3 line and as soon as all tests pass, I knew that the problem was solved. Using the script 'svnmerge.py' you should be able to easily port just the revisions relating to the unit test framework in the 1.3 line and then have access to the framework to make your life easier :)
Cheers, Edward On 3/30/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
Author: varioustoxins Date: Fri Mar 30 10:58:03 2007 New Revision: 3253 URL: http://svn.gna.org/viewcvs/relax?rev=3253&view=rev Log: 'classification' of Processor classes 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=3253&r1=3252&r2=3253&view=diff ============================================================================== --- branches/multi_processor/multi/mpi4py_processor.py (original) +++ branches/multi_processor/multi/mpi4py_processor.py Fri Mar 30 10:58:03 2007 @@ -26,12 +26,12 @@ import sys import os import math -import time,datetime import textwrap -from multi.processor import Memo,Slave_command +from multi.processor import Processor,Memo,Slave_command from multi.processor import Result,Result_command,Result_string from multi.commands import Exit_command + @@ -95,7 +95,7 @@ #FIXME do some inheritance -class Mpi4py_processor: +class Mpi4py_processor(Processor): @@ -124,7 +124,7 @@ self.memo_map.clear() def assert_on_master(self): - if MPI.rank != 0: + if self.on_slave(): msg = 'running on slave when expected master with MPI.rank == 0, rank was %d'% MPI.rank raise Exception(msg) @@ -141,9 +141,7 @@ - def run_command_globally(self,command): - queue = [command for i in range(1,MPI.size)] - self.run_command_queue(queue) + def run_command_queue(self,queue): self.assert_on_master() @@ -191,23 +189,19 @@ raise Exception(message) - def pre_run(self): - self.start_time = time.time() - - def post_run(self): - end_time = time.time() - time_diff= end_time - start_time - time_delta = datetime.timedelta(seconds=time_diff) - time_delta_str = time_delta.__str__() - (time_delta_str,millis) = time_delta_str.rsplit(sep='.',maxsplit=1) - print 'overall runtime: ' + time_delta_str + '\n' + + def on_master(self): + result = False + if MPI.rank ==0: + result = True + return result def run(self): - if MPI.rank ==0: + if self.on_master(): self.pre_run() self.relax_instance.run() self.post_run() Modified: branches/multi_processor/multi/processor.py URL: http://svn.gna.org/viewcvs/relax/branches/multi_processor/multi/processor.py?rev=3253&r1=3252&r2=3253&view=diff ============================================================================== --- branches/multi_processor/multi/processor.py (original) +++ branches/multi_processor/multi/processor.py Fri Mar 30 10:58:03 2007 @@ -21,6 +21,67 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # ################################################################################ + +#FIXME better requirement of inherited commands +import time,datetime + + + +def raise_unimplimented(method): + raise NotImplementedError("Attempt to invoke unimplemented abstract method %s") % method.__name__ + +#requires 2.4 [EMAIL PROTECTED] +#def abstract(f): +# raise_unimplimented(f) +# return f + +class Processor(object): + + def add_to_queue(self,command,memo=None): + raise_unimplimented(self.add_to_queue) + + def run_queue(self): + raise_unimplimented(self.run_queue) + + def run(self): + raise_unimplimented(self.run) + + def return_object(self,result): + raise_unimplimented(self.return_object) + + def get_name(self): + raise_unimplimented(self.get_name) + + def exit(self): + raise_unimplimented(self.exit) + + def on_master(self): + raise_unimplimented(self.on_master) + + def on_slave(self): + return not self.on_master() + + def run_command_globally(self,command): + queue = [command for i in range(1,MPI.size)] + self.run_command_queue(queue) + + def pre_run(self): + if self.on_master(): + self.start_time = time.time() + + def get_time_delta(self,start_time,end_time): + + time_diff= end_time - start_time + time_delta = datetime.timedelta(seconds=time_diff) + time_delta_str = time_delta.__str__() + (time_delta_str,millis) = time_delta_str.split('.',1) + return time_delta_str + + def post_run(self): + if self.on_master(): + end_time = time.time() + time_delta_str = self.get_time_delta(self.start_time,end_time) + print 'overall runtime: ' + time_delta_str + '\n' class Result(object): def __init__(self,completed): Modified: branches/multi_processor/multi/uni_processor.py URL: http://svn.gna.org/viewcvs/relax/branches/multi_processor/multi/uni_processor.py?rev=3253&r1=3252&r2=3253&view=diff ============================================================================== --- branches/multi_processor/multi/uni_processor.py (original) +++ branches/multi_processor/multi/uni_processor.py Fri Mar 30 10:58:03 2007 @@ -26,10 +26,50 @@ import multi import time,datetime -from multi.processor import Result_command,Result_string +from multi.processor import Processor,Result_command,Result_string +#class Processor(object): +# def add_to_queue(self,command,memo=None): +# pass +# def run_queue(self): +# pass +# def run(self): +# pass +# def return_object(self,result): +# pass +# def get_name(self): +# pass +# def exit(self): +# pass +# +# def on_master(self): +# pass +# +# def on_slave(self): +# return not self.on_master() +# +# def run_command_globally(self,command): +# queue = [command for i in range(1,MPI.size)] +# self.run_command_queue(queue) +# +# def pre_run(self): +# if self.on_master(): +# self.start_time = time.time() +# +# def get_time_delta(self,start_time,end_time): +# end_time = time.time() +# time_diff= end_time - self.start_time +# time_delta = datetime.timedelta(seconds=time_diff) +# time_delta_str = time_delta.__str__() +# (time_delta_str,millis) = time_delta_str.rsplit(sep='.',maxsplit=1) +# return time_delta +# +# def post_run(self): +# if self.on_master(): +# +# print 'overall runtime: ' + time_delta_str + '\n' #FIXME need to subclass -class Uni_processor(object): +class Uni_processor(Processor): def __init__(self,relax_instance): self.relax_instance= relax_instance @@ -37,6 +77,8 @@ self.memo_map={} + def on_master(self): + return True def add_to_queue(self,command,memo=None): self.command_queue.append(command) @@ -46,26 +88,28 @@ def run_queue(self): #FIXME: need a finally here to cleanup exceptions states - for command in self.command_queue: - print command - self.run_command_queue() + for command in self.command_queue: + command.run(self) + #self.run_command_queue() #TODO: add cheques for empty queuese and maps if now warn del self.command_queue[:] self.memo_map.clear() - - def run_command_queue(self): - for command in self.command_queue: - command.run(self) +# FIXME: remove me +# def run_command_queue(self): +# for command in self.command_queue: +# command.run(self) def run(self): - start_time = time.clock() +# start_time = time.clock() + self.pre_run() self.relax_instance.run() - end_time = time.clock() - time_diff= end_time - start_time - time_delta = datetime.timedelta(seconds=time_diff) - print 'overall runtime: ' + time_delta.__str__() + '\n' + self.post_run() +# end_time = time.clock() +# time_diff= end_time - start_time +# time_delta = datetime.timedelta(seconds=time_diff) +# print 'overall runtime: ' + time_delta.__str__() + '\n' @@ -96,7 +140,4 @@ -if __name__ == '__main__': - test =Uni_processor(None) - print test Modified: branches/multi_processor/relax URL: http://svn.gna.org/viewcvs/relax/branches/multi_processor/relax?rev=3253&r1=3252&r2=3253&view=diff ============================================================================== --- branches/multi_processor/relax (original) +++ branches/multi_processor/relax Fri Mar 30 10:58:03 2007 @@ -554,6 +554,9 @@ return result #FIXME: mode not required should be an instance variable of relax? +#FIXME error checking for if module require not found +#FIXME move module loading to processor +#FIXME module loading code needs to be in a util module def load_multiprocessor(relax_instance): processor_name = relax_instance.multiprocessor_type + '_processor' _______________________________________________ relax (http://nmr-relax.com) This is the relax-commits mailing list [email protected] To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-commits
_______________________________________________ relax (http://nmr-relax.com) This is the relax-devel mailing list [email protected] To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-devel
