Cleaned up file hierarchy

hvy · Jul 13, 2016 · a7e2b57 · a7e2b57
1 parent 89d6a60
commit a7e2b57
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 371 deletions.
diff --git a/VGG.py b/VGG.py
diff --git a/images/cat.jpg b/images/cat.jpg
diff --git a/images/dog.jpg b/images/dog.jpg
diff --git a/max_pooling_2d.py b/max_pooling_2d.py
diff --git a/VGGVisualizer.py → models/VGG.py b/VGGVisualizer.py → models/VGG.py
@@ -2,16 +2,16 @@
 import chainer.links as L
 import chainer.functions as F
 from chainer import Variable
-from max_pooling_2d import max_pooling_2d
-from unpooling_2d import unpooling_2d
+from lib.chainer.chainer.functions.pooling import max_pooling_2d
+from lib.chainer.chainer.functions.pooling import unpooling_2d
 
-F.max_pooling_2d = max_pooling_2d
-F.unpooling_2d = unpooling_2d
-
-input_dimensions = (244, 244)
+# Override original Chainer functions
+F.max_pooling_2d = max_pooling_2d.max_pooling_2d
+F.unpooling_2d = unpooling_2d.unpooling_2d
 
 
 class VGG(chainer.Chain):
+    """Input dimensions are (244, 244)."""
     def __init__(self):
         super(VGG, self).__init__(
             conv1_1=L.Convolution2D(3, 64, 3, stride=1, pad=1),

diff --git a/models/__init__.py b/models/__init__.py
diff --git a/unpooling_2d.py b/unpooling_2d.py
diff --git a/visualize.py b/visualize.py
@@ -3,7 +3,7 @@
 import cv2 as cv
 from chainer import serializers
 from chainer import Variable
-from VGGVisualizer import VGG
+from models.VGG import VGG
 import imgutil