Skip to content

P
pytensor
提交 3dacc526 authored 作者: Frederic's avatar Frederic
浏览文件
操作

make comparison test better.

In NumPy, I have a PR that make it use array_priority for comparison. The new test assert that it don't work, or work correctly.
上级 c6d31233
隐藏空白字符变更
内嵌 并排
正在显示 包含 78 行增加 和 24 行删除
theano/tensor/tests/test_basic.py
浏览文件 @ 3dacc526
...@@ -4332,57 +4332,111 @@ class T_Join_and_Split(unittest.TestCase): ...@@ -4332,57 +4332,111 @@ class T_Join_and_Split(unittest.TestCase):
class test_comparison(unittest.TestCase): class test_comparison(unittest.TestCase):
def test_gt(self): def test_gt(self):
for dtype in ['float64', 'float32', 'complex64', 'complex128']: for dtype in ['float64', 'float32', 'complex64', 'complex128']:
x, y = vector(dtype=dtype), vector(dtype=dtype)
fn = inplace_func([x, y], x > y)
l = numpy.asarray([0., -1., 1.], dtype=dtype) l = numpy.asarray([0., -1., 1.], dtype=dtype)
r = numpy.asarray([0., 1., -1.], dtype=dtype) r = numpy.asarray([0., 1., -1.], dtype=dtype)
v = fn(l, r) for x, y, err in [
self.assertTrue(numpy.all(v == (l > r)), (v, (l > r))) (shared(l.astype(dtype)), shared(r.astype(dtype)), False),
(l, shared(r.astype(dtype)), True),
(tensor.constant(l), shared(r.astype(dtype)), False),
(shared(l.astype(dtype)), r, False),
(shared(l.astype(dtype)), tensor.constant(r), False),
]:
try:
fn = inplace_func([], x > y)
v = fn()
self.assertTrue(numpy.all(v == (l > r)), (v, (l > r)))
except TypeError:
assert err
def test_lt(self): def test_lt(self):
for dtype in ['float64', 'float32', 'complex64', 'complex128']: for dtype in ['float64', 'float32', 'complex64', 'complex128']:
x, y = vector(dtype=dtype), vector(dtype=dtype)
fn = inplace_func([x, y], x < y)
l = numpy.asarray([0., -1., 1.], dtype=dtype) l = numpy.asarray([0., -1., 1.], dtype=dtype)
r = numpy.asarray([0., 1., -1.], dtype=dtype) r = numpy.asarray([0., 1., -1.], dtype=dtype)
v = fn(l, r) for x, y, err in [
self.assertTrue(numpy.all(v == (l < r)), (v, (l < r))) (shared(l.astype(dtype)), shared(r.astype(dtype)), False),
(l, shared(r.astype(dtype)), True),
(tensor.constant(l), shared(r.astype(dtype)), False),
(shared(l.astype(dtype)), r, False),
(shared(l.astype(dtype)), tensor.constant(r), False),
]:
try:
fn = inplace_func([], x < y)
v = fn()
self.assertTrue(numpy.all(v == (l < r)), (v, (l < r)))
except TypeError:
assert err
def test_le(self): def test_le(self):
for dtype in ['float64', 'float32', 'complex64', 'complex128']: for dtype in ['float64', 'float32', 'complex64', 'complex128']:
x, y = vector(dtype=dtype), vector(dtype=dtype)
fn = inplace_func([x, y], x <= y)
l = numpy.asarray([0., -1., 1.], dtype=dtype) l = numpy.asarray([0., -1., 1.], dtype=dtype)
r = numpy.asarray([0., 1., -1.], dtype=dtype) r = numpy.asarray([0., 1., -1.], dtype=dtype)
v = fn(l, r) for x, y, err in [
self.assertTrue(numpy.all(v == (l <= r)), (v, (l <= r))) (shared(l.astype(dtype)), shared(r.astype(dtype)), False),
(l, shared(r.astype(dtype)), True),
(tensor.constant(l), shared(r.astype(dtype)), False),
(shared(l.astype(dtype)), r, False),
(shared(l.astype(dtype)), tensor.constant(r), False),
]:
try:
fn = inplace_func([], x <= y)
v = fn()
self.assertTrue(numpy.all(v == (l <= r)), (v, (l <= r)))
except TypeError:
assert err
def test_ge(self): def test_ge(self):
for dtype in ['float64', 'float32', 'complex64', 'complex128']: for dtype in ['float64', 'float32', 'complex64', 'complex128']:
x, y = vector(dtype=dtype), vector(dtype=dtype)
fn = inplace_func([x, y], x >= y)
l = numpy.asarray([0., -1., 1.], dtype=dtype) l = numpy.asarray([0., -1., 1.], dtype=dtype)
r = numpy.asarray([0., 1., -1.], dtype=dtype) r = numpy.asarray([0., 1., -1.], dtype=dtype)
v = fn(l, r) for x, y, err in [
self.assertTrue(numpy.all(v == (l >= r)), (v, (l >= r))) (shared(l.astype(dtype)), shared(r.astype(dtype)), False),
(l, shared(r.astype(dtype)), True),
(tensor.constant(l), shared(r.astype(dtype)), False),
(shared(l.astype(dtype)), r, False),
(shared(l.astype(dtype)), tensor.constant(r), False),
]:
try:
fn = inplace_func([], x >= y)
v = fn()
self.assertTrue(numpy.all(v == (l >= r)), (v, (l >= r)))
except TypeError:
assert err
def test_eq(self): def test_eq(self):
for dtype in ['float64', 'float32', 'complex64', 'complex128']: for dtype in ['float64', 'float32', 'complex64', 'complex128']:
x, y = vector(dtype=dtype), vector(dtype=dtype)
fn = inplace_func([x, y], eq(x, y))
l = numpy.asarray([0., -1., 1.], dtype=dtype) l = numpy.asarray([0., -1., 1.], dtype=dtype)
r = numpy.asarray([0., 1., -1.], dtype=dtype) r = numpy.asarray([0., 1., -1.], dtype=dtype)
v = fn(l, r) for x, y, err in [
self.assertTrue(numpy.all(v == (l == r)), (v, (l == r))) (shared(l.astype(dtype)), shared(r.astype(dtype)), False),
(l, shared(r.astype(dtype)), True),
(tensor.constant(l), shared(r.astype(dtype)), False),
(shared(l.astype(dtype)), r, False),
(shared(l.astype(dtype)), tensor.constant(r), False),
]:
try:
fn = inplace_func([], eq(x, y))
v = fn()
self.assertTrue(numpy.all(v == (l == r)), (v, (l == r)))
except TypeError:
assert err
def test_neq(self): def test_neq(self):
for dtype in ['float64', 'float32', 'complex64', 'complex128']: for dtype in ['float64', 'float32', 'complex64', 'complex128']:
x, y = vector(dtype=dtype), vector(dtype=dtype)
fn = inplace_func([x, y], neq(x, y))
l = numpy.asarray([0., -1., 1.], dtype=dtype) l = numpy.asarray([0., -1., 1.], dtype=dtype)
r = numpy.asarray([0., 1., -1.], dtype=dtype) r = numpy.asarray([0., 1., -1.], dtype=dtype)
v = fn(l, r) for x, y, err in [
self.assertTrue(numpy.all(v == (l != r)), (v, (l != r))) (shared(l.astype(dtype)), shared(r.astype(dtype)), False),
(l, shared(r.astype(dtype)), True),
(tensor.constant(l), shared(r.astype(dtype)), False),
(shared(l.astype(dtype)), r, False),
(shared(l.astype(dtype)), tensor.constant(r), False),
]:
try:
fn = inplace_func([], neq(x, y))
v = fn()
self.assertTrue(numpy.all(v == (l != r)), (v, (l != r)))
except TypeError:
assert err
class test_bitwise(unittest.TestCase): class test_bitwise(unittest.TestCase):
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论