NOTE:
\n",
"\n",
"This tutorial, as well as all the other tutorials, has been written as a jupyter notebook.\n",
- "If you're reading it online, you can either keep reading, or go to `docs/tutorials` to explore them in a more interactive way!\n",
+ "If you're reading it online, you can either keep reading, or clone the repository and go to `docs/tutorials` to explore them in a more interactive way!\n",
"\n",
"
"
]
@@ -330,8 +330,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "rotations: 2\n",
- "T_gates: 4*L + 8*L/multiplicity(2, L) + 4*mu + swap.O(log2(L)) - 8\n"
+ "T_gates: 4*L + 8*L/multiplicity(2, L) + 4*mu + swap.O(log2(L)) - 8\n",
+ "rotations: 2\n"
]
}
],
@@ -367,8 +367,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "rotations: 2\n",
- "T_gates: swap.O(log2(120)) + 824\n"
+ "T_gates: swap.O(log2(120)) + 824\n",
+ "rotations: 2\n"
]
}
],
@@ -403,8 +403,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "rotations: 2\n",
- "T_gates: 4*L + 8*L/multiplicity(2, L) + 4*mu + O(log2(L)) - 8\n"
+ "T_gates: 4*L + 8*L/multiplicity(2, L) + 4*mu + O(log2(L)) - 8\n",
+ "rotations: 2\n"
]
}
],
@@ -419,7 +419,7 @@
"id": "e090cce2-8b9f-449f-8c14-96212cbe7f85",
"metadata": {},
"source": [
- "We still have big O there, but at least now we got rid of the `swap`. So let's assume the simplest case, i.e.`O(x) = x`."
+ "We still have big O there, but at least now we got rid of the `swap`. So let's assume the simplest case, i.e.`O(x) = ceiling(x)` "
]
},
{
@@ -432,14 +432,16 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "rotations: 2\n",
- "T_gates: log2(120) + 824\n"
+ "T_gates: 831\n",
+ "rotations: 2\n"
]
}
],
"source": [
+ "import math\n",
+ "\n",
"def big_O(x):\n",
- " return x\n",
+ " return math.ceil(x)\n",
"\n",
"functions_map = {\"O\": big_O}\n",
"evaluated_routine = evaluate(compiled_routine, assignments, functions_map=functions_map)\n",
@@ -465,8 +467,10 @@
"If we just interact with bare python objects, getting a quick idea of the values of various fields might be a bit cumbersome.\n",
"That's where `explore_routine` functions might be helpful. Try it out using the snippet below.\n",
"\n",
+ "\n",
" NOTE:
\n",
- "This is an interactive feature and will not render in the static version of the docs. To use it you need to run this tutorial as a jupyter notebook.\n",
+ "This is an interactive feature and will not render in the static version of the docs. To use it you need to run this tutorial as a jupyter notebook.
\n",
+ "Remember to install bartiq with
pip install bartiq[jupyter] to make sure you have all the dependencies needed for these widgets to work (for more details visit
installation docs).\n",
"
\n"
]
},
@@ -479,7 +483,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "0abdf57a3f6c40318de80a701c9e3610",
+ "model_id": "811e911faa5847d59817f59b97115522",
"version_major": 2,
"version_minor": 0
},
@@ -529,13 +533,13 @@
"&\\text{temp\\_2} = 8\\\\\n",
"&\\text{temp\\_3} = 1\\newline\n",
"&\\underline{\\text{Resources:}}\\\\\n",
+ "&T_{\\text{gates}} = 831\\\\\n",
"&rotations = 2\\\\\n",
- "&T_{\\text{gates}} = \\operatorname{log}_{2}{\\left(120 \\right)} + 824\\\\\n",
"&\\text{usp}.\\!T_{\\text{gates}} = 320\\\\\n",
"&\\text{usp}.\\!rotations = 2\\\\\n",
"&\\text{qrom}.\\!T_{\\text{gates}} = 476\\\\\n",
"&\\text{compare}.\\!T_{\\text{gates}} = 28\\\\\n",
- "&\\text{swap}.\\!T_{\\text{gates}} = \\operatorname{log}_{2}{\\left(120 \\right)}\n",
+ "&\\text{swap}.\\!T_{\\text{gates}} = 7\n",
"\\end{align}$"
],
"text/plain": [
diff --git a/src/bartiq/compilation/_evaluate.py b/src/bartiq/compilation/_evaluate.py
index 90c34af..0bf3aa7 100644
--- a/src/bartiq/compilation/_evaluate.py
+++ b/src/bartiq/compilation/_evaluate.py
@@ -105,8 +105,6 @@ def _evaluate(
for parsed_assignment in parsed_assignments:
_evaluate_over_assignment(evaluated_routine, parsed_assignment, backend, functions_map)
- # TODO: This is just for backward compatibility and making sure tests pass. # noqa:T101
- evaluated_routine.linked_params = {}
return evaluated_routine
diff --git a/src/bartiq/compilation/_symbolic_function.py b/src/bartiq/compilation/_symbolic_function.py
index 1ecdf00..f4177e6 100644
--- a/src/bartiq/compilation/_symbolic_function.py
+++ b/src/bartiq/compilation/_symbolic_function.py
@@ -693,6 +693,10 @@ def update_routine_with_symbolic_function(routine: Routine, function: SymbolicFu
input_params, input_register_sizes_from_inputs = _parse_function_inputs(function)
costs, registers_sizes_from_outputs = _parse_function_outputs(function, input_register_sizes_from_inputs)
routine.input_params = sorted(input_params)
+ linked_params_to_remove = set(routine.linked_params.keys()) - set(input_params)
+ for param in linked_params_to_remove:
+ del routine.linked_params[param]
+
for port_name, port_size in input_register_sizes_from_inputs.items():
routine.input_ports[port_name].size = str(port_size)
for port_name, port_size in registers_sizes_from_outputs.items():
@@ -769,6 +773,10 @@ def _parse_function_outputs(function, input_register_sizes_from_inputs):
f"got {type(output_variable)}"
)
else:
- costs.append(f"{output_symbol} = {output_variable.evaluated_expression}")
+ cost_value = (
+ output_variable.evaluated_expression if output_variable.value is None else output_variable.value
+ )
+
+ costs.append(f"{output_symbol} = {cost_value}")
return costs, register_sizes
diff --git a/tests/compilation/data/evaluate_test_data.json b/tests/compilation/data/evaluate_test_data.json
index b0eb4f9..5e22574 100644
--- a/tests/compilation/data/evaluate_test_data.json
+++ b/tests/compilation/data/evaluate_test_data.json
@@ -10,6 +10,42 @@
"type": null
}
],
+ [
+ {
+ "name": "",
+ "type": null,
+ "input_params": [
+ "x"
+ ],
+ "resources": {
+ "Q": {
+ "name": "Q",
+ "type": "other",
+ "value": {
+ "type": "str",
+ "value": "log2(x)"
+ }
+ }
+ }
+ },
+ [
+ "x=120"
+ ],
+ {
+ "name": "",
+ "type": null,
+ "resources": {
+ "Q": {
+ "name": "Q",
+ "type": "other",
+ "value": {
+ "type": "str",
+ "value": "6.90689059560852"
+ }
+ }
+ }
+ }
+ ],
[
{
"name": "",
@@ -1800,7 +1836,10 @@
"value": "N"
}
}
- }
+ },
+ "input_params": [
+ "y"
+ ]
}
},
"connections": [
@@ -1810,7 +1849,8 @@
}
],
"input_params": [
- "x"
+ "x",
+ "y"
],
"linked_params": {
"x": [
@@ -1818,6 +1858,12 @@
"a",
"x"
]
+ ],
+ "y": [
+ [
+ "b",
+ "y"
+ ]
]
}
},
@@ -1854,7 +1900,10 @@
"value": "0"
}
}
- }
+ },
+ "input_params": [
+ "y"
+ ]
}
},
"connections": [
@@ -1862,7 +1911,18 @@
"source": "a.out_0",
"target": "b.in_0"
}
- ]
+ ],
+ "input_params": [
+ "y"
+ ],
+ "linked_params": {
+ "y": [
+ [
+ "b",
+ "y"
+ ]
+ ]
+ }
}
],
[
@@ -1936,5 +1996,127 @@
}
}
}
+ ],
+ [
+ {
+ "name": "",
+ "type": null,
+ "input_params": [
+ "x",
+ "y"
+ ],
+ "linked_params": {
+ "x": [
+ [
+ "a",
+ "x"
+ ]
+ ],
+ "y": [
+ [
+ "a",
+ "y"
+ ]
+ ]
+ },
+ "children": {
+ "a": {
+ "name": "a",
+ "type": null,
+ "input_params": [
+ "x",
+ "y"
+ ],
+ "linked_params": {
+ "x": [
+ [
+ "b",
+ "x"
+ ]
+ ],
+ "y": [
+ [
+ "b",
+ "y"
+ ]
+ ]
+ },
+ "children": {
+ "b": {
+ "name": "b",
+ "type": null,
+ "input_params": [
+ "x",
+ "y"
+ ],
+ "resources": {
+ "Q": {
+ "name": "Q",
+ "type": "other",
+ "value": {
+ "type": "str",
+ "value": "x + y"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ [
+ "x=10"
+ ],
+ {
+ "name": "",
+ "type": null,
+ "input_params": [
+ "y"
+ ],
+ "linked_params": {
+ "y": [
+ [
+ "a",
+ "y"
+ ]
+ ]
+ },
+ "children": {
+ "a": {
+ "name": "a",
+ "type": null,
+ "input_params": [
+ "y"
+ ],
+ "linked_params": {
+ "y": [
+ [
+ "b",
+ "y"
+ ]
+ ]
+ },
+ "children": {
+ "b": {
+ "name": "b",
+ "type": null,
+ "input_params": [
+ "y"
+ ],
+ "resources": {
+ "Q": {
+ "name": "Q",
+ "type": "other",
+ "value": {
+ "type": "str",
+ "value": "y + 10"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
]
]
\ No newline at end of file