amalgamation

Author: bottler

.gitignore

@@ -1,2 +1,3 @@
 *~
 *.pyc
+*.sqlite

oncampus.py

@@ -4,14 +4,19 @@
 # draw : whetheer it would be a good idea to try to plot graphs to the screen. This will be false if you are offcampus or are using SSH without X forwarding
 import os, subprocess, string
 
-if "STY" in os.environ or "TMUX" in os.environ: #we are inside gnu screen or tmux
-    #It's not obvious what behaviour is correct in this case - same session can be used in multiple places.
-    #Simplest is to treat this as off campus.
-    #When on campus just do graphing in another terminal.
-    oncampus = False
-elif "SSH_CLIENT" in os.environ:
-    oncampus = -1 < subprocess.check_output(["who", "-m"]).find(b"warwick")
+if os.name=="posix":
+    if "STY" in os.environ or "TMUX" in os.environ: #we are inside gnu screen or tmux
+        #It's not obvious what behaviour is correct in this case - same session can be used in multiple places.
+        #Simplest is to treat this as off campus.
+        #When on campus just do graphing in another terminal.
+        oncampus = False
+    elif "SSH_CLIENT" in os.environ:
+        oncampus = -1 < subprocess.check_output(["who", "-m"]).find(b"warwick")
+    else:
+        oncampus = True
+        
+    draw = oncampus and "DISPLAY" in os.environ
 else:
+    #You are probably sitting at your machine
+    draw = True
     oncampus = True
-
-draw = oncampus and "DISPLAY" in os.environ

results/amalgamateResults.py

@@ -0,0 +1,47 @@
+import sys
+import os
+import sqlite3
+#Creates a file resultsAmalgam.sqlite which is an amalgamation of all the results files named on the command line
+#at the moment, assume they are are all new format
+filename = "resultsAmalgam.sqlite"
+if os.path.isfile(filename):
+    raise RuntimeError("file "+filename+" already exists")
+
+con = sqlite3.connect(filename)
+c=con.cursor()
+
+if not os.path.isfile(sys.argv[1]):
+    raise RuntimeError("no file "+sys.argv[1])
+c.execute("attach ? as o",(sys.argv[1],))
+runColList="(COUNT INTEGER PRIMARY KEY, TIME TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL, CONTINUATION TEXT, ARCHITECTURE TEXT, SOLVER TEXT, CODE TEXT)"
+setup=["create table if not exists RUNS"+runColList,#these default keys start at 1
+       "create table if not exists STEPS(STEP INTEGER PRIMARY KEY, RUN int, OBJECTIVE real, TRAINACC real, TESTOBJECTIVE real, TESTACC REAL )",
+       "create table if not exists TIMES(RUN INT, TIME real)", # stores the time of the tenth step of each run, allowing speed to be measured
+       "create table if not exists ATTRIBS(RUN INT, NAME TEXT, ISRESULT INT, VALUE TEXT)"
+       ]
+for s in setup:
+    c.execute(s)
+
+print (sys.argv[1])
+c.execute("insert into RUNS SELECT * FROM o.RUNS") #Thus proving the DB is new format
+nrun=c.lastrowid
+c.execute("insert into STEPS SELECT * FROM o.STEPS")
+c.execute("insert into TIMES SELECT * FROM o.TIMES")
+c.execute("insert into ATTRIBS SELECT * FROM o.ATTRIBS")
+c.execute("detach o")
+
+for t in sys.argv[2:]:
+    if not os.path.isfile(t):
+        raise RuntimeError("no file "+t)
+    c.execute("attach ? as o",(t,))
+    if c.execute("select sql like '%LAYERTYPE%' from sqlite_master where tbl_name='RUNS'").fetchone()[0]:
+        raise RuntimeError(t + " has old columns, can't deal with it here")
+    print (t)
+    c.execute("insert into RUNS SELECT COUNT+?,TIME,CONTINUATION,ARCHITECTURE,SOLVER,CODE FROM o.RUNS",(nrun,))
+    next_nrun=c.lastrowid
+    c.execute("insert into STEPS(RUN,OBJECTIVE,TRAINACC,TESTOBJECTIVE,TESTACC) SELECT RUN+?,OBJECTIVE,TRAINACC,TESTOBJECTIVE,TESTACC FROM O.STEPS",(nrun,))
+    c.execute("insert into TIMES select RUN+?, TIME FROM O.TIMES",(nrun,))
+    c.execute("insert into ATTRIBS SELECT RUN+?, NAME, ISRESULT, VALUE FROM O.ATTRIBS",(nrun,))
+    nrun=next_nrun
+    c.execute("detach o")
+