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

diff --git a/cnn-svrt.py b/cnn-svrt.py
index 0216b4e..142b81f 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__()
@@ -263,6 +247,20 @@ def int_to_suffix(n):
     else:
         return str(n)
 
+class vignette_logger():
+    def __init__(self, delay_min = 60):
+        self.start_t = time.time()
+        self.delay_min = delay_min
+
+    def __call__(self, n, m):
+        t = time.time()
+        if t > self.start_t + self.delay_min:
+            dt = (t - self.start_t) / m
+            log_string('sample_generation {:d} / {:d}'.format(
+                m,
+                n), ' [ETA ' + time.ctime(time.time() + dt * (n - m)) + ']'
+            )
+
 ######################################################################
 
 if args.nb_train_samples%args.batch_size > 0 or args.nb_test_samples%args.batch_size > 0:
@@ -271,10 +269,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):
 
@@ -316,7 +314,8 @@ for problem_number in range(1, 24):
 
         train_set = VignetteSet(problem_number,
                                 args.nb_train_samples, args.batch_size,
-                                cuda = torch.cuda.is_available())
+                                cuda = torch.cuda.is_available(),
+                                logger = vignette_logger())
 
         log_string('data_generation {:0.2f} samples / s'.format(
             train_set.nb_samples / (time.time() - t))