Mercurial > ift6266

changeset 264:f14fb56b3f8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ajout de fonctionnalitees pour deux testsets. Changements afin de pouvoir utiliser la nouvelle version de datasets
author SylvainPL <sylvain.pannetier.lebeuf@umontreal.ca>
date Thu, 18 Mar 2010 10:53:02 -0400
parents a0264184684e
children 1e4e60ddadb1
files deep/stacked_dae/v_sylvain/nist_sda.py
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/deep/stacked_dae/v_sylvain/nist_sda.py	Thu Mar 18 10:52:22 2010 -0400
+++ b/deep/stacked_dae/v_sylvain/nist_sda.py	Thu Mar 18 10:53:02 2010 -0400
@@ -60,7 +60,7 @@
 
     print "Creating optimizer with state, ", state
 
-    optimizer = SdaSgdOptimizer(dataset=datasets.nist_all, 
+    optimizer = SdaSgdOptimizer(dataset=datasets.nist_all(), 
                                     hyperparameters=state, \
                                     n_ins=n_ins, n_outs=n_outs,\
                                     examples_per_epoch=examples_per_epoch, \
@@ -68,7 +68,7 @@
                                     max_minibatches=rtt)
 
     parameters=[]
-    optimizer.pretrain(datasets.nist_all)
+    optimizer.pretrain(datasets.nist_P07())
     channel.save()
     
     #Set some of the parameters used for the finetuning
@@ -92,31 +92,31 @@
     if finetune_choice==0:
         print('\n\n\tfinetune avec nist\n\n')
         optimizer.reload_parameters()
-        optimizer.finetune(datasets.nist_all,max_finetune_epoch_NIST)
+        optimizer.finetune(datasets.nist_all(),datasets.nist_P07(),max_finetune_epoch_NIST,ind_test=1)
     if finetune_choice==1:
         print('\n\n\tfinetune avec P07\n\n')
         optimizer.reload_parameters()
-        optimizer.finetune(datasets.nist_P07,max_finetune_epoch_P07)
+        optimizer.finetune(datasets.nist_P07(),datasets.nist_all(),max_finetune_epoch_P07,ind_test=0)
     if finetune_choice==2:
         print('\n\n\tfinetune avec nist suivi de P07\n\n')
         optimizer.reload_parameters()
-        optimizer.finetune(datasets.nist_all,max_finetune_epoch_NIST)
-        optimizer.finetune(datasets.nist_P07,max_finetune_epoch_P07)
+        optimizer.finetune(datasets.nist_all(),datasets.nist_P07(),max_finetune_epoch_NIST,ind_test=1)
+        optimizer.finetune(datasets.nist_P07(),datasets.nist_all(),max_finetune_epoch_P07,ind_test=0)
 
     if finetune_choice==-1:
         print('\nSerie de 3 essais de fine-tuning')
         print('\n\n\tfinetune avec nist\n\n')
         optimizer.reload_parameters()
-        optimizer.finetune(datasets.nist_all,max_finetune_epoch_NIST)
+        optimizer.finetune(datasets.nist_all(),datasets.nist_P07(),max_finetune_epoch_NIST,ind_test=1)
         channel.save()
         print('\n\n\tfinetune avec P07\n\n')
         optimizer.reload_parameters()
-        optimizer.finetune(datasets.nist_P07,max_finetune_epoch_P07)
+        optimizer.finetune(datasets.nist_P07(),datasets.nist_all(),max_finetune_epoch_P07,ind_test=0)
         channel.save()
         print('\n\n\tfinetune avec nist suivi de P07\n\n')
         optimizer.reload_parameters()
-        optimizer.finetune(datasets.nist_all,max_finetune_epoch_NIST)
-        optimizer.finetune(datasets.nist_P07,max_finetune_epoch_P07)
+        optimizer.finetune(datasets.nist_all(),datasets.nist_P07(),max_finetune_epoch_NIST,ind_test=1)
+        optimizer.finetune(datasets.nist_P07(),datasets.nist_all(),max_finetune_epoch_P07,ind_test=0)
         channel.save()
     
     channel.save()