Skip to content

feat(v2): add video support #972

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
samsja merged 31 commits into from
Jan 17, 2023
Merged

feat(v2): add video support #972

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a452268
feat: add video url and tensors to proto
Jan 3, 2023
3ccb697
feat: add video url and video ndarray
Jan 3, 2023
dc957d1
feat: add video torch tensor and tests
Jan 4, 2023
fc86920
fix: mypy checks
Jan 4, 2023
8a55e0b
chore: add av to video extra
Jan 4, 2023
5cb098a
fix: allow dim 3
Jan 4, 2023
3ba1f78
test: wip video load and save
Jan 5, 2023
be63926
refactor: move to numpy to computational backend
Jan 6, 2023
395a495
fix: video load and save
Jan 11, 2023
406ec80
test: adjust tests
Jan 11, 2023
091e79a
fix: video load and save and add docstrings
Jan 11, 2023
dee1146
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-add-v…
Jan 11, 2023
e4106a8
fix: fix some imports after merging
Jan 11, 2023
23ee930
docs: add doc strings and fix example urls
Jan 11, 2023
7ab8dbd
docs: small fixes in docs
Jan 11, 2023
ecf01d8
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-add-v…
Jan 11, 2023
5295dd1
refactor: rename save to mp4 file to save
Jan 11, 2023
b3f2ccb
feat: add shape method to comp backend
Jan 16, 2023
20ecf2c
refactor: move validate shape to video tensor mixin
Jan 16, 2023
711d105
refactor: extract private load and make separate methods for frames
Jan 16, 2023
0c9c1fd
fix: use torch shape instead of size method
Jan 16, 2023
e3a465c
fix: add typehint to shape in comp backend
Jan 16, 2023
40eac93
docs: add supported strings for skip type
Jan 16, 2023
a700f30
fix: apply suggestions from code review
Jan 17, 2023
94572fd
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-add-v…
Jan 17, 2023
07ceae8
fix: small change to trigger ci again
Jan 17, 2023
c2e129d
fix: extract shape var
Jan 17, 2023
d50ae67
fix: introduce compbackendinterface
Jan 17, 2023
2e365e6
fix: revert previous pr and fix for mypy
Jan 17, 2023
c44a035
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-add-v…
Jan 17, 2023
95b0b81
Merge remote-tracking branch 'origin/feat-rewrite-v2' into feat-add-v…
Jan 17, 2023
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
Prev Previous commit
Next Next commit
fix: small change to trigger ci again 
Signed-off-by: anna-charlotte <[email protected]>
  • Loading branch information
anna-charlotte committed Jan 17, 2023
commit 07ceae8eb85e67888e742fef66390b5e43d9c2b7
1 change: 0 additions & 1 deletion docarray/typing/tensor/video/video_tensor_mixin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ def validate_shape(
cls: Union[Type['VideoTorchTensor'], Type['VideoNdArray']], value: 'T'
) -> 'T':
comp_backend = cls.get_comp_backend()

if (
comp_backend.n_dim(value) not in [3, 4] # type: ignore
Copy link
Member

@samsja samsja Jan 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need to ignore the type ?

Copy link
Contributor Author

@anna-charlotte anna-charlotte Jan 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without it mypy complains, I think because value in validate_shape can be an instance of VideoTensor, in our use case either VideoNdArray or VideoTorchTensor but the .n_dim methods have a specified input class respectiveley to their comp backend (np.ndarray or torch.Tensor). Therefore mypy complains that value is not an NdArray for NumpyCompBackend.n_dim() (or torch tensor for torch comp backend):

docarray/typing/tensor/video/video_tensor_mixin.py:22: error: Argument 1 to "n_dim" of "TorchCompBackend" has incompatible type "T"; expected "Tensor"  [arg-type]
docarray/typing/tensor/video/video_tensor_mixin.py:22: error: Argument 1 to "n_dim" of "NumpyCompBackend" has incompatible type "T"; expected "ndarray[Any, Any]"  [arg-type]

Copy link
Member

@JohannesMessner JohannesMessner Jan 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is this issue that has to be fixed using the ugly overloads.

Copy link
Member

@samsja samsja Jan 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JohannesMessner need ur help there we did not manage to debug this. I don't understand why it is not working and why we have different TypeVar in AbstractCompBackend

Copy link
Contributor Author

@anna-charlotte anna-charlotte Jan 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

overload was not working here, because the Mixin should not know about the classes VideoNdArray and VideoTorchTensor

or comp_backend.shape(value)[-1] != 3 # type: ignore
Expand Down