这是indexloc提供的服务，不要输入任何密码
Skip to content

Improve Batch #126

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
merged 3 commits into from
Jul 11, 2020
Merged

Improve Batch #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f58257
make sure the key type of Batch is string, and add unit tests
youkaichao Jul 10, 2020
4129116
add is_empty() function and unit tests
youkaichao Jul 10, 2020
31f6da7
enable cat of mixing dict and Batch, just like stack
youkaichao Jul 10, 2020
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: 4 additions & 0 deletions test/base/test_batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@

def test_batch():
assert list(Batch()) == []
assert Batch().is_empty()
assert not Batch(a=[1, 2, 3]).is_empty()
with pytest.raises(AssertionError):
Batch({1: 2})
batch = Batch(a=[torch.ones(3), torch.ones(3)])
assert torch.allclose(batch.a, torch.ones(2, 3))
batch = Batch(obs=[0], np=np.zeros([3, 4]))
Expand Down
20 changes: 17 additions & 3 deletions tianshou/data/batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ def _create_value(inst: Any, size: int) -> Union[
return np.array([None for _ in range(size)])


def _assert_type_keys(keys):
keys = list(keys)
assert all(isinstance(e, str) for e in keys), \
f"keys should all be string, but got {keys}"


class Batch:
"""Tianshou provides :class:`~tianshou.data.Batch` as the internal data
structure to pass any kind of data to other methods, for example, a
Expand Down Expand Up @@ -247,6 +253,7 @@ def __init__(self,
batch_dict = deepcopy(batch_dict)
if batch_dict is not None:
if isinstance(batch_dict, (dict, Batch)):
_assert_type_keys(batch_dict.keys())
for k, v in batch_dict.items():
if isinstance(v, (list, tuple, np.ndarray)):
v_ = None
Expand Down Expand Up @@ -511,12 +518,14 @@ def cat_(self, batch: 'Batch') -> None:
raise TypeError(s)

@staticmethod
def cat(batches: List['Batch']) -> 'Batch':
"""Concatenate a :class:`~tianshou.data.Batch` object into a single
def cat(batches: List[Union[dict, 'Batch']]) -> 'Batch':
"""Concatenate a list of :class:`~tianshou.data.Batch` object into a single
new batch.
"""
batch = Batch()
for batch_ in batches:
if isinstance(batch_, dict):
batch_ = Batch(batch_)
batch.cat_(batch_)
return batch

Expand All @@ -531,6 +540,7 @@ def stack_(self,
keys_shared = set.intersection(*keys_map)
values_shared = [
[e[k] for e in batches] for k in keys_shared]
_assert_type_keys(keys_shared)
for k, v in zip(keys_shared, values_shared):
if all(isinstance(e, (dict, Batch)) for e in v):
self.__dict__[k] = Batch.stack(v, axis)
Expand All @@ -542,6 +552,7 @@ def stack_(self,
v = v.astype(np.object)
self.__dict__[k] = v
keys_partial = reduce(set.symmetric_difference, keys_map)
_assert_type_keys(keys_partial)
for k in keys_partial:
for i, e in enumerate(batches):
val = e.get(k, None)
Expand All @@ -554,7 +565,7 @@ def stack_(self,
self.__dict__[k][i] = val

@staticmethod
def stack(batches: List['Batch'], axis: int = 0) -> 'Batch':
def stack(batches: List[Union[dict, 'Batch']], axis: int = 0) -> 'Batch':
"""Stack a :class:`~tianshou.data.Batch` object into a single new
batch.
"""
Expand Down Expand Up @@ -615,6 +626,9 @@ def __len__(self) -> int:
raise TypeError("Object of type 'Batch' has no len()")
return min(r)

def is_empty(self):
return len(self.__dict__.keys()) == 0

@property
def shape(self) -> List[int]:
"""Return self.shape."""
Expand Down