X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=cnn-svrt.py;h=c7e0585abd009c5efb26913ee214ac74ec22eb41;hb=b7c9b813a879742e1a2ac359c46c0fb6335455cf;hp=7bef242de186a1bbcbad4a84444c5c3311a9445e;hpb=08ef6b7c332153cd72b7a225e27ee7af8882f313;p=pysvrt.git diff --git a/cnn-svrt.py b/cnn-svrt.py index 7bef242..c7e0585 100755 --- a/cnn-svrt.py +++ b/cnn-svrt.py @@ -66,26 +66,48 @@ parser.add_argument('--batch_size', help = 'Mini-batch size') parser.add_argument('--log_file', - type = str, default = 'cnn-svrt.log', + type = str, default = 'default.log', help = 'Log file name') parser.add_argument('--compress_vignettes', action='store_true', default = False, help = 'Use lossless compression to reduce the memory footprint') +parser.add_argument('--deep_model', + action='store_true', default = False, + help = 'Use Afroze\'s Alexnet-like deep model') + +parser.add_argument('--test_loaded_models', + action='store_true', default = False, + help = 'Should we compute the test errors of loaded models') + args = parser.parse_args() ###################################################################### log_file = open(args.log_file, 'w') +pred_log_t = None print(Fore.RED + 'Logging into ' + args.log_file + Style.RESET_ALL) -def log_string(s): - s = Fore.GREEN + time.ctime() + Style.RESET_ALL + ' ' + s +# Log and prints the string, with a time stamp. Does not log the +# remark +def log_string(s, remark = ''): + global pred_log_t + + t = time.time() + + if pred_log_t is None: + elapsed = 'start' + else: + elapsed = '+{:.02f}s'.format(t - pred_log_t) + + pred_log_t = t + + s = Fore.BLUE + '[' + time.ctime() + '] ' + Fore.GREEN + elapsed + Style.RESET_ALL + ' ' + s log_file.write(s + '\n') log_file.flush() - print(s) + print(s + Fore.CYAN + remark + Style.RESET_ALL) ###################################################################### @@ -124,6 +146,70 @@ 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__() + self.conv1 = nn.Conv2d( 1, 32, kernel_size=7, stride=4, padding=3) + self.conv2 = nn.Conv2d( 32, 96, kernel_size=5, padding=2) + self.conv3 = nn.Conv2d( 96, 128, kernel_size=3, padding=1) + self.conv4 = nn.Conv2d(128, 128, kernel_size=3, padding=1) + self.conv5 = nn.Conv2d(128, 96, kernel_size=3, padding=1) + self.fc1 = nn.Linear(1536, 256) + self.fc2 = nn.Linear(256, 256) + self.fc3 = nn.Linear(256, 2) + self.name = 'deepnet' + + def forward(self, x): + x = self.conv1(x) + x = fn.max_pool2d(x, kernel_size=2) + x = fn.relu(x) + + x = self.conv2(x) + x = fn.max_pool2d(x, kernel_size=2) + x = fn.relu(x) + + x = self.conv3(x) + x = fn.relu(x) + + x = self.conv4(x) + x = fn.relu(x) + + x = self.conv5(x) + x = fn.max_pool2d(x, kernel_size=2) + x = fn.relu(x) + + x = x.view(-1, 1536) + + x = self.fc1(x) + x = fn.relu(x) + + x = self.fc2(x) + x = fn.relu(x) + + x = self.fc3(x) + + return x + +###################################################################### + def train_model(model, train_set): batch_size = args.batch_size criterion = nn.CrossEntropyLoss() @@ -133,6 +219,8 @@ def train_model(model, train_set): optimizer = optim.SGD(model.parameters(), lr = 1e-2) + start_t = time.time() + for e in range(0, args.nb_epochs): acc_loss = 0.0 for b in range(0, train_set.nb_batches): @@ -143,7 +231,9 @@ def train_model(model, train_set): model.zero_grad() loss.backward() optimizer.step() - log_string('train_loss {:d} {:f}'.format(e + 1, acc_loss)) + dt = (time.time() - start_t) / (e + 1) + log_string('train_loss {:d} {:f}'.format(e + 1, acc_loss), + ' [ETA ' + time.ctime(time.time() + dt * (args.nb_epochs - e)) + ']') return model @@ -171,7 +261,12 @@ for arg in vars(args): for problem_number in range(1, 24): - model = AfrozeShallowNet() + log_string('**** problem ' + str(problem_number) + ' ****') + + if args.deep_model: + model = AfrozeDeepNet() + else: + model = AfrozeShallowNet() if torch.cuda.is_available(): model.cuda() @@ -184,29 +279,29 @@ for problem_number in range(1, 24): for p in model.parameters(): nb_parameters += p.numel() log_string('nb_parameters {:d}'.format(nb_parameters)) + need_to_train = False try: - model.load_state_dict(torch.load(model_filename)) log_string('loaded_model ' + model_filename) - except: + need_to_train = True + + if need_to_train: log_string('training_model ' + model_filename) + t = time.time() + if args.compress_vignettes: train_set = CompressedVignetteSet(problem_number, args.nb_train_batches, args.batch_size, cuda=torch.cuda.is_available()) - test_set = CompressedVignetteSet(problem_number, - args.nb_test_batches, args.batch_size, - cuda=torch.cuda.is_available()) else: train_set = VignetteSet(problem_number, args.nb_train_batches, args.batch_size, cuda=torch.cuda.is_available()) - test_set = VignetteSet(problem_number, - args.nb_test_batches, args.batch_size, - cuda=torch.cuda.is_available()) + + log_string('data_generation {:0.2f} samples / s'.format(train_set.nb_samples / (time.time() - t))) train_model(model, train_set) torch.save(model.state_dict(), model_filename) @@ -221,6 +316,21 @@ for problem_number in range(1, 24): train_set.nb_samples) ) + if need_to_train or args.test_loaded_models: + + t = time.time() + + if args.compress_vignettes: + test_set = CompressedVignetteSet(problem_number, + args.nb_test_batches, args.batch_size, + cuda=torch.cuda.is_available()) + else: + test_set = VignetteSet(problem_number, + args.nb_test_batches, args.batch_size, + cuda=torch.cuda.is_available()) + + log_string('data_generation {:0.2f} samples / s'.format(test_set.nb_samples / (time.time() - t))) + nb_test_errors = nb_errors(model, test_set) log_string('test_error {:d} {:.02f}% {:d} {:d}'.format(