Unverified 提交 14671ad3 authored 作者: Frédéric Bastien's avatar Frédéric Bastien 提交者: GitHub

Merge pull request #6747 from rebecca-palmer/py38_syntaxwarnings

MAINT: Avoid SyntaxWarnings on import in Python 3.8
...@@ -261,7 +261,7 @@ class Mode(object): ...@@ -261,7 +261,7 @@ class Mode(object):
def __init__(self, linker=None, optimizer='default'): def __init__(self, linker=None, optimizer='default'):
if linker is None: if linker is None:
linker = config.linker linker = config.linker
if optimizer is 'default': if type(optimizer)==str and optimizer == 'default':
optimizer = config.optimizer optimizer = config.optimizer
Mode.__setstate__(self, (linker, optimizer)) Mode.__setstate__(self, (linker, optimizer))
......
...@@ -1540,12 +1540,12 @@ class COp(Op): ...@@ -1540,12 +1540,12 @@ class COp(Op):
undef_macros = [] undef_macros = []
for i, inp in enumerate(inputs): for i, inp in enumerate(inputs):
define_macros.append("#define INPUT_%d %s" (i, inp)) define_macros.append("#define INPUT_%d %s" % (i, inp))
undef_macros.append("#undef INPUT_%d", (i,)) undef_macros.append("#undef INPUT_%d" % (i,))
for i, out in enumerate(outputs): for i, out in enumerate(outputs):
define_macros.append("#define OUTPUT_%d %s" (i, inp)) define_macros.append("#define OUTPUT_%d %s" % (i, inp))
undef_macros.append("#undef OUTPUT_%d", (i,)) undef_macros.append("#undef OUTPUT_%d" % (i,))
def c_init_code_struct(self, node, name, sub): def c_init_code_struct(self, node, name, sub):
""" """
......
...@@ -1284,7 +1284,7 @@ def local_optimizer(tracks, inplace=False, requirements=()): ...@@ -1284,7 +1284,7 @@ def local_optimizer(tracks, inplace=False, requirements=()):
""" """
if tracks is not None: if tracks is not None:
if len(tracks) is 0: if len(tracks) == 0:
raise ValueError("Use None instead of an empty list to apply to all nodes.", f.__module__, f.__name__) raise ValueError("Use None instead of an empty list to apply to all nodes.", f.__module__, f.__name__)
for t in tracks: for t in tracks:
if not (isinstance(t, op.Op) or issubclass(t, op.PureOp)): if not (isinstance(t, op.Op) or issubclass(t, op.PureOp)):
......
...@@ -113,7 +113,7 @@ class TestPerformLinker(unittest.TestCase): ...@@ -113,7 +113,7 @@ class TestPerformLinker(unittest.TestCase):
def test_input_output_same(self): def test_input_output_same(self):
x, y, z = inputs() x, y, z = inputs()
fn = perform_linker(FunctionGraph([x], [x])).make_function() fn = perform_linker(FunctionGraph([x], [x])).make_function()
assert 1.0 is fn(1.0) assert 1.0 == fn(1.0)
def test_input_dependency0(self): def test_input_dependency0(self):
x, y, z = inputs() x, y, z = inputs()
......
...@@ -642,7 +642,7 @@ class AbstractBatchNormTrainGrad(Op): ...@@ -642,7 +642,7 @@ class AbstractBatchNormTrainGrad(Op):
# some inputs should be disconnected # some inputs should be disconnected
results = [g_wrt_x, g_wrt_dy, g_wrt_scale, g_wrt_x_mean, g_wrt_x_invstd, results = [g_wrt_x, g_wrt_dy, g_wrt_scale, g_wrt_x_mean, g_wrt_x_invstd,
theano.gradient.DisconnectedType()()] theano.gradient.DisconnectedType()()]
return [theano.gradient.DisconnectedType()() if r is 0 else r return [theano.gradient.DisconnectedType()() if (type(r)==int and r==0) else r
for r in results] for r in results]
def connection_pattern(self, node): def connection_pattern(self, node):
......
...@@ -95,7 +95,7 @@ class TestConv2D(utt.InferShapeTester): ...@@ -95,7 +95,7 @@ class TestConv2D(utt.InferShapeTester):
# REFERENCE IMPLEMENTATION # REFERENCE IMPLEMENTATION
s = 1. s = 1.
orig_image_data = image_data orig_image_data = image_data
if border_mode is not 'full': if border_mode != 'full':
s = -1. s = -1.
out_shape2d = np.array(N_image_shape[-2:]) +\ out_shape2d = np.array(N_image_shape[-2:]) +\
s * np.array(N_filter_shape[-2:]) - s s * np.array(N_filter_shape[-2:]) - s
......
...@@ -57,7 +57,7 @@ def test_determinism_1(): ...@@ -57,7 +57,7 @@ def test_determinism_1():
updates.append((s, val)) updates.append((s, val))
for var in theano.gof.graph.ancestors(update for _, update in updates): for var in theano.gof.graph.ancestors(update for _, update in updates):
if var.name is not None and var.name is not 'b': if var.name is not None and var.name != 'b':
if var.name[0] != 's' or len(var.name) != 2: if var.name[0] != 's' or len(var.name) != 2:
var.name = None var.name = None
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论