diff --git a/infer.py b/infer.py index 877ebaf568216ec0f975c70f8b0e890dea5427c9..de199162bdea1db511d97a68505dea545434ba1c 100644 --- a/infer.py +++ b/infer.py @@ -11,7 +11,7 @@ in_ -= np.array((104.00698793,116.66876762,122.67891434)) in_ = in_.transpose((2,0,1)) # load net -net = caffe.Net('fcn8s/deploy.prototxt', 'fcn8s/fcn8s-heavy-40k.caffemodel', caffe.TEST) +net = caffe.Net('voc-fcn8s/deploy.prototxt', 'voc-fcn8s/fcn8s-heavy-40k.caffemodel', caffe.TEST) # shape for input (data blob is N x C x H x W), set data net.blobs['data'].reshape(1, *in_.shape) net.blobs['data'].data[...] = in_ diff --git a/voc-fcn-alexnet/train.prototxt b/voc-fcn-alexnet/train.prototxt index a5c17be2e29b0b410237b57fa51e7cbb8e3e4836..b12b608e7a34166516eb9830c4b8360207a38eb2 100644 --- a/voc-fcn-alexnet/train.prototxt +++ b/voc-fcn-alexnet/train.prototxt @@ -4,7 +4,7 @@ layer { top: "data" top: "label" python_param { - module: "layers" + module: "voc_layers" layer: "SBDDSegDataLayer" param_str: "{\'sbdd_dir\': \'../../data/sbdd/dataset\', \'seed\': 1337, \'split\': \'train\', \'mean\': (104.00699, 116.66877, 122.67892)}" } diff --git a/voc-fcn-alexnet/val.prototxt b/voc-fcn-alexnet/val.prototxt index aa972cdc526dbe3832bdac3747c4badf83bd8e24..1d264d2cf3dca563ce0d5e6627ea2ebb213f66fa 100644 --- a/voc-fcn-alexnet/val.prototxt +++ b/voc-fcn-alexnet/val.prototxt @@ -4,7 +4,7 @@ layer { top: "data" top: "label" python_param { - module: "layers" + module: "voc_layers" layer: "VOCSegDataLayer" param_str: "{\'voc_dir\': \'../../data/pascal/VOC2011\', \'seed\': 1337, \'split\': \'seg11valid\', \'mean\': (104.00699, 116.66877, 122.67892)}" } diff --git a/voc-fcn16s/train.prototxt b/voc-fcn16s/train.prototxt index 5695288100386d4afad6de0ebda571d221173866..c6e175f896d415fc9a466d77bf07e9ea39ccb58f 100644 --- a/voc-fcn16s/train.prototxt +++ b/voc-fcn16s/train.prototxt @@ -4,7 +4,7 @@ layer { top: "data" top: "label" python_param { - module: "layers" + module: "voc_layers" layer: "SBDDSegDataLayer" param_str: "{\'sbdd_dir\': \'../../data/sbdd/dataset\', \'seed\': 1337, \'split\': \'train\', \'mean\': (104.00699, 116.66877, 122.67892)}" } diff --git a/voc-fcn16s/val.prototxt b/voc-fcn16s/val.prototxt index 1c29d389647ec601f76980dd26fbb21819c12e12..13d96a92f25705fb74f68d246554f46ed1ddda30 100644 --- a/voc-fcn16s/val.prototxt +++ b/voc-fcn16s/val.prototxt @@ -4,7 +4,7 @@ layer { top: "data" top: "label" python_param { - module: "layers" + module: "voc_layers" layer: "VOCSegDataLayer" param_str: "{\'voc_dir\': \'../../data/pascal/VOC2011\', \'seed\': 1337, \'split\': \'seg11valid\', \'mean\': (104.00699, 116.66877, 122.67892)}" } diff --git a/voc-fcn32s/train.prototxt b/voc-fcn32s/train.prototxt index 0d416203633a0cb63f4d35079b72ce735ca17403..dcd1992b77716ac89eee47a1a8da13843dbc57c9 100644 --- a/voc-fcn32s/train.prototxt +++ b/voc-fcn32s/train.prototxt @@ -4,7 +4,7 @@ layer { top: "data" top: "label" python_param { - module: "layers" + module: "voc_layers" layer: "SBDDSegDataLayer" param_str: "{\'sbdd_dir\': \'../../data/sbdd/dataset\', \'seed\': 1337, \'split\': \'train\', \'mean\': (104.00699, 116.66877, 122.67892)}" } diff --git a/voc-fcn32s/val.prototxt b/voc-fcn32s/val.prototxt index aba4f23cf4c3eb7de2e145e6999b740838323fcb..e15cf304c538ef0c84714bc28ea2778fe8c13b28 100644 --- a/voc-fcn32s/val.prototxt +++ b/voc-fcn32s/val.prototxt @@ -4,7 +4,7 @@ layer { top: "data" top: "label" python_param { - module: "layers" + module: "voc_layers" layer: "VOCSegDataLayer" param_str: "{\'voc_dir\': \'../../data/pascal/VOC2011\', \'seed\': 1337, \'split\': \'seg11valid\', \'mean\': (104.00699, 116.66877, 122.67892)}" } diff --git a/voc-fcn8s/train.prototxt b/voc-fcn8s/train.prototxt index 189a446db2eb970af668e4c6743d53a8172cd109..b17e2253d0d028f5f0d896c6b32783c0695c1e28 100644 --- a/voc-fcn8s/train.prototxt +++ b/voc-fcn8s/train.prototxt @@ -4,7 +4,7 @@ layer { top: "data" top: "label" python_param { - module: "layers" + module: "voc_layers" layer: "SBDDSegDataLayer" param_str: "{\'sbdd_dir\': \'../../data/sbdd/dataset\', \'seed\': 1337, \'split\': \'train\', \'mean\': (104.00699, 116.66877, 122.67892)}" } diff --git a/voc-fcn8s/val.prototxt b/voc-fcn8s/val.prototxt index afe12ae9d7305a2cbff9791bab8bc049a3a3d1f3..9c824ecd0412586487de29ce24d27f67a8cc97d1 100644 --- a/voc-fcn8s/val.prototxt +++ b/voc-fcn8s/val.prototxt @@ -4,7 +4,7 @@ layer { top: "data" top: "label" python_param { - module: "layers" + module: "voc_layers" layer: "VOCSegDataLayer" param_str: "{\'voc_dir\': \'../../data/pascal/VOC2011\', \'seed\': 1337, \'split\': \'seg11valid\', \'mean\': (104.00699, 116.66877, 122.67892)}" }