Commit 7e981456 authored by Evan Shelhamer's avatar Evan Shelhamer
Browse files

Merge pull request #2294 from TorosFanny/master

  [example] fix path for diff in net surgery
parents df587758 2e03d89f
......@@ -5494,12 +5494,96 @@
"name": "stdout",
"output_type": "stream",
"text": [
"diff: imagenet/bvlc_caffenet_full_conv.prototxt: No such file or directory\r\n"
"1,2c1\r\n",
"< # Fully convolutional network version of CaffeNet.\r\n",
"< name: \"CaffeNetConv\"\r\n",
"---\r\n",
"> name: \"CaffeNet\"\r\n",
"4c3\r\n",
"< input_dim: 1\r\n",
"---\r\n",
"> input_dim: 10\r\n",
"6,7c5,6\r\n",
"< input_dim: 451\r\n",
"< input_dim: 451\r\n",
"---\r\n",
"> input_dim: 227\r\n",
"> input_dim: 227\r\n",
"152,153c151,152\r\n",
"< name: \"fc6-conv\"\r\n",
"< type: \"Convolution\"\r\n",
"---\r\n",
"> name: \"fc6\"\r\n",
"> type: \"InnerProduct\"\r\n",
"155,156c154,155\r\n",
"< top: \"fc6-conv\"\r\n",
"< convolution_param {\r\n",
"---\r\n",
"> top: \"fc6\"\r\n",
"> inner_product_param {\r\n",
"158d156\r\n",
"< kernel_size: 6\r\n",
"164,165c162,163\r\n",
"< bottom: \"fc6-conv\"\r\n",
"< top: \"fc6-conv\"\r\n",
"---\r\n",
"> bottom: \"fc6\"\r\n",
"> top: \"fc6\"\r\n",
"170,171c168,169\r\n",
"< bottom: \"fc6-conv\"\r\n",
"< top: \"fc6-conv\"\r\n",
"---\r\n",
"> bottom: \"fc6\"\r\n",
"> top: \"fc6\"\r\n",
"177,181c175,179\r\n",
"< name: \"fc7-conv\"\r\n",
"< type: \"Convolution\"\r\n",
"< bottom: \"fc6-conv\"\r\n",
"< top: \"fc7-conv\"\r\n",
"< convolution_param {\r\n",
"---\r\n",
"> name: \"fc7\"\r\n",
"> type: \"InnerProduct\"\r\n",
"> bottom: \"fc6\"\r\n",
"> top: \"fc7\"\r\n",
"> inner_product_param {\r\n",
"183d180\r\n",
"< kernel_size: 1\r\n",
"189,190c186,187\r\n",
"< bottom: \"fc7-conv\"\r\n",
"< top: \"fc7-conv\"\r\n",
"---\r\n",
"> bottom: \"fc7\"\r\n",
"> top: \"fc7\"\r\n",
"195,196c192,193\r\n",
"< bottom: \"fc7-conv\"\r\n",
"< top: \"fc7-conv\"\r\n",
"---\r\n",
"> bottom: \"fc7\"\r\n",
"> top: \"fc7\"\r\n",
"202,206c199,203\r\n",
"< name: \"fc8-conv\"\r\n",
"< type: \"Convolution\"\r\n",
"< bottom: \"fc7-conv\"\r\n",
"< top: \"fc8-conv\"\r\n",
"< convolution_param {\r\n",
"---\r\n",
"> name: \"fc8\"\r\n",
"> type: \"InnerProduct\"\r\n",
"> bottom: \"fc7\"\r\n",
"> top: \"fc8\"\r\n",
"> inner_product_param {\r\n",
"208d204\r\n",
"< kernel_size: 1\r\n",
"214c210\r\n",
"< bottom: \"fc8-conv\"\r\n",
"---\r\n",
"> bottom: \"fc8\"\r\n"
]
}
],
"source": [
"!diff imagenet/bvlc_caffenet_full_conv.prototxt ../models/bvlc_reference_caffenet/deploy.prototxt"
"!diff net_surgery/bvlc_caffenet_full_conv.prototxt ../models/bvlc_reference_caffenet/deploy.prototxt"
]
},
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment