saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-23 19:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[WebNN EP] Remove Conv initializer constraint for GPU (#18129)

Browse source 
### Description

WebNN can now handle Conv with filter as input .

### Motivation and Context
<!-- - Why is this change required? What problem does it solve?
- If it fixes an open issue, please link to the issue here. -->

Support more models with WebNN.
This commit is contained in:
zesongw 2023-10-28 04:57:01 +08:00 committed by GitHub
parent 28ad3ff799
commit d9695dea6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
onnxruntime/core/providers/webnn/builders/impl/conv_op_builder.cc
View file

@ -49,9 +49,8 @@ common::Status SetConvBaseOptions(ModelBuilder& model_builder,
NodeAttrHelper helper(node);
const auto group = helper.Get("group", static_cast<int32_t>(1));
const auto& input_defs = node.InputDefs();
const auto& weight_tensor = *model_builder.GetInitializerTensors().at(input_defs[1]->Name());
const auto& weight_shape = weight_tensor.dims();
std::vector<int64_t> weight_shape;
ORT_RETURN_IF_NOT(GetShape(*input_defs[1], weight_shape, logger), "Cannot get weight shape");
options.set("strides", emscripten::val::array(strides));
options.set("dilations", emscripten::val::array(dilations));
options.set("groups", group);
@ -278,25 +277,28 @@ Status ConvOpBuilder::AddToModelBuilderImpl(ModelBuilder& model_builder, const N
bool ConvOpBuilder::IsOpSupportedImpl(const InitializedTensorSet& initializers,
const Node& node,
const WebnnDeviceType /* device_type */,
const WebnnDeviceType device_type,
const logging::Logger& logger) const {
const auto& name = node.Name();
const auto& op_type = node.OpType();
const auto& input_defs = node.InputDefs();
const auto& weight_name = input_defs[1]->Name();
if (Contains(initializers, weight_name)) {
const auto& tensor = *initializers.at(weight_name);
if (tensor.dims().size() != 4) {
LOGS(logger, VERBOSE) << op_type << " [" << name << "] dimension: " << tensor.dims().size()
<< " Only conv 2d is supported.";
// WebNN CPU backend (XNNPACK) requires the filter operand to be a constant.
// https://github.com/google/XNNPACK/blob/master/src/subgraph/convolution-2d.c#L739
if (device_type == WebnnDeviceType::CPU) {
if (Contains(initializers, weight_name)) {
const auto& tensor = *initializers.at(weight_name);
if (tensor.dims().size() != 4) {
LOGS(logger, VERBOSE) << op_type << " [" << name << "] dimension: " << tensor.dims().size()
<< " Only conv 2d is supported.";
return false;
}
} else {
LOGS(logger, VERBOSE) << "The weight of " << op_type << " [" << name << "] must be known";
return false;
}
} else {
LOGS(logger, VERBOSE) << "The weight of " << op_type << " [" << name << "] must be known";
return false;
}
return true;
}