a lot of test

demos/cython/mandel_main_cp.py

@@ -0,0 +1,44 @@
+import numpy as np
+import matplotlib.pyplot as plt
+import sys
+from mandel import compute_mandel as compute_mandel_py
+try:
+    from mandel_cyt import compute_mandel as compute_mandel_cyt
+except ImportError:
+    pass
+
+def plot_mandel(mandel):
+    plt.imshow(mandel)
+    plt.axis('off')
+    plt.show()
+
+def main(version='py'):
+    kwargs = dict(cr=0.285, ci=0.01,
+                  N=200,
+                  bound=1.5)
+
+    # choose pure Python or Cython version
+    if version == 'py':
+        print("Using pure Python")
+        mandel_func = compute_mandel_py
+    elif version == 'cyt': 
+        print("Using Cython")
+        try:
+            mandel_func = compute_mandel_cyt
+        except NameError as ex:
+            raise RuntimeError("Cython extension missing") from ex
+    else:
+        raise RuntimeError("Unknown version")
+
+    mandel_set, runtime = mandel_func(**kwargs)
+    return mandel_set, runtime
+
+if __name__ == '__main__':
+    if len(sys.argv) == 2:
+        mandel_set, runtime = main('cyt')
+    else:
+        mandel_set, runtime = main()
+    print('Mandelbrot set generated in {0:9.4f} seconds'.format(runtime))
+    plot_mandel(mandel_set)
+
+

demos/cython/setup.py

@@ -1,7 +1,8 @@
 from distutils.core import setup, Extension
 from Cython.Build import cythonize
+import numpy
 
 setup(
-     ext_modules=cythonize("mandel_cyt.pyx"),
+     ext_modules=cythonize("mandel_cyt.pyx",compiler_directives = {'language_level': 3}),include_dirs = [numpy.get_include()],
 )
 

demos/memory_usage.py

@@ -24,16 +24,16 @@ def maxmem():
 
 a = np.random.random((1024, 1024, 10))
 b = np.random.random((1024, 1024, 10))
-c = a - b
+#c = a - b
 #c = 2.0 * a - 4.5 * b
 #c = 2.0 * a - 4.5 * b + np.sin(a) - np.cos(b)
 #c = 2.0 * a - 4.5 * b + (np.sin(a) - np.cos(b))
 #c = (np.sin(a) - np.cos(b)) + 2.0 * a - 4.5 * b
 
-#c = 2.0 * a
-#c -= 4.5 * b
-#c += np.sin(a)
-#c -= np.cos(b)
+c = 2.0 * a
+c -= 4.5 * b
+c += np.sin(a)
+c -= np.cos(b)
 
 mem = maxmem() - overhead