From afad7bcab6dfae07fd238125bb796d7b04942499 Mon Sep 17 00:00:00 2001
From: qnqinan <qnqinan@163.com>
Date: Mon, 11 Mar 2019 19:45:06 +0800
Subject: [PATCH] update deconvbnrelu and conv2d in opcmake

---
 src/operators/op_param.h | 12 ++++++------
 tools/op.cmake           |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/operators/op_param.h b/src/operators/op_param.h
index 5b9a2ea8f2..9982294767 100644
--- a/src/operators/op_param.h
+++ b/src/operators/op_param.h
@@ -2554,13 +2554,13 @@ class FusionDeconvBNReluParam : public ConvTransposeParam<Dtype> {
  public:
   FusionDeconvBNReluParam(const VariableNameMap &inputs,
                           const VariableNameMap &outputs,
-                          const AttributeMap &attrs, const Scope &scope)
+                          const AttributeMap &attrs, Scope *scope)
       : ConvTransposeParam<Dtype>(inputs, outputs, attrs, scope) {
-    output_ = OpParam::OutFrom<GType>(outputs, scope);
-    input_bias_ = OpParam::InputBiasFrom<GType>(inputs, scope);
-    input_mean_ = OpParam::InputMeanFrom<GType>(inputs, scope);
-    input_scale_ = OpParam::InputScaleFrom<GType>(inputs, scope);
-    input_variance_ = OpParam::InputVarianceFrom<GType>(inputs, scope);
+    output_ = OpParam::OutFrom<GType>(outputs, *scope);
+    input_bias_ = OpParam::InputBiasFrom<GType>(inputs, *scope);
+    input_mean_ = OpParam::InputMeanFrom<GType>(inputs, *scope);
+    input_scale_ = OpParam::InputScaleFrom<GType>(inputs, *scope);
+    input_variance_ = OpParam::InputVarianceFrom<GType>(inputs, *scope);
     epsilon_ = OpParam::GetAttr<float>("epsilon", attrs);
     momentum_ = OpParam::GetAttr<float>("momentum", attrs);
   }
diff --git a/tools/op.cmake b/tools/op.cmake
index aed5ce3260..190bb142bc 100755
--- a/tools/op.cmake
+++ b/tools/op.cmake
@@ -138,6 +138,8 @@ if (CON GREATER -1)
   set(CONV_TRANSPOSE_OP ON)
   set(FUSION_DECONVADDBNRELU_OP ON)
   set(FUSION_DECONVADDBN_OP ON)
+  set(FUSION_DECONVBNRELU_OP ON)
+  set(CONV_OP ON)
   set(ELEMENTWISEMUL_OP ON)
   set(FUSION_FCRELU_OP ON)
   set(RELU_OP ON)
@@ -616,6 +618,9 @@ endif()
 if (FUSION_DECONVADDBNRELU_OP)
   add_definitions(-DFUSION_DECONVADDBNRELU_OP)
 endif()
+if (FUSION_DECONVBNRELU_OP)
+  add_definitions(-DFUSION_DECONVBNRELU_OP)
+endif()
 if (FUSION_DECONVADDBN_OP)
   add_definitions(-DFUSION_DECONVADDBN_OP)
 endif()
-- 
GitLab