X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=cnn-svrt.py;h=58035d2e421c8692e859edf97f61e052be34df03;hb=b6cc25f4622917b0025d613d617b5ce9e23f07e9;hp=0216b4e5cbba5740e053d43d5d9fad5ff0ab2f27;hpb=f18f927a8bb37ca1c43bf6cf38237c274944753a;p=pysvrt.git

diff --git a/cnn-svrt.py b/cnn-svrt.py
index 0216b4e..58035d2 100755
--- a/cnn-svrt.py
+++ b/cnn-svrt.py
@@ -19,7 +19,7 @@
 #  General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with selector.  If not, see <http://www.gnu.org/licenses/>.
+#  along with svrt.  If not, see <http://www.gnu.org/licenses/>.
 
 import time
 import argparse
@@ -41,7 +41,7 @@ from torchvision import datasets, transforms, utils
 
 # SVRT
 
-import vignette_set
+import svrtset
 
 ######################################################################
 
@@ -144,22 +144,6 @@ class AfrozeShallowNet(nn.Module):
 
 # Afroze's DeepNet
 
-#                       map size   nb. maps
-#                     ----------------------
-#    input                128x128    1
-# -- conv(21x21 x 32 stride=4) -> 28x28    32
-# -- max(2x2)                  -> 14x14      6
-# -- conv(7x7 x 96)            -> 8x8      16
-# -- max(2x2)                  -> 4x4      16
-# -- conv(5x5 x 96)            -> 26x36      16
-# -- conv(3x3 x 128)           -> 36x36      16
-# -- conv(3x3 x 128)           -> 36x36      16
-
-# -- conv(5x5 x 120) -> 1x1        120
-# -- reshape           -> 120        1
-# -- full(3x84)      -> 84         1
-# -- full(84x2)        -> 2          1
-
 class AfrozeDeepNet(nn.Module):
     def __init__(self):
         super(AfrozeDeepNet, self).__init__()
@@ -271,10 +255,10 @@ if args.nb_train_samples%args.batch_size > 0 or args.nb_test_samples%args.batch_
 
 if args.compress_vignettes:
     log_string('using_compressed_vignettes')
-    VignetteSet = vignette_set.CompressedVignetteSet
+    VignetteSet = svrtset.CompressedVignetteSet
 else:
     log_string('using_uncompressed_vignettes')
-    VignetteSet = vignette_set.VignetteSet
+    VignetteSet = svrtset.VignetteSet
 
 for problem_number in range(1, 24):