diff --git a/voc-fcn-alexnet/net.py b/voc-fcn-alexnet/net.py index e8fd3a32f8158504a66e9cc99128568fd6d22f48..e0ad9da5c4e90147b212d00b0403de5c7fc03364 100644 --- a/voc-fcn-alexnet/net.py +++ b/voc-fcn-alexnet/net.py @@ -18,12 +18,12 @@ def fcn(split): pydata_params = dict(split=split, mean=(104.00699, 116.66877, 122.67892), seed=1337) if split == 'train': - pydata_params['sbdd_dir'] = '../../data/sbdd/dataset' + pydata_params['sbdd_dir'] = '../data/sbdd/dataset' pylayer = 'SBDDSegDataLayer' else: - pydata_params['voc_dir'] = '../../data/pascal/VOC2011' + pydata_params['voc_dir'] = '../data/pascal/VOC2011' pylayer = 'VOCSegDataLayer' - n.data, n.label = L.Python(module='layers', layer=pylayer, + n.data, n.label = L.Python(module='voc_layers', layer=pylayer, ntop=2, param_str=str(pydata_params)) # the base net diff --git a/voc-fcn-alexnet/train.prototxt b/voc-fcn-alexnet/train.prototxt index b12b608e7a34166516eb9830c4b8360207a38eb2..5840d2a69563a30ce6369f7a39e7fa1efc5d8e57 100644 --- a/voc-fcn-alexnet/train.prototxt +++ b/voc-fcn-alexnet/train.prototxt @@ -6,7 +6,7 @@ layer { python_param { module: "voc_layers" layer: "SBDDSegDataLayer" - param_str: "{\'sbdd_dir\': \'../../data/sbdd/dataset\', \'seed\': 1337, \'split\': \'train\', \'mean\': (104.00699, 116.66877, 122.67892)}" + param_str: "{\'sbdd_dir\': \'../data/sbdd/dataset\', \'seed\': 1337, \'split\': \'train\', \'mean\': (104.00699, 116.66877, 122.67892)}" } } layer { diff --git a/voc-fcn-alexnet/val.prototxt b/voc-fcn-alexnet/val.prototxt index 1d264d2cf3dca563ce0d5e6627ea2ebb213f66fa..eee644d9f543849da5150bbae559327ea70c97be 100644 --- a/voc-fcn-alexnet/val.prototxt +++ b/voc-fcn-alexnet/val.prototxt @@ -6,7 +6,7 @@ layer { python_param { module: "voc_layers" layer: "VOCSegDataLayer" - param_str: "{\'voc_dir\': \'../../data/pascal/VOC2011\', \'seed\': 1337, \'split\': \'seg11valid\', \'mean\': (104.00699, 116.66877, 122.67892)}" + param_str: "{\'voc_dir\': \'../data/pascal/VOC2011\', \'seed\': 1337, \'split\': \'seg11valid\', \'mean\': (104.00699, 116.66877, 122.67892)}" } } layer { diff --git a/voc-fcn16s/train.prototxt b/voc-fcn16s/train.prototxt index c6e175f896d415fc9a466d77bf07e9ea39ccb58f..ea3b4e6465029e45aa9228153fcadba7ddda9a18 100644 --- a/voc-fcn16s/train.prototxt +++ b/voc-fcn16s/train.prototxt @@ -428,6 +428,15 @@ layer { bottom: "fc6" top: "fc6" } +layer { + name: "drop6" + type: "Dropout" + bottom: "fc6" + top: "fc6" + dropout_param { + dropout_ratio: 0.5 + } +} layer { name: "fc7" type: "Convolution" @@ -454,6 +463,15 @@ layer { bottom: "fc7" top: "fc7" } +layer { + name: "drop7" + type: "Dropout" + bottom: "fc7" + top: "fc7" + dropout_param { + dropout_ratio: 0.5 + } +} layer { name: "score_fr" type: "Convolution" diff --git a/voc-fcn16s/val.prototxt b/voc-fcn16s/val.prototxt index 13d96a92f25705fb74f68d246554f46ed1ddda30..b7827a969940ab93e5767a84fb12ccba921ce449 100644 --- a/voc-fcn16s/val.prototxt +++ b/voc-fcn16s/val.prototxt @@ -428,6 +428,15 @@ layer { bottom: "fc6" top: "fc6" } +layer { + name: "drop6" + type: "Dropout" + bottom: "fc6" + top: "fc6" + dropout_param { + dropout_ratio: 0.5 + } +} layer { name: "fc7" type: "Convolution" @@ -454,6 +463,15 @@ layer { bottom: "fc7" top: "fc7" } +layer { + name: "drop7" + type: "Dropout" + bottom: "fc7" + top: "fc7" + dropout_param { + dropout_ratio: 0.5 + } +} layer { name: "score_fr" type: "Convolution" diff --git a/voc-fcn32s/net.py b/voc-fcn32s/net.py index df9e524b49977e57142585e8598b83471adc51a6..634e11ffbfd0f00af9ba962dbc276e90eb340992 100644 --- a/voc-fcn32s/net.py +++ b/voc-fcn32s/net.py @@ -16,10 +16,10 @@ def fcn(split): pydata_params = dict(split=split, mean=(104.00699, 116.66877, 122.67892), seed=1337) if split == 'train': - pydata_params['sbdd_dir'] = '../../data/sbdd/dataset' + pydata_params['sbdd_dir'] = '../data/sbdd/dataset' pylayer = 'SBDDSegDataLayer' else: - pydata_params['voc_dir'] = '../../data/pascal/VOC2011' + pydata_params['voc_dir'] = '../data/pascal/VOC2011' pylayer = 'VOCSegDataLayer' n.data, n.label = L.Python(module='voc_layers', layer=pylayer, ntop=2, param_str=str(pydata_params)) diff --git a/voc-fcn32s/train.prototxt b/voc-fcn32s/train.prototxt index dcd1992b77716ac89eee47a1a8da13843dbc57c9..6ef56e615fd78d22720cb2898184c2f3af5b2ab8 100644 --- a/voc-fcn32s/train.prototxt +++ b/voc-fcn32s/train.prototxt @@ -6,7 +6,7 @@ layer { python_param { module: "voc_layers" layer: "SBDDSegDataLayer" - param_str: "{\'sbdd_dir\': \'../../data/sbdd/dataset\', \'seed\': 1337, \'split\': \'train\', \'mean\': (104.00699, 116.66877, 122.67892)}" + param_str: "{\'sbdd_dir\': \'../data/sbdd/dataset\', \'seed\': 1337, \'split\': \'train\', \'mean\': (104.00699, 116.66877, 122.67892)}" } } layer { @@ -428,6 +428,15 @@ layer { bottom: "fc6" top: "fc6" } +layer { + name: "drop6" + type: "Dropout" + bottom: "fc6" + top: "fc6" + dropout_param { + dropout_ratio: 0.5 + } +} layer { name: "fc7" type: "Convolution" @@ -454,6 +463,15 @@ layer { bottom: "fc7" top: "fc7" } +layer { + name: "drop7" + type: "Dropout" + bottom: "fc7" + top: "fc7" + dropout_param { + dropout_ratio: 0.5 + } +} layer { name: "score_fr" type: "Convolution" diff --git a/voc-fcn32s/val.prototxt b/voc-fcn32s/val.prototxt index e15cf304c538ef0c84714bc28ea2778fe8c13b28..1989f464e7f210b155c16c5857e598548835bf77 100644 --- a/voc-fcn32s/val.prototxt +++ b/voc-fcn32s/val.prototxt @@ -6,7 +6,7 @@ layer { python_param { module: "voc_layers" layer: "VOCSegDataLayer" - param_str: "{\'voc_dir\': \'../../data/pascal/VOC2011\', \'seed\': 1337, \'split\': \'seg11valid\', \'mean\': (104.00699, 116.66877, 122.67892)}" + param_str: "{\'voc_dir\': \'../data/pascal/VOC2011\', \'seed\': 1337, \'split\': \'seg11valid\', \'mean\': (104.00699, 116.66877, 122.67892)}" } } layer { @@ -428,6 +428,15 @@ layer { bottom: "fc6" top: "fc6" } +layer { + name: "drop6" + type: "Dropout" + bottom: "fc6" + top: "fc6" + dropout_param { + dropout_ratio: 0.5 + } +} layer { name: "fc7" type: "Convolution" @@ -454,6 +463,15 @@ layer { bottom: "fc7" top: "fc7" } +layer { + name: "drop7" + type: "Dropout" + bottom: "fc7" + top: "fc7" + dropout_param { + dropout_ratio: 0.5 + } +} layer { name: "score_fr" type: "Convolution" diff --git a/voc-fcn8s-atonce/net.py b/voc-fcn8s-atonce/net.py index 67694caeec6c8ea200377bfc01986fe2c6d60f20..f94d4801f8e9da677ad718fd0d11e5f6710c5ce5 100644 --- a/voc-fcn8s-atonce/net.py +++ b/voc-fcn8s-atonce/net.py @@ -16,10 +16,10 @@ def fcn(split): pydata_params = dict(split=split, mean=(104.00699, 116.66877, 122.67892), seed=1337) if split == 'train': - pydata_params['sbdd_dir'] = '../../data/sbdd/dataset' + pydata_params['sbdd_dir'] = '../data/sbdd/dataset' pylayer = 'SBDDSegDataLayer' else: - pydata_params['voc_dir'] = '../../data/pascal/VOC2011' + pydata_params['voc_dir'] = '../data/pascal/VOC2011' pylayer = 'VOCSegDataLayer' n.data, n.label = L.Python(module='voc_layers', layer=pylayer, ntop=2, param_str=str(pydata_params)) diff --git a/voc-fcn8s-atonce/train.prototxt b/voc-fcn8s-atonce/train.prototxt index 8e14dc05ff3d39a8ca7e51d09cb2c6b6901e111e..b9fd222b44393c0f4395a9256bd37380cdbf02a4 100644 --- a/voc-fcn8s-atonce/train.prototxt +++ b/voc-fcn8s-atonce/train.prototxt @@ -6,7 +6,7 @@ layer { python_param { module: "voc_layers" layer: "SBDDSegDataLayer" - param_str: "{\'sbdd_dir\': \'../../data/sbdd/dataset\', \'seed\': 1337, \'split\': \'train\', \'mean\': (104.00699, 116.66877, 122.67892)}" + param_str: "{\'sbdd_dir\': \'../data/sbdd/dataset\', \'seed\': 1337, \'split\': \'train\', \'mean\': (104.00699, 116.66877, 122.67892)}" } } layer { diff --git a/voc-fcn8s-atonce/val.prototxt b/voc-fcn8s-atonce/val.prototxt index 7a5e38fdbf4760ddd17e330d81011a1661bf0454..6a6a068a74de5e6383e974af948673626842b131 100644 --- a/voc-fcn8s-atonce/val.prototxt +++ b/voc-fcn8s-atonce/val.prototxt @@ -6,7 +6,7 @@ layer { python_param { module: "voc_layers" layer: "VOCSegDataLayer" - param_str: "{\'voc_dir\': \'../../data/pascal/VOC2011\', \'seed\': 1337, \'split\': \'seg11valid\', \'mean\': (104.00699, 116.66877, 122.67892)}" + param_str: "{\'voc_dir\': \'../data/pascal/VOC2011\', \'seed\': 1337, \'split\': \'seg11valid\', \'mean\': (104.00699, 116.66877, 122.67892)}" } } layer { diff --git a/voc-fcn8s/net.py b/voc-fcn8s/net.py index 913c808b1292bfc7be577b49792a5f3071d0dcf3..8151fb06befe55ba33084bbd0b9e450ae7cdbac4 100644 --- a/voc-fcn8s/net.py +++ b/voc-fcn8s/net.py @@ -16,10 +16,10 @@ def fcn(split): pydata_params = dict(split=split, mean=(104.00699, 116.66877, 122.67892), seed=1337) if split == 'train': - pydata_params['sbdd_dir'] = '../../data/sbdd/dataset' + pydata_params['sbdd_dir'] = '../data/sbdd/dataset' pylayer = 'SBDDSegDataLayer' else: - pydata_params['voc_dir'] = '../../data/pascal/VOC2011' + pydata_params['voc_dir'] = '../data/pascal/VOC2011' pylayer = 'VOCSegDataLayer' n.data, n.label = L.Python(module='voc_layers', layer=pylayer, ntop=2, param_str=str(pydata_params)) diff --git a/voc-fcn8s/train.prototxt b/voc-fcn8s/train.prototxt index b17e2253d0d028f5f0d896c6b32783c0695c1e28..f162124e6060619bee3c84481e8f711d84ddb910 100644 --- a/voc-fcn8s/train.prototxt +++ b/voc-fcn8s/train.prototxt @@ -6,7 +6,7 @@ layer { python_param { module: "voc_layers" layer: "SBDDSegDataLayer" - param_str: "{\'sbdd_dir\': \'../../data/sbdd/dataset\', \'seed\': 1337, \'split\': \'train\', \'mean\': (104.00699, 116.66877, 122.67892)}" + param_str: "{\'sbdd_dir\': \'../data/sbdd/dataset\', \'seed\': 1337, \'split\': \'train\', \'mean\': (104.00699, 116.66877, 122.67892)}" } } layer { @@ -428,6 +428,15 @@ layer { bottom: "fc6" top: "fc6" } +layer { + name: "drop6" + type: "Dropout" + bottom: "fc6" + top: "fc6" + dropout_param { + dropout_ratio: 0.5 + } +} layer { name: "fc7" type: "Convolution" @@ -454,6 +463,15 @@ layer { bottom: "fc7" top: "fc7" } +layer { + name: "drop7" + type: "Dropout" + bottom: "fc7" + top: "fc7" + dropout_param { + dropout_ratio: 0.5 + } +} layer { name: "score_fr" type: "Convolution" diff --git a/voc-fcn8s/val.prototxt b/voc-fcn8s/val.prototxt index 9c824ecd0412586487de29ce24d27f67a8cc97d1..4d35da9199d1074c093b0211ddfe6f506f626b0a 100644 --- a/voc-fcn8s/val.prototxt +++ b/voc-fcn8s/val.prototxt @@ -6,7 +6,7 @@ layer { python_param { module: "voc_layers" layer: "VOCSegDataLayer" - param_str: "{\'voc_dir\': \'../../data/pascal/VOC2011\', \'seed\': 1337, \'split\': \'seg11valid\', \'mean\': (104.00699, 116.66877, 122.67892)}" + param_str: "{\'voc_dir\': \'../data/pascal/VOC2011\', \'seed\': 1337, \'split\': \'seg11valid\', \'mean\': (104.00699, 116.66877, 122.67892)}" } } layer { @@ -428,6 +428,15 @@ layer { bottom: "fc6" top: "fc6" } +layer { + name: "drop6" + type: "Dropout" + bottom: "fc6" + top: "fc6" + dropout_param { + dropout_ratio: 0.5 + } +} layer { name: "fc7" type: "Convolution" @@ -454,6 +463,15 @@ layer { bottom: "fc7" top: "fc7" } +layer { + name: "drop7" + type: "Dropout" + bottom: "fc7" + top: "fc7" + dropout_param { + dropout_ratio: 0.5 + } +} layer { name: "score_fr" type: "Convolution"