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

Remove code for scipy 0.12 support that we don't support anymore.

上级 51ac3abd
...@@ -1722,12 +1722,7 @@ if imported_scipy_special: ...@@ -1722,12 +1722,7 @@ if imported_scipy_special:
expected_j0 = scipy.special.j0 expected_j0 = scipy.special.j0
expected_j1 = scipy.special.j1 expected_j1 = scipy.special.j1
skip_scipy = False skip_scipy = False
if LooseVersion(scipy_version) >= LooseVersion("0.12.0"):
expected_erfcx = scipy.special.erfcx expected_erfcx = scipy.special.erfcx
skip_scipy12 = False
else:
expected_erfcx = []
skip_scipy12 = "the erfcx op requires scipy version >= 0.12, installed version is " + scipy_version
else: else:
expected_erf = [] expected_erf = []
expected_erfc = [] expected_erfc = []
...@@ -1741,7 +1736,6 @@ else: ...@@ -1741,7 +1736,6 @@ else:
expected_j0 = [] expected_j0 = []
expected_j1 = [] expected_j1 = []
skip_scipy = "scipy is not present" skip_scipy = "scipy is not present"
skip_scipy12 = "scipy is not present"
ErfTester = makeBroadcastTester( ErfTester = makeBroadcastTester(
op=tensor.erf, op=tensor.erf,
...@@ -1785,8 +1779,7 @@ ErfcxTester = makeBroadcastTester( ...@@ -1785,8 +1779,7 @@ ErfcxTester = makeBroadcastTester(
good=_good_broadcast_unary_normal_float_no_complex_small_neg_range, good=_good_broadcast_unary_normal_float_no_complex_small_neg_range,
grad=_grad_broadcast_unary_normal_small_neg_range, grad=_grad_broadcast_unary_normal_small_neg_range,
eps=2e-10, eps=2e-10,
mode=mode_no_scipy, mode=mode_no_scipy)
skip=skip_scipy12)
ErfcxInplaceTester = makeBroadcastTester( ErfcxInplaceTester = makeBroadcastTester(
op=inplace.erfcx_inplace, op=inplace.erfcx_inplace,
expected=expected_erfcx, expected=expected_erfcx,
...@@ -1794,8 +1787,7 @@ ErfcxInplaceTester = makeBroadcastTester( ...@@ -1794,8 +1787,7 @@ ErfcxInplaceTester = makeBroadcastTester(
grad=_grad_broadcast_unary_normal_small_neg_range, grad=_grad_broadcast_unary_normal_small_neg_range,
eps=2e-10, eps=2e-10,
mode=mode_no_scipy, mode=mode_no_scipy,
inplace=True, inplace=True)
skip=skip_scipy12)
ErfinvTester = makeBroadcastTester( ErfinvTester = makeBroadcastTester(
op=tensor.erfinv, op=tensor.erfinv,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论