Skip to content
This repository has been archived by the owner on Aug 19, 2023. It is now read-only.

random_circuit_hex benchmark backwards compatility #358

Merged
merged 2 commits into from
Jul 2, 2019
Merged

random_circuit_hex benchmark backwards compatility #358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1eb17aa
Reorder euler_angles_1q imports for random_circuit_hex benchmark.
kdk Jul 2, 2019
0420d05
Compatability for transpiler seed kwarg in random_circuit_hex benchmark.
kdk Jul 2, 2019
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
19 changes: 11 additions & 8 deletions test/benchmarks/random_circuit_hex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,20 @@
import copy

try:
from qiskit.mapper import _compiling as compiling
from qiskit.quantum_info.synthesis import euler_angles_1q
except ImportError:
try:
from qiskit.mapper import compiling
from qiskit.mapper.compiling import euler_angles_1q
except ImportError:
from qiskit.quantum_info import synthesis as compiling
from qiskit.mapper._compiling import euler_angles_1q
from qiskit import QuantumCircuit, ClassicalRegister, QuantumRegister
from qiskit import BasicAer
try:
from qiskit.compiler import transpile
TRANSPILER_SEED_KEYWORD = 'seed_transpiler'
except ImportError:
from qiskit.transpiler import transpile
TRANSPILER_SEED_KEYWORD = 'seed_mapper'
try:
from qiskit.quantum_info.random import random_unitary
HAS_RANDOM_UNITARY = True
Expand Down Expand Up @@ -61,7 +63,7 @@ def make_circuit_ring(nq, depth, seed):
else:
u = random_unitary_matrix(2)

angles = compiling.euler_angles_1q(u)
angles = euler_angles_1q(u)
qc.u3(angles[0], angles[1], angles[2], q[i])

# insert the final measurements
Expand All @@ -83,11 +85,12 @@ def setup(self, n):
self.sim_backend = BasicAer.get_backend('qasm_simulator')

def time_simulator_transpile(self, _):
transpile(self.circuit, self.sim_backend, seed_transpiler=self.seed)
transpile(self.circuit, self.sim_backend,
**{TRANSPILER_SEED_KEYWORD: self.seed})

def track_depth_simulator_transpile(self, _):
return transpile(self.circuit, self.sim_backend,
seed_transpiler=self.seed).depth()
**{TRANSPILER_SEED_KEYWORD: self.seed}).depth()

def time_ibmq_backend_transpile(self, _):
# Run with ibmq_16_melbourne configuration
Expand All @@ -98,7 +101,7 @@ def time_ibmq_backend_transpile(self, _):
transpile(self.circuit,
basis_gates=['u1', 'u2', 'u3', 'cx', 'id'],
coupling_map=coupling_map,
seed_transpiler=self.seed)
**{TRANSPILER_SEED_KEYWORD: self.seed})

def track_depth_ibmq_backend_transpile(self, _):
# Run with ibmq_16_melbourne configuration
Expand All @@ -109,4 +112,4 @@ def track_depth_ibmq_backend_transpile(self, _):
return transpile(self.circuit,
basis_gates=['u1', 'u2', 'u3', 'cx', 'id'],
coupling_map=coupling_map,
seed_transpiler=self.seed).depth()
**{TRANSPILER_SEED_KEYWORD: self.seed}).depth()