trisurf-manager.git

			@@ -15,7 +15,7 @@
			else:
			from urlparse import urlparse
			from vtk import *
			from . import VTKRendering

			#import io

			from IPython import embed
			@@ -55,6 +55,8 @@
			parser.add_argument('-n', nargs='+', metavar='PROC_NO', type=int, help='OBSOLETE. Specifies process numbers.')
			parser.add_argument('-R','--raw',help='print status and the rest of the information in raw format', action="store_true")
			parser.add_argument('-x','--local-only',help='do not attempt to contact remote hosts. Run all operations only on local machine',action='store_true')
			parser.add_argument('--originating-host',nargs=1,help='specify which host started the remote connections. Useful mainly fo internal functionaly of tsmgr and analyses.')
			parser.add_argument('--analysis-options', nargs='+', help='options passed down to analyses')
			args = parser.parse_args(arguments)
			return args

			@@ -74,6 +76,15 @@

			def copyConfigAndConnect(hosts):
			print("Connecting to remote hosts and copying config files, tapes and snapshots")
			#create a list of files to be copied across all the remote hosts
			file_list=[]
			for h in hosts:
			for r in h['runs']:
			if(r.isFromSnapshot):
			file_list.append(r.snapshotFile)
			else:
			file_list.append(r.tapeFilename)
			file_list.append(main.__file__)
			for host in hosts:
			if(host['name'] !=socket.gethostname()): #if I am not the computer named in host name
			try:
			@@ -87,16 +98,21 @@
			rm=Remote.Connection(hostname=host['address'],username=username, port=port)
			rm.connect()
			# 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)
			except:
			pass
			try:
			rm.send_file(run.snapshotFile,run.snapshotFile)
			except:
			pass
			if('remotebasepath' in host):
			remote_dir=host['remotebasepath']
			else:
			remote_dir='trisurf_simulations'
			rm.send_multiple_files_in_directory(file_list,remote_dir)
			# rm.send_file(main.__file__,'remote_control.py')
			# for run in host['runs']:
			# try:
			# rm.send_file(run.tapeFile,run.tapeFile)
			# except:
			# pass
			# try:
			# rm.send_file(run.snapshotFile,run.snapshotFile)
			# except:
			# pass
			host['_conn']= rm
			# we are connected to all hosts...
			return hosts
			@@ -187,9 +203,9 @@
			exit(0)


			def analyze(args,host,a_dict, analysis,hosts):
			if len(a_dict)==0:
			print ('Error: no analyses are specified in the tsmgr.start()!')
			def analyze(args,host,analysis,hosts):
			if len(trisurf._analysis_list)==0:
			print ('Error: no decorated function with @analysis decorator!')
			exit(1)
			target_runs=getTargetRunIdxList(args)
			if target_runs==None:
			@@ -197,11 +213,11 @@
			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())+".")
			if(anal not in trisurf._analysis_list):
			print("Analysis '"+anal+"' is not known. Available analyses: "+", ".join(trisurf._analysis_list.keys())+".")
			exit(0)
			for anal in analysis:
			retval=a_dict[anal](host['runs'][i-1],host=host, args=args, hosts=hosts)
			retval=trisurf._analysis_list[anal](host['runs'][i-1],host=host, args=args, hosts=hosts)
			#try:
			if(retval):
			exit(0)
			@@ -232,7 +248,7 @@
			embed()
			exit(0)
			elif args['analysis']!= None:
			analyze(args,host,kwargs.get('analyses', {}), args['analysis'],kwargs.get('hosts',None))
			analyze(args,host, args['analysis'],kwargs.get('hosts',None))
			exit(0)
			else: #version requested
			print(getTrisurfVersion())
			@@ -241,12 +257,16 @@


			def preview_vtu(args,host):
			#only for localhost at the moment
			if sys.version_info>=(3,0):
			print("Preview works only with python 2.7")
			exit(1)
			from . import VTKRendering
			target_runs=getTargetRunIdxList(args)
			if target_runs==None:
			target_runs=list(range(1,len(host['runs'])+1))
			if host['name'] == socket.gethostname():
			VTKRendering.Renderer(args,host)
			for i in target_runs:
			VTKRendering.Renderer(args,host,host['runs'][i-1])
			else:
			print("VTK rendering currently works on localhost only!")


			def getListOfHostConfigurationByHostname(hosts,host):
			rhost=[]
			@@ -257,7 +277,7 @@



			def start(hosts,argv=sys.argv[1:], analyses={}):
			def start(hosts,argv=sys.argv[1:]):
			args=vars(ParseCLIArguments(argv))
			#Backward compatibility... If running just on localmode, the host specification is unnecessary. Check if only Runs are specified
			try:
			@@ -285,9 +305,17 @@
			print("Host <font color='orange'>"+host['name']+"</font> reports:")
			else:
			print("Host "+bcolors.WARNING+host['name']+bcolors.ENDC+" reports:")
			perform_action(args,host, analyses=analyses, hosts=hosts)
			perform_action(args,host, hosts=hosts)
			elif not args['local_only']:
			output=host['_conn'].execute('python3 ./remote_control.py -x '+" ".join(argv))
			if('remotebasepath' in host):
			remote_dir=host['remotebasepath']
			else:
			remote_dir='trisurf_simulations'
			#output=host['_conn'].execute('cd '+remote_dir)
			#print(remote_dir)
			#print(main.__file__)
			#print('python3 '+main.__file__+' -x '+" ".join(argv))
			output=host['_conn'].execute('cd '+remote_dir+ '; python3 '+main.__file__+' -x --originating-host ' +socket.gethostname()+" "+" ".join(argv))
			for line in output:
			print(line.replace('\n',''))