From 12db16fd9cefcaaab89f8e13416e53b126a6c702 Mon Sep 17 00:00:00 2001 From: Hiroshi Date: Tue, 30 Mar 2021 10:27:38 +0900 Subject: [PATCH] format import in aerbackend --- qiskit/providers/aer/backends/aerbackend.py | 3 +-- qiskit/providers/aer/profile.py | 18 +++++++++--------- test/terra/backends/test_profile.py | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/qiskit/providers/aer/backends/aerbackend.py b/qiskit/providers/aer/backends/aerbackend.py index ea573f504d..4ec539cbc6 100644 --- a/qiskit/providers/aer/backends/aerbackend.py +++ b/qiskit/providers/aer/backends/aerbackend.py @@ -30,10 +30,9 @@ from qiskit.qobj import QasmQobj, PulseQobj from qiskit.compiler import assemble -from qiskit.providers.aer.profile import get_performance_options - from ..aerjob import AerJob from ..aererror import AerError +from ..profile import get_performance_options # Logger logger = logging.getLogger(__name__) diff --git a/qiskit/providers/aer/profile.py b/qiskit/providers/aer/profile.py index 4fa323b678..2839062232 100644 --- a/qiskit/providers/aer/profile.py +++ b/qiskit/providers/aer/profile.py @@ -99,11 +99,11 @@ def _set_option(option_name, value, persist): filename = os.getenv('QISKIT_SETTINGS', user_config.DEFAULT_FILENAME) if os.path.isfile(filename): config.read(filename) - if section_name not in config.sections(): - config.add_section(section_name) - config.set(section_name, option_name, str(value)) - with open(filename, "w+") as config_file: - config.write(config_file) + if section_name not in config.sections(): + config.add_section(section_name) + config.set(section_name, option_name, str(value)) + with open(filename, "w+") as config_file: + config.write(config_file) @staticmethod def _get_options_from_file(option2type): @@ -337,7 +337,8 @@ def profile_fusion_threshold(min_qubits=10, max_qubits=20, ntrials=10, raise AerError(f'Unable to find threshold in range [{min_qubits}, {max_qubits}]') -def profile_fusion_costs(num_qubits, ntrials=10, backend_options=None, gpu=False, diagonal=False): +def profile_fusion_costs(num_qubits, ntrials=10, backend_options=None, gpu=False, diagonal=False, + return_ratio=True): """Evaluate optimal costs in cost-based fusion for current system.""" profile_opts = {'method': 'statevector', 'max_parallel_experiments': 1, @@ -380,8 +381,7 @@ def profile_fusion_costs(num_qubits, ntrials=10, backend_options=None, gpu=False profile_circuit, None)) - costs = [] - for target in range(0, 5): - costs.append(all_gate_time[target] / all_gate_time[0]) + base_line = all_gate_time[0] if return_ratio else 1.0 + costs = [gate_time / base_line for gate_time in all_gate_time] return costs diff --git a/test/terra/backends/test_profile.py b/test/terra/backends/test_profile.py index 10b644aea7..5689ae71b2 100644 --- a/test/terra/backends/test_profile.py +++ b/test/terra/backends/test_profile.py @@ -26,7 +26,7 @@ from qiskit.providers.aer import QasmSimulator from qiskit.providers.aer.profile import profile_performance_options, clear_performance_options -#@unittest.skip("Remove this for manual run") +@unittest.skip("Remove this for manual run") class TestProfileQasmSimulator(common.QiskitAerTestCase):