Mercurial > pylearn

changeset 657:4837aee22352

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Pascal Lamblin <lamblinp@iro.umontreal.ca>
date Fri, 20 Feb 2009 15:08:46 -0500
parents 40cae12a9bb8 (diff) 14d22ca1c8b5 (current diff)
children 6d927441a38f
files
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/pylearn/algorithms/rbm.py	Fri Feb 13 13:22:26 2009 -0500
+++ b/pylearn/algorithms/rbm.py	Fri Feb 20 15:08:46 2009 -0500
@@ -11,7 +11,6 @@
 from ..datasets import make_dataset
 from .minimizer import make_minimizer
 from .stopper import make_stopper
-from ..dbdict.experiment import subdict
 
 class RBM(T.RModule):
 
@@ -76,7 +75,7 @@
 
 
 def train_rbm(state, channel=lambda *args, **kwargs:None):
-    dataset = make_dataset(**subdict_copy(state, prefix='dataset_'))
+    dataset = make_dataset(**state.dataset)
     train = dataset.train
 
     rbm_module = RBM(
--- a/pylearn/external/wrap_libsvm.py	Fri Feb 13 13:22:26 2009 -0500
+++ b/pylearn/external/wrap_libsvm.py	Fri Feb 20 15:08:46 2009 -0500
@@ -2,7 +2,6 @@
 """
 import numpy
 from ..datasets import make_dataset
-from ..dbdict.experiment import subdict_copy
 
 # libsvm currently has no python installation instructions/convention.
 #
@@ -55,8 +54,7 @@
     This is the kind of function that dbdict-run can use.
 
     """
-    dataset = make_dataset(**subdict_copy(state, 'dataset_'))
-            
+    dataset = make_dataset(**state.dataset)
 
 
     #libsvm needs stuff in int32 on a 32bit machine