Skip to content

Commit

Permalink
Remove optional sympy imports (#11662)
Browse files Browse the repository at this point in the history
* remove optional sympy

* remove optional sympy

* remove optional sympy

* black,lint
  • Loading branch information
TsafrirA authored Jan 29, 2024
1 parent fefa722 commit 042a1a1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 17 deletions.
7 changes: 1 addition & 6 deletions test/python/pulse/test_pulse_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import unittest
from unittest.mock import patch
import numpy as np
import symengine as sym

from qiskit.circuit import Parameter
from qiskit.pulse.library import (
Expand All @@ -39,12 +40,6 @@

from qiskit.pulse import functional_pulse, PulseError
from qiskit.test import QiskitTestCase
from qiskit.utils import optionals as _optional

if _optional.HAS_SYMENGINE:
import symengine as sym
else:
import sympy as sym


class TestWaveform(QiskitTestCase):
Expand Down
7 changes: 1 addition & 6 deletions test/python/qpy/test_block_load_from_qpy.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from ddt import ddt, data, unpack

import numpy as np
import symengine as sym

from qiskit.pulse import builder, Schedule
from qiskit.pulse.library import (
Expand All @@ -43,12 +44,6 @@
from qiskit.pulse.configuration import Kernel, Discriminator


if _optional.HAS_SYMENGINE:
import symengine as sym
else:
import sympy as sym


class QpyScheduleTestCase(QiskitTestCase):
"""QPY schedule testing platform."""

Expand Down
7 changes: 2 additions & 5 deletions test/qpy_compat/test_qpy.py
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,6 @@ def generate_control_flow_switch_circuits():
def generate_schedule_blocks():
"""Standard QPY testcase for schedule blocks."""
from qiskit.pulse import builder, channels, library
from qiskit.utils import optionals

current_version = current_version_str.split(".")
for i in range(len(current_version[2])):
Expand Down Expand Up @@ -469,10 +468,8 @@ def generate_schedule_blocks():
builder.acquire(1000, channels.AcquireChannel(0), channels.MemorySlot(0))
schedule_blocks.append(block)
# Raw symbolic pulse
if optionals.HAS_SYMENGINE:
import symengine as sym
else:
import sympy as sym
import symengine as sym

duration, amp, t = sym.symbols("duration amp t") # pylint: disable=invalid-name
expr = amp * sym.sin(2 * sym.pi * t / duration)
my_pulse = library.SymbolicPulse(
Expand Down

0 comments on commit 042a1a1

Please sign in to comment.