Skip to content

Commit

Permalink
Don't raise error on len of empty Batch (thu-ml#1084)
Browse files Browse the repository at this point in the history
  • Loading branch information
MischaPanch authored and ZhengLi1314 committed Apr 15, 2024
1 parent fcbbe31 commit a70b532
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ instead of just `nn.Module`. #1032
- Added interfaces for most `Actor` and `Critic` classes to enforce the presence of `forward` methods. #1032
- Simplified `PGPolicy` forward by unifying the `dist_fn` interface (see associated breaking change). #1032
- Use `.mode` of distribution instead of relying on knowledge of the distribution type. #1032
- Exception no longer raised on `len` of empty `Batch`. #1084

### Breaking Changes

Expand Down
9 changes: 5 additions & 4 deletions tianshou/data/batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -870,16 +870,17 @@ def __len__(self) -> int:
"""Return len(self)."""
lens = []
for obj in self.__dict__.values():
# TODO: causes inconsistent behavior to batch with empty batches
# and batch with empty sequences of other type. Remove, but only after
# Buffer and Collectors have been improved to no longer rely on this
if isinstance(obj, Batch) and obj.is_empty(recurse=True):
continue
if hasattr(obj, "__len__") and (isinstance(obj, Batch) or obj.ndim > 0):
lens.append(len(obj))
else:
raise TypeError(f"Object {obj} in {self} has no len()")
if len(lens) == 0:
# empty batch has the shape of any, like the tensorflow '?' shape.
# So it has no length.
raise TypeError(f"Object {self} has no len()")
if not lens:
return 0
return min(lens)

def is_empty(self, recurse: bool = False) -> bool:
Expand Down

0 comments on commit a70b532

Please sign in to comment.