Merge pull request #636 from zhangyang0701/develop

Unify FUSION_CONVADDRELU_OP usage

src/operators/fusion_conv_add_relu_op.cpp

@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#ifdef CONVADDRELU_OP
+#ifdef FUSION_CONVADDRELU_OP
 
 #include "fusion_conv_add_relu_op.h"
 #include "operators/math/conv_func.h"

src/operators/fusion_conv_add_relu_op.h

@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#ifdef CONVADDRELU_OP
+#ifdef FUSION_CONVADDRELU_OP
 
 #pragma once
 

src/operators/kernel/arm/conv_add_relu_kernel.cpp

@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#ifdef FUSION_CONVADD_RELU_OP
+#ifdef FUSION_CONVADDRELU_OP
 
 #include "operators/kernel/conv_add_relu_kernel.h"
 #include "operators/kernel/central-arm-func/conv_add_relu_arm_func.h"

src/operators/kernel/central-arm-func/conv_add_relu_arm_func.h

@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#ifdef FUSION_CONVADD_RELU_OP
+#ifdef FUSION_CONVADDRELU_OP
 
 #pragma once
 #include <vector>

src/operators/kernel/conv_add_relu_kernel.h

@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 
-#ifdef FUSION_CONVADD_RELU_OP
+#ifdef FUSION_CONVADDRELU_OP
 
 #include <vector>
 #include "framework/ddim.h"

src/operators/op_param.h

@@ -962,7 +962,7 @@ class FusionConvAddParam : public OpParam {
 Print &operator<<(Print &printer, const FusionConvAddParam &conv_param);
 #endif
 
-#ifdef FUSION_CONVADD_RELU_OP
+#ifdef FUSION_CONVADDRELU_OP
 class FusionConvAddReluParam : public FusionConvAddParam {
  public:
   FusionConvAddReluParam(const VariableNameMap &inputs,

tools/op.cmake

@@ -10,7 +10,7 @@ if ("googlenet" IN_LIST NET)
   set(POOL_OP ON)
   set(RELU_OP ON)
   set(FUSION_CONVADD_OP ON)
-  set(FUSION_CONVADD_RELU_OP ON)
+  set(FUSION_CONVADDRELU_OP ON)
 
   set(FOUND_MATCH ON)
 endif()
@@ -72,15 +72,18 @@ endif()
 
 if ("FPGAnets" IN_LIST NET)
   message("FPGAnets enabled")
-  set(FUSION_CONVRELU_OP ON)
-  set(FUSION_CONVBNSCALE_OP ON)
-  set(FUSION_CONVBNSCALERELU_OP ON)  
+  set(FUSION_CONVADDRELU_OP ON)
+  set(FUSION_CONVADDBNRELU_OP ON)
+  set(FUSION_CONVADDBN_OP ON)
   set(FUSION_POOLBN_OP ON)
   set(FUSION_ELEMENTWISEADDRELU_OP ON)
+  set(FUSION_FC_OP ON)
+  set(FUSION_FCRELU_OP ON)
   set(REGION_OP ON)
   set(POOL_OP ON)
   set(CONCAT_OP ON)
   set(SOFTMAX_OP ON)
+  set(DROPOUT_OP ON)
 
   set(FOUND_MATCH ON)   
 endif()
@@ -95,7 +98,7 @@ if(NOT FOUND_MATCH)
   set(DEPTHWISECONV_OP ON)
   set(ELEMENTWISEADD_OP ON)
   set(FUSION_CONVADD_OP ON)
-  set(CONVADDRELU_OP ON)
+  set(FUSION_CONVADDRELU_OP ON)
   set(FUSION_FC_OP ON)
   set(LRN_OP ON)
   set(MUL_OP ON)
@@ -107,7 +110,6 @@ if(NOT FOUND_MATCH)
   set(SIGMOID_OP ON)
   set(SOFTMAX_OP ON)
   set(TRANSPOSE_OP ON)
-  set(FUSION_CONVADD_RELU_OP ON)
   set(FUSION_CONVADDBNRELU_OP ON)
   set(FUSION_DWCONVBNRELU_OP ON)
   set(FUSION_CONVBNRELU_OP ON)
@@ -126,7 +128,7 @@ endif()
   # option(DEPTHWISECONV_OP "" ON)
   # option(ELEMENTWISEADD_OP "" ON)
   # option(FUSION_CONVADD_OP "" ON)
-  # option(CONVADDRELU_OP "" ON)
+  # option(FUSION_CONVADDRELU_OP "" ON)
   # option(FUSION_FC_OP "" ON)
   # option(LRN_OP "" ON)
   # option(MUL_OP "" ON)
@@ -138,7 +140,6 @@ endif()
   # option(SIGMOID_OP "" ON)
   # option(SOFTMAX_OP "" ON)
   # option(TRANSPOSE_OP "" ON)
-  # option(FUSION_CONVADD_RELU_OP "" ON)
 # endif ()
 
 if (BATCHNORM_OP)
@@ -162,8 +163,8 @@ endif()
 if (FUSION_CONVADD_OP)
   add_definitions(-DFUSION_CONVADD_OP)
 endif()
-if (CONVADDRELU_OP)
-  add_definitions(-DCONVADDRELU_OP)
+if (FUSION_CONVADDRELU_OP)
+  add_definitions(-DFUSION_CONVADDRELU_OP)
 endif()
 if (FUSION_FC_OP)
   add_definitions(-DFUSION_FC_OP)
@@ -198,9 +199,6 @@ endif()
 if (TRANSPOSE_OP)
   add_definitions(-DTRANSPOSE_OP)
 endif()
-if (FUSION_CONVADD_RELU_OP)
-  add_definitions(-DFUSION_CONVADD_RELU_OP)
-endif()
 if (FUSION_CONVADDBNRELU_OP)
   add_definitions(-DFUSION_CONVADDBNRELU_OP)
 endif()
@@ -231,14 +229,11 @@ if (IM2SEQUENCE_OP)
   add_definitions(-DIM2SEQUENCE_OP)
 endif()
 
-if (FUSION_CONVRELU_OP)
-  add_definitions(-DFUSION_CONVRELU_OP)
-endif()
-if (FUSION_CONVBNSCALE_OP)
-  add_definitions(-DFUSION_CONVBNSCALE_OP)
+if (FUSION_CONVADDBN_OP)
+  add_definitions(-DFUSION_CONVADDBN_OP)
 endif()
-if (FUSION_CONVBNSCALERELU_OP)
-  add_definitions(-DFUSION_CONVBNSCALERELU_OP)
+if (FUSION_FCRELU_OP)
+  add_definitions(-DFUSION_FCRELU_OP)
 endif()
 if (FUSION_POOLBN_OP)
   add_definitions(-DFUSION_POOLBN_OP)