提交 dd8070ea authored 作者: Frederic Bastien's avatar Frederic Bastien

changed FancyModule for Module following previous modification.

上级 8962bb7e
...@@ -12,7 +12,7 @@ import random ...@@ -12,7 +12,7 @@ import random
import numpy as N import numpy as N
from theano.compile import module as M from theano.compile import module as M
class RegressionLayer(M.FancyModule): class RegressionLayer(M.Module):
def __init__(self, input = None, target = None, regularize = True): def __init__(self, input = None, target = None, regularize = True):
super(RegressionLayer, self).__init__() #boilerplate super(RegressionLayer, self).__init__() #boilerplate
# MODEL CONFIGURATION # MODEL CONFIGURATION
...@@ -91,7 +91,7 @@ class T_function_module(unittest.TestCase): ...@@ -91,7 +91,7 @@ class T_function_module(unittest.TestCase):
assert plus10() == 9 assert plus10() == 9
def test_Klass_basic_example2(self): def test_Klass_basic_example2(self):
m = M.FancyModule() m = M.Module()
n = T.scalar('n') n = T.scalar('n')
m.c = M.Member(T.scalar()) # state variables must be wrapped with ModuleMember m.c = M.Member(T.scalar()) # state variables must be wrapped with ModuleMember
m.inc = M.Method(n, [], c = m.c + n) # m.c <= m.c + n m.inc = M.Method(n, [], c = m.c + n) # m.c <= m.c + n
...@@ -125,14 +125,14 @@ class T_function_module(unittest.TestCase): ...@@ -125,14 +125,14 @@ class T_function_module(unittest.TestCase):
def test_Klass_nesting_example2(self): def test_Klass_nesting_example2(self):
def make_incdec_module(): def make_incdec_module():
m = M.FancyModule() m = M.Module()
n = T.scalar('n') n = T.scalar('n')
m.c = M.Member(T.scalar()) # state variables must be wrapped with ModuleMember m.c = M.Member(T.scalar()) # state variables must be wrapped with ModuleMember
m.inc = M.Method(n, [], c = m.c + n) # m.c <= m.c + n m.inc = M.Method(n, [], c = m.c + n) # m.c <= m.c + n
m.dec = M.Method(n, [], c = m.c - n) # k.c <= k.c - n m.dec = M.Method(n, [], c = m.c - n) # k.c <= k.c - n
return m return m
m = M.FancyModule() m = M.Module()
m.incdec1 = make_incdec_module() m.incdec1 = make_incdec_module()
m.incdec2 = make_incdec_module() m.incdec2 = make_incdec_module()
m.sum = M.Method([], m.incdec1.c + m.incdec2.c) m.sum = M.Method([], m.incdec1.c + m.incdec2.c)
...@@ -201,8 +201,8 @@ class T_function_module(unittest.TestCase): ...@@ -201,8 +201,8 @@ class T_function_module(unittest.TestCase):
assert sum() == 4 # -2 + 6 assert sum() == 4 # -2 + 6
def test_Klass_basic_example2_more(self): def test_Klass_basic_example2_more(self):
m = M.FancyModule() m = M.Module()
m2 = M.FancyModule() m2 = M.Module()
m2.name="m2" # for better error m2.name="m2" # for better error
#top level don't have name, but other have auto name. #top level don't have name, but other have auto name.
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论