From a88b6bfbb800a51cf71f502c9eba08e479da706e Mon Sep 17 00:00:00 2001 From: nihuini Date: Fri, 8 Mar 2019 16:01:31 +0800 Subject: [PATCH] update softmax version --- benchmark/mobilenet_ssd.param | 2 +- benchmark/mobilenet_ssd_int8.param | 4 ++-- benchmark/squeezenet_ssd.param | 2 +- benchmark/squeezenet_ssd_int8.param | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/benchmark/mobilenet_ssd.param b/benchmark/mobilenet_ssd.param index 5bda98c28..306d8aeb3 100644 --- a/benchmark/mobilenet_ssd.param +++ b/benchmark/mobilenet_ssd.param @@ -124,6 +124,6 @@ Concat mbox_loc 6 1 conv11_mbox_loc_flat conv13_mbox_loc_flat Concat mbox_conf 6 1 conv11_mbox_conf_flat conv13_mbox_conf_flat conv14_2_mbox_conf_flat conv15_2_mbox_conf_flat conv16_2_mbox_conf_flat conv17_2_mbox_conf_flat mbox_conf 0=0 Concat mbox_priorbox 6 1 conv11_mbox_priorbox conv13_mbox_priorbox conv14_2_mbox_priorbox conv15_2_mbox_priorbox conv16_2_mbox_priorbox conv17_2_mbox_priorbox mbox_priorbox 0=1 Reshape mbox_conf_reshape 1 1 mbox_conf mbox_conf_reshape 0=21 1=-1 2=-233 3=0 -Softmax mbox_conf_softmax 1 1 mbox_conf_reshape mbox_conf_softmax 0=1 +Softmax mbox_conf_softmax 1 1 mbox_conf_reshape mbox_conf_softmax 0=1 1=1 Flatten mbox_conf_flatten 1 1 mbox_conf_softmax mbox_conf_flatten DetectionOutput detection_out 3 1 mbox_loc mbox_conf_flatten mbox_priorbox detection_out 0=21 1=0.450000 2=100 3=100 4=0.250000 diff --git a/benchmark/mobilenet_ssd_int8.param b/benchmark/mobilenet_ssd_int8.param index 287c49e26..b6400c933 100755 --- a/benchmark/mobilenet_ssd_int8.param +++ b/benchmark/mobilenet_ssd_int8.param @@ -123,7 +123,7 @@ PriorBox conv17_2_mbox_priorbox 2 1 conv17_2_conv17_2/relu_splitncnn_0 d Concat mbox_loc 6 1 conv11_mbox_loc_flat conv13_mbox_loc_flat conv14_2_mbox_loc_flat conv15_2_mbox_loc_flat conv16_2_mbox_loc_flat conv17_2_mbox_loc_flat mbox_loc 0=0 Concat mbox_conf 6 1 conv11_mbox_conf_flat conv13_mbox_conf_flat conv14_2_mbox_conf_flat conv15_2_mbox_conf_flat conv16_2_mbox_conf_flat conv17_2_mbox_conf_flat mbox_conf 0=0 Concat mbox_priorbox 6 1 conv11_mbox_priorbox conv13_mbox_priorbox conv14_2_mbox_priorbox conv15_2_mbox_priorbox conv16_2_mbox_priorbox conv17_2_mbox_priorbox mbox_priorbox 0=1 -Reshape mbox_conf_reshape 1 1 mbox_conf mbox_conf_reshape 0=21 1=-1 2=0 3=0 -Softmax mbox_conf_softmax 1 1 mbox_conf_reshape mbox_conf_softmax 0=1 +Reshape mbox_conf_reshape 1 1 mbox_conf mbox_conf_reshape 0=21 1=-1 2=-233 3=0 +Softmax mbox_conf_softmax 1 1 mbox_conf_reshape mbox_conf_softmax 0=1 1=1 Flatten mbox_conf_flatten 1 1 mbox_conf_softmax mbox_conf_flatten DetectionOutput detection_out 3 1 mbox_loc mbox_conf_flatten mbox_priorbox detection_out 0=21 1=0.450000 2=100 3=100 4=0.250000 diff --git a/benchmark/squeezenet_ssd.param b/benchmark/squeezenet_ssd.param index cb54f96ca..4cd54d2e0 100644 --- a/benchmark/squeezenet_ssd.param +++ b/benchmark/squeezenet_ssd.param @@ -176,6 +176,6 @@ Concat mbox_loc 6 1 fire5_mbox_loc_flat fire9_mbox_loc_flat fi Concat mbox_conf 6 1 fire5_mbox_conf_flat fire9_mbox_conf_flat fire10_mbox_conf_flat fire11_mbox_conf_flat conv12_2_mbox_conf_flat conv13_2_mbox_conf_flat mbox_conf 0=0 Concat mbox_priorbox 6 1 fire5_mbox_priorbox fire9_mbox_priorbox fire10_mbox_priorbox fire11_mbox_priorbox conv12_2_mbox_priorbox conv13_2_mbox_priorbox mbox_priorbox 0=1 Reshape mbox_conf_reshape 1 1 mbox_conf mbox_conf_reshape 0=21 1=-1 2=-233 3=0 -Softmax mbox_conf_softmax 1 1 mbox_conf_reshape mbox_conf_softmax 0=1 +Softmax mbox_conf_softmax 1 1 mbox_conf_reshape mbox_conf_softmax 0=1 1=1 Flatten mbox_conf_flatten 1 1 mbox_conf_softmax mbox_conf_flatten DetectionOutput detection_out 3 1 mbox_loc mbox_conf_flatten mbox_priorbox detection_out 0=21 1=0.450000 2=100 3=100 4=0.250000 diff --git a/benchmark/squeezenet_ssd_int8.param b/benchmark/squeezenet_ssd_int8.param index 19fb43c9e..11a17a3d9 100755 --- a/benchmark/squeezenet_ssd_int8.param +++ b/benchmark/squeezenet_ssd_int8.param @@ -175,7 +175,7 @@ PriorBox conv13_2_mbox_priorbox 2 1 conv13_2_conv13_2/relu_splitncnn_0 d Concat mbox_loc 6 1 fire5_mbox_loc_flat fire9_mbox_loc_flat fire10_mbox_loc_flat fire11_mbox_loc_flat conv12_2_mbox_loc_flat conv13_2_mbox_loc_flat mbox_loc 0=0 Concat mbox_conf 6 1 fire5_mbox_conf_flat fire9_mbox_conf_flat fire10_mbox_conf_flat fire11_mbox_conf_flat conv12_2_mbox_conf_flat conv13_2_mbox_conf_flat mbox_conf 0=0 Concat mbox_priorbox 6 1 fire5_mbox_priorbox fire9_mbox_priorbox fire10_mbox_priorbox fire11_mbox_priorbox conv12_2_mbox_priorbox conv13_2_mbox_priorbox mbox_priorbox 0=1 -Reshape mbox_conf_reshape 1 1 mbox_conf mbox_conf_reshape 0=21 1=-1 2=0 3=0 -Softmax mbox_conf_softmax 1 1 mbox_conf_reshape mbox_conf_softmax 0=1 +Reshape mbox_conf_reshape 1 1 mbox_conf mbox_conf_reshape 0=21 1=-1 2=-233 3=0 +Softmax mbox_conf_softmax 1 1 mbox_conf_reshape mbox_conf_softmax 0=1 1=1 Flatten mbox_conf_flatten 1 1 mbox_conf_softmax mbox_conf_flatten DetectionOutput detection_out 3 1 mbox_loc mbox_conf_flatten mbox_priorbox detection_out 0=21 1=0.450000 2=100 3=100 4=0.050000