Skip to content

first pass on adding CircuitElement mixin to Clifford#3

Merged
ShellyGarion merged 1 commit into
ShellyGarion:circuit_elementfrom
alexanderivrii:circuit_element
Oct 6, 2021
Merged

first pass on adding CircuitElement mixin to Clifford#3
ShellyGarion merged 1 commit into
ShellyGarion:circuit_elementfrom
alexanderivrii:circuit_element

Conversation

@alexanderivrii
Copy link
Copy Markdown

Summary

Details and comments

@ShellyGarion ShellyGarion merged commit df319e3 into ShellyGarion:circuit_element Oct 6, 2021
ShellyGarion pushed a commit that referenced this pull request Apr 14, 2026
Qiskit#15943)

* fix(transpiler): TemplateOptimization drops circuit global_phase on substitution

circuit_to_dagdependency did not copy global_phase when converting a
template QuantumCircuit to DAGDependency, so template phases were lost
before matching. TemplateSubstitution.run_dag_opt also constructed a
new DAGDependency for the optimised output without inheriting the
original circuit's global_phase, resetting it to zero whenever at
least one substitution was applied.

Fixed by copying global_phase in circuit_to_dagdependency and seeding
dag_dep_opt.global_phase from the circuit DAG at construction time.
Also added the per-match phase subtraction (Fix 3) for when templates
with nonzero global_phase become accepted via the identity check fix
in Qiskit#14538.

Fixes Qiskit#14537.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(transpiler): TemplateOptimization drops circuit global_phase on substitution

circuit_to_dagdependency did not copy global_phase when converting a
template QuantumCircuit to DAGDependency, so template phases were lost
before matching. TemplateSubstitution.run_dag_opt also constructed a
new DAGDependency for the optimised output without inheriting the
original circuit's global_phase, resetting it to zero whenever at
least one substitution was applied. Additionally, when a template
carries a nonzero global_phase phi_T (gate content implements
e^{-i*phi_T} * I while the full operator is I), the per-match phase
contribution was not being subtracted from the output circuit.

Fixes Qiskit#14537.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* style: black reformat test_template_matching.py

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* docs: use RST hyperlink for issue reference in release note

The :issue: role is not available in this project's Sphinx config.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* test(transpiler): add combined circuit+template global_phase regression test

Covers the case where both the circuit and the template carry a nonzero
global_phase simultaneously, confirming that fixes #2 (circuit phase
preserved across substitution) and #3 (per-match template phase subtracted)
compose correctly.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* test(transpiler): use assertEqual for Operator comparisons in template tests

Replace assertTrue(Operator(x) == Operator(y)) with assertEqual(Operator(x), Operator(y))
so that assertion failures show the actual vs expected values rather than just "False is not
True". Also shorten multi-line test docstrings to concise one-liners.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Address review feedback on template optimization global phase fix

- Simplify comment on global phase update in template_substitution.py
- Split release note into per-bug files; add fix-circuit-to-dagdependency-global-phase-14537.yaml
- Update tests: use issue reproducer (4-gate circuit) in test_template_nonzero_global_phase_applied_to_circuit, merge single/multiple match tests, drop modulo from assertAlmostEqual

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Fix test assertions and remove duplicate test

- Fix test_circuit_and_template_both_have_nonzero_global_phase expected
  value from np.pi/4 to 7*np.pi/12 (pi/3 + pi/4)
- Remove duplicate test_circuit_global_phase_preserved_with_multiple_template_matches
- Update test_template_nonzero_global_phase_applied_to_circuit to use
  Operator equivalence instead of phase/count assertions since partial
  template match does occur

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Update releasenotes/notes/fix-circuit-to-dagdependency-global-phase-14537.yaml

Co-authored-by: Julien Gacon <gaconju@gmail.com>

* Update releasenotes/notes/fix-template-optimization-global-phase-14537.yaml

Co-authored-by: Julien Gacon <gaconju@gmail.com>

* Update test/python/transpiler/test_template_matching.py

Co-authored-by: Julien Gacon <gaconju@gmail.com>

* Update test/python/transpiler/test_template_matching.py

Actually I removed all reference to "Regression test" in the test descriptions based on this comment
Qiskit#15943 (comment)

Co-authored-by: Julien Gacon <gaconju@gmail.com>

* Remove 'Regression test' from docstring per review feedback

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Julien Gacon <gaconju@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants