✨🤖 Update RotatE to ERModel #877
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
trigger ci
cthoyt
reviewed
Apr 16, 2022
| @@ -611,7 +611,7 @@ def rotate_interaction( | |||
| The scores. | |||
| """ | |||
| # r expresses a rotation in complex plane. | |||
| h, r, t = [view_complex(x) for x in (h, r, t)] | |||
There was a problem hiding this comment.
are we ready to replace this function with the torch builtin?
There was a problem hiding this comment.
except in testing and dead code, we do not seem to reference this function anywhere else
trigger ci
mberr
commented
Apr 16, 2022
src/pykeen/nn/representation.py
Outdated
| @@ -347,7 +347,7 @@ def __init__( | |||
| # work-around until full complex support (torch==1.10 still does not work) | |||
| # TODO: verify that this is our understanding of complex! | |||
| if dtype.is_complex: | |||
| shape = tuple(shape[:-1]) + (2 * shape[-1],) | |||
| shape = tuple(shape[:-1]) + (shape[-1], 2) | |||
There was a problem hiding this comment.
this is the shape torch.view_as_complex expects, i.e., (..., 2)
mberr
commented
Apr 16, 2022
| @@ -661,11 +661,6 @@ def negative_norm( | |||
| assert not isinstance(p, str) | |||
| return -(x.abs() ** p).sum(dim=-1) | |||
|
|
|||
| if torch.is_complex(x): | |||
| assert not isinstance(p, str) | |||
| # workaround for complex numbers: manually compute norm | |||
There was a problem hiding this comment.
not necessary anymore in current torch
trigger ci
trigger ci
trigger ci
cthoyt
approved these changes
Apr 19, 2022
This was referenced Apr 20, 2022
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR updates
RotatEto new-styleERModel.It also update
Embeddingto better encapsulate complex embeddings, and updates the interaction functions of ComplEx and RotatE to operate on PyTorch native complex tensors.Benchmark
TL;DR: slightly slower evaluation (new
27.04svs26.74s); more than twice as fast in training (new39.77svs.91.72s)Quadro RTX 8000
pykeen experiments run sun2019_rotate_fb15k237.jsonwith the configuration being equal to src/pykeen/experiments/rotate/sun2019_rotate_fb15k237.json @ f47ee602, except that the number of training epochs has been reduced to
2.master)update-rotate-to-ermodel)*: withbatch_size=256**: withbatch_size=128