From 25296b31e8e26baea90fe5d3eef952f9e36f5d74 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 15 May 2016 18:22:19 +0000
Subject: [PATCH] Added a small fix in trisurf
---
python/trisurf/trisurf.py | 245 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 198 insertions(+), 47 deletions(-)
diff --git a/python/trisurf/trisurf.py b/python/trisurf/trisurf.py
index 30c06bd..2f98e2c 100644
--- a/python/trisurf/trisurf.py
+++ b/python/trisurf/trisurf.py
@@ -12,49 +12,76 @@
import psutil
import time
import datetime
+import subprocess
+import shutil
-'''
-This is a trisurf instance manager written in python
-
-
-Invoke with:
-tsmgr [-t tape | -r snapshot.vtu] [-s subdirectory]
-
-If tape is specified, the trisurf wilt start from tape with initial distribution, if snapshot is specified the trisurf will be restored from given snapshot file and simulation will continue.
-
-'''
+# Process status
+TS_NOLOCK=0 # lock file does not exist
+TS_NONEXISTANT=0 # process is not in the list of processes
+TS_STOPPED=1 # the process is listed, but is in stopped state
+TS_RUNNING=2 # process is running
+TS_COMPLETED=3 #simulation is completed
class FileContent:
+ '''
+ Class is helpful for reading and writting the specific files.
+ '''
def __init__(self,filename):
+ ''' The instance is done by calling constructor FileContent(filename)
+
+ The object then reads filename if it exists, otherwise the data is empty string.
+ User may force to reread file by calling the readline() method of the class.
+
+ Filename is stored in local variable for future file operations.
+ '''
+
self.filename=filename
- self.data=""
self.readfile()
def readfile(self):
+ '''Force reread of the file and setting the data'''
+ self.data=""
try:
with open (self.filename, "r") as myfile:
- self.data=myfile.read().replace('\n', '')
+ self.data=myfile.read().replace('\n', '') #read the file and remove newline from the text
except:
- pass
+ pass # does nothing if error occurs
def writefile(self, data, mode='w'):
+ '''File may be updated by completely rewritting the file contents or appending the data to the end of the file.
+ this is achieved by calling writefile(data, mode) method, where data is the string data to be written and
+ mode can be 'a' for append and 'w' for writting the file anew.
+ '''
with open (self.filename, mode) as myfile:
myfile.write(data)
def getText(self):
+ '''
+ Method getText() or calling the object itself returns string of data
+ '''
return self.data
def __str__(self):
+ '''
+ Method getText() or calling the object itself returns string of data
+ '''
return self.getText()
class Tape:
- '''Has all the info on the tape'''
+ '''
+ Special class that manages configuration of trisurf (commonly named tape). It can read and parse configuration from disk or parse it from string.
+ '''
def __init__(self):
+ '''The object is instatiated by calling Tape() constructor without parameters'''
return
def readTape(self, tape='tape'):
+ '''
+ Tape is read and parsed by calling the readTape() method with optional tape parameter, which is full path to filename where the configuration is stored.
+ If the tape cannot be read, it prints error and exits.
+ '''
try:
self.config=configobj.ConfigObj(tape)
except:
@@ -62,13 +89,17 @@
exit(1)
def setTape(self, string):
+ '''Method setTape(string) parses the string in memory that hold the tape contents.'''
self.config=configobj.ConfigObj(io.StringIO(string))
return
def getValue(self,key):
+ '''Method getValue(key) returns value of a single parsed setting named "key".'''
+
return self.config[key]
def __str__(self):
+ '''Calling the object itself, it recreates the tape contents from parsed values in form of key=value.'''
retval=""
for key,val in self.config.iteritems():
retval=retval+str(key)+" = "+str(val)+"\n"
@@ -77,22 +108,31 @@
class Directory:
+ '''
+ Class deals with the paths where the simulation is run and data is stored.
+ '''
def __init__(self, maindir=".", simdir=""):
+ '''Initialization Directory() takes two optional parameters, namely maindir and simdir. Defaults to current directory. It sets local variables maindir and simdir accordingly.'''
self.maindir=maindir
self.simdir=simdir
return
def fullpath(self):
+ '''
+ Method returns string of path where the data is stored. It combines values of maindir and simdir as maindir/simdir on Unix.
+ '''
return os.path.join(self.maindir,self.simdir)
def exists(self):
+ ''' Method checks whether the directory specified by fullpath() exists. It return True/False on completion.'''
path=self.fullpath()
if(os.path.exists(path)):
- return 1
+ return True
else:
- return 0
+ return False
def make(self):
+ ''' Method make() creates directory. If it fails it exits the program with error message.'''
try:
os.makedirs(self.fullpath())
except:
@@ -101,11 +141,15 @@
return
def makeifnotexist(self):
+ '''Method makeifnotexist() creates directory if it does not exist.'''
if(self.exists()==0):
self.make()
- return
+ return True
+ else:
+ return False
def remove(self):
+ '''Method remove() removes directory recursively. WARNING! No questions asked.'''
if(self.exists()):
try:
os.rmdir(self.fullpath())
@@ -115,6 +159,9 @@
return
def goto(self):
+ '''
+ Method goto() moves current directory to the one specified by fullpath(). WARNING: when using the relative paths, do not call this function multiple times.
+ '''
try:
os.chdir(self.fullpath())
except:
@@ -123,7 +170,17 @@
class Statistics:
+ '''
+ Class that deals with the statistics file from the simulations.
+ File is generally large and not all data is needed, so it is dealt with in a specific way.
+ '''
+
def __init__(self,path,filename="statistics.csv"):
+ '''
+ At the initialization call it receives optional filename parameter specifying the path and filename of the statistics file.
+
+ The local variables path, filename, fullname (joined path and filename) and private check if the file exists are stored.
+ '''
self.path=path
self.filename=filename
self.fullname=os.path.join(path,filename)
@@ -131,12 +188,16 @@
return
def exists(self):
+ '''Method check if the statistics file exists.'''
if(os.path.isfile(self.fullname)):
return True
else:
return False
def mapcount(self):
+ '''
+ Internal method for determining the number of the lines in the most efficient way. Is it really the most efficient?
+ '''
f = open(self.fullname, "r+")
buf = mmap.mmap(f.fileno(), 0)
lines = 0
@@ -146,8 +207,17 @@
return lines
def read(self):
+ '''
+ Method read() reads the statistics if it exists. It sets local variable dT storing the time differential between two intervals of simulation (outer loops). It also stores last simulation loop and the start of the run.
+ '''
if(self.exists()):
+ # epoch1=0
+ # epoch2=0
+ # n1=0
+ # n2=0
nlines=self.mapcount()
+ if nlines<2:
+ return(False)
try:
with open(self.fullname, "r+") as fin:
i=0;
@@ -168,26 +238,33 @@
else:
#print("File "+self.fullname+" does not exists.\n")
return(False)
-
- self.dT=(int(epoch2)-int(epoch1))/(int(n2)-int(n1))
+ try:
+ self.dT=(int(epoch2)-int(epoch1))/(int(n2)-int(n1))
+ except:
+ self.dT=0
self.last=n2
self.startDate=epoch1
return(True)
def __str__(self):
+ '''
+ Prints the full path with filename of the statistics.csv file
+ '''
return(str(self.fullname))
class Runner:
'''
- Class Runner consists of a single running or terminated instance of the trisurf
+ Class Runner consists of a single running or terminated instance of the trisurf. It manages starting, stopping, verifying the running process and printing the reports of the configured instances.
'''
- def __init__(self, subdir='run0', tape='', snapshot=''):
+ def __init__(self, subdir='run0', tape=None, snapshot=None, runArgs=[]):
self.subdir=subdir
- if(tape!=''):
+ self.runArgs=runArgs
+ self.fromSnapshot=False
+ if(tape!=None):
self.initFromTape(tape)
- if(snapshot!=''):
+ if(snapshot!=None):
self.initFromSnapshot(snapshot)
return
@@ -195,6 +272,7 @@
def initFromTape(self, tape):
self.tape=Tape()
self.tape.readTape(tape)
+ self.tapeFile=tape
def initFromSnapshot(self, snapshotfile):
try:
@@ -202,42 +280,105 @@
except:
print("Error reading snapshot file")
exit(1)
-
+ self.fromSnapshot=True
+ self.snapshotFile=snapshotfile
root = tree.getroot()
tapetxt=root.find('tape')
version=root.find('trisurfversion')
self.tape=Tape()
self.tape.setTape(tapetxt.text)
-
+
def getPID(self):
self.Dir=Directory(maindir=self.maindir,simdir=self.subdir)
- self.Dir.makeifnotexist()
+ #self.Dir.makeifnotexist()
try:
fp = open(os.path.join(self.Dir.fullpath(),'.lock'))
except IOError as e:
return 0 #file probably does not exist. e==2??
pid=fp.readline()
fp.close()
- return pid
+ return int(pid)
+
+ def getLastIteration(self):
+ self.Dir=Directory(maindir=self.maindir,simdir=self.subdir)
+ #self.Dir.makeifnotexist()
+ try:
+ fp = open(os.path.join(self.Dir.fullpath(),'.status'))
+ except IOError as e:
+ return -1 #file probably does not exist. e==2??
+ status=fp.readline()
+ fp.close()
+ return int(status)
+
+ def isCompleted(self):
+ if (int(self.tape.getValue("iterations"))==self.getLastIteration()+1):
+ return True
+ else:
+ return False
def getStatus(self):
pid=self.getPID()
+ if(self.isCompleted()):
+ return TS_COMPLETED
if(pid==0):
- return 0
+ return TS_NOLOCK
if(psutil.pid_exists(int(pid))):
- if psutil.Process(int(pid)).name=="trisurf":
- return 1
+ proc= psutil.Process(int(pid))
+ if proc.name=="trisurf":
+ if proc.status=="stopped":
+ return TS_STOPPED
+ else:
+ return TS_RUNNING
else:
- return 0
+ return TS_NONEXISTANT
else:
- return 0
+ return TS_NONEXISTANT
def start(self):
- if(self.getStatus()==0):
+ if(self.getStatus()==0 or self.getStatus()==TS_COMPLETED):
+ #check if executable exists
+ if(shutil.which('trisurf')==None):
+ print("Error. Trisurf executable not found in PATH. Please install trisurf prior to running trisurf manager.")
+ exit(1)
self.Dir=Directory(maindir=self.maindir,simdir=self.subdir)
- self.Dir.makeifnotexist()
-# self.Dir.goto()
- print("Starting trisurf-ng executable at "+self.Dir.fullpath()+"\n")
+#Symlinks tape file to the directory or create tape file from snapshot in the direcory...
+ if(self.Dir.makeifnotexist()):
+ if(self.fromSnapshot==False):
+ try:
+ os.symlink(os.path.abspath(self.tapeFile), self.Dir.fullpath()+"/tape")
+ except:
+ print("Error while symlinking "+os.path.abspath(self.tapeFile)+" to "+self.Dir.fullpath()+"/tape")
+ exit(1)
+ else:
+ try:
+ with open (os.path.join(self.Dir.fullpath(),"tape"), "w") as myfile:
+ myfile.write("#This is automatically generated tape file from snapshot\n")
+ myfile.write(str(self.tape))
+ except:
+ print("Error -- cannot make tapefile "+ os.path.join(self.Dir.fullpath(),"tape")+" from the snapshot in the running directory")
+ exit(1)
+ try:
+ os.symlink(os.path.abspath(self.snapshotFile), os.path.join(self.Dir.fullpath(),self.snapshotFile))
+ except:
+ print("Error while symlinking "+os.path.abspath(self.snapshotFile)+" to "+os.path.join(self.Dir.fullpath(),self.snapshotFile))
+
+ #check if the simulation has been completed. in this case notify user and stop executing.
+ if(self.isCompleted() and ("--force-from-tape" not in self.runArgs) and ("--reset-iteration-count" not in self.runArgs)):
+ print("The simulation was completed. Not starting executable at localhost in "+self.Dir.fullpath()+"\n")
+ return
+
+ cwd=Directory(maindir=os.getcwd())
+ self.Dir.goto()
+ print("Starting trisurf-ng executable at localhost in "+self.Dir.fullpath()+"\n")
+ if(self.fromSnapshot==True):
+ params=["trisurf", "--restore-from-vtk",self.snapshotFile]+self.runArgs
+ else:
+ #veify if dump exists. If not it is a first run and shoud be run with --force-from-tape
+ if(os.path.isfile("dump.bin")==False):
+ self.runArgs.append("--force-from-tape")
+ params=["trisurf"]+self.runArgs
+ subprocess.Popen (params, stdout=subprocess.DEVNULL)
+ cwd.goto()
else:
print("Process already running. Not starting\n")
return
@@ -246,7 +387,7 @@
pass
def setMaindir(self,prefix,variables):
- maindir="./"
+ maindir=""
for p,v in zip(prefix,variables):
if(v=="xk0"):
tv=str(round(float(self.tape.config[v])))
@@ -264,24 +405,34 @@
self.Dir=Directory(maindir=self.maindir,simdir=self.subdir)
self.statistics=Statistics(self.Dir.fullpath(), statfile)
self.Comment=FileContent(os.path.join(self.Dir.fullpath(),".comment"))
- pid=self.getPID();
- if(self.getStatus()):
- statustxt="Running"
- else:
- statustxt="Stopped"
+ pid=self.getPID()
+ status=self.getStatus()
+ if(self.statistics.fileOK):
+ ETA=str(datetime.timedelta(microseconds=(int(self.tape.config['iterations'])-int(self.statistics.last))*self.statistics.dT)*1000000)
+ if(status==TS_NONEXISTANT or status==TS_NOLOCK):
+ statustxt="Not running"
pid=""
+ ETA=""
+ elif status==TS_STOPPED:
+ statustxt="Stopped"
+ ETA="N/A"
+ elif status==TS_COMPLETED:
+ statustxt="Completed"
+ pid=""
+ ETA=""
+ else:
+ statustxt="Running"
if(self.statistics.fileOK):
-# report=time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(int(self.statistics.startDate)))+"\t"+str(datetime.timedelta(microseconds=(int(self.tape.config['iterations'])-int(self.statistics.last))*self.statistics.dT)*1000)+" ETA\t"+"STATUS"
- report=[time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(int(self.statistics.startDate))),str(datetime.timedelta(microseconds=(int(self.tape.config['iterations'])-int(self.statistics.last))*self.statistics.dT)*1000), statustxt, pid, str(self.Dir.fullpath()), self.Comment.getText()]
+ report=[time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(int(self.statistics.startDate))),ETA, statustxt, pid, str(self.Dir.fullpath()), self.Comment.getText()]
else:
- report=["N/A","N/A\t",statustxt, pid, str(self.Dir.fullpath()), self.Comment.getText()]
+ report=["N/A","N/A",statustxt, pid, str(self.Dir.fullpath()), self.Comment.getText()]
return report
- def writeComment(self, data):
+ def writeComment(self, data, mode='w'):
self.Dir=Directory(maindir=self.maindir,simdir=self.subdir)
self.Comment=FileContent(os.path.join(self.Dir.fullpath(),".comment"))
- self.Comment.writefile(data,mode='w')
+ self.Comment.writefile(data,mode=mode)
def __str__(self):
if(self.getStatus()==0):
--
Gitblit v1.9.3