numpy
diff --git a/.gitignore b/.gitignore
@@ -86,3 +86,5 @@ numpy/core/include/numpy/__ufunc_api.h
 numpy/core/include/numpy/_numpyconfig.h
 numpy/version.py
 site.cfg
+
+.DS_Store
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -21,3 +21,6 @@ include doc/Makefile doc/postprocess.py
 recursive-include doc/release *
 recursive-include doc/source *
 recursive-include doc/sphinxext *
+recursive-include doc/cython *
+recursive-include doc/pyrex *
+recursive-include doc/swig *
diff --git a/Makefile b/Makefile
@@ -0,0 +1,12 @@
+PYTHON?=python
+INSTALLDIR?=/opt/cphvb/
+
+all:
+	$(PYTHON) setup.py build
+
+clean:
+	rm -Rf build
+
+install:
+	$(PYTHON) setup.py build
+	sudo $(PYTHON) setup.py install --prefix $(INSTALLDIR)
diff --git a/cphvb/__init__.py b/cphvb/__init__.py
@@ -0,0 +1,21 @@
+"""
+/*
+ * Copyright 2011 Mads R. B. Kristensen <madsbk@gmail.com>
+ *
+ * This file is part of DistNumPy <https://github.com/distnumpy>.
+ *
+ * DistNumPy is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DistNumPy is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with DistNumPy. If not, see <http://www.gnu.org/licenses/>.
+ */
+"""
+from setup import build
diff --git a/cphvb/benchmarks/jacobi.py b/cphvb/benchmarks/jacobi.py
@@ -0,0 +1,60 @@
+import sys
+import numpy as np
+import time
+import cphvbnumpy
+
+def cphvb(ary):
+    if DIST:
+        cphvbnumpy.handle_array(ary)
+
+def jacobi(A, B, tol=0.005, forcedIter=0):
+    '''itteratively solving for matrix A with solution vector B
+       tol = tolerance for dh/h
+       init_val = array of initial values to use in the solver
+    '''
+    h = np.zeros(np.shape(B), float)
+    dmax = 1.0
+    n = 0
+    tmp0 = np.empty(np.shape(A), float)
+    tmp1 = np.empty(np.shape(B), float)
+    AD = np.diagonal(A)
+    cphvb(A)
+    cphvb(B)
+    cphvb(h)
+    cphvb(tmp0)
+    cphvb(tmp1)
+    cphvb(AD)
+    cphvbnumpy.flush()
+    t1 = time.time()
+    while (forcedIter and forcedIter > n) or \
+          (forcedIter == 0 and dmax > tol):
+        n += 1
+        np.multiply(A,h,tmp0)
+        np.add.reduce(tmp0,1,out=tmp1)
+        tmp2 = AD
+        np.subtract(B, tmp1, tmp1)
+        np.divide(tmp1, tmp2, tmp1)
+        hnew = h + tmp1
+        np.subtract(hnew,h,tmp2)
+        np.divide(tmp2,h,tmp1)
+        np.absolute(tmp1,tmp1)
+        dmax = np.maximum.reduce(tmp1)
+        h = hnew
+
+    cphvbnumpy.flush()
+    t2 = time.time()
+    print 'Iter: ', n, ' size:', np.shape(A), " time:", t2-t1
+
+    return h
+DIST = int(sys.argv[1])
+size = int(sys.argv[2])
+iter = int(sys.argv[3])
+
+#A = array([[4, -1, -1, 0], [-1, 4, 0, -1], [-1, 0, 4, -1], [0, -1, -1, 4]], float, dist=d)
+#B = array([1,2,0,1], float, dist=d)
+
+A = np.random.random((size,size))
+B = np.random.random((size))
+
+C = jacobi(A, B, forcedIter=iter)
+
diff --git a/cphvb/benchmarks/jacobi_stencil.py b/cphvb/benchmarks/jacobi_stencil.py
@@ -0,0 +1,60 @@
+import sys
+import numpy as np
+import time
+import cphvbnumpy
+
+def cphvb(ary):
+    if DIST:
+        cphvbnumpy.handle_array(ary)
+
+DIST=int(sys.argv[1])
+W = int(sys.argv[2])
+H = int(sys.argv[2])
+forcedIter = int(sys.argv[3])
+
+full = np.zeros((W+2,H+2), dtype=np.double)
+work = np.zeros((W,H), dtype=np.double)
+diff = np.zeros((W,H), dtype=np.double)
+tmpdelta = np.zeros((W), dtype=np.double)
+
+cphvb(full)
+cphvb(work)
+cphvb(diff)
+cphvb(tmpdelta)
+
+cells = full[1:-1, 1:-1]
+up    = full[1:-1, 0:-2]
+left  = full[0:-2, 1:-1]
+right = full[2:  , 1:-1]
+down  = full[1:-1, 2:  ]
+
+full[:,0]  += -273.15
+full[:,-1] += -273.15
+full[0,:]  +=  40.0
+full[-1,:] += -273.13
+
+cphvbnumpy.flush()
+t1 = time.time()
+epsilon=W*H*0.010
+delta=epsilon+1
+i=0
+print "HEJ"
+while (forcedIter and forcedIter > i) or \
+      (forcedIter == 0 and epsilon<delta):
+  i+=1
+  work[:] = cells
+  work += up
+  work += left
+  work += right
+  work += down
+  work *= 0.2
+  np.subtract(cells,work,diff)
+  np.absolute(diff, diff)
+  np.add.reduce(diff,out=tmpdelta)
+  delta = np.add.reduce(tmpdelta)
+  cells[:] = work
+
+cphvbnumpy.flush()
+timing = time.time() - t1
+
+print 'jacobi_stencil - Iter: ', i, ' size:', np.shape(work), " time:", timing
diff --git a/cphvb/include/cphvbnumpy.h b/cphvb/include/cphvbnumpy.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2011 Mads R. B. Kristensen <madsbk@gmail.com>
+ *
+ * This file is part of DistNumPy <https://github.com/distnumpy>.
+ *
+ * DistNumPy is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DistNumPy is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with DistNumPy. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CPHVBNUMPY_H
+#define CPHVBNUMPY_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//Only import when compiling cphvbnumpymodule.c
+#ifdef CPHVBNUMPY_MODULE
+#include "numpy/ndarraytypes.h"
+#include "numpy/arrayobject.h"
+#include "numpy/ufuncobject.h"
+#endif
+
+/* Retrieval of the cphVB array
+ *
+ * @obj      The (PyArrayObject *).
+ * @return   The (cphvb_array *).
+ */
+#define PyCphVB_ARRAY(obj) (((PyArrayObject *)(obj))->cphvb_ary)
+
+
+//Import the API.
+#include "cphvbnumpy_api.h"
+
+
+//Check that the definitions in numpy are in accordance with cphVB.
+#if NPY_BITSOF_SHORT != 16
+#    error the NPY_BITSOF_INT not 16 bit
+#endif
+#if NPY_BITSOF_INT != 32
+#    error the NPY_BITSOF_INT not 32 bit
+#endif
+#if NPY_BITSOF_LONG != 32 && NPY_BITSOF_LONG != 64
+#    error the NPY_BITSOF_LONG not 32 or 64 bit
+#endif
+#if NPY_BITSOF_LONGLONG != 64
+#    error the NPY_BITSOF_LONGLONG not 64 bit
+#endif
+#if NPY_BITSOF_FLOAT != 32
+#    error the NPY_BITSOF_FLOAT not 32 bit
+#endif
+#if NPY_BITSOF_FLOAT == 64
+#    error the NPY_BITSOF_FLOAT not 64 bit
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !defined(CPHVBNUMPY_H) */