From 5a0c37472ba8a97df62c3f55185cd9538ddd2043 Mon Sep 17 00:00:00 2001 From: qnqinan Date: Mon, 19 Nov 2018 15:39:47 +0800 Subject: [PATCH] update FPGA support op in op.cmake file --- tools/op.cmake | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tools/op.cmake b/tools/op.cmake index 71424179d7..5901a23a1f 100644 --- a/tools/op.cmake +++ b/tools/op.cmake @@ -127,23 +127,26 @@ endif() list(FIND NET "FPGA_NET_V2" CON) if (CON GREATER -1) message("FPGA_NET_V2 enabled") + set(FEED_OP ON) + set(FUSION_CONVADDRELU_OP ON) set(FUSION_ELEMENTWISEADDRELU_OP ON) set(FUSION_FC_OP ON) set(POOL_OP ON) set(SOFTMAX_OP ON) set(FUSION_CONVBNRELU_OP ON) set(FUSION_CONVBN_OP ON) -<<<<<<< HEAD -# set(CONV_TRANSPOSE_OP ON) -# set(SLICE_OP ON) -# set(ELEMENTWISEADD_OP ON) -======= set(CONV_TRANSPOSE_OP ON) set(FUSION_DECONVRELU_OP ON) - set(SLICE_OP ON) + #set(SLICE_OP ON) set(TANH_OP ON) set(ELEMENTWISEADD_OP ON) ->>>>>>> upstream/develop + set(TRANSPOSE2_OP ON) + set(FUSION_CONVADD_OP ON) + set(SPLIT_OP ON) + set(FUSION_DECONVADD_OP ON) + set(FUSION_DECONVADDRELU_OP ON) + + set(FOUND_MATCH ON) endif() @@ -458,4 +461,10 @@ if (TANH_OP) endif() if (FUSION_DECONVRELU_OP) add_definitions(-DFUSION_DECONVRELU_OP) +endif() +if (FUSION_DECONVADD_OP) + add_definitions(-DFUSION_DECONVADD_OP) +endif() +if (FUSION_DECONVADDRELU_OP) + add_definitions(-DFUSION_DECONVADDRELU_OP) endif() \ No newline at end of file -- GitLab