Add numpy_fulltest.py that runs the full numpy testsuite

src/asm_writing/rewriter.cpp

@@ -1248,7 +1248,7 @@ std::vector<Location> Rewriter::getDecrefLocations() {
         ASSERT(var->locations.size() == 1, "this code only looks at one location");
         Location l = *var->locations.begin();
 
-        assert(l.type == Location::Scratch);
+        assert(l.type == Location::Scratch || l.type == Location::Stack);
 
         int offset1 = indirectFor(l).offset;
         int offset2 = p.second;

test/extra/numpy_fulltest.py

+import os
+import sys
+import subprocess
+
+sys.path.append(os.path.dirname(__file__) + "/../lib")
+import test_helper
+
+def print_progress_header(text):
+    print "\n>>>"
+    print ">>> " + text + "..."
+    print ">>>"
+
+ENV_NAME = "numpy_fulltest_env_" + os.path.basename(sys.executable)
+DEPENDENCIES = ["nose==1.3.7"]
+
+import platform
+USE_CUSTOM_PATCHES = (platform.python_implementation() == "Pyston")
+
+test_helper.create_virtenv(ENV_NAME, DEPENDENCIES)
+
+
+SRC_DIR = ENV_NAME
+ENV_DIR = os.path.abspath(ENV_NAME)
+PYTHON_EXE = os.path.abspath(ENV_NAME + "/bin/python")
+CYTHON_DIR = os.path.abspath(os.path.join(SRC_DIR, "Cython-0.22"))
+NUMPY_DIR = os.path.abspath(os.path.join(SRC_DIR, "numpy"))
+
+print_progress_header("Setting up Cython...")
+if not os.path.exists(CYTHON_DIR):
+
+    url = "http://cython.org/release/Cython-0.22.tar.gz"
+    subprocess.check_call(["wget", url], cwd=SRC_DIR)
+    subprocess.check_call(["tar", "-zxf", "Cython-0.22.tar.gz"], cwd=SRC_DIR)
+
+    if USE_CUSTOM_PATCHES:
+        PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "../integration/Cython-0.22.patch"))
+        subprocess.check_call(["patch", "-p1", "--input=" + PATCH_FILE], cwd=CYTHON_DIR)
+        print ">>> Applied Cython patch"
+
+
+    try:
+        subprocess.check_call([PYTHON_EXE, "setup.py", "install"], cwd=CYTHON_DIR)
+        subprocess.check_call([PYTHON_EXE, "-c", "import Cython"], cwd=CYTHON_DIR)
+    except:
+        subprocess.check_call(["rm", "-rf", CYTHON_DIR])
+else:
+    print ">>> Cython already installed."
+
+NUMPY_PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "../integration/numpy_patch.patch"))
+
+print_progress_header("Cloning up NumPy...")
+if not os.path.exists(NUMPY_DIR):
+    url = "https://github.com/numpy/numpy"
+    subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "v1.11.0", url], cwd=SRC_DIR)
+else:
+    print ">>> NumPy already installed."
+
+PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "../integration/numpy_patch.patch"))
+
+if USE_CUSTOM_PATCHES:
+    print_progress_header("Patching NumPy...")
+    subprocess.check_call(["patch", "-p1", "--input=" + PATCH_FILE], cwd=NUMPY_DIR)
+
+try:
+    env = os.environ
+    CYTHON_BIN_DIR = os.path.abspath(os.path.join(ENV_NAME + "/bin"))
+    env["PATH"] = CYTHON_BIN_DIR + ":" + env["PATH"]
+
+    # Should be able to do this:
+    # subprocess.check_call([os.path.join(SRC_DIR, "bin/pip"), "install", NUMPY_DIR])
+    # but they end up naming f2py "f2py_release"/"f2py_dbg"
+
+    print_progress_header("Setting up NumPy...")
+    subprocess.check_call([PYTHON_EXE, "setup.py", "build"], cwd=NUMPY_DIR, env=env)
+
+    print_progress_header("Installing NumPy...")
+    subprocess.check_call([PYTHON_EXE, "setup.py", "install"], cwd=NUMPY_DIR, env=env)
+except:
+    if USE_CUSTOM_PATCHES:
+        print_progress_header("Unpatching NumPy...")
+        cmd = ["patch", "-p1", "--forward", "-i", NUMPY_PATCH_FILE, "-R", "-d", NUMPY_DIR]
+        subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+
+    # TODO: I'm not sure we need to do this:
+    subprocess.check_call(["rm", "-rf", NUMPY_DIR + "/build"])
+    subprocess.check_call(["rm", "-rf", NUMPY_DIR + "/dist"])
+
+    raise
+
+try:
+    test_helper.run_test(['sh', '-c', '. %s/bin/activate && python %s/numpy/tools/test-installed-numpy.py' % (ENV_DIR, ENV_DIR)],
+            ENV_NAME, [dict(ran=5781, errors=2, failures=3)])
+finally:
+    if USE_CUSTOM_PATCHES:
+        print_progress_header("Unpatching NumPy...")
+        cmd = ["patch", "-p1", "--forward", "-i", NUMPY_PATCH_FILE, "-R", "-d", NUMPY_DIR]
+        subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+
+print
+print "PASSED"

test/integration/numpy_test.py

@@ -91,7 +91,7 @@ NUMPY_PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "nump
 print_progress_header("Cloning up NumPy...")
 if not os.path.exists(NUMPY_DIR):
     url = "https://github.com/numpy/numpy"
-    subprocess.check_call(["git", "clone", "--branch", "v1.11.0", url], cwd=SRC_DIR)
+    subprocess.check_call(["git", "clone", "--depth", "1", "--branch", "v1.11.0", url], cwd=SRC_DIR)
 else:
     print ">>> NumPy already installed."
 

test/lib/test_helper.py

@@ -8,9 +8,9 @@ def create_virtenv(name, package_list = None, force_create = False):
     if force_create or not os.path.exists(name) or os.stat(sys.executable).st_mtime > os.stat(name + "/bin/python").st_mtime:
         if os.path.exists(name):
             subprocess.check_call(["rm", "-rf", name])
-        
+
         print "Creating virtualenv to install testing dependencies..."
-        
+
         VIRTUALENV_SCRIPT = os.path.dirname(__file__) + "/../lib/virtualenv/virtualenv.py"
 
         try:
@@ -58,11 +58,12 @@ def parse_output(output):
     return result
 
 def run_test(cmd, cwd, expected, env = None):
+    print "Running", cmd
     process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=cwd, env=env)
     output, unused_err = process.communicate()
     errcode = process.poll()
     result = parse_output(output)
-    
+
     print
     print "Return code:", errcode
     if expected == result: