提交 3c66aa65 authored 作者: ricardoV94's avatar ricardoV94 提交者: Ricardo Vieira

Remove useless int() in f-strings

上级 246714b6
...@@ -4333,9 +4333,9 @@ class Composite(ScalarInnerGraphOp): ...@@ -4333,9 +4333,9 @@ class Composite(ScalarInnerGraphOp):
# Rename internal variables # Rename internal variables
for i, r in enumerate(self.fgraph.inputs): for i, r in enumerate(self.fgraph.inputs):
r.name = f"i{int(i)}" r.name = f"i{i}"
for i, r in enumerate(self.fgraph.outputs): for i, r in enumerate(self.fgraph.outputs):
r.name = f"o{int(i)}" r.name = f"o{i}"
io = set(self.fgraph.inputs + self.fgraph.outputs) io = set(self.fgraph.inputs + self.fgraph.outputs)
for i, r in enumerate(self.fgraph.variables): for i, r in enumerate(self.fgraph.variables):
if ( if (
...@@ -4343,7 +4343,7 @@ class Composite(ScalarInnerGraphOp): ...@@ -4343,7 +4343,7 @@ class Composite(ScalarInnerGraphOp):
and r not in io and r not in io
and len(self.fgraph.clients[r]) > 1 and len(self.fgraph.clients[r]) > 1
): ):
r.name = f"t{int(i)}" r.name = f"t{i}"
if len(self.fgraph.outputs) > 1 or len(self.fgraph.apply_nodes) > 10: if len(self.fgraph.outputs) > 1 or len(self.fgraph.apply_nodes) > 10:
self._name = "Composite{...}" self._name = "Composite{...}"
...@@ -4431,7 +4431,7 @@ class Composite(ScalarInnerGraphOp): ...@@ -4431,7 +4431,7 @@ class Composite(ScalarInnerGraphOp):
return self._c_code return self._c_code
fg = self.fgraph fg = self.fgraph
subd = {e: f"%(i{int(i)})s" for i, e in enumerate(fg.inputs)} subd = {e: f"%(i{i})s" for i, e in enumerate(fg.inputs)}
for var in fg.variables: for var in fg.variables:
if var.owner is None: if var.owner is None:
...@@ -4458,11 +4458,11 @@ class Composite(ScalarInnerGraphOp): ...@@ -4458,11 +4458,11 @@ class Composite(ScalarInnerGraphOp):
for output in node.outputs: for output in node.outputs:
if output not in subd: if output not in subd:
i += 1 i += 1
name = f"V%(id)s_tmp{int(i)}" name = f"V%(id)s_tmp{i}"
subd[output] = name subd[output] = name
_c_code += f"{output.type.dtype_specs()[1]} {name};\n" _c_code += f"{output.type.dtype_specs()[1]} {name};\n"
nodename = f"%(nodename)s_subnode{int(j)}" nodename = f"%(nodename)s_subnode{j}"
nodenames.append(nodename) nodenames.append(nodename)
s = node.op.c_code( s = node.op.c_code(
...@@ -4470,14 +4470,14 @@ class Composite(ScalarInnerGraphOp): ...@@ -4470,14 +4470,14 @@ class Composite(ScalarInnerGraphOp):
nodename, nodename,
[subd[input] for input in node.inputs], [subd[input] for input in node.inputs],
[subd[output] for output in node.outputs], [subd[output] for output in node.outputs],
dict(fail="%(fail)s", id=f"%(id)s_{int(j)}"), dict(fail="%(fail)s", id=f"%(id)s_{j}"),
) )
_c_code += s _c_code += s
_c_code += "\n" _c_code += "\n"
# Copy the temporary outputs to the real outputs # Copy the temporary outputs to the real outputs
for i, output in enumerate(fg.outputs): for i, output in enumerate(fg.outputs):
_c_code += f"%(o{int(i)})s = {subd[output]};\n" _c_code += f"%(o{i})s = {subd[output]};\n"
_c_code += "}\n" _c_code += "}\n"
...@@ -4488,8 +4488,8 @@ class Composite(ScalarInnerGraphOp): ...@@ -4488,8 +4488,8 @@ class Composite(ScalarInnerGraphOp):
def c_code(self, node, nodename, inames, onames, sub): def c_code(self, node, nodename, inames, onames, sub):
d = dict( d = dict(
chain( chain(
zip((f"i{int(i)}" for i in range(len(inames))), inames, strict=True), zip((f"i{i}" for i in range(len(inames))), inames, strict=True),
zip((f"o{int(i)}" for i in range(len(onames))), onames, strict=True), zip((f"o{i}" for i in range(len(onames))), onames, strict=True),
), ),
**sub, **sub,
) )
......
...@@ -212,15 +212,13 @@ class ScalarLoop(ScalarInnerGraphOp): ...@@ -212,15 +212,13 @@ class ScalarLoop(ScalarInnerGraphOp):
# The first input is `n_steps` so we skip it in the mapping dictionary # The first input is `n_steps` so we skip it in the mapping dictionary
n_update = len(self.outputs) - (1 if self.is_while else 0) n_update = len(self.outputs) - (1 if self.is_while else 0)
carry_subd = { carry_subd = {
c: f"%(i{int(i)})s" for i, c in enumerate(fgraph.inputs[:n_update], start=1) c: f"%(i{i})s" for i, c in enumerate(fgraph.inputs[:n_update], start=1)
} }
constant_subd = { constant_subd = {
c: f"%(i{int(i)})s" c: f"%(i{i})s"
for i, c in enumerate(fgraph.inputs[n_update:], start=n_update + 1) for i, c in enumerate(fgraph.inputs[n_update:], start=n_update + 1)
} }
out_subd = { out_subd = {u: f"%(o{i})s" for i, u in enumerate(fgraph.outputs[:n_update])}
u: f"%(o{int(i)})s" for i, u in enumerate(fgraph.outputs[:n_update])
}
until_subd = {u: "until" for u in fgraph.outputs[n_update:]} until_subd = {u: "until" for u in fgraph.outputs[n_update:]}
subd = {**carry_subd, **constant_subd, **until_subd} subd = {**carry_subd, **constant_subd, **until_subd}
...@@ -267,11 +265,11 @@ class ScalarLoop(ScalarInnerGraphOp): ...@@ -267,11 +265,11 @@ class ScalarLoop(ScalarInnerGraphOp):
for output in node.outputs: for output in node.outputs:
if output not in subd: if output not in subd:
i += 1 i += 1
name = f"V%(id)s_tmp{int(i)}" name = f"V%(id)s_tmp{i}"
subd[output] = name subd[output] = name
_c_code += f"{output.type.dtype_specs()[1]} {name};\n" _c_code += f"{output.type.dtype_specs()[1]} {name};\n"
nodename = f"%(nodename)s_subnode{int(j)}" nodename = f"%(nodename)s_subnode{j}"
nodenames.append(nodename) nodenames.append(nodename)
s = node.op.c_code( s = node.op.c_code(
...@@ -281,7 +279,7 @@ class ScalarLoop(ScalarInnerGraphOp): ...@@ -281,7 +279,7 @@ class ScalarLoop(ScalarInnerGraphOp):
# The initial value of `update` was set to `init` before the loop # The initial value of `update` was set to `init` before the loop
[subd[input] for input in node.inputs], [subd[input] for input in node.inputs],
[subd[output] for output in node.outputs], [subd[output] for output in node.outputs],
dict(fail="%(fail)s", id=f"%(id)s_{int(j)}"), dict(fail="%(fail)s", id=f"%(id)s_{j}"),
) )
_c_code += s _c_code += s
_c_code += "\n" _c_code += "\n"
...@@ -320,8 +318,8 @@ class ScalarLoop(ScalarInnerGraphOp): ...@@ -320,8 +318,8 @@ class ScalarLoop(ScalarInnerGraphOp):
def c_code(self, node, nodename, inames, onames, sub): def c_code(self, node, nodename, inames, onames, sub):
d = dict( d = dict(
chain( chain(
zip((f"i{int(i)}" for i in range(len(inames))), inames, strict=True), zip((f"i{i}" for i in range(len(inames))), inames, strict=True),
zip((f"o{int(i)}" for i in range(len(onames))), onames, strict=True), zip((f"o{i}" for i in range(len(onames))), onames, strict=True),
), ),
**sub, **sub,
) )
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论