Skip to content

Instantly share code, notes, and snippets.

--- numba-0.8.1/gen_type_conversion.py 2013-05-03 10:59:52.000000000 -0400
+++ numba/gen_type_conversion.py 2013-07-18 17:59:59.000000000 -0400
@@ -122,8 +122,8 @@
def generate_conversions(out_c, out_h):
"Generate numba/external/utilities/generated_conversions.c"
out_c.write("/* This file is generated by %s, do not edit */\n" %
- os.path.abspath(__file__))
- out_c.write('#include "%s"\n\n' % out_h.name)
+ __file__)
+ out_c.write('#include "generated_conversions.h"\n\n')
diff -ru numba-0.8.1/deps/pyextensibletype/include/interning.h numba/deps/pyextensibletype/include/interning.h
--- numba-0.8.1/deps/pyextensibletype/include/interning.h 2013-05-03 10:59:52.000000000 -0400
+++ numba/deps/pyextensibletype/include/interning.h 2013-07-18 17:54:34.000000000 -0400
@@ -170,7 +170,6 @@
const char *secret = table->secrets;
int tries = 0;
uint64_t prehash;
- int result;
while (1) {
Index: builtinmodule.py
===================================================================
--- builtinmodule.py (revision 79617)
+++ builtinmodule.py (revision 83202)
@@ -4,11 +4,11 @@
"""
from __future__ import print_function, division, absolute_import
+import ast
from numba import *
Index: numba/codegen/translate.py
===================================================================
--- numba/codegen/translate.py (revision 80237)
+++ numba/codegen/translate.py (revision 80238)
@@ -1039,6 +1039,15 @@
# ____________________________________________________________
# Compare
+ _cmp_op_map = {
+ ast.Gt : '>',
Index: numba/environment.py
===================================================================
--- numba/environment.py (revision 80669)
+++ numba/environment.py (revision 80670)
@@ -41,6 +41,7 @@
'update_signature',
'create_lfunc1',
'NormalizeASTStage',
+ 'TransformBuiltinLoops',
'ControlFlowAnalysis',
Index: numba/specialize/loops.py
===================================================================
--- numba/specialize/loops.py (revision 79617)
+++ numba/specialize/loops.py (revision 83202)
@@ -95,36 +105,31 @@
else:
have_step = True
- start, stop, step = [nodes.CloneableNode(n)
- for n in (start, stop, step)]
Index: numba/type_inference/infer.py
===================================================================
--- numba/type_inference/infer.py (revision 80685)
+++ numba/type_inference/infer.py (revision 80686)
@@ -850,7 +850,11 @@
["is_int", 'is_object', 'is_bool'])
v1, v2 = node.left.variable, node.right.variable
- promotion_type = self.promote(v1, v2)
+ # Handle string formatting with %
Index: numba/control_flow/reaching.py
===================================================================
--- numba/control_flow/reaching.py (revision 80690)
+++ numba/control_flow/reaching.py (revision 80691)
@@ -132,7 +132,8 @@
entry, "Unused argument '%s'" % entry.name)
else:
if (warn_unused and entry.warn_unused and
- flow.is_tracked(entry)):
+ not entry.name.startswith('_') and
Index: numba/external/pyapi.py
===================================================================
--- numba/external/pyapi.py (revision 82154)
+++ numba/external/pyapi.py (revision 82155)
@@ -179,12 +179,17 @@
def from_long(name, type):
create_func(name, object_, type, _from_long)
-from_long('PyLong_FromLong', long_)
+if not PY3:
Index: numba/visitors.py
===================================================================
--- numba/visitors.py (revision 81089)
+++ numba/visitors.py (revision 81090)
@@ -364,47 +364,68 @@
function_level = 0
def __init__(self, *args, **kwargs):
- self.referenced = {}
- self.assigned = {}