Skip to content

Use Dask for concatenate #38

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
marqh merged 2 commits into from
Feb 15, 2017
Merged

Use Dask for concatenate #38

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
4ebca19
Swap out Biggus concatenate for Dask concatenate
AlexHilson Feb 15, 2017
c2772ac
Re-enable passing concatenate tests
AlexHilson Feb 15, 2017
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
4 changes: 2 additions & 2 deletions lib/iris/_concatenate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from collections import defaultdict, namedtuple
from copy import deepcopy

import biggus
import dask.array as da
import numpy as np

import iris.coords
Expand Down Expand Up @@ -842,7 +842,7 @@ def _build_data(self):
skeletons = self._skeletons
data = [skeleton.data for skeleton in skeletons]

data = biggus.LinearMosaic(tuple(data), axis=self.axis)
data = da.concatenate(data, self.axis)

return data

Expand Down
5 changes: 0 additions & 5 deletions lib/iris/tests/test_concatenate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ def test_multi_equal(self):
self.assertEqual(concatenate(cubes), cubes)


@tests.skip_biggus
class TestNoConcat(tests.IrisTest):
def test_one_cube_has_anon_dim(self):
cubes = []
Expand Down Expand Up @@ -343,7 +342,6 @@ def test_masked_fill_value(self):
self.assertEqual(len(result), 1)


@tests.skip_biggus
class Test2D(tests.IrisTest):
def test_concat_masked_2x2d(self):
cubes = []
Expand Down Expand Up @@ -584,7 +582,6 @@ def test_concat_2x2d_aux_xy_bounds(self):
self.assertEqual(result[0].shape, (2, 4))


@tests.skip_biggus
class TestMulti2D(tests.IrisTest):
def test_concat_4x2d_aux_xy(self):
cubes = []
Expand Down Expand Up @@ -678,7 +675,6 @@ def test_concat_9mix2d_aux_xy(self):
self.assertEqual(result[0].shape, (6, 6))


@tests.skip_biggus
class TestMulti2DScalar(tests.IrisTest):
def test_concat_scalar_4x2d_aux_xy(self):
cubes = iris.cube.CubeList()
Expand Down Expand Up @@ -806,7 +802,6 @@ def test_concat_scalar_4mix2d_aux_xy(self):
self.assertEqual(result[0].shape, (2, 4, 4))


@tests.skip_biggus
class Test3D(tests.IrisTest):
def _make_group(self, xoff=0, yoff=0, zoff=0, doff=0):
xoff *= 4
Expand Down