diff --git a/src/framework/load_ops.h b/src/framework/load_ops.h index c38a23614bf59f82dc3937c77f29fe0526f3d29a..d7e2a059ed3fc13e0ec650db872cd6d1d0013d04 100644 --- a/src/framework/load_ops.h +++ b/src/framework/load_ops.h @@ -71,7 +71,7 @@ LOAD_OP(fill_constant) LOAD_OP2(batch_norm, CPU, GPU_CL); #endif #ifdef BILINEAR_INTERP_OP -LOAD_OP2(bilinear_interp, CPU, GPU_CL); +LOAD_OP1(bilinear_interp, CPU); #endif #ifdef BOXCODER_OP LOAD_OP2(box_coder, CPU, GPU_CL); @@ -86,21 +86,21 @@ LOAD_OP3(conv2d, CPU, GPU_CL, FPGA); LOAD_OP2(lrn, CPU, GPU_CL); #endif #ifdef SIGMOID_OP -LOAD_OP2(sigmoid, CPU, GPU_CL); +LOAD_OP1(sigmoid, CPU); #endif #ifdef FUSION_FC_RELU_OP -LOAD_OP3(fusion_fc_relu, CPU, GPU_CL, FPGA); +LOAD_OP2(fusion_fc_relu, CPU, FPGA); LOAD_FUSION_MATCHER(fusion_fc_relu); #endif #ifdef FUSION_ELEMENTWISEADDRELU_OP -LOAD_OP3(fusion_elementwise_add_relu, CPU, GPU_CL, FPGA); +LOAD_OP2(fusion_elementwise_add_relu, CPU, FPGA); LOAD_FUSION_MATCHER(fusion_elementwise_add_relu); #endif #ifdef SPLIT_OP -LOAD_OP2(split, CPU, GPU_CL); +LOAD_OP1(split, CPU); #endif #ifdef RESIZE_OP -LOAD_OP2(resize, CPU, GPU_CL); +LOAD_OP1(resize, CPU); #endif #ifdef FUSION_CONVADDBNRELU_OP LOAD_OP3(fusion_conv_add_bn_relu, CPU, GPU_CL, FPGA); @@ -110,13 +110,13 @@ LOAD_FUSION_MATCHER(fusion_conv_add_bn_relu); LOAD_OP2(reshape, CPU, GPU_CL); #endif #ifdef RESHAPE2_OP -LOAD_OP2(reshape2, CPU, GPU_CL); +LOAD_OP1(reshape2, CPU); #endif #ifdef TRANSPOSE_OP LOAD_OP2(transpose, CPU, GPU_CL); #endif #ifdef TRANSPOSE2_OP -LOAD_OP2(transpose2, CPU, GPU_CL); +LOAD_OP1(transpose2, CPU); #endif #ifdef PRIORBOX_OP LOAD_OP2(prior_box, CPU, GPU_CL); @@ -133,25 +133,25 @@ LOAD_FUSION_MATCHER(fusion_conv_add); LOAD_OP2(softmax, CPU, GPU_CL); #endif #ifdef SHAPE_OP -LOAD_OP2(shape, CPU, GPU_CL); +LOAD_OP1(shape, CPU); #endif #ifdef DEPTHWISECONV_OP -LOAD_OP2(depthwise_conv2d, CPU, GPU_CL); +LOAD_OP1(depthwise_conv2d, CPU); #endif #ifdef CONV_TRANSPOSE_OP -LOAD_OP2(conv2d_transpose, CPU, GPU_CL); +LOAD_OP1(conv2d_transpose, CPU); #endif #ifdef SCALE_OP -LOAD_OP2(scale, CPU, GPU_CL); +LOAD_OP1(scale, CPU); #endif #ifdef ELEMENTWISEADD_OP LOAD_OP2(elementwise_add, CPU, GPU_CL); #endif #ifdef PRELU_OP -LOAD_OP2(prelu, CPU, GPU_CL); +LOAD_OP1(prelu, CPU); #endif #ifdef FLATTEN_OP -LOAD_OP2(flatten, CPU, GPU_CL); +LOAD_OP1(flatten, CPU); #endif #ifdef FUSION_CONVBNADDRELU_OP LOAD_OP3(fusion_conv_bn_add_relu, CPU, GPU_CL, FPGA); @@ -162,13 +162,13 @@ LOAD_OP3(fusion_conv_bn_relu, CPU, GPU_CL, FPGA); LOAD_FUSION_MATCHER(fusion_conv_bn_relu); #endif #ifdef GRU_OP -LOAD_OP2(gru, CPU, GPU_CL); +LOAD_OP1(gru, CPU); #endif #ifdef GRU_UNIT_OP -LOAD_OP2(gru_unit, CPU, GPU_CL); +LOAD_OP1(gru_unit, CPU); #endif #ifdef FUSION_CONVADDBN_OP -LOAD_OP3(fusion_conv_add_bn, CPU, GPU_CL, FPGA); +LOAD_OP2(fusion_conv_add_bn, CPU, FPGA); LOAD_FUSION_MATCHER(fusion_conv_add_bn); #endif #ifdef DROPOUT_OP @@ -179,7 +179,7 @@ LOAD_OP2(fusion_dwconv_bn_relu, CPU, GPU_CL); LOAD_FUSION_MATCHER(fusion_dwconv_bn_relu); #endif #ifdef CRF_OP -LOAD_OP2(crf_decoding, CPU, GPU_CL); +LOAD_OP1(crf_decoding, CPU); #endif #ifdef MUL_OP LOAD_OP2(mul, CPU, GPU_CL); @@ -189,13 +189,13 @@ LOAD_OP2(norm, CPU, GPU_CL); #endif #ifdef RELU_OP LOAD_OP2(relu, CPU, GPU_CL); -LOAD_OP2(relu6, CPU, GPU_CL); +LOAD_OP1(relu6, CPU); #endif #ifdef IM2SEQUENCE_OP -LOAD_OP2(im2sequence, CPU, GPU_CL); +LOAD_OP1(im2sequence, CPU); #endif #ifdef LOOKUP_OP -LOAD_OP2(lookup_table, CPU, GPU_CL); +LOAD_OP1(lookup_table, CPU); #endif #ifdef FUSION_FC_OP LOAD_OP3(fusion_fc, CPU, GPU_CL, FPGA); @@ -208,123 +208,123 @@ LOAD_OP3(pool2d, CPU, GPU_CL, FPGA); LOAD_OP2(multiclass_nms, CPU, GPU_CL); #endif #ifdef POLYGONBOXTRANSFORM_OP -LOAD_OP2(polygon_box_transform, CPU, GPU_CL); +LOAD_OP1(polygon_box_transform, CPU); #endif #ifdef SUM_OP -LOAD_OP2(sum, CPU, GPU_CL); +LOAD_OP1(sum, CPU); #endif #ifdef ELEMENTWISEMUL_OP -LOAD_OP2(elementwise_mul, CPU, GPU_CL); +LOAD_OP1(elementwise_mul, CPU); #endif #ifdef SLICE_OP -LOAD_OP2(slice, CPU, GPU_CL); +LOAD_OP1(slice, CPU); #endif #ifdef FUSION_CONVBN_OP -LOAD_OP3(fusion_conv_bn, CPU, GPU_CL, FPGA); +LOAD_OP2(fusion_conv_bn, CPU, FPGA); LOAD_FUSION_MATCHER(fusion_conv_bn); #endif #ifdef ELEMENTWISESUB_OP -LOAD_OP2(elementwise_sub, CPU, GPU_CL) +LOAD_OP1(elementwise_sub, CPU) #endif #ifdef TOP_K_OP -LOAD_OP2(top_k, CPU, GPU_CL) +LOAD_OP1(top_k, CPU) #endif #ifdef CAST_OP -LOAD_OP2(cast, CPU, GPU_CL) +LOAD_OP1(cast, CPU) #endif #ifdef QUANT_OP -LOAD_OP2(quantize, CPU, GPU_CL); +LOAD_OP1(quantize, CPU); #endif #ifdef DEQUANT_OP -LOAD_OP2(dequantize, CPU, GPU_CL); +LOAD_OP1(dequantize, CPU); #endif #ifdef FUSION_DEQUANT_BN_OP -LOAD_OP2(fusion_dequant_bn, CPU, GPU_CL); +LOAD_OP1(fusion_dequant_bn, CPU); LOAD_FUSION_MATCHER(fusion_dequant_bn); #endif #ifdef FUSION_DEQUANT_ADD_BN_OP -LOAD_OP2(fusion_dequant_add_bn, CPU, GPU_CL); +LOAD_OP1(fusion_dequant_add_bn, CPU); LOAD_FUSION_MATCHER(fusion_dequant_add_bn); #endif #ifdef FUSION_DEQUANT_BN_RELU_OP -LOAD_OP2(fusion_dequant_bn_relu, CPU, GPU_CL); +LOAD_OP1(fusion_dequant_bn_relu, CPU); LOAD_FUSION_MATCHER(fusion_dequant_bn_relu); #endif #ifdef FUSION_DEQUANT_ADD_BN_RELU_OP -LOAD_OP2(fusion_dequant_add_bn_relu, CPU, GPU_CL); +LOAD_OP1(fusion_dequant_add_bn_relu, CPU); LOAD_FUSION_MATCHER(fusion_dequant_add_bn_relu); #endif #ifdef FUSION_DEQUANT_ADD_BN_QUANT_OP -LOAD_OP2(fusion_dequant_add_bn_quant, CPU, GPU_CL); +LOAD_OP1(fusion_dequant_add_bn_quant, CPU); LOAD_FUSION_MATCHER(fusion_dequant_add_bn_quant); #endif #ifdef FUSION_DEQUANT_ADD_BN_RELU_QUANT_OP -LOAD_OP2(fusion_dequant_add_bn_relu_quant, CPU, GPU_CL); +LOAD_OP1(fusion_dequant_add_bn_relu_quant, CPU); LOAD_FUSION_MATCHER(fusion_dequant_add_bn_relu_quant); #endif #ifdef SEQUENCE_EXPAND_OP -LOAD_OP2(sequence_expand, CPU, GPU_CL); +LOAD_OP1(sequence_expand, CPU); #endif #ifdef SEQUENCE_POOL_OP -LOAD_OP2(sequence_pool, CPU, GPU_CL); +LOAD_OP1(sequence_pool, CPU); #endif #ifdef LOG_OP -LOAD_OP2(log, CPU, GPU_CL); +LOAD_OP1(log, CPU); #endif #ifdef LOD_RESET_OP -LOAD_OP2(lod_reset, CPU, GPU_CL); +LOAD_OP1(lod_reset, CPU); #endif #ifdef LESS_THAN_OP -LOAD_OP2(less_than, CPU, GPU_CL); +LOAD_OP1(less_than, CPU); #endif #ifdef LOGICAL_AND_OP -LOAD_OP2(logical_and, CPU, GPU_CL); +LOAD_OP1(logical_and, CPU); #endif #ifdef LOGICAL_OR_OP -LOAD_OP2(logical_or, CPU, GPU_CL); +LOAD_OP1(logical_or, CPU); #endif #ifdef LOGICAL_NOT_OP -LOAD_OP2(logical_not, CPU, GPU_CL); +LOAD_OP1(logical_not, CPU); #endif #ifdef LOGICAL_XOR_OP -LOAD_OP2(logical_xor, CPU, GPU_CL); +LOAD_OP1(logical_xor, CPU); #endif #ifdef WHILE_OP -LOAD_OP2(while, CPU, GPU_CL); +LOAD_OP1(while, CPU); #endif #ifdef WRITE_TO_ARRAY_OP -LOAD_OP2(write_to_array, CPU, GPU_CL); +LOAD_OP1(write_to_array, CPU); #endif #ifdef READ_FROM_ARRAY_OP -LOAD_OP2(read_from_array, CPU, GPU_CL); +LOAD_OP1(read_from_array, CPU); #endif #ifdef IS_EMPTY_OP -LOAD_OP2(is_empty, CPU, GPU_CL); +LOAD_OP1(is_empty, CPU); #endif #ifdef INCREMENT_OP -LOAD_OP2(increment, CPU, GPU_CL); +LOAD_OP1(increment, CPU); #endif #ifdef ANCHOR_GENERATOR_OP -LOAD_OP2(anchor_generator, CPU, GPU_CL); +LOAD_OP1(anchor_generator, CPU); #endif #ifdef PROPOSAL_OP -LOAD_OP2(generate_proposals, CPU, GPU_CL); +LOAD_OP1(generate_proposals, CPU); #endif #ifdef PSROI_POOL_OP -LOAD_OP2(psroi_pool, CPU, GPU_CL); +LOAD_OP1(psroi_pool, CPU); #endif #ifdef ROI_PERSPECTIVE_OP -LOAD_OP2(roi_perspective_transform, CPU, GPU_CL); +LOAD_OP1(roi_perspective_transform, CPU); #endif #ifdef BEAM_SEARCH_OP -LOAD_OP2(beam_search, CPU, GPU_CL); +LOAD_OP1(beam_search, CPU); #endif #ifdef BEAM_SEARCH_DECODE_OP -LOAD_OP2(beam_search_decode, CPU, GPU_CL); +LOAD_OP1(beam_search_decode, CPU); #endif #ifdef PAD2D_OP -LOAD_OP2(pad2d, CPU, GPU_CL); +LOAD_OP1(pad2d, CPU); #endif #ifdef ONE_HOT_OP -LOAD_OP2(one_hot, CPU, GPU_CL); +LOAD_OP1(one_hot, CPU); #endif