Skip to content
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

[BugFix] Fix sampling of values from NonTensorSpec #2169

Merged
merged 1 commit into from
May 22, 2024
Merged

[BugFix] Fix sampling of values from NonTensorSpec #2169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
init
  • Loading branch information
@vmoens
vmoens committed May 22, 2024
commit 7f033780b07484e7c0806bbe7b881e93627b7aaf
8 changes: 8 additions & 0 deletions test/test_specs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3404,6 +3404,14 @@ def test_project(self, shape, device, spectype, rand_shape, n=5):
assert (sp != s).all()


class TestNonTensorSpec:
def test_sample(self):
nts = NonTensorSpec(shape=(3, 4))
assert nts.one((2,)).shape == (2, 3, 4)
assert nts.rand((2,)).shape == (2, 3, 4)
assert nts.zero((2,)).shape == (2, 3, 4)


if __name__ == "__main__":
args, unknown = argparse.ArgumentParser().parse_known_args()
pytest.main([__file__, "--capture", "no", "--exitfirst"] + unknown)
24 changes: 18 additions & 6 deletions torchrl/data/tensor_specs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1949,14 +1949,26 @@ def to(self, dest: Union[torch.dtype, DEVICE_TYPING]) -> NonTensorSpec:
def clone(self) -> NonTensorSpec:
return self.__class__(shape=self.shape, device=self.device, dtype=self.dtype)

def rand(self, shape):
return NonTensorData(data=None, batch_size=self.shape, device=self.device)
def rand(self, shape=None):
if shape is None:
shape = ()
return NonTensorData(
data=None, batch_size=(*shape, self.shape), device=self.device
)

def zero(self, batch_size):
return NonTensorData(data=None, batch_size=self.shape, device=self.device)
def zero(self, shape=None):
if shape is None:
shape = ()
return NonTensorData(
data=None, batch_size=(*shape, self.shape), device=self.device
)

def one(self, batch_size):
return NonTensorData(data=None, batch_size=self.shape, device=self.device)
def one(self, shape=None):
if shape is None:
shape = ()
return NonTensorData(
data=None, batch_size=(*shape, self.shape), device=self.device
)

def is_in(self, val: torch.Tensor) -> bool:
shape = torch.broadcast_shapes(self.shape, val.shape)
Expand Down
Loading