Merged in sergem/numpy/bincount (pull request ganesh-k13#12)

mattip · mattip · commit 6b082f72c52c · 2016-03-13T20:46:34.000+02:00
Implemented bincount
diff --git a/numpy/core/multiarray.py b/numpy/core/multiarray.py
@@ -1,5 +1,6 @@
 from _numpypy.multiarray import *
 from _numpypy.multiarray import _reconstruct
+from pypy_impl import bincount
 
 def _fastCopyAndTranspose(a):
     return a.T.copy()
@@ -39,6 +40,7 @@ def _copyto(dst, src, casting='same_kind', where=None):
 if 'copyto' not in globals():
     copyto = _copyto
 
+
 def format_longfloat(x, precision):
     return "%%.%df" % precision % x
 
@@ -99,7 +101,7 @@ def __init__(self, *args, **kwargs):
 nested_iters
 broadcast empty_like fromiter fromfile frombuffer newbuffer getbuffer
 int_asbuffer set_numeric_ops promote_types digitize
-lexsort compare_chararrays putmask einsum inner bincount interp
+lexsort compare_chararrays putmask einsum inner interp
 _vec_string datetime_data correlate correlate2 vdot matmul _insert
 datetime_as_string busday_offset busday_count is_busday busdaycalendar
 ravel_multi_index unravel_index packbits unpackbits
diff --git a/numpy/core/pypy_impl/__init__.py b/numpy/core/pypy_impl/__init__.py
@@ -0,0 +1 @@
+from bincount import bincount
diff --git a/numpy/core/pypy_impl/bincount.py b/numpy/core/pypy_impl/bincount.py
@@ -0,0 +1,36 @@
+from numpy.core.multiarray import dtype
+from numpy.core.multiarray import zeros
+from numpy.core.multiarray import array
+
+
+def bincount(x, weights=None, minlength=None):
+    if minlength is None:
+        minlength = 0
+    else:
+        if not isinstance(minlength, (int, long)):
+            raise TypeError("an integer is required")
+        if minlength <= 0:
+            raise ValueError("minlength must be positive")
+
+    x = array(x)
+    len_output = minlength
+    if len(x) > 0:
+        if x.min() < 0:
+            raise ValueError("x must not be negative")
+        len_output = max(len_output, x.max() + 1)
+
+    if x.dtype.kind not in 'ui':
+        raise ValueError("x must be integer")
+
+    if weights is None:
+        output = zeros(len_output, dtype=dtype('int'))
+        for elem in x:
+            output[elem] += 1
+    else:
+        if len(weights) != len(x):
+            raise ValueError("x and weights arrays must have the same size")
+        output = zeros(len_output, dtype=dtype('float'))
+        for i in range(len(x)):
+            output[x[i]] += weights[i]
+    return output
+
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
@@ -1001,6 +1001,9 @@ def generate_umath_c(ext, build_dir):
     config.add_data_dir('tests')
     config.add_data_dir('tests/data')
 
+    if is_pypy():
+        config.add_data_dir('pypy_impl')
+
     config.make_svn_version_py()
 
     return config
