Skip to content

Revert "Set sympy.evaluate(False) on frequent code paths for phase tracking. (#6072)" #6386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 3 commits into from
May 12, 2021
Merged

Revert "Set sympy.evaluate(False) on frequent code paths for phase tracking. (#6072)" #6386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0fa34a
Revert "Set sympy.evaluate(False) on frequent code paths for phase tr…
mtreinish May 9, 2021
f1bc158
Merge branch 'main' into revert-sympy
mtreinish May 10, 2021
d2c4c4f
Merge branch 'main' into revert-sympy
kdk May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions qiskit/dagcircuit/dagcircuit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,10 +996,7 @@ def substitute_node_with_dag(self, node, input_dag, wires=None):
in_dag.apply_operation_back(replay_node.op, replay_node.qargs, replay_node.cargs)

if in_dag.global_phase:
from sympy import evaluate

with evaluate(False):
self.global_phase += in_dag.global_phase
self.global_phase += in_dag.global_phase

if wires is None:
wires = in_dag.wires
Expand Down
5 changes: 1 addition & 4 deletions qiskit/transpiler/passes/basis/basis_translator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,7 @@ def run(self, dag):
dag.substitute_node(node, dag_op, inplace=True)

if bound_target_dag.global_phase:
from sympy import evaluate

with evaluate(False):
dag.global_phase += bound_target_dag.global_phase
dag.global_phase += bound_target_dag.global_phase
else:
dag.substitute_node_with_dag(node, bound_target_dag)
else:
Expand Down