提交 fd685902 authored 作者: Frédéric Bastien's avatar Frédéric Bastien 提交者: GitHub

Merge pull request #5746 from shubhvachher/ipT_grad

skip_verify_grad added to makeTester for all InplaceTester
......@@ -760,7 +760,6 @@ SubInplaceTester = makeBroadcastTester(op=inplace.sub_inplace,
good=_good_broadcast_binary_normal,
bad_build=_bad_build_broadcast_binary_normal,
bad_runtime=_bad_runtime_broadcast_binary_normal,
grad=_grad_broadcast_binary_normal,
inplace=True)
......@@ -807,7 +806,6 @@ MaximumInplaceTester = makeBroadcastTester(
good=_good_broadcast_binary_normal,
bad_build=_bad_build_broadcast_binary_normal,
bad_runtime=_bad_runtime_broadcast_binary_normal,
grad=_grad_broadcast_binary_normal,
inplace=True)
MinimumTester = makeBroadcastTester(
......@@ -824,7 +822,6 @@ MinimumInplaceTester = makeBroadcastTester(
good=_good_broadcast_binary_normal,
bad_build=_bad_build_broadcast_binary_normal,
bad_runtime=_bad_runtime_broadcast_binary_normal,
grad=_grad_broadcast_binary_normal,
inplace=True)
MulTester = makeBroadcastTester(
......@@ -845,7 +842,6 @@ MulInplaceTester = makeBroadcastTester(
good=_good_broadcast_binary_normal,
bad_build=_bad_build_broadcast_binary_normal,
bad_runtime=_bad_runtime_broadcast_binary_normal,
grad=_grad_broadcast_binary_normal,
inplace=True)
......@@ -954,7 +950,6 @@ TrueDivInplaceTester = makeBroadcastTester(
_good_broadcast_div_mod_normal_float_inplace,
# The output is now in float, we cannot work inplace on an int.
without=['integer', 'uint8', 'uint16', 'int8']),
grad=_grad_broadcast_div_mod_normal,
grad_rtol=div_grad_rtol,
inplace=True)
......@@ -992,7 +987,6 @@ InvInplaceTester = makeBroadcastTester(
expected=lambda x: _numpy_true_div(np.int8(1), x),
good=_good_inv_inplace,
bad_runtime=_bad_runtime_inv,
grad=_grad_inv,
grad_rtol=div_grad_rtol,
inplace=True)
......@@ -1024,7 +1018,6 @@ ModInplaceTester = makeBroadcastTester(
x % y, dtype=theano.scalar.basic.upcast(x.dtype, y.dtype)),
good=copymod(_good_broadcast_div_mod_normal_float_inplace,
["complex1", "complex2"]),
grad=_grad_broadcast_div_mod_normal,
grad_eps=1e-5,
inplace=True)
......@@ -1080,7 +1073,6 @@ PowInplaceTester = makeBroadcastTester(
op=inplace.pow_inplace,
expected=lambda x, y: x ** y,
good=_good_broadcast_pow_normal_float_pow,
grad=_grad_broadcast_pow_normal,
inplace=True,
mode=m
)
......@@ -1191,7 +1183,6 @@ AbsInplaceTester = makeBroadcastTester(
op=inplace.abs__inplace,
expected=lambda x: np.abs(x),
good=_good_broadcast_unary_normal_abs,
grad=_grad_broadcast_unary_normal,
inplace=True)
NegTester = makeBroadcastTester(
......@@ -1203,7 +1194,6 @@ NegInplaceTester = makeBroadcastTester(
op=inplace.neg_inplace,
expected=lambda x: -x,
good=_good_broadcast_unary_normal,
grad=_grad_broadcast_unary_normal,
inplace=True)
SgnTester = makeBroadcastTester(
......@@ -1215,7 +1205,6 @@ SgnInplaceTester = makeBroadcastTester(
op=inplace.sgn_inplace,
expected=np.sign,
good=_good_broadcast_unary_normal_no_complex,
grad=_grad_broadcast_unary_normal,
inplace=True)
IntDivTester = makeBroadcastTester(
......@@ -1252,9 +1241,6 @@ CeilInplaceTester = makeBroadcastTester(
good=_good_broadcast_unary_normal_no_complex,
# corner cases includes a lot of integers: points where Ceil is not
# continuous (not differentiable)
grad=copymod(_grad_broadcast_unary_normal_noint,
extra=[np.asarray([-2.5, -1.5, -1.51, 0.49, .98, 1.02],
dtype=floatX)]),
inplace=True)
FloorTester = makeBroadcastTester(
......@@ -1267,7 +1253,6 @@ FloorInplaceTester = makeBroadcastTester(
op=inplace.floor_inplace,
expected=upcast_float16_ufunc(np.floor),
good=_good_broadcast_unary_normal_no_complex,
grad=_grad_broadcast_unary_normal_noint,
inplace=True)
TruncInplaceTester = makeBroadcastTester(
......@@ -1291,7 +1276,6 @@ RoundHalfToEvenInplaceTester = makeBroadcastTester(
op=inplace.round_half_to_even_inplace,
expected=np.round,
good=_good_broadcast_unary_normal_float_no_complex,
grad=_grad_broadcast_unary_normal_no_complex_no_corner_case,
inplace=True)
# np.vectorize don't handle correctly empty ndarray.
......@@ -1307,7 +1291,6 @@ RoundHalfAwayFromZeroInplaceTester = makeBroadcastTester(
op=inplace.round_half_away_from_zero_inplace,
expected=lambda a: theano.scalar.basic.round_half_away_from_zero_vec(a),
good=_good_broadcast_unary_normal_float_no_empty_no_complex,
grad=_grad_broadcast_unary_normal_no_complex_no_corner_case,
inplace=True)
SqrTester = makeBroadcastTester(
......@@ -1320,7 +1303,6 @@ SqrInplaceTester = makeBroadcastTester(
op=inplace.sqr_inplace,
expected=np.square,
good=_good_broadcast_unary_normal,
grad=_grad_broadcast_unary_normal,
inplace=True)
ExpTester = makeBroadcastTester(
......@@ -1335,7 +1317,6 @@ ExpInplaceTester = makeBroadcastTester(
op=inplace.exp_inplace,
expected=np.exp,
good=_good_broadcast_unary_normal_float,
grad=_grad_broadcast_unary_normal,
inplace=True)
Exp2Tester = makeBroadcastTester(
......@@ -1347,7 +1328,6 @@ Exp2InplaceTester = makeBroadcastTester(
op=inplace.exp2_inplace,
expected=np.exp2,
good=_good_broadcast_unary_normal_float,
grad=_grad_broadcast_unary_normal,
inplace=True)
......@@ -1363,7 +1343,6 @@ Expm1InplaceTester = makeBroadcastTester(
op=inplace.expm1_inplace,
expected=np.expm1,
good=_good_broadcast_unary_normal_float,
grad=_grad_broadcast_unary_normal,
inplace=True)
......@@ -1390,7 +1369,6 @@ LogInplaceTester = makeBroadcastTester(
op=inplace.log_inplace,
expected=np.log,
good=_good_broadcast_unary_positive_float,
grad=_grad_broadcast_unary_positive,
inplace=True)
Log2Tester = makeBroadcastTester(
......@@ -1402,7 +1380,6 @@ Log2InplaceTester = makeBroadcastTester(
op=inplace.log2_inplace,
expected=np.log2,
good=_good_broadcast_unary_positive_float,
grad=_grad_broadcast_unary_positive,
inplace=True)
Log10Tester = makeBroadcastTester(
......@@ -1414,7 +1391,6 @@ Log10InplaceTester = makeBroadcastTester(
op=inplace.log10_inplace,
expected=np.log10,
good=_good_broadcast_unary_positive_float,
grad=_grad_broadcast_unary_positive,
inplace=True)
Log1pTester = makeBroadcastTester(
......@@ -1426,7 +1402,6 @@ Log1pInplaceTester = makeBroadcastTester(
op=inplace.log1p_inplace,
expected=np.log1p,
good=_good_broadcast_unary_positive_float,
grad=_grad_broadcast_unary_positive,
inplace=True)
SqrtTester = makeBroadcastTester(
......@@ -1438,7 +1413,6 @@ SqrtInplaceTester = makeBroadcastTester(
op=inplace.sqrt_inplace,
expected=np.sqrt,
good=_good_broadcast_unary_positive_float,
grad=_grad_broadcast_unary_positive,
inplace=True)
_good_broadcast_unary_wide = dict(
......@@ -1469,7 +1443,6 @@ Deg2radInplaceTester = makeBroadcastTester(
op=inplace.deg2rad_inplace,
expected=np.deg2rad,
good=_good_broadcast_unary_normal_float_no_complex,
grad=_grad_broadcast_unary_normal_no_complex,
inplace=True,
eps=angle_eps)
......@@ -1483,7 +1456,6 @@ Rad2degInplaceTester = makeBroadcastTester(
op=inplace.rad2deg_inplace,
expected=np.rad2deg,
good=_good_broadcast_unary_normal_float_no_complex,
grad=_grad_broadcast_unary_normal_no_complex,
inplace=True,
eps=angle_eps)
......@@ -1496,7 +1468,6 @@ SinInplaceTester = makeBroadcastTester(
op=inplace.sin_inplace,
expected=np.sin,
good=_good_broadcast_unary_wide_float,
grad=_grad_broadcast_unary_wide,
inplace=True)
_good_broadcast_unary_arcsin = dict(
......@@ -1525,7 +1496,6 @@ ArcsinInplaceTester = makeBroadcastTester(
op=inplace.arcsin_inplace,
expected=np.arcsin,
good=_good_broadcast_unary_arcsin_float,
grad=_grad_broadcast_unary_arcsin,
inplace=True)
CosTester = makeBroadcastTester(
......@@ -1537,7 +1507,6 @@ CosInplaceTester = makeBroadcastTester(
op=inplace.cos_inplace,
expected=np.cos,
good=_good_broadcast_unary_wide_float,
grad=_grad_broadcast_unary_wide,
inplace=True)
......@@ -1556,7 +1525,6 @@ ArccosInplaceTester = makeBroadcastTester(
op=inplace.arccos_inplace,
expected=np.arccos,
good=_good_broadcast_unary_arcsin_float,
grad=_grad_broadcast_unary_arcsin,
inplace=True)
_good_broadcast_unary_tan = dict(
......@@ -1582,7 +1550,6 @@ TanInplaceTester = makeBroadcastTester(
op=inplace.tan_inplace,
expected=np.tan,
good=copymod(_good_broadcast_unary_tan, without=['integers', 'int8', 'uint8', 'uint16']),
grad=_grad_broadcast_unary_tan,
inplace=True)
ArctanTester = makeBroadcastTester(
......@@ -1594,7 +1561,6 @@ ArctanInplaceTester = makeBroadcastTester(
op=inplace.arctan_inplace,
expected=np.arctan,
good=_good_broadcast_unary_wide_float,
grad=_grad_broadcast_unary_wide,
inplace=True)
_good_broadcast_binary_arctan2 = dict(
......@@ -1634,7 +1600,6 @@ Arctan2InplaceTester = makeBroadcastTester(
expected=np.arctan2,
good=copymod(_good_broadcast_binary_arctan2,
without=['integers', 'int8', 'uint8', 'uint16']),
grad=_grad_broadcast_binary_arctan2,
inplace=True)
CoshTester = makeBroadcastTester(
......@@ -1649,7 +1614,6 @@ CoshInplaceTester = makeBroadcastTester(
op=inplace.cosh_inplace,
expected=np.cosh,
good=_good_broadcast_unary_normal_float,
grad=_grad_broadcast_unary_normal,
inplace=True)
_good_broadcast_unary_arccosh = dict(
......@@ -1669,7 +1633,6 @@ ArccoshInplaceTester = makeBroadcastTester(
op=inplace.arccosh_inplace,
expected=np.arccosh,
good=copymod(_good_broadcast_unary_arccosh, without=['integers', 'uint8']),
grad=_grad_broadcast_unary_arccosh,
inplace=True)
SinhTester = makeBroadcastTester(
......@@ -1684,7 +1647,6 @@ SinhInplaceTester = makeBroadcastTester(
op=inplace.sinh_inplace,
expected=np.sinh,
good=_good_broadcast_unary_normal_float,
grad=_grad_broadcast_unary_normal,
inplace=True)
ArcsinhTester = makeBroadcastTester(
......@@ -1696,7 +1658,6 @@ ArcsinhInplaceTester = makeBroadcastTester(
op=inplace.arcsinh_inplace,
expected=np.arcsinh,
good=_good_broadcast_unary_normal_float,
grad=_grad_broadcast_unary_normal,
inplace=True)
TanhTester = makeBroadcastTester(
......@@ -1708,7 +1669,6 @@ TanhInplaceTester = makeBroadcastTester(
op=inplace.tanh_inplace,
expected=np.tanh,
good=_good_broadcast_unary_normal_float,
grad=_grad_broadcast_unary_normal,
inplace=True)
_good_broadcast_unary_arctanh = dict(
......@@ -1731,7 +1691,6 @@ ArctanhInplaceTester = makeBroadcastTester(
op=inplace.arctanh_inplace,
expected=np.arctanh,
good=copymod(_good_broadcast_unary_arctanh, without=['integers', 'int8', 'uint8', 'uint16']),
grad=_grad_broadcast_unary_arctanh,
inplace=True)
......@@ -1786,7 +1745,6 @@ ErfInplaceTester = makeBroadcastTester(
op=inplace.erf_inplace,
expected=expected_erf,
good=_good_broadcast_unary_normal_float,
grad=_grad_broadcast_unary_normal,
mode=mode_no_scipy,
eps=2e-10,
inplace=True,
......@@ -1804,7 +1762,6 @@ ErfcInplaceTester = makeBroadcastTester(
op=inplace.erfc_inplace,
expected=expected_erfc,
good=_good_broadcast_unary_normal_float_no_complex,
grad=_grad_broadcast_unary_normal,
eps=2e-10,
mode=mode_no_scipy,
inplace=True,
......@@ -1821,7 +1778,6 @@ ErfcxInplaceTester = makeBroadcastTester(
op=inplace.erfcx_inplace,
expected=expected_erfcx,
good=_good_broadcast_unary_normal_float_no_complex_small_neg_range,
grad=_grad_broadcast_unary_normal_small_neg_range,
eps=2e-10,
mode=mode_no_scipy,
inplace=True)
......@@ -1868,7 +1824,6 @@ GammaInplaceTester = makeBroadcastTester(
op=inplace.gamma_inplace,
expected=expected_gamma,
good=_good_broadcast_unary_gammaln,
grad=_grad_broadcast_unary_gammaln,
mode=mode_no_scipy,
eps=1e-5,
inplace=True,
......@@ -1886,7 +1841,6 @@ GammalnInplaceTester = makeBroadcastTester(
op=inplace.gammaln_inplace,
expected=expected_gammaln,
good=_good_broadcast_unary_gammaln,
grad=_grad_broadcast_unary_gammaln,
eps=2e-10,
mode=mode_no_scipy,
inplace=True,
......@@ -1989,7 +1943,6 @@ J0InplaceTester = makeBroadcastTester(
op=inplace.j0_inplace,
expected=expected_j0,
good=_good_broadcast_unary_bessel,
grad=_grad_broadcast_unary_bessel,
eps=2e-10,
mode=mode_no_scipy,
inplace=True,
......@@ -2008,7 +1961,6 @@ J1InplaceTester = makeBroadcastTester(
op=inplace.j1_inplace,
expected=expected_j1,
good=_good_broadcast_unary_bessel,
grad=_grad_broadcast_unary_bessel,
eps=2e-10,
mode=mode_no_scipy,
inplace=True,
......@@ -2059,7 +2011,6 @@ I0InplaceTester = makeBroadcastTester(
op=inplace.i0_inplace,
expected=expected_i0,
good=_good_broadcast_unary_bessel,
grad=_grad_broadcast_unary_bessel,
eps=2e-10,
mode=mode_no_scipy,
inplace=True,
......@@ -2078,7 +2029,6 @@ I1InplaceTester = makeBroadcastTester(
op=inplace.i1_inplace,
expected=expected_i1,
good=_good_broadcast_unary_bessel,
grad=_grad_broadcast_unary_bessel,
eps=2e-10,
mode=mode_no_scipy,
inplace=True,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论