Support int32 index for Gather #2030
Conversation
lib/Graph/Nodes.cpp
Outdated
| @@ -818,7 +818,8 @@ bool RowwiseQuantizedFullyConnectedNode::verify() const { | |||
|
|
|||
| bool GatherNode::verify() const { | |||
| bool isValid = checkType(getResult(), getData().getElementType(), this); | |||
| isValid &= checkType(getIndices(), ElemKind::Int64ITy, this); | |||
| isValid &= (checkType(getIndices(), ElemKind::Int64ITy, this) || | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
include/glow/Graph/VerifierHelper.h
Outdated
| const char *msg, const InputTy &a, llvm::ArrayRef<InputTy> b, | ||
| const Node *parent, | ||
| const CompareWithName<InputTy> &comp = CompareOperatorEqual<InputTy>()) { | ||
| bool seed = false; |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
include/glow/Graph/VerifierHelper.h
Outdated
| @@ -153,6 +188,12 @@ bool checkSameShape(NodeValue A, NodeValue B, const Node *parent); | |||
| /// \see expectCompareTrue for more details. | |||
| bool checkType(NodeValue A, ElemKind expectedType, const Node *parent); | |||
|
|
|||
| /// Check that the element type of the operand \p A matches any of the expected | |||
| /// types \p expected Types. \p parent is used to print the context of that | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
lib/Backends/CPU/libjit/libjit.cpp
Outdated
| @@ -370,7 +370,7 @@ void libjit_gather(T *dest, const T *data, const size_t *indices, | |||
| size_t sampleStart = sample * sampleSize; | |||
|
|
|||
| // For each slice that we fetch: | |||
| for (size_t i = 0; i < numIndices; i++) { | |||
| for (IDX i = 0; i < numIndices; i++) { | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| auto *F = getFunction("gather", dest->getElementType()); | ||
| llvm::Function *F = nullptr; | ||
| if (indices->getElementType() == ElemKind::Int64ITy) { | ||
| F = getFunction("gather64", dest->getElementType()); |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
Comments addressed. |
| isValid &= checkType(getIndices(), ElemKind::Int64ITy, this); | ||
| isValid &= checkType( | ||
| getIndices(), | ||
| llvm::makeArrayRef({ElemKind::Int64ITy, ElemKind::Int32ITy}), this); |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
|
||
| { | ||
| ONNXModelLoader onnxLD(netFilename, {"data", "indices"}, | ||
| {&data.getType(), &indices.getType()}, *F); | ||
| output = onnxLD.getSingleOutput(); | ||
| } | ||
| EE.compile(CompilationMode::Infer, F); |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
Description:
The indices input of
Gathercan be eitherint32_torint64_t, we need to support both. This PR does this and adds support for Interpreter and CPU backend.Testing:
Unit test
Documentation:
[Optional Fixes #issue]
Please see a detailed explanation of how to fill out the fields in the relevant sections in PULL_REQUEST.md.