comaniac commented on a change in pull request #6109:
URL: https://github.com/apache/incubator-tvm/pull/6109#discussion_r459551485
##########
File path: src/relay/backend/contrib/arm_compute_lib/codegen.cc
##########
@@ -78,57 +90,83 @@ class ACLJSONSerializer : public
backend::contrib::JSONSerializer {
private:
/*!
- * \brief Create a JSON representation of a composite convolution.
+ * \brief Extract convolution nodes from a composite function.
*
- * \param call The call to be represented.
- * \return A JSON representation of a specific operator.
+ * \param cn The call node of the composite function.
+ * \return Extracted composite convolution nodes.
*/
- std::shared_ptr<JSONGraphNode> CreateCompositeConvJSONNode(const CallNode*
cn) {
- const std::string name = "nn.conv2d";
- const CallNode* pad = nullptr;
- const CallNode* conv = nullptr;
- const CallNode* bias = nullptr;
- bool has_activation = false;
-
- // Unpack composite function
+ static CompositeConvNodes UnpackCompositeConvolution(const CallNode* cn) {
+ CompositeConvNodes nodes{};
const auto* fn = cn->op.as<FunctionNode>();
CHECK(fn);
const auto* current_call = fn->body.as<CallNode>();
+ if (backend::IsOp(current_call, "qnn.requantize")) {
+ nodes.requantize = current_call;
+ current_call = current_call->args[0].as<CallNode>();
+ }
if (backend::IsOp(current_call, "nn.relu")) {
- has_activation = true;
+ nodes.activation = current_call;
current_call = current_call->args[0].as<CallNode>();
}
if (backend::IsOp(current_call, "nn.bias_add")) {
- bias = current_call;
+ nodes.bias = current_call;
current_call = current_call->args[0].as<CallNode>();
}
- CHECK(backend::IsOp(current_call, "nn.conv2d"));
- conv = current_call;
+ if (nodes.requantize) {
+ CHECK(backend::IsOp(current_call, "qnn.conv2d"));
Review comment:
I meant we could just have the CHECK embedded to make the logic clearer.
```c
if (backend::IsOp(current_call, "nn.relu")) {
nodes.activation = current_call;
current_call = current_call->args[0].as<CallNode>();
CHECK(backend::IsOp(current_call, "qnn.conv2d"));
}
if ( ... ) {
CHECK(backend::IsOp(current_call, "nn.conv2d"));
}
if ( ... ) {
CHECK(backend::IsOp(current_call, "nn.conv2d"));
}
```
##########
File path: src/runtime/contrib/arm_compute_lib/acl_runtime.cc
##########
@@ -163,24 +149,61 @@ class ACLRuntime : public JSONRuntimeBase {
struct CachedLayer {
std::shared_ptr<arm_compute::IFunction> function;
std::vector<arm_compute::Tensor> inputs;
- std::vector<arm_compute::Tensor> const_inputs;
std::vector<arm_compute::Tensor> outputs;
};
+ /*!
+ * \brief Create an ACL tensor given the JSON representation.
Review comment:
Hmmm I see. Then this is different from other functions in `acl_utils`.
We could use the different naming convention. Specifically, we could keep the
function here and rename it to something like `MakeACLTensorFromDataEntry` (you
might have a better name for it).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
