From 6c59617d2147c703606cee833ce24057887ca1d7 Mon Sep 17 00:00:00 2001
From: Evan Shelhamer <shelhamer@imaginarynumber.net>
Date: Mon, 19 Sep 2016 20:37:21 -0700
Subject: [PATCH] align proto defs with net spec: VOC paths, dropout, and
 module name

---
 voc-fcn-alexnet/net.py          |  6 +++---
 voc-fcn-alexnet/train.prototxt  |  2 +-
 voc-fcn-alexnet/val.prototxt    |  2 +-
 voc-fcn16s/train.prototxt       | 18 ++++++++++++++++++
 voc-fcn16s/val.prototxt         | 18 ++++++++++++++++++
 voc-fcn32s/net.py               |  4 ++--
 voc-fcn32s/train.prototxt       | 20 +++++++++++++++++++-
 voc-fcn32s/val.prototxt         | 20 +++++++++++++++++++-
 voc-fcn8s-atonce/net.py         |  4 ++--
 voc-fcn8s-atonce/train.prototxt |  2 +-
 voc-fcn8s-atonce/val.prototxt   |  2 +-
 voc-fcn8s/net.py                |  4 ++--
 voc-fcn8s/train.prototxt        | 20 +++++++++++++++++++-
 voc-fcn8s/val.prototxt          | 20 +++++++++++++++++++-
 14 files changed, 125 insertions(+), 17 deletions(-)

diff --git a/voc-fcn-alexnet/net.py b/voc-fcn-alexnet/net.py
index e8fd3a3..e0ad9da 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 b12b608..5840d2a 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 1d264d2..eee644d 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 c6e175f..ea3b4e6 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 13d96a9..b7827a9 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 df9e524..634e11f 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 dcd1992..6ef56e6 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 e15cf30..1989f46 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 67694ca..f94d480 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 8e14dc0..b9fd222 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 7a5e38f..6a6a068 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 913c808..8151fb0 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 b17e225..f162124 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 9c824ec..4d35da9 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"
-- 
GitLab