Skip to content

fix: docvec equality if tensors are involved - #1663

Merged
JohannesMessner merged 10 commits into
mainfrom
fix-docvec-equality
Jun 20, 2023
Merged

fix: docvec equality if tensors are involved#1663
JohannesMessner merged 10 commits into
mainfrom
fix-docvec-equality

Conversation

@JohannesMessner

@JohannesMessner JohannesMessner commented Jun 20, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

Before this, DocVec equality checks that involved a tensor would fail by raising and Exception:

    class Text(BaseDoc):
        tens: TorchTensor

    da = DocVec[Text](
        [Text(tens=[1, 2, 3, 4]) for _ in range(10)], tensor_type=TorchTensor
    )
    da2 = DocVec[Text](
        [Text(tens=[1, 2, 3, 4]) for _ in range(10)], tensor_type=TorchTensor
    )
    assert da == da2  # would raise
RuntimeError: Boolean value of Tensor with more than one value is ambiguous

This is because checks of the form tens1 == tens2 return a boolean tensor, not a single bool, which breaks an assumption in the previous implementation.

This PR solved that by introducing a helper function that let's us compare tensors and get a single bool as output.

@JohannesMessner
fix: equality for docvec if tensors are involved
4939705 
Signed-off-by: Johannes Messner <messnerjo@gmail.com>
@JohannesMessner
test: add tf tests
e0be741 
Signed-off-by: Johannes Messner <messnerjo@gmail.com>
@JohannesMessner
fix: add type ignore for mypy imports
98920a6 
Signed-off-by: Johannes Messner <messnerjo@gmail.com>
@JohannesMessner
test: remove non existing fixture
8bf1632 
Signed-off-by: Johannes Messner <messnerjo@gmail.com>
@JohannesMessner
test: fix faulty import
8ac1846 
Signed-off-by: Johannes Messner <messnerjo@gmail.com>
@JohannesMessner
fix: compare tf tensors of different shapes
6f4abed 
Signed-off-by: Johannes Messner <messnerjo@gmail.com>
@github-actions github-actions Bot added size/m and removed size/s labels Jun 20, 2023
@JohannesMessner
fix: unwrap tf tensor when needed
a76a37b 
Signed-off-by: Johannes Messner <messnerjo@gmail.com>
@JohannesMessner
fix: mypy
e4622b6 
Signed-off-by: Johannes Messner <messnerjo@gmail.com>
@JohannesMessner
JohannesMessner marked this pull request as ready for review June 20, 2023 09:46
samsja
samsja reviewed Jun 20, 2023
View reviewed changes
Comment thread docarray/helper.py Outdated
@JohannesMessner
refactor: move stuff to comp backends
62a3b1d 
Signed-off-by: Johannes Messner <messnerjo@gmail.com>
@JohannesMessner
fix: mypy
a89cae6 
Signed-off-by: Johannes Messner <messnerjo@gmail.com>
@JohannesMessner
JohannesMessner requested a review from samsja June 20, 2023 10:42
@github-actions

github-actions Bot commented Jun 20, 2023

Copy link
Copy Markdown

📝 Docs are deployed on https://ft-fix-docvec-equality--jina-docs.netlify.app 🎉

@JohannesMessner
JohannesMessner merged commit c3c8061 into main Jun 20, 2023
@JohannesMessner
JohannesMessner deleted the fix-docvec-equality branch June 20, 2023 11:41
@JohannesMessner JohannesMessner mentioned this pull request Jun 20, 2023
Closed
@scott-martens scott-martens mentioned this pull request Jun 20, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@samsja samsja samsja approved these changes

Assignees

No one assigned

Labels

area/core area/testing component/array size/m

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@JohannesMessner @samsja