- Fixed a missing array import.

- Fix to XFunc for Python 3, to be verified.

Author: andrewtliew

src/compas/hpc/geometry/basic.py

@@ -5,6 +5,7 @@
 from numba import int64
 from numba import jit
 
+from numpy import array
 from numpy import sqrt
 from numpy import sum
 from numpy import zeros
@@ -577,8 +578,6 @@ def multiply_matrix_vector_numba(A, b):
 
 if __name__ == "__main__":
 
-    from numpy import array
-
     u = array([1., 2., 3.])
     v = array([4., 5., 6.])
     c = array([[1., 2., 3.], [1., 1., 1.]])
@@ -623,6 +622,7 @@ def multiply_matrix_vector_numba(A, b):
 
     print(multiply_matrices_numba(e, f))
     print(multiply_matrix_vector_numba(e, d))
+
 #     print(vector_component_numba(u, v))
 #     print(vector_component_xy_numba(u, v))
 #     print(homogenise_vectors_numba(d,3))

src/compas/utilities/xfunc.py

@@ -28,8 +28,11 @@
 import sys
 import importlib
 
-import json
-import cStringIO
+import json
+try:
+    import cStringIO
+except:
+    import io
 import cProfile
 import pstats
 import traceback
@@ -68,8 +71,11 @@
     r = f(*args, **kwargs)
 
     profile.disable()
-
-    stream = cStringIO.StringIO()
+
+    try:
+        stream = cStringIO.StringIO()
+    except:
+        stream = io.StringIO()
     stats  = pstats.Stats(profile, stream=stream)
     stats.strip_dirs()
     stats.sort_stats(1)
@@ -120,7 +126,8 @@
 def test_xfunc(numiter=100, pause=0.1):
     for k in range(numiter):
         print(k)
-        time.sleep(pause)
+        time.sleep(pause)
+    return 'test_xfunc_finished'
 
 
 def _xecute(funcname, basedir, tmpdir, delete_files, mode, callback, callback_args,