Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion cirq-aqt/cirq_aqt/aqt_target_gateset.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@

from __future__ import annotations

from typing import TYPE_CHECKING

import numpy as np

import cirq
from cirq.protocols.decompose_protocol import DecomposeResult

if TYPE_CHECKING:
from cirq.protocols.decompose_protocol import DecomposeResult


class AQTTargetGateset(cirq.TwoQubitCompilationTargetGateset):
Expand Down
4 changes: 3 additions & 1 deletion cirq-aqt/cirq_aqt/json_resolver_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
from __future__ import annotations

import functools
from typing import TYPE_CHECKING

from cirq.protocols.json_serialization import ObjectFactory
if TYPE_CHECKING:
from cirq.protocols.json_serialization import ObjectFactory


@functools.lru_cache()
Expand Down
4 changes: 2 additions & 2 deletions cirq-core/cirq/circuits/frozen_circuit.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
Union,
)

import numpy as np

from cirq import _compat, protocols
from cirq.circuits import AbstractCircuit, Alignment, Circuit
from cirq.circuits.insert_strategy import InsertStrategy

if TYPE_CHECKING:
import numpy as np

import cirq


Expand Down
4 changes: 2 additions & 2 deletions cirq-core/cirq/contrib/acquaintance/topological_sort.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
import random
from typing import Any, Callable, cast, Iterable, TYPE_CHECKING

import networkx

from cirq import ops

if TYPE_CHECKING:
import networkx

import cirq


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

from typing import Any, Dict, Generic, Sequence, Type, TYPE_CHECKING

import numpy as np

from cirq import sim
from cirq.sim.simulation_state import TSimulationState

if TYPE_CHECKING:
import numpy as np

import cirq


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
from types import NotImplementedType
from typing import cast, List, Type, TYPE_CHECKING, Union

import numpy as np

from cirq import linalg, ops, protocols, transformers

if TYPE_CHECKING:
import numpy as np

import cirq


Expand Down
8 changes: 5 additions & 3 deletions cirq-core/cirq/contrib/quantum_volume/quantum_volume.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@
from __future__ import annotations

from dataclasses import dataclass
from typing import Callable, Dict, List, Optional, Set, Tuple
from typing import Callable, Dict, List, Optional, Set, Tuple, TYPE_CHECKING

import networkx as nx
import numpy as np
import pandas as pd

import cirq
import cirq.contrib.routing as ccr

if TYPE_CHECKING:
import networkx as nx
import pandas as pd


def generate_model_circuit(
num_qubits: int, depth: int, *, random_state: cirq.RANDOM_STATE_OR_SEED_LIKE = None
Expand Down
7 changes: 4 additions & 3 deletions cirq-core/cirq/contrib/quimb/grid_circuits.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@

from __future__ import annotations

from typing import Iterator

import networkx as nx
from typing import Iterator, TYPE_CHECKING

import cirq

if TYPE_CHECKING:
import networkx as nx


def get_grid_moments(
problem_graph: nx.Graph, two_qubit_gate=cirq.ZZPowGate
Expand Down
6 changes: 4 additions & 2 deletions cirq-core/cirq/contrib/quimb/state_vector.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
from __future__ import annotations

import warnings
from typing import cast, Dict, List, Optional, Sequence, Tuple, Union
from typing import cast, Dict, List, Optional, Sequence, Tuple, TYPE_CHECKING, Union

import numpy as np
import quimb
import quimb.tensor as qtn

import cirq

if TYPE_CHECKING:
import numpy as np


def _get_quimb_version():
"""Returns the quimb version and parsed (major,minor) numbers if possible.
Expand Down
4 changes: 2 additions & 2 deletions cirq-core/cirq/contrib/routing/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

from typing import Callable, Optional, TYPE_CHECKING

import networkx as nx

from cirq import circuits, protocols
from cirq.contrib.routing.greedy import route_circuit_greedily

if TYPE_CHECKING:
import networkx as nx

from cirq.contrib.routing.swap_network import SwapNetwork

ROUTERS = {'greedy': route_circuit_greedily}
Expand Down
3 changes: 2 additions & 1 deletion cirq-core/cirq/experiments/qubit_characterizations.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
from matplotlib import pyplot as plt

# this is for older systems with matplotlib <3.2 otherwise 3d projections fail
from mpl_toolkits import mplot3d
from scipy.optimize import curve_fit

import cirq.vis.heatmap as cirq_heatmap
Expand All @@ -43,6 +42,8 @@
from cirq.devices import grid_qubit

if TYPE_CHECKING:
from mpl_toolkits import mplot3d

import cirq


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@
Union,
)

import networkx as nx
import numpy as np

from cirq import circuits, devices, ops, protocols, value
from cirq._doc import document

if TYPE_CHECKING:
import networkx as nx

import cirq

QidPairT = Tuple['cirq.Qid', 'cirq.Qid']
Expand Down
3 changes: 2 additions & 1 deletion cirq-core/cirq/experiments/two_qubit_xeb.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

import networkx as nx
import numpy as np
import pandas as pd
from matplotlib import pyplot as plt

from cirq import ops, value, vis
Expand All @@ -45,6 +44,8 @@
if TYPE_CHECKING:
import multiprocessing

import pandas as pd

import cirq


Expand Down
2 changes: 1 addition & 1 deletion cirq-core/cirq/linalg/predicates.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def slice_for_qubits_equal_to(
out_size = (
cast(int, num_qubits) if out_size_specified else max(target_qubit_axes, default=-1) + 1
)
result = cast(List[Union[slice, int, 'ellipsis']], [slice(None)] * out_size)
result = cast(List[Union[slice, int, EllipsisType]], [slice(None)] * out_size)
if not out_size_specified:
result.append(Ellipsis)
if qid_shape is None:
Expand Down
3 changes: 2 additions & 1 deletion cirq-core/cirq/ops/gate_operation.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@
Union,
)

import numpy as np
from typing_extensions import Self

from cirq import ops, protocols, value
from cirq.ops import control_values as cv, gate_features, raw_types

if TYPE_CHECKING:
import numpy as np

import cirq


Expand Down
10 changes: 5 additions & 5 deletions cirq-core/cirq/ops/linear_combinations.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
)

import numpy as np
from scipy.sparse import csr_matrix
from sympy.core.expr import Expr
from sympy.core.symbol import Symbol
import sympy
from sympy.logic.boolalg import And, Not, Or, Xor

from cirq import linalg, protocols, qis, value
Expand All @@ -46,6 +44,8 @@
from cirq.value.linear_dict import _format_terms

if TYPE_CHECKING:
from scipy.sparse import csr_matrix

import cirq

UnitPauliStringT = FrozenSet[Tuple[raw_types.Qid, pauli_gates.Pauli]]
Expand Down Expand Up @@ -490,7 +490,7 @@ def from_pauli_strings(cls, terms: Union[PauliString, List[PauliString]]) -> Pau

@classmethod
def from_boolean_expression(
cls, boolean_expr: Expr, qubit_map: Dict[str, cirq.Qid]
cls, boolean_expr: sympy.Expr, qubit_map: Dict[str, cirq.Qid]
) -> PauliSum:
"""Builds the Hamiltonian representation of a Boolean expression.

Expand All @@ -507,7 +507,7 @@ def from_boolean_expression(
Raises:
ValueError: If `boolean_expr` is of an unsupported type.
"""
if isinstance(boolean_expr, Symbol):
if isinstance(boolean_expr, sympy.Symbol):
# In table 1, the entry for 'x' is '1/2.I - 1/2.Z'
return cls.from_pauli_strings(
[
Expand Down
4 changes: 2 additions & 2 deletions cirq-core/cirq/ops/pauli_string_phasor.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
Union,
)

import sympy

from cirq import protocols, value
from cirq._compat import deprecated, proper_repr
from cirq.ops import (
Expand All @@ -42,6 +40,8 @@
)

if TYPE_CHECKING:
import sympy

import cirq


Expand Down
3 changes: 2 additions & 1 deletion cirq-core/cirq/ops/raw_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
)

import numpy as np
import sympy
from typing_extensions import Self

from cirq import protocols, value
Expand All @@ -52,6 +51,8 @@


if TYPE_CHECKING:
import sympy

import cirq
from cirq.ops import control_values as cv

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

from typing import Optional, Sequence, TYPE_CHECKING

import numpy as np

from cirq.qis import clifford_tableau
from cirq.sim.clifford.stabilizer_simulation_state import StabilizerSimulationState

if TYPE_CHECKING:
import numpy as np

import cirq


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

from typing import Optional, Sequence, TYPE_CHECKING, Union

import numpy as np

from cirq._compat import proper_repr
from cirq.sim.clifford import stabilizer_state_ch_form
from cirq.sim.clifford.stabilizer_simulation_state import StabilizerSimulationState

if TYPE_CHECKING:
import numpy as np

import cirq


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from types import NotImplementedType
from typing import Any, cast, Generic, Optional, Sequence, TYPE_CHECKING, TypeVar, Union

import numpy as np
import sympy

from cirq import linalg, ops, protocols
Expand All @@ -28,6 +27,8 @@
from cirq.sim.simulation_state import SimulationState

if TYPE_CHECKING:
import numpy as np

import cirq


Expand Down
3 changes: 2 additions & 1 deletion cirq-core/cirq/sim/simulation_state_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@
Union,
)

import numpy as np
from typing_extensions import Self

from cirq import protocols, value

if TYPE_CHECKING:
import numpy as np

import cirq


Expand Down
2 changes: 2 additions & 0 deletions cirq-core/cirq/testing/consistent_protocols.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from __future__ import annotations

import itertools
from typing import Any, Dict, Optional, Sequence, Type

Expand Down
Loading