From b5893d4ebb69fe920ae432db7e598aada5de8cda Mon Sep 17 00:00:00 2001
From: Siu Kwan Lam <michael.lam.sk@gmail.com>
Date: Mon, 6 Aug 2012 17:02:04 -0700
Subject: [PATCH] Add test to use numpy.fromfunc. Depends on numpy branch
 "ufunc-from-function-pointer" in git://github.com/jayvius/numpy.git

---
 parallel_vectorize.py            |  5 ++--
 test_parallel_vectorize.py       | 11 +++-----
 test_parallel_vectorize_numpy.py | 46 ++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 test_parallel_vectorize_numpy.py

diff --git a/parallel_vectorize.py b/parallel_vectorize.py
index 2d9421f..bef04eb 100644
--- a/parallel_vectorize.py
+++ b/parallel_vectorize.py
@@ -151,11 +151,12 @@ class ParallelUFunc(CDefinition):
             for t in range(ThreadCount):
                 cur_ctxt = contexts[t].as_struct(Context)
                 total_completed += cur_ctxt.completed
-                self.debug(cur_ctxt.id, 'completed', cur_ctxt.completed)
+                # self.debug(cur_ctxt.id, 'completed', cur_ctxt.completed)
 
             with self.ifelse( total_completed == N ) as ifelse:
                 with ifelse.then():
-                    self.debug("All is well!")
+                    # self.debug("All is well!")
+                    pass # keep quite if all is well
                 with ifelse.otherwise():
                     self.debug("ERROR: race occurred! Trigger segfault")
                     self.unreachable()
diff --git a/test_parallel_vectorize.py b/test_parallel_vectorize.py
index e16d206..ed2010d 100644
--- a/test_parallel_vectorize.py
+++ b/test_parallel_vectorize.py
@@ -2,7 +2,7 @@ from parallel_vectorize import *
 
 
 class Work_D_D(CDefinition):
-    _name_ = 'copy_d_d'
+    _name_ = 'work_d_d'
     _retty_ = C.double
     _argtys_ = [
         ('inval', C.double),
@@ -47,11 +47,6 @@ class Tester(CDefinition):
         ArgCount = 2
         WorkCount = 10000
 
-#        parallel_ufunc = self.depends(ParallelUFuncPosix,
-#                                      ThreadCount=ThreadCount)
-#        ufunc_core = self.depends(UFuncCore_D_D)
-#        worker = self.depends(Work_D_D)
-
         sppufunc = self.depends(SpecializedParallelUFunc,
                                 PUFuncDef = ParallelUFuncPosix,
                                 CoreDef = UFuncCore_D_D,
@@ -123,11 +118,11 @@ def main():
     # run
     print('run')
     exe = CExecutor(module)
-    exe.engine.get_pointer_to_function(fntester)
     func = exe.get_ctype_function(fntester, 'void')
 
     func()
-
+    # Will not reach here is race condition occurred
+    print('Good')
 
 if __name__ == '__main__':
     main()
diff --git a/test_parallel_vectorize_numpy.py b/test_parallel_vectorize_numpy.py
new file mode 100644
index 0000000..dc3557f
--- /dev/null
+++ b/test_parallel_vectorize_numpy.py
@@ -0,0 +1,46 @@
+from test_parallel_vectorize import *
+
+import numpy as np
+
+def main():
+    module = Module.new(__name__)
+    sppufunc = SpecializedParallelUFunc.define(module,
+                            PUFuncDef = ParallelUFuncPosix,
+                            CoreDef = UFuncCore_D_D,
+                            Func = Work_D_D,
+                            FuncName = Work_D_D._name_,
+                            ThreadCount = 2)
+    module.verify()
+
+    mpm = PassManager.new()
+    pmbuilder = PassManagerBuilder.new()
+    pmbuilder.opt_level = 3
+    pmbuilder.populate(mpm)
+
+    mpm.run(module)
+#    print module
+
+    # run
+
+    exe = CExecutor(module)
+    funcptr = exe.engine.get_pointer_to_function(sppufunc)
+    print("Function pointer: %x" % funcptr)
+
+    ptr_t = long # py2 only
+
+    typenum = np.dtype(np.double).num
+    ufunc = np.fromfunc([ptr_t(funcptr)], [[typenum, typenum]], 1, 1, [None])
+
+    x = np.linspace(0., 10., 1000)
+    x.dtype=np.double
+#    print x
+    ans = ufunc(x)
+#    print ans
+
+    if not ( ans == x/2.345 ).all():
+        raise ValueError('Computation failed')
+    else:
+        print('Good')
+
+if __name__ == '__main__':
+    main()