Sourcery refactored main branch #20
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
Comment on lines
-76
to
+90
| gamma = Parameter('g{}_{}_{}'.format(p, n1, n2)) | ||
| gamma = Parameter(f'g{p}_{n1}_{n2}') | ||
| qc.cx(n1, n2) | ||
| qc.rz(gamma, n2) | ||
| qc.cx(n1, n2) | ||
| beta = Parameter('b{}'.format(p)) | ||
| beta = Parameter(f'b{p}') | ||
| for node in self.zz_graph.nodes(): | ||
| qc.rx(beta,node) | ||
| qc.barrier() | ||
| qc.measure(range(n), range(n)) | ||
|
|
||
| trans_ckt = self.__compile_with_backend(ckt_qiskit = qc) | ||
| filename = 'uncompiled_' + self.output_file_name | ||
| filename = f'uncompiled_{self.output_file_name}' | ||
| qc.qasm(filename = filename) | ||
| self.__fix_param_names(filename) | ||
| filename = 'naive_compiled_' + self.output_file_name | ||
| filename = f'naive_compiled_{self.output_file_name}' |
There was a problem hiding this comment.
Function CompileQAOAQiskit.__naive_compilation refactored with the following changes:
- Replace call to format with f-string [×2] (
use-fstring-for-formatting) - Use f-string instead of string concatenation [×2] (
use-fstring-for-concatenation)
Comment on lines
-124
to
+127
| assert self.Backend in self.supported_backends | ||
| else: | ||
| self.Backend = 'qiskit' | ||
| assert self.Backend in self.supported_backends | ||
|
|
||
| assert self.Backend in self.supported_backends |
There was a problem hiding this comment.
Function CompileQAOAQiskit.__load_config refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if)
Comment on lines
-210
to
218
| fmap[logical_q[0:]] = int(physical_q[0:]) | ||
| fmap[logical_q[:]] = int(physical_q[:]) | ||
|
|
||
| final_map = [ | ||
| fmap[str(i)] | ||
| for i in range( | ||
| qiskit_ckt_object.width() - qiskit_ckt_object.num_qubits | ||
| ) | ||
| ] | ||
|
|
There was a problem hiding this comment.
Function CompileQAOAQiskit.__final_mapping_ic refactored with the following changes:
- Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] [×2] (
remove-redundant-slice-index) - Convert for loop into list comprehension (
list-comprehension)
Comment on lines
-246
to
+255
| if not self.incr_c_var_awareness: | ||
| swap_dist = self.qq_distances[_physical_q1][_physical_q2] | ||
| else: | ||
| swap_dist = self.noise_aware_qq_distances[_physical_q1][_physical_q2] | ||
| swap_dist = ( | ||
| self.noise_aware_qq_distances[_physical_q1][_physical_q2] | ||
| if self.incr_c_var_awareness | ||
| else self.qq_distances[_physical_q1][_physical_q2] | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function CompileQAOAQiskit.__sort_zz_by_qq_distances refactored with the following changes:
- Swap if/else branches of if expression to remove negation (
swap-if-expression) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-275
to
+281
| gamma = Parameter('g{}_{}_{}'.format(p, n1, n2)) | ||
| gamma = Parameter(f'g{p}_{n1}_{n2}') |
There was a problem hiding this comment.
Function CompileQAOAQiskit.__construct_single_layer_ckt_ic refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-642
to
+683
| out = open('{}_fixed'.format(filename), 'w') | ||
| for line in f: | ||
| captures = re.search('(g\d+)_(\d+)_(\d+)', line) | ||
| if captures: | ||
| captures = captures.groups() | ||
| g = captures[0] | ||
| n1 = captures[1] | ||
| n2 = captures[2] | ||
| if '({}, {})'.format(n1, n2) in all_keys: | ||
| coeff = 2*float(self.zz_dict['({}, {})'.format(n1, n2)]) | ||
| else: | ||
| coeff = 2*float(self.zz_dict['({}, {})'.format(n2, n1)]) | ||
| line = line.replace('{}_{}_{}'.format(g, n1, n2), str(coeff) + '*' + g) | ||
| out.write(line) | ||
| out.close() | ||
| with open(f'{filename}_fixed', 'w') as out: | ||
| for line in f: | ||
| if captures := re.search('(g\d+)_(\d+)_(\d+)', line): | ||
| captures = captures.groups() | ||
| g = captures[0] | ||
| n1 = captures[1] | ||
| n2 = captures[2] | ||
| if f'({n1}, {n2})' in all_keys: | ||
| coeff = 2 * float(self.zz_dict[f'({n1}, {n2})']) | ||
| else: | ||
| coeff = 2 * float(self.zz_dict[f'({n2}, {n1})']) | ||
| line = line.replace(f'{g}_{n1}_{n2}', f'{str(coeff)}*{g}') | ||
| out.write(line) | ||
| os.remove(filename) | ||
| os.rename(filename + '_fixed', filename) | ||
| os.rename(f'{filename}_fixed', filename) |
There was a problem hiding this comment.
Function CompileQAOAQiskit.__fix_param_names refactored with the following changes:
- Use
withwhen opening file to ensure closure (ensure-file-closed) - Replace call to format with f-string [×5] (
use-fstring-for-formatting) - Use named expression to simplify assignment and conditional (
use-named-expression) - Use f-string instead of string concatenation [×3] (
use-fstring-for-concatenation)
Comment on lines
-35
to
+37
| logical_to_physical_layout = {} | ||
| for node in problem_zz_interactions_graph.nodes(): | ||
| logical_to_physical_layout[node] = 'NA' | ||
| logical_to_physical_layout = { | ||
| node: 'NA' for node in problem_zz_interactions_graph.nodes() | ||
| } |
There was a problem hiding this comment.
Function initial_layout refactored with the following changes:
- Convert for loop into dictionary comprehension (
dict-comprehension) - Use named expression to simplify assignment and conditional (
use-named-expression) - Convert for loop into list comprehension (
list-comprehension) - Swap if/else branches (
swap-if-else-branches) - Replaces an empty collection equality with a boolean operation [×3] (
simplify-empty-collection-comparison) - Replace a for append loop with list extend (
for-append-to-extend)
This removes the following comments ( why? ):
#if some logical neighbors are already placed find unallocated physical neighbors
#assign best available physical qubit to logical
#qubit if none of the logical neighbors are placed
#check which neighbors are already placced
Comment on lines
-128
to
+126
| if sorted_program_qubits == []: | ||
| if not sorted_program_qubits: |
There was a problem hiding this comment.
Function sort_program_qubits refactored with the following changes:
- Replaces an empty collection equality with a boolean operation (
simplify-empty-collection-comparison)
Comment on lines
-159
to
+157
| print('Unconnected node: {}'.format(node)) | ||
| print(f'Unconnected node: {node}') |
There was a problem hiding this comment.
Function problem_profiling refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting)
Comment on lines
-175
to
+173
| strength = 0 | ||
| for neigh in neighbours: | ||
| strength += coupling_graph[node][neigh]['weight'] | ||
| strength = sum(coupling_graph[node][neigh]['weight'] for neigh in neighbours) |
There was a problem hiding this comment.
Function hardware_qubit_strength_vqp refactored with the following changes:
- Convert for loop into call to sum() (
sum-comprehension)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branch
mainrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
mainbranch, then run:Help us improve this pull request!