bug fix, SE module H-swish -> H-sigmoid

wangwenfeng0 · May 14, 2019 · 9e66ca5 · 9e66ca5
1 parent 9053a36
commit 9e66ca5
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 216 deletions.
diff --git a/mobilenet_v3_large_1.0.prototxt b/mobilenet_v3_large_1.0.prototxt
@@ -621,7 +621,7 @@ layer {
     }
   }
 }
-# H-swish
+# H-sigmoid
 layer {
   name: "conv3-2/dwise-se-fc2/shift"
   type: "Power"
@@ -650,21 +650,11 @@ layer {
     shift: 0
   }
 }
-layer {
-  name: "conv3-2/dwise-hard"
-  type: "Eltwise"
-  bottom: "conv3-2/dwise-se-fc2"
-  bottom: "conv3-2/dwise-se-fc2/shift"
-  top: "conv3-2/dwise-hard"
-  eltwise_param {
-    operation: PROD
-  }
-}
 layer {
   name: "conv3-2/dwise/scale"
   type: "Scale"
   bottom: "conv3-2/dwise"
-  bottom: "conv3-2/dwise-hard"
+  bottom: "conv3-2/dwise-se-fc2/shift"
   top: "conv3-2/dwise/scale"
   scale_param{
     axis: 0
@@ -860,7 +850,7 @@ layer {
     }
   }
 }
-# H-swish
+# H-sigmoid
 layer {
   name: "conv4-1/dwise-se-fc2/shift"
   type: "Power"
@@ -889,21 +879,11 @@ layer {
     shift: 0
   }
 }
-layer {
-  name: "conv4-1/dwise-hard"
-  type: "Eltwise"
-  bottom: "conv4-1/dwise-se-fc2"
-  bottom: "conv4-1/dwise-se-fc2/shift"
-  top: "conv4-1/dwise-hard"
-  eltwise_param {
-    operation: PROD
-  }
-}
 layer {
   name: "conv4-1/dwise/scale"
   type: "Scale"
   bottom: "conv4-1/dwise"
-  bottom: "conv4-1/dwise-hard"
+  bottom: "conv4-1/dwise-se-fc2/shift"
   top: "conv4-1/dwise/scale"
   scale_param{
     axis: 0
@@ -1107,7 +1087,7 @@ layer {
     }
   }
 }
-# H-swish
+# H-sigmoid
 layer {
   name: "conv4-2/dwise-se-fc2/shift"
   type: "Power"
@@ -1136,21 +1116,11 @@ layer {
     shift: 0
   }
 }
-layer {
-  name: "conv4-2/dwise-hard"
-  type: "Eltwise"
-  bottom: "conv4-2/dwise-se-fc2"
-  bottom: "conv4-2/dwise-se-fc2/shift"
-  top: "conv4-2/dwise-hard"
-  eltwise_param {
-    operation: PROD
-  }
-}
 layer {
   name: "conv4-2/dwise/scale"
   type: "Scale"
   bottom: "conv4-2/dwise"
-  bottom: "conv4-2/dwise-hard"
+  bottom: "conv4-2/dwise-se-fc2/shift"
   top: "conv4-2/dwise/scale"
   scale_param{
     axis: 0
@@ -2204,7 +2174,7 @@ layer {
     }
   }
 }
-# H-swish
+# H-sigmoid
 layer {
   name: "conv5-4/dwise-se-fc2/shift"
   type: "Power"
@@ -2233,21 +2203,11 @@ layer {
     shift: 0
   }
 }
-layer {
-  name: "conv5-4/dwise-hard"
-  type: "Eltwise"
-  bottom: "conv5-4/dwise-se-fc2"
-  bottom: "conv5-4/dwise-se-fc2/shift"
-  top: "conv5-4/dwise-hard"
-  eltwise_param {
-    operation: PROD
-  }
-}
 layer {
   name: "conv5-4/dwise/scale"
   type: "Scale"
   bottom: "conv5-4/dwise/hswish"
-  bottom: "conv5-4/dwise-hard"
+  bottom: "conv5-4/dwise-se-fc2/shift"
   top: "conv5-4/dwise/scale"
   scale_param{
     axis: 0
@@ -2509,7 +2469,7 @@ layer {
     }
   }
 }
-# H-swish
+# H-sigmoid
 layer {
   name: "conv5-5/dwise-se-fc2/shift"
   type: "Power"
@@ -2538,21 +2498,11 @@ layer {
     shift: 0
   }
 }
-layer {
-  name: "conv5-5/dwise-hard"
-  type: "Eltwise"
-  bottom: "conv5-5/dwise-se-fc2"
-  bottom: "conv5-5/dwise-se-fc2/shift"
-  top: "conv5-5/dwise-hard"
-  eltwise_param {
-    operation: PROD
-  }
-}
 layer {
   name: "conv5-5/dwise/scale"
   type: "Scale"
   bottom: "conv5-5/dwise/hswish"
-  bottom: "conv5-5/dwise-hard"
+  bottom: "conv5-5/dwise-se-fc2/shift"
   top: "conv5-5/dwise/scale"
   scale_param{
     axis: 0
@@ -2822,7 +2772,7 @@ layer {
     }
   }
 }
-# H-swish
+# H-sigmoid
 layer {
   name: "conv5-6/dwise-se-fc2/shift"
   type: "Power"
@@ -2851,21 +2801,11 @@ layer {
     shift: 0
   }
 }
-layer {
-  name: "conv5-6/dwise-hard"
-  type: "Eltwise"
-  bottom: "conv5-6/dwise-se-fc2"
-  bottom: "conv5-6/dwise-se-fc2/shift"
-  top: "conv5-6/dwise-hard"
-  eltwise_param {
-    operation: PROD
-  }
-}
 layer {
   name: "conv5-6/dwise/scale"
   type: "Scale"
   bottom: "conv5-6/dwise/hswish"
-  bottom: "conv5-6/dwise-hard"
+  bottom: "conv5-6/dwise-se-fc2/shift"
   top: "conv5-6/dwise/scale"
   scale_param{
     axis: 0
@@ -3135,7 +3075,7 @@ layer {
     }
   }
 }
-# H-swish
+# H-sigmoid
 layer {
   name: "conv5-7/dwise-se-fc2/shift"
   type: "Power"
@@ -3164,21 +3104,11 @@ layer {
     shift: 0
   }
 }
-layer {
-  name: "conv5-7/dwise-hard"
-  type: "Eltwise"
-  bottom: "conv5-7/dwise-se-fc2"
-  bottom: "conv5-7/dwise-se-fc2/shift"
-  top: "conv5-7/dwise-hard"
-  eltwise_param {
-    operation: PROD
-  }
-}
 layer {
   name: "conv5-7/dwise/scale"
   type: "Scale"
   bottom: "conv5-7/dwise/hswish"
-  bottom: "conv5-7/dwise-hard"
+  bottom: "conv5-7/dwise-se-fc2/shift"
   top: "conv5-7/dwise/scale"
   scale_param{
     axis: 0
@@ -3440,7 +3370,7 @@ layer {
     }
   }
 }
-# H-swish
+# H-sigmoid
 layer {
   name: "conv6-1/dwise-se-fc2/shift"
   type: "Power"
@@ -3469,21 +3399,11 @@ layer {
     shift: 0
   }
 }
-layer {
-  name: "conv6-1/dwise-hard"
-  type: "Eltwise"
-  bottom: "conv6-1/dwise-se-fc2"
-  bottom: "conv6-1/dwise-se-fc2/shift"
-  top: "conv6-1/dwise-hard"
-  eltwise_param {
-    operation: PROD
-  }
-}
 layer {
   name: "conv6-1/dwise/scale"
   type: "Scale"
   bottom: "conv6-1/dwise/hswish"
-  bottom: "conv6-1/dwise-hard"
+  bottom: "conv6-1/dwise-se-fc2/shift"
   top: "conv6-1/dwise/scale"
   scale_param{
     axis: 0