Automated merge with ssh://projects@lgcm.iro.umontreal.ca/hg/theano

examples/logistic_regression.py

@@ -12,13 +12,23 @@ import numpy as N
 
 class LogisticRegressionN(module.FancyModule):
     class InstanceType(module.FancyModuleInstance):
-        def initialize(self, n_in, n_out):
+        def initialize(self, n_in, n_out, seed = None):
             #self.component is the LogisticRegressionTemplate instance that built this guy.
-
-            self.w = N.random.randn(n_in, n_out)
-            self.b = N.random.randn(n_out)
+            rng = N.random.RandomState(seed)
+            
+            self.w = rng.randn(n_in, n_out)
+            self.b = rng.randn(n_out)
             self.lr = 0.01
             self.__hide__ = ['params']
+        def __eq__(self, other):
+            if not isinstance(other.component, LogisticRegressionN) and not isinstance(other.component, LogisticRegression2):
+                raise NotImplemented
+         #we compare the member.
+            if (N.abs(self.w-other.w)<1e-8).all() and (N.abs(self.b-other.b)<1e-8).all() and self.lr == other.lr:
+                return True
+            return False
+        def __hash__(self):
+            raise NotImplemented
 
     def __init__(self, x = None, targ = None):
         super(LogisticRegressionN, self).__init__() #boilerplate
@@ -48,13 +58,24 @@ class LogisticRegressionN(module.FancyModule):
 
 class LogisticRegression2(module.FancyModule):
     class InstanceType(module.FancyModuleInstance):
-        def initialize(self, n_in):
+        def initialize(self, n_in, seed = 1827):
             #self.component is the LogisticRegressionTemplate instance that built this guy.
 
-            self.w = N.random.randn(n_in,1)
-            self.b = N.random.randn(1)
+            rng = N.random.RandomState(seed)
+            
+            self.w = rng.randn(n_in, 1)
+            self.b = rng.randn(1)
             self.lr = 0.01
             self.__hide__ = ['params']
+        def __eq__(self, other):
+            if not isinstance(other.component, LogisticRegressionN) and not isinstance(other.component, LogisticRegression2):
+                raise NotImplemented
+         #we compare the member.
+            if (N.abs(self.w-other.w)<1e-8).all() and (N.abs(self.b-other.b)<1e-8).all() and self.lr == other.lr:
+                return True
+            return False
+        def __hash__(self):
+            raise NotImplemented 
 
     def __init__(self, x = None, targ = None):
         super(LogisticRegression2, self).__init__() #boilerplate
@@ -85,7 +106,7 @@ class LogisticRegression2(module.FancyModule):
         
 
 
-if __name__ == '__main__':
+def main():
     pprint.assign(nnet.crossentropy_softmax_1hot_with_bias_dx, printing.FunctionPrinter('xsoftmaxdx'))
     pprint.assign(nnet.crossentropy_softmax_argmax_1hot_with_bias, printing.FunctionPrinter('nll', 'softmax', 'argmax'))
     if 1:
@@ -135,6 +156,8 @@ if __name__ == '__main__':
         print 'TRAINED MODEL:'
         print lr
 
+if __name__ == '__main__':
+    main()
 
 
 

examples/tests/test_logistic_regression.py

+#!/usr/bin/env python
+#
+# UNIT TEST
+#
+import unittest
+import numpy
+from theano import gof
+
+from theano.gradient import *
+from theano import gradient
+import theano
+
+import sys
+from theano import tensor as T
+from theano.tensor import nnet
+from theano.compile import module
+from theano import printing, pprint
+from theano import compile
+
+import numpy as N
+
+class test_logistic_regression_example(unittest.TestCase):
+
+    def test_example_main(self): 
+        """Test that the file execute without trouble"""
+        from ..examples import logistic_regression
+        logistic_regression.main()
+
+    def test_example_moduleN(self): 
+        """Test that the LogisticRegressionN module execute the same with different mode"""
+        from ..examples import logistic_regression
+        pprint.assign(nnet.crossentropy_softmax_1hot_with_bias_dx, printing.FunctionPrinter('xsoftmaxdx'))
+        pprint.assign(nnet.crossentropy_softmax_argmax_1hot_with_bias, printing.FunctionPrinter('nll', 'softmax', 'argmax'))
+
+        lrc = logistic_regression.LogisticRegressionN()
+        lr1 = lrc.make(10, 2, mode=theano.Mode('c|py', 'fast_run'), seed=1827)
+        lr2 = lrc.make(10, 2, mode=theano.Mode('py', 'fast_run'), seed=1827)
+        lr3 = lrc.make(10, 2, mode=theano.Mode('py', 'merge'), seed=1827) #'FAST_RUN')
+        lr4 = lrc.make(10, 2, mode=compile.FAST_RUN.excluding('fast_run'), seed=1827)
+        #FAST_RUN, FAST_COMPILE, 
+        data_x = N.random.randn(5, 10)
+        data_y = (N.random.randn(5) > 0)
+
+        def train(lr):
+            for i in xrange(1000):
+                lr.lr = 0.02
+                xe = lr.update(data_x, data_y) 
+        train(lr1)
+        train(lr2)
+        train(lr3)
+        train(lr4)
+
+        assert lr1==lr2
+        assert lr1==lr3
+        assert lr1==lr4
+
+    def test_example_module2(self): 
+        """Test that the LogisticRegression2 module execute the same with different mode"""
+        from ..examples import logistic_regression
+        lrc = logistic_regression.LogisticRegression2() #TODO: test 2==N
+        lr0 = lrc.make(10,2)
+#        lr0 = lrc.make(10,2,seed=1827)#error
+#        lr1 = lrc.make(10, 2, mode=theano.Mode('c|py', 'fast_run'), seed=1827)
+#         lr2 = lrc.make(10, 2, mode=theano.Mode('py', 'fast_run'), seed=1827)
+#         lr3 = lrc.make(10, 2, mode=theano.Mode('py', 'merge'), seed=1827) #'FAST_RU
+
+#         lr4 = lrc.make(10, 2, mode=compile.FAST_RUN.excluding('fast_run'), seed=1827)
+#         #FAST_RUN, FAST_COMPILE, 
+#         data_x = N.random.randn(5, 10)
+#         data_y = (N.random.randn(5) > 0)
+
+#         def train(lr):
+#             for i in xrange(10000):
+#                 lr.lr = 0.02
+#                 xe = lr.update(data_x, data_y) 
+#        train(lr1)
+#        train(lr2)
+#        train(lr3)
+ #       train(lr4)
+
+#        self.fail("NotImplementedError")
+
+if __name__ == '__main__':
+    from theano.tests import main
+    main("test_wiki")