Skip to content

Commit

Permalink
escape for single partition
Browse files Browse the repository at this point in the history
  • Loading branch information
veenstrajelmer committed Aug 14, 2024
1 parent 946ae02 commit 24b6182
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions tests/test_partitioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ def test_partition_roundtrip(self):
reordered = back.isel(mesh2d_nFaces=order)
assert reordered["face_z"].equals(self.uds["face_z"])

def test_merge_partition_single(self):
partitions = [self.uds]
back = xu.merge_partitions(partitions)
assert back == self.uds

def test_merge_partitions__errors(self):
partitions = self.uds.ugrid.partition(n_part=2)
with pytest.raises(TypeError, match="Expected UgridDataArray or UgridDataset"):
Expand Down
5 changes: 5 additions & 0 deletions xugrid/ugrid/partitioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ def merge_data_along_dim(

return xr.concat(to_merge, dim=merge_dim)

xu.merge_partitions([1])

def merge_partitions(partitions, merge_ugrid_chunks: bool = True):
"""
Expand Down Expand Up @@ -339,6 +340,10 @@ def merge_partitions(partitions, merge_ugrid_chunks: bool = True):
if obj_type not in (UgridDataArray, UgridDataset):
raise TypeError(msg.format(obj_type.__name__))

# return first partition if single partition is provided
if len(partitions) == 1:
return next(iter(partitions))

# Collect grids
grids = [grid for p in partitions for grid in p.grids]
ugrid_dims = {dim for grid in grids for dim in grid.dimensions}
Expand Down

0 comments on commit 24b6182

Please sign in to comment.