update SSD topologies to use pure MKLDNN engine.

ftian1 · ftian1 · commit 0e6b69cbf140 · 2017-12-27T15:25:54.000+08:00
diff --git a/models/intel_optimized_models/ssd/AlexNet/VOC0712/SSD_300x300/deploy.prototxt b/models/intel_optimized_models/ssd/AlexNet/VOC0712/SSD_300x300/deploy.prototxt
@@ -1326,7 +1326,6 @@ layer {
   concat_param {
     axis: 1
   }
-    engine: "CAFFE"
 }
 layer {
   name: "mbox_conf"
@@ -1341,7 +1340,6 @@ layer {
   concat_param {
     axis: 1
   }
-    engine: "CAFFE"
 }
 layer {
   name: "mbox_priorbox"
@@ -1356,7 +1354,6 @@ layer {
   concat_param {
     axis: 2
   }
-  engine: "CAFFE"
 }
 layer {
   name: "mbox_conf_reshape"
diff --git a/models/intel_optimized_models/ssd/AlexNet/VOC0712/SSD_300x300/test.prototxt b/models/intel_optimized_models/ssd/AlexNet/VOC0712/SSD_300x300/test.prototxt
@@ -1350,7 +1350,6 @@ layer {
   concat_param {
     axis: 1
   }
-    engine: "CAFFE"
 }
 layer {
   name: "mbox_conf"
@@ -1365,7 +1364,6 @@ layer {
   concat_param {
     axis: 1
   }
-    engine: "CAFFE"
 }
 layer {
   name: "mbox_priorbox"
@@ -1380,7 +1378,6 @@ layer {
   concat_param {
     axis: 2
   }
-  engine: "CAFFE"
 }
 layer {
   name: "mbox_conf_reshape"
diff --git a/models/intel_optimized_models/ssd/AlexNet/VOC0712/SSD_300x300/train.prototxt b/models/intel_optimized_models/ssd/AlexNet/VOC0712/SSD_300x300/train.prototxt
@@ -1455,7 +1455,6 @@ layer {
   concat_param {
     axis: 1
   }
-    engine: "CAFFE"
 }
 layer {
   name: "mbox_conf"
@@ -1470,7 +1469,6 @@ layer {
   concat_param {
     axis: 1
   }
-    engine: "CAFFE"
 }
 layer {
   name: "mbox_priorbox"
@@ -1485,7 +1483,6 @@ layer {
   concat_param {
     axis: 2
   }
-  engine: "CAFFE"
 }
 layer {
   name: "mbox_loss"
diff --git a/models/intel_optimized_models/ssd/VGGNet/VOC0712/SSD_300x300/deploy.prototxt b/models/intel_optimized_models/ssd/VGGNet/VOC0712/SSD_300x300/deploy.prototxt
@@ -1535,7 +1535,6 @@ layer {
   concat_param {
     axis: 1
   }
-  engine: "CAFFE"
 }
 layer {
   name: "mbox_conf"
@@ -1550,7 +1549,6 @@ layer {
   concat_param {
     axis: 1
   }
-  engine: "CAFFE"
 }
 layer {
   name: "mbox_priorbox"
@@ -1565,7 +1563,6 @@ layer {
   concat_param {
     axis: 2
   }
-  engine: "CAFFE"
 }
 layer {
   name: "mbox_conf_reshape"
diff --git a/models/intel_optimized_models/ssd/VGGNet/VOC0712/SSD_300x300/test.prototxt b/models/intel_optimized_models/ssd/VGGNet/VOC0712/SSD_300x300/test.prototxt
@@ -1559,7 +1559,6 @@ layer {
   concat_param {
     axis: 1
   }
-    engine: "CAFFE"
 }
 layer {
   name: "mbox_conf"
@@ -1574,7 +1573,6 @@ layer {
   concat_param {
     axis: 1
   }
-    engine: "CAFFE"
 }
 layer {
   name: "mbox_priorbox"
@@ -1589,7 +1587,6 @@ layer {
   concat_param {
     axis: 2
   }
-  engine: "CAFFE"
 }
 layer {
   name: "mbox_conf_reshape"
diff --git a/models/intel_optimized_models/ssd/VGGNet/VOC0712/SSD_300x300/train.prototxt b/models/intel_optimized_models/ssd/VGGNet/VOC0712/SSD_300x300/train.prototxt
@@ -1664,7 +1664,6 @@ layer {
   concat_param {
     axis: 1
   }
-    engine: "CAFFE"
 }
 layer {
   name: "mbox_conf"
@@ -1679,7 +1678,6 @@ layer {
   concat_param {
     axis: 1
   }
-    engine: "CAFFE"
 }
 layer {
   name: "mbox_priorbox"
@@ -1694,7 +1692,6 @@ layer {
   concat_param {
     axis: 2
   }
-  engine: "CAFFE"
 }
 layer {
   name: "mbox_loss"
diff --git a/models/intel_optimized_models/ssd/VGGNet/VOC0712/SSD_300x300_webcam/test.prototxt b/models/intel_optimized_models/ssd/VGGNet/VOC0712/SSD_300x300_webcam/test.prototxt
@@ -1552,7 +1552,6 @@ layer {
   top: "mbox_loc"
   concat_param {
     axis: 1
-    engine: CAFFE
   }
 }
 layer {
@@ -1567,7 +1566,6 @@ layer {
   top: "mbox_conf"
   concat_param {
     axis: 1
-    engine: CAFFE
   }
 }
 layer {
@@ -1582,7 +1580,6 @@ layer {
   top: "mbox_priorbox"
   concat_param {
     axis: 2
-    engine: CAFFE
   }
 }
 layer {
diff --git a/models/intel_optimized_models/ssd/VGGNet/coco/SSD_300x300/deploy.prototxt b/models/intel_optimized_models/ssd/VGGNet/coco/SSD_300x300/deploy.prototxt
@@ -1534,7 +1534,6 @@ layer {
   top: "mbox_loc"
   concat_param {
     axis: 1
-    engine: CAFFE
   }
 }
 layer {
@@ -1549,7 +1548,6 @@ layer {
   top: "mbox_conf"
   concat_param {
     axis: 1
-    engine: CAFFE
   }
 }
 layer {
@@ -1564,7 +1562,6 @@ layer {
   top: "mbox_priorbox"
   concat_param {
     axis: 2
-    engine: CAFFE
   }
 }
 layer {
diff --git a/models/intel_optimized_models/ssd/VGGNet/coco/SSD_300x300/test.prototxt b/models/intel_optimized_models/ssd/VGGNet/coco/SSD_300x300/test.prototxt
@@ -1559,7 +1559,6 @@ layer {
   top: "mbox_loc"
   concat_param {
     axis: 1
-    engine: CAFFE
   }
 }
 layer {
@@ -1574,7 +1573,6 @@ layer {
   top: "mbox_conf"
   concat_param {
     axis: 1
-    engine: CAFFE
   }
 }
 layer {
@@ -1589,7 +1587,6 @@ layer {
   top: "mbox_priorbox"
   concat_param {
     axis: 2
-    engine: CAFFE
   }
 }
 layer {
diff --git a/models/intel_optimized_models/ssd/VGGNet/coco/SSD_300x300/train.prototxt b/models/intel_optimized_models/ssd/VGGNet/coco/SSD_300x300/train.prototxt
@@ -1664,7 +1664,6 @@ layer {
   top: "mbox_loc"
   concat_param {
     axis: 1
-    engine: CAFFE
   }
 }
 layer {
@@ -1679,7 +1678,6 @@ layer {
   top: "mbox_conf"
   concat_param {
     axis: 1
-    engine: CAFFE
   }
 }
 layer {
@@ -1694,7 +1692,6 @@ layer {
   top: "mbox_priorbox"
   concat_param {
     axis: 2
-    engine: CAFFE
   }
 }
 layer {
diff --git a/models/intel_optimized_models/ssd/VGGNet/coco/SSD_300x300_webcam/test.prototxt b/models/intel_optimized_models/ssd/VGGNet/coco/SSD_300x300_webcam/test.prototxt
@@ -1552,7 +1552,6 @@ layer {
   top: "mbox_loc"
   concat_param {
     axis: 1
-    engine: CAFFE
   }
 }
 layer {
@@ -1567,7 +1566,6 @@ layer {
   top: "mbox_conf"
   concat_param {
     axis: 1
-    engine: CAFFE
   }
 }
 layer {
@@ -1582,7 +1580,6 @@ layer {
   top: "mbox_priorbox"
   concat_param {
     axis: 2
-    engine: CAFFE
   }
 }
 layer {

Original file line number	Diff line number	Diff line change
`@@ -1326,7 +1326,6 @@ layer {`
`1326`	`1326`	`concat_param {`
`1327`	`1327`	`axis: 1`
`1328`	`1328`	`}`
`1329`		`- engine: "CAFFE"`
`1330`	`1329`	`}`
`1331`	`1330`	`layer {`
`1332`	`1331`	`name: "mbox_conf"`
`@@ -1341,7 +1340,6 @@ layer {`
`1341`	`1340`	`concat_param {`
`1342`	`1341`	`axis: 1`
`1343`	`1342`	`}`
`1344`		`- engine: "CAFFE"`
`1345`	`1343`	`}`
`1346`	`1344`	`layer {`
`1347`	`1345`	`name: "mbox_priorbox"`
`@@ -1356,7 +1354,6 @@ layer {`
`1356`	`1354`	`concat_param {`
`1357`	`1355`	`axis: 2`
`1358`	`1356`	`}`
`1359`		`- engine: "CAFFE"`
`1360`	`1357`	`}`
`1361`	`1358`	`layer {`
`1362`	`1359`	`name: "mbox_conf_reshape"`
Original file line number	Diff line number	Diff line change
`@@ -1350,7 +1350,6 @@ layer {`
`1350`	`1350`	`concat_param {`
`1351`	`1351`	`axis: 1`
`1352`	`1352`	`}`
`1353`		`- engine: "CAFFE"`
`1354`	`1353`	`}`
`1355`	`1354`	`layer {`
`1356`	`1355`	`name: "mbox_conf"`
`@@ -1365,7 +1364,6 @@ layer {`
`1365`	`1364`	`concat_param {`
`1366`	`1365`	`axis: 1`
`1367`	`1366`	`}`
`1368`		`- engine: "CAFFE"`
`1369`	`1367`	`}`
`1370`	`1368`	`layer {`
`1371`	`1369`	`name: "mbox_priorbox"`
`@@ -1380,7 +1378,6 @@ layer {`
`1380`	`1378`	`concat_param {`
`1381`	`1379`	`axis: 2`
`1382`	`1380`	`}`
`1383`		`- engine: "CAFFE"`
`1384`	`1381`	`}`
`1385`	`1382`	`layer {`
`1386`	`1383`	`name: "mbox_conf_reshape"`
Original file line number	Diff line number	Diff line change
`@@ -1455,7 +1455,6 @@ layer {`
`1455`	`1455`	`concat_param {`
`1456`	`1456`	`axis: 1`
`1457`	`1457`	`}`
`1458`		`- engine: "CAFFE"`
`1459`	`1458`	`}`
`1460`	`1459`	`layer {`
`1461`	`1460`	`name: "mbox_conf"`
`@@ -1470,7 +1469,6 @@ layer {`
`1470`	`1469`	`concat_param {`
`1471`	`1470`	`axis: 1`
`1472`	`1471`	`}`
`1473`		`- engine: "CAFFE"`
`1474`	`1472`	`}`
`1475`	`1473`	`layer {`
`1476`	`1474`	`name: "mbox_priorbox"`
`@@ -1485,7 +1483,6 @@ layer {`
`1485`	`1483`	`concat_param {`
`1486`	`1484`	`axis: 2`
`1487`	`1485`	`}`
`1488`		`- engine: "CAFFE"`
`1489`	`1486`	`}`
`1490`	`1487`	`layer {`
`1491`	`1488`	`name: "mbox_loss"`
Original file line number	Diff line number	Diff line change
`@@ -1535,7 +1535,6 @@ layer {`
`1535`	`1535`	`concat_param {`
`1536`	`1536`	`axis: 1`
`1537`	`1537`	`}`
`1538`		`- engine: "CAFFE"`
`1539`	`1538`	`}`
`1540`	`1539`	`layer {`
`1541`	`1540`	`name: "mbox_conf"`
`@@ -1550,7 +1549,6 @@ layer {`
`1550`	`1549`	`concat_param {`
`1551`	`1550`	`axis: 1`
`1552`	`1551`	`}`
`1553`		`- engine: "CAFFE"`
`1554`	`1552`	`}`
`1555`	`1553`	`layer {`
`1556`	`1554`	`name: "mbox_priorbox"`
`@@ -1565,7 +1563,6 @@ layer {`
`1565`	`1563`	`concat_param {`
`1566`	`1564`	`axis: 2`
`1567`	`1565`	`}`
`1568`		`- engine: "CAFFE"`
`1569`	`1566`	`}`
`1570`	`1567`	`layer {`
`1571`	`1568`	`name: "mbox_conf_reshape"`
Original file line number	Diff line number	Diff line change
`@@ -1559,7 +1559,6 @@ layer {`
`1559`	`1559`	`concat_param {`
`1560`	`1560`	`axis: 1`
`1561`	`1561`	`}`
`1562`		`- engine: "CAFFE"`
`1563`	`1562`	`}`
`1564`	`1563`	`layer {`
`1565`	`1564`	`name: "mbox_conf"`
`@@ -1574,7 +1573,6 @@ layer {`
`1574`	`1573`	`concat_param {`
`1575`	`1574`	`axis: 1`
`1576`	`1575`	`}`
`1577`		`- engine: "CAFFE"`
`1578`	`1576`	`}`
`1579`	`1577`	`layer {`
`1580`	`1578`	`name: "mbox_priorbox"`
`@@ -1589,7 +1587,6 @@ layer {`
`1589`	`1587`	`concat_param {`
`1590`	`1588`	`axis: 2`
`1591`	`1589`	`}`
`1592`		`- engine: "CAFFE"`
`1593`	`1590`	`}`
`1594`	`1591`	`layer {`
`1595`	`1592`	`name: "mbox_conf_reshape"`
Original file line number	Diff line number	Diff line change
`@@ -1664,7 +1664,6 @@ layer {`
`1664`	`1664`	`concat_param {`
`1665`	`1665`	`axis: 1`
`1666`	`1666`	`}`
`1667`		`- engine: "CAFFE"`
`1668`	`1667`	`}`
`1669`	`1668`	`layer {`
`1670`	`1669`	`name: "mbox_conf"`
`@@ -1679,7 +1678,6 @@ layer {`
`1679`	`1678`	`concat_param {`
`1680`	`1679`	`axis: 1`
`1681`	`1680`	`}`
`1682`		`- engine: "CAFFE"`
`1683`	`1681`	`}`
`1684`	`1682`	`layer {`
`1685`	`1683`	`name: "mbox_priorbox"`
`@@ -1694,7 +1692,6 @@ layer {`
`1694`	`1692`	`concat_param {`
`1695`	`1693`	`axis: 2`
`1696`	`1694`	`}`
`1697`		`- engine: "CAFFE"`
`1698`	`1695`	`}`
`1699`	`1696`	`layer {`
`1700`	`1697`	`name: "mbox_loss"`
Original file line number	Diff line number	Diff line change
`@@ -1552,7 +1552,6 @@ layer {`
`1552`	`1552`	`top: "mbox_loc"`
`1553`	`1553`	`concat_param {`
`1554`	`1554`	`axis: 1`
`1555`		`- engine: CAFFE`
`1556`	`1555`	`}`
`1557`	`1556`	`}`
`1558`	`1557`	`layer {`
`@@ -1567,7 +1566,6 @@ layer {`
`1567`	`1566`	`top: "mbox_conf"`
`1568`	`1567`	`concat_param {`
`1569`	`1568`	`axis: 1`
`1570`		`- engine: CAFFE`
`1571`	`1569`	`}`
`1572`	`1570`	`}`
`1573`	`1571`	`layer {`
`@@ -1582,7 +1580,6 @@ layer {`
`1582`	`1580`	`top: "mbox_priorbox"`
`1583`	`1581`	`concat_param {`
`1584`	`1582`	`axis: 2`
`1585`		`- engine: CAFFE`
`1586`	`1583`	`}`
`1587`	`1584`	`}`
`1588`	`1585`	`layer {`
Original file line number	Diff line number	Diff line change
`@@ -1534,7 +1534,6 @@ layer {`
`1534`	`1534`	`top: "mbox_loc"`
`1535`	`1535`	`concat_param {`
`1536`	`1536`	`axis: 1`
`1537`		`- engine: CAFFE`
`1538`	`1537`	`}`
`1539`	`1538`	`}`
`1540`	`1539`	`layer {`
`@@ -1549,7 +1548,6 @@ layer {`
`1549`	`1548`	`top: "mbox_conf"`
`1550`	`1549`	`concat_param {`
`1551`	`1550`	`axis: 1`
`1552`		`- engine: CAFFE`
`1553`	`1551`	`}`
`1554`	`1552`	`}`
`1555`	`1553`	`layer {`
`@@ -1564,7 +1562,6 @@ layer {`
`1564`	`1562`	`top: "mbox_priorbox"`
`1565`	`1563`	`concat_param {`
`1566`	`1564`	`axis: 2`
`1567`		`- engine: CAFFE`
`1568`	`1565`	`}`
`1569`	`1566`	`}`
`1570`	`1567`	`layer {`