Some small bugs fixed in trisurf.py. Added possibility to run custom analys...

Samo Penic

2017-01-06 f0131dcc3b40089ad3129535aa9c3f4965452c39

Some small bugs fixed in trisurf.py. Added possibility to run custom analyses from config. see networkedExample.py

 networkedExample.py

@@ -19,10 +19,18 @@
run3.setSubdir("run2")



Runs=[run2, run3]

hosts=({'name':'Hestia','address':'kabinet.penic.eu', 'runs':Runs, 'username':'samo'},
    {'name':'altea','address':'127.0.0.1', 'runs':Runs, 'username':'samo'})
#this is how analyses are defined
def analyze(run, **kwargs):
    host=kwargs.get('host', None)
    print("Analysis on host "+host['name']+" for run "+run.Dir.fullpath()+" completed")

tsmgr.start(hosts)



hosts=({'name':'natalie','address':'kabinet.penic.eu', 'runs':Runs, 'username':'samo'},
    {'name':'Hestia','address':'127.0.0.1', 'runs':Runs, 'username':'samo'})

analyses={'analysis1':analyze,}
tsmgr.start(hosts, analyses=analyses)

 trisurf/Remote.py

@@ -1,7 +1,6 @@
import paramiko



class Connection:
    def __init__(self, hostname, port=22, username=None, password=None):
        self.hostname=hostname

 trisurf/trisurf.py

@@ -280,7 +280,7 @@
            table[key]=[]
        for line in lines:
            fields=line.split()
            for i in range(0,len(keys)-1):
            for i in range(0,len(keys)):
                try:
                    value=num(fields[i])
                    table[keys[i]].append(value)

 trisurf/tsmgr.py

@@ -20,6 +20,8 @@

from IPython import embed

import __main__ as main

#Color definitions for terminal
class bcolors:
    HEADER = '\033[95m'
@@ -38,6 +40,7 @@
                help='process number at host. If hostname is not specified, localhost is assumed. If no processes are specified all processes on all hosts are assumed.')
    action_group=parser.add_mutually_exclusive_group(required=True)
    action_group.add_argument('-c','--comment',nargs=1, help='append comment to current comment')
    action_group.add_argument('--analysis', nargs='*', help='runs analysis function defined in configuration file')
    action_group.add_argument('--delete-comment', help='delete comment',action='store_true')
    action_group.add_argument('-k','--kill','--stop','--suspend', help='stop/kill the process', action='store_true')
    action_group.add_argument('-r','--run','--start','--continue', help='start/continue process', action='store_true')
@@ -83,7 +86,8 @@
                port=22 #default ssh port
            rm=Remote.Connection(hostname=host['address'],username=username, port=port)
            rm.connect()
            rm.send_file(__file__,'remote_control.py')
#            print ("Sendind file:"+main.__file__)
            rm.send_file(main.__file__,'remote_control.py')
            for run in host['runs']:
                try:
                    rm.send_file(run.tapeFile,run.tapeFile)
@@ -116,7 +120,7 @@
    if target_runs==None:
        target_runs=list(range(1,len(host['runs'])+1))
    report=[]
    print("was here")
#    print("was here")
    for i in target_runs:
        line=host['runs'][i-1].getStatistics()
        line.insert(0,i)
@@ -182,7 +186,22 @@
        print("Cannot start WebServer in python 2.7")
    exit(0)

def perform_action(args,host):

def analyze(args,host,a_dict, analysis):
    target_runs=getTargetRunIdxList(args)
    if target_runs==None:
        target_runs=list(range(1,len(host['runs'])+1))
    for i in target_runs:

        for anal in analysis:
            if(anal not in a_dict):
                print("Analysis '"+anal+"' is not known. Available analyses: "+", ".join(a_dict.keys())+".")
                exit(0)
        for anal in analysis:
            a_dict[anal](host['runs'][i-1],host=host)


def perform_action(args,host,**kwargs):
    #find which flags have been used and act upon them. -r -s -k -v -c --delete-comment are mutually exclusive, so only one of them is active
    if args['run']:
        run_processes(args,host)
@@ -201,6 +220,9 @@
    elif args['jump_to_ipython']:
        print('Jumping to shell...')
        embed()
        exit(0)
    elif args['analysis']!= None:
        analyze(args,host,kwargs.get('analyses', {}), args['analysis'])
        exit(0)
    else: #version requested
        print(getTrisurfVersion())
@@ -225,7 +247,7 @@



def start(hosts,argv=sys.argv[1:]):
def start(hosts,argv=sys.argv[1:], analyses={}):
    args=vars(ParseCLIArguments(argv))
    #print(vars(args))

@@ -233,10 +255,8 @@
    try:
        test_host=hosts[0]['name']
    except:
        print("Network mode disabled. Old syntax detected.")
        host={'name':socket.gethostname(),'address':'127.0.0.1', 'runs':hosts}
        perform_action(args,host)
        exit(0)
        print("Old syntax detected.")
        hosts=({'name':socket.gethostname(),'address':'127.0.0.1', 'runs':hosts},)


    #find the host at which the action is attended
@@ -259,7 +279,7 @@
                print("Host <font color='orange'>"+host['name']+"</font> reports the following:")
            else:
                print("Host "+bcolors.WARNING+host['name']+bcolors.ENDC+" reports the following:")
            perform_action(args,host)
            perform_action(args,host, analyses=analyses)
        elif not args['local_only']:
            output=host['_conn'].execute('python3 ./remote_control.py -x '+" ".join(argv))
            for line in output: