diff --git a/src/operators/fusion_conv_add_relu_op.cpp b/src/operators/fusion_conv_add_relu_op.cpp index 5575b52ce9866901a13c630a7509c7e5ec5401cb..18618886cccba08c7502b3e1d75fbba9b6916f56 100644 --- a/src/operators/fusion_conv_add_relu_op.cpp +++ b/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" diff --git a/src/operators/fusion_conv_add_relu_op.h b/src/operators/fusion_conv_add_relu_op.h index cf68fac8cf6dad4eb8469a543656311e5cedc9e7..50a4a2c7c64526c9a5dc1057829ed14f09357780 100644 --- a/src/operators/fusion_conv_add_relu_op.h +++ b/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 diff --git a/src/operators/kernel/arm/conv_add_relu_kernel.cpp b/src/operators/kernel/arm/conv_add_relu_kernel.cpp index 356dd191e761afc5d5b6bfacd250f90ae31017b2..8414b7374dd0ed2b10784563dbac9c1565d66f4c 100644 --- a/src/operators/kernel/arm/conv_add_relu_kernel.cpp +++ b/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" diff --git a/src/operators/kernel/central-arm-func/conv_add_relu_arm_func.h b/src/operators/kernel/central-arm-func/conv_add_relu_arm_func.h index 6aadbab95c591d4286fdbb3c3f01a291cdd90429..e8929e3e94073d384d24f63b5aa73e51e353fa26 100644 --- a/src/operators/kernel/central-arm-func/conv_add_relu_arm_func.h +++ b/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 diff --git a/src/operators/kernel/conv_add_relu_kernel.h b/src/operators/kernel/conv_add_relu_kernel.h index 3f36d80c4781aebea756b04e340d056a79cfd7d7..931313273d150fa1ad159e7069fbc3812d6e6657 100644 --- a/src/operators/kernel/conv_add_relu_kernel.h +++ b/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 #include "framework/ddim.h" diff --git a/src/operators/op_param.h b/src/operators/op_param.h index 4948a5163244085830243de7f8b90d6c52b9d8e0..cf2367b9f3e5bbcb2ada32fb6715d39edb781713 100644 --- a/src/operators/op_param.h +++ b/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, diff --git a/tools/op.cmake b/tools/op.cmake index d90a3db9883bd189e3187e11164994646c16fc33..ec9768443c5e9825931111803acf1f51c1aa1acd 100644 --- a/tools/op.cmake +++ b/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)