Use new loading in standalone apps

python/thunder/timeseries/query.py

@@ -5,8 +5,7 @@
 import argparse
 from numpy import zeros
 from scipy.io import loadmat
-from pyspark import SparkContext
-from thunder.utils import load, getdims, subtoind
+from thunder.utils import ThunderContext, getdims, subtoind
 from thunder.utils import save
 
 
@@ -88,9 +87,9 @@ def calc(self, data):
 
     args = parser.parse_args()
 
-    sc = SparkContext(appName="query")
+    tsc = ThunderContext.start(appName="query")
 
-    data = load(sc, args.datafile, args.preprocess).cache()
+    data = tsc.loadText(args.datafile, args.preprocess).cache()
     ts = Query(args.indsfile).calc(data)
 
     outputdir = args.outputdir + "-query"

python/thunder/timeseries/stats.py

@@ -5,10 +5,8 @@
 import argparse
 from numpy import median, mean, std
 from scipy.linalg import norm
-from pyspark import SparkContext
 from thunder.timeseries.base import TimeSeriesBase
-from thunder.utils import load
-from thunder.utils import save
+from thunder.utils import ThunderContext, save
 
 
 class Stats(TimeSeriesBase):
@@ -37,9 +35,9 @@ def get(self, y):
 
     args = parser.parse_args()
 
-    sc = SparkContext(appName="stats")
+    tsc = ThunderContext.start(appName="stats")
 
-    data = load(sc, args.datafile, args.preprocess).cache()
+    data = tsc.loadText(args.datafile, args.preprocess).cache()
     vals = Stats(args.mode).calc(data)
 
     outputdir = args.outputdir + "-stats"