Merge pull request #2 from mitchell547/my_branch

fix paths

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_

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)}"
   }

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)}"
   }

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)}"
   }

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)}"
   }

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)}"
   }

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)}"
   }

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)}"
   }

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)}"
   }