wip

.gitignore

@@ -8,3 +8,4 @@ parsetab.py
 version.py
 dist/
 build/
+runtime/

smop/Makefile

@@ -24,7 +24,7 @@ GENERAL = accumarray.m accumdim.m bicubic.m bincoeff.m\
     saveobj.m shiftdim.m shift.m sortrows.m sph2cart.m structfun.m\
     subsindex.m trapz.m triplequad.m
 
-all: mybench.py runtime.py
+all: mybench.py 
 	$(PYTHON) -c "import mybench ; mybench.mybench()"
 
 general.py: $(GENERAL)

smop/main.py

@@ -48,13 +48,14 @@ def main():
     """
     try:
         opts, args = getopt.gnu_getopt(sys.argv[1:],
-                                       "d:ho:vVsS:X:", 
+                                       "d:ho:vVsr:S:X:", 
                                        [
                                         "dot=",
                                         "exclude=",
                                         "help",
                                         "syntax-errors=",
                                         "output=",
+                                        "runtime=",
                                         "strict",
                                         "verbose",
                                         "version",
@@ -69,9 +70,12 @@ def main():
     output = None
     strict = 0
     dot = None
+    runtime = "runtime"
 
     for o, a in opts:
-        if o in ("-s", "--strict"):
+        if o in ("-r", "--runtime"):
+            runtime = a
+        elif o in ("-s", "--strict"):
             strict = 1
         elif o in ("-S", "--syntax-errors"):
             options.syntax_errors += a.split(",")
@@ -141,10 +145,8 @@ def main():
     fp = open(output,"w") if output != "-" else sys.stdout
     print >> fp, "# Autogenerated with SMOP version " + __version__
     print >> fp, "# " + " ".join(sys.argv)
-    print >> fp, """
-from __future__ import division
-from . import *
-"""
+    print >> fp, "from __future__ import division"
+    print >> fp, "from %s import *" % runtime
 
     for pattern in args:
         for filename in glob.glob(os.path.expanduser(pattern)):

smop/runtime/Makefile

@@ -6,7 +6,7 @@ SCRIPTS = $(OCTAVE)/scripts
 
 CYTHON = cython
 PYTHON = python
-FLAGS = -Xquadgk.m,quadl.m,lcm.m
+FLAGS = -Xquadgk.m,quadl.m,lcm.m --runtime .
 V = 2.7
 SMOP = smop
 SPECFUN = bessel.py betaln.py beta.py ellipke.py expint.py factorial.py\
@@ -41,4 +41,4 @@ clean:
 	gcc -Wno-cpp -I /usr/include/python$V -O2 -shared -o $@ $^
 
 %.py: %.m
-	smop $(FLAGS) -o $@ $^
+	$(SMOP) $(FLAGS) -o $@ $^