提交 55ca1933 authored 作者: Olivier Delalleau's avatar Olivier Delalleau

Fixed a couple tests now failing because they were using pickle protocol 0

上级 78fd7c53
...@@ -740,7 +740,7 @@ def test_pickle_aliased_memory(): ...@@ -740,7 +740,7 @@ def test_pickle_aliased_memory():
try: try:
m.f.pickle_aliased_memory_strategy = 'warn' m.f.pickle_aliased_memory_strategy = 'warn'
m.g.pickle_aliased_memory_strategy = 'warn' m.g.pickle_aliased_memory_strategy = 'warn'
m_dup = cPickle.loads(cPickle.dumps(m)) m_dup = cPickle.loads(cPickle.dumps(m, protocol=-1))
assert sio.getvalue().startswith('aliased relat') assert sio.getvalue().startswith('aliased relat')
finally: finally:
logging.getLogger('theano.compile.function_module').removeHandler(handler) logging.getLogger('theano.compile.function_module').removeHandler(handler)
...@@ -749,7 +749,7 @@ def test_pickle_aliased_memory(): ...@@ -749,7 +749,7 @@ def test_pickle_aliased_memory():
try: try:
m.f.pickle_aliased_memory_strategy = 'raise' m.f.pickle_aliased_memory_strategy = 'raise'
m.g.pickle_aliased_memory_strategy = 'raise' m.g.pickle_aliased_memory_strategy = 'raise'
m_dup = cPickle.loads(cPickle.dumps(m)) m_dup = cPickle.loads(cPickle.dumps(m, protocol=-1))
except AliasedMemoryError, e: except AliasedMemoryError, e:
return return
...@@ -761,7 +761,7 @@ def test_pickle_aliased_memory(): ...@@ -761,7 +761,7 @@ def test_pickle_aliased_memory():
#m's memory is aliased differently.... #m's memory is aliased differently....
m.y = m.x[1:2] m.y = m.x[1:2]
m_dup = cPickle.loads(cPickle.dumps(m)) m_dup = cPickle.loads(cPickle.dumps(m, protocol=-1))
if 0: if 0:
#is m_dup's memory aliased the same way? #is m_dup's memory aliased the same way?
......
...@@ -401,7 +401,7 @@ class test_Prod(unittest.TestCase): ...@@ -401,7 +401,7 @@ class test_Prod(unittest.TestCase):
def test_pickle_bug(self): def test_pickle_bug(self):
# Regression test for bug fixed in 24d4fd291054. # Regression test for bug fixed in 24d4fd291054.
o = Prod() o = Prod()
s = cPickle.dumps(o) s = cPickle.dumps(o, protocol=-1)
o = cPickle.loads(s) o = cPickle.loads(s)
cPickle.dumps(o) cPickle.dumps(o)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论