Skip to content

Fix plotting after refactor #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kwmsmith merged 2 commits into from
May 5, 2014
Merged

Fix plotting after refactor #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d6501e
Fix import in plotting.py
bgrant May 5, 2014
e138806
Fix plotting examples
bgrant May 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion distarray/plotting/plotting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from numpy import arange, concatenate, empty, linspace, resize

from distarray.externals.six.moves import range
from distarray.decorators import local
from distarray.dist.decorators import local


@local
Expand Down
4 changes: 2 additions & 2 deletions examples/plot_distarray_block_axis_0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

from matplotlib import pyplot

import distarray
from distarray import plotting
from distarray.dist import Context


c = distarray.Context()
c = Context()
a = c.zeros((64, 64))
process_coords = [(0, 0), (1, 0), (2, 0), (3, 0)]
plotting.plot_array_distribution(a, process_coords, cell_label=False,
Expand Down
4 changes: 2 additions & 2 deletions examples/plot_distarray_block_axis_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

from matplotlib import pyplot

import distarray
from distarray import plotting
from distarray.dist import Context


c = distarray.Context()
c = Context()
a = c.zeros((64, 64), dtype='int32', dist=('n', 'b'))
process_coords = [(0, 0), (1, 0), (2, 0), (3, 0)]
plotting.plot_array_distribution(a, process_coords, cell_label=False,
Expand Down
4 changes: 2 additions & 2 deletions examples/plot_distarray_block_block.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

from matplotlib import pyplot

import distarray
from distarray import plotting
from distarray.dist import Context


c = distarray.Context()
c = Context()
a = c.zeros((64, 64), dtype='int32', dist=('b', 'b'))
process_coords = [(0, 0), (0, 1), (1, 0), (1, 1)]
plotting.plot_array_distribution(a, process_coords, cell_label=False,
Expand Down
4 changes: 2 additions & 2 deletions examples/plot_distarray_block_cyclic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

from matplotlib import pyplot

import distarray
from distarray import plotting
from distarray.dist import Context


c = distarray.Context()
c = Context()
a = c.zeros((64, 64), dtype='int32', dist=('b', 'c'))
process_coords = [(0, 0), (0, 1), (1, 0), (1, 1)]
plotting.plot_array_distribution(a, process_coords, cell_label=False,
Expand Down
4 changes: 2 additions & 2 deletions examples/plot_distarray_cyclic_cyclic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

from matplotlib import pyplot

import distarray
from distarray import plotting
from distarray.dist import Context


c = distarray.Context()
c = Context()
a = c.zeros((64, 64), dtype='int32', dist=('c', 'c'))
process_coords = [(0, 0), (0, 1), (1, 0), (1, 1)]
plotting.plot_array_distribution(a, process_coords, cell_label=False,
Expand Down
6 changes: 3 additions & 3 deletions examples/plot_distarray_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def print_array_documentation(context,

Parameters
----------
context : distarray.Context
context : distarray.dist.Context
The context that will be used to query the array properties.
array : DistArray
The array to describe.
Expand Down Expand Up @@ -556,7 +556,7 @@ def create_distribution_plot_and_documentation_all(context):


def main():
context = distarray.Context()
context = distarray.dist.Context()
num_targets = len(context.targets)
# Examples are designed for various engine counts...
engine_counts = [3, 4, 8]
Expand All @@ -565,7 +565,7 @@ def main():
raise ValueError('Need at least %d engines for all the examples, '
'but only have %d.' % (need_targets, num_targets))
for engine_count in engine_counts:
context_n = distarray.Context(targets=range(engine_count))
context_n = distarray.dist.Context(targets=range(engine_count))
create_distribution_plot_and_documentation_all(context_n)


Expand Down