Merge pull request #418 from enthought/bugfix/fix-examples-for-0.3

Fix examples for 0.3 release

Author: kwmsmith

examples/basic_demo.py

@@ -7,17 +7,15 @@
 from __future__ import print_function
 
 import numpy
-import distarray
 from distarray.externals.six.moves import input
-from distarray import Context
-from distarray.client_map import Distribution
-from distarray.decorators import local
+
+from distarray.dist import Context, Distribution
+from distarray.dist.decorators import local
 from pprint import pprint
 
 context = Context()
 
 numpy.set_printoptions(precision=2, linewidth=1000)
-context.view.execute("import numpy")
 
 
 @local
@@ -34,8 +32,8 @@ def local_sin_plus_50(da):
 
 @local
 def global_sum(da):
-    """Reproducing the `sum` function in densedistarray."""
-    from distarray.mpiutils import MPI
+    """Reproducing the `sum` function in LocalArray."""
+    from distarray.local.mpiutils import MPI
     from distarray.local import LocalArray
     from distarray.local.maps import Distribution
 

examples/julia-set/bench_dist.py

@@ -17,14 +17,16 @@
 from IPython.parallel import Client
 from matplotlib import pyplot
 
-from distarray import Context, Distribution
-from distarray.decorators import local, vectorize
+from distarray.dist import Context, Distribution
+from distarray.dist.decorators import local, vectorize
 
 
 # Make an empty distributed array
 def make_empty_da(resolution, dist, context):
     """Create the arr we will build the fractal with."""
-    distribution = Distribution.from_shape(context, (resolution[0], resolution[1]), dist=dist)
+    distribution = Distribution.from_shape(context,
+                                           (resolution[0], resolution[1]),
+                                           dist=dist)
     out = context.empty(distribution, dtype=complex)
     return out
 
@@ -35,8 +37,8 @@ def draw_coord(arr, re_ax, im_ax, resolution):
     """Draw the complex coordinate plane"""
     re_step = float(re_ax[1] - re_ax[0]) / resolution[0]
     im_step = float(im_ax[1] - im_ax[0]) / resolution[1]
-    for i in arr.maps[0].global_iter:
-        for j in arr.maps[1].global_iter:
+    for i in arr.distribution[0].global_iter:
+        for j in arr.distribution[1].global_iter:
             arr.global_index[i, j] = complex(re_ax[0] + re_step*i,
                                              im_ax[0] + im_step*j)
     return arr

examples/julia-set/julia_distarray.py

@@ -11,12 +11,11 @@
 """
 
 import sys
-
 from matplotlib import pyplot
 
-from distarray import Context
-from distarray.client_map import Distribution
-from distarray.decorators import local, vectorize
+from distarray.dist import Context, Distribution
+from distarray.dist.decorators import local, vectorize
+
 
 context = Context()
 with context.view.sync_imports():

examples/make_distarray.py

@@ -8,8 +8,7 @@
 Create a distarray.
 """
 
-from distarray.context import Context
-from distarray.client_map import Distribution
+from distarray.dist import Context, Distribution
 
 
 c = Context()

examples/pi-montecarlo/pi_distarray.py

@@ -10,27 +10,37 @@
     $ python pi_distarray.py <number of points>
 """
 
-import sys
+from __future__ import division
 
-import distarray
-from distarray.random import Random
+import sys
 
 from util import timer
 
-context = distarray.Context()
+from distarray.dist import Context, Distribution, hypot
+from distarray.dist.random import Random
+
+
+context = Context()
 random = Random(context)
 
 
+def local_sum(mask):
+    return mask.ndarray.sum()
+
+
 @timer
 def calc_pi(n):
     """Estimate pi using distributed NumPy arrays."""
-    x = random.rand((n,))
-    y = random.rand((n,))
-    r = distarray.hypot(x, y)
-    return 4 * float((r < 1.).sum())/n
+    distribution = Distribution.from_shape(context=context, shape=(n,))
+    x = random.rand(distribution)
+    y = random.rand(distribution)
+    r = hypot(x, y)
+    mask = (r < 1)
+    lsum = context.apply(local_sum, (mask.key,))
+    return 4 * sum(lsum) / n
+
 
 if __name__ == '__main__':
     N = int(sys.argv[1])
     result, time = calc_pi(N)
     print('time  : %3.4g\nresult: %.7f' % (time, result))
-    context.view.client.purge_everything()

examples/plot_distarray_protocol.py

@@ -183,23 +183,23 @@ def rst_table(rows, cols, lines_list):
 
     # Examine the array on all the engines.
     cmd = 'distbuffer = %s.__distarray__()' % (array.key)
-    context._execute(cmd)
+    context._execute(cmd, targets=context.targets)
     cmd = 'db_keys = list(distbuffer.keys())'
-    context._execute(cmd)
+    context._execute(cmd, targets=context.targets)
     cmd = 'db_version = distbuffer["__version__"]'
-    context._execute(cmd)
+    context._execute(cmd, targets=context.targets)
     cmd = 'db_buffer = distbuffer["buffer"]'
-    context._execute(cmd)
+    context._execute(cmd, targets=context.targets)
     cmd = 'db_dim_data = distbuffer["dim_data"]'
-    context._execute(cmd)
+    context._execute(cmd, targets=context.targets)
     cmd = 'db_coords = %s.cart_coords' % (array.key)
-    context._execute(cmd)
+    context._execute(cmd, targets=context.targets)
     # Get data from each engine.
-    db_keys = context._pull('db_keys')
-    db_version = context._pull('db_version')
-    db_buffer = context._pull('db_buffer')
-    db_dim_data = context._pull('db_dim_data')
-    db_coords = context._pull('db_coords')
+    db_keys = context._pull('db_keys', targets=context.targets)
+    db_version = context._pull('db_version', targets=context.targets)
+    db_buffer = context._pull('db_buffer', targets=context.targets)
+    db_dim_data = context._pull('db_dim_data', targets=context.targets)
+    db_coords = context._pull('db_coords', targets=context.targets)
     # Get local ndarrays.
     db_ndarrays = array.get_ndarrays()
 
@@ -336,8 +336,8 @@ def shape_text(shape):
     # This is duplicating work in print_array_documentation(),
     # but it is needed for the local array plots.
     cmd = 'process_coords = %s.cart_coords' % (array.key)
-    context._execute(cmd)
-    process_coords = context._pull('process_coords')
+    context._execute(cmd, targets=context.targets)
+    process_coords = context._pull('process_coords', targets=context.targets)
 
     # Plot title and axis labels.
     plot_title = title + ' ' + shape_text(shape) + '\n'