Add matmul

Author: fujunwei

third_party/blink/renderer/modules/ml/v2/BUILD.gn

@@ -24,6 +24,8 @@ blink_modules_sources("v2") {
     "ops/conv.h",
     "ops/input.cc",
     "ops/input.h",
+    "ops/matmul.cc",
+    "ops/matmul.h",
     "ops/output.cc",
     "ops/output.h",
     "ops/pooling.cc",

third_party/blink/renderer/modules/ml/v2/nn_context.cpp

@@ -18,6 +18,7 @@
 #include "third_party/blink/renderer/modules/ml/v2/ops/constant.h"
 #include "third_party/blink/renderer/modules/ml/v2/ops/conv.h"
 #include "third_party/blink/renderer/modules/ml/v2/ops/input.h"
+#include "third_party/blink/renderer/modules/ml/v2/ops/matmul.h"
 #include "third_party/blink/renderer/modules/ml/v2/ops/pooling.h"
 #include "third_party/blink/renderer/modules/ml/v2/ops/relu.h"
 #include "third_party/blink/renderer/modules/ml/v2/ops/reshape.h"
@@ -232,6 +233,10 @@ Operand* NNContext::relu(Operand* input) {
   return MakeGarbageCollected<Relu>(input);
 }
 
+Operand* NNContext::matmul(Operand* a, Operand* b) {
+  return MakeGarbageCollected<MatMul>(a, b);
+}
+
 ScriptPromise NNContext::createModel(ScriptState* script_state,
                                      const NamedOperandVector& outputs) {
   auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);

third_party/blink/renderer/modules/ml/v2/nn_context.h

@@ -69,6 +69,7 @@ class NNContext final : public ScriptWrappable,
   Operand* reshape(Operand*, WTF::Vector<int32_t>);
   Operand* softmax(Operand*);
   Operand* relu(Operand*);
+  Operand* matmul(Operand*, Operand*);
   ScriptPromise createModel(ScriptState*, const NamedOperandVector&);
 
   // ExecutionContextLifecycleObserver overrides.

third_party/blink/renderer/modules/ml/v2/nn_context.idl

@@ -27,6 +27,7 @@ interface NNContext {
     Operand reshape(Operand input, sequence<long> newShape);
     Operand softmax(Operand input);
     Operand relu(Operand input);
+    Operand matmul(Operand a, Operand b);
 
     // Create Model
     [CallWith=ScriptState] Promise<Model> createModel(sequence<NamedOperand> outputs);

third_party/blink/renderer/modules/ml/v2/ops/matmul.cc

@@ -0,0 +1,47 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "third_party/blink/renderer/modules/ml/v2/ops/matmul.h"
+
+#include <memory>
+
+#include "third_party/blink/renderer/modules/ml/neural_network_context.h"
+
+namespace blink {
+
+MatMul::MatMul(Operand* a, Operand* b) : Output({a, b}) {}
+
+void MatMul::AddLayer(NNModel* model, uint32_t& index) {
+  Vector<uint32_t> input_indexes;
+  // Add input index to input_indexes.
+  for (auto& input : Output::Inputs()) {
+    input_indexes.push_back(input->Index());
+  }
+
+  // We can't get the bias size.
+  uint32_t bias_index = index++;
+  model->AddUnspecifiedOperand();
+  input_indexes.push_back(bias_index);
+
+  // Add fused code operand and set the value.
+  uint32_t fuse_index = index++;
+  model->AddScalarOperand(fuse_index, 0);
+  input_indexes.push_back(fuse_index);
+
+  // There are no MatMul defined in Android NN API, We use kFullyConnected
+  // instead of MatMul.
+  uint32_t matmul_index = index++;
+  model->AddScalarOperand(matmul_index, 0);
+  input_indexes.push_back(matmul_index);
+
+  // Add MatMul output operand.
+  uint32_t output_index = index++;
+  Operand::SetIndex(output_index);
+  model->AddUnspecifiedOperand();
+
+  model->AddOperation(NeuralNetworkContext::kFullyConnected, input_indexes,
+                      {output_index});
+}
+
+}  // namespace blink

third_party/blink/renderer/modules/ml/v2/ops/matmul.h

@@ -0,0 +1,24 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_ML_OPS_MATMUL_H_
+#define THIRD_PARTY_BLINK_RENDERER_MODULES_ML_OPS_MATMUL_H_
+
+#include "third_party/blink/renderer/modules/ml/v2/nn_model.h"
+#include "third_party/blink/renderer/modules/ml/v2/operand.h"
+#include "third_party/blink/renderer/modules/ml/v2/ops/output.h"
+
+namespace blink {
+
+class MatMul final : public Output {
+ public:
+  MatMul(Operand*, Operand*);
+  ~MatMul() override = default;
+
+  void AddLayer(NNModel* model, uint32_t& index) override;
+};
+
+}  // namespace blink
+
+#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_ML_OPS_MATMUL_H_