sqdtoolz 0.9.0.dev1__tar.gz → 0.9.2.dev1__tar.gz

{sqdtoolz-0.9.0.dev1 → sqdtoolz-0.9.2.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqdtoolz
-Version: 0.9.0.dev1
+Version: 0.9.2.dev1
 Summary: toolbox to control and run experiments
 Author-email: Prasanna Pakkiam <p.pakkiam@uq.edu.au>, Rohit Beriwal <r.beriwal@uq.edu.au>
 Project-URL: Homepage, https://github.com/sqdlab/sqdtoolz

{sqdtoolz-0.9.0.dev1 → sqdtoolz-0.9.2.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sqdtoolz"
-version = "0.9.0.dev1"
+version = "0.9.2.dev1"
 description = "toolbox to control and run experiments"
 readme = "README.md"
 requires-python = ">=3.10"

{sqdtoolz-0.9.0.dev1 → sqdtoolz-0.9.2.dev1}/sqdtoolz/Experiments/Experimental/ExpZIqubit.py

@@ -31,6 +31,10 @@ class ExpZIqubit(Experiment):
         self._transition = kwargs.pop('transition', 'ge')
         #
         self._plot_ZI = kwargs.pop('ZI_plot', False)
+        self._skip_ZI_analysis = kwargs.pop('skip_ZI_analysis', True)
+        if self._plot_ZI:
+            #Cannot plot_ZI without executing the ZI analysis workflow...
+            self._skip_ZI_analysis = False
         self._args = kwargs
         self._show_pulse_sheet = kwargs.pop('show_pulse_sheet', False)
     
@@ -55,6 +59,8 @@ class ExpZIqubit(Experiment):
             getattr(options, 'transition')(self._transition)
         if hasattr(options, 'close_figures'):
             options.close_figures(not self._plot_ZI)
+        if hasattr(options, 'do_analysis'):
+            getattr(options, 'do_analysis')(not self._skip_ZI_analysis)
         if hasattr(options, 'cal_states'):
             #Automatically default to transition for calibration states... Note that this only matters if use_cal_traces is True...
             getattr(options, 'cal_states')( self._args.get('cal_states', self._transition) )
@@ -116,7 +122,7 @@ class ExpZIqubit(Experiment):
             #Another hack for the case where they iterate once per qubit in the experiment for a given workflow...
             if 'qubits' in zi_wfw_params and not ('qubits' in zi_exp_params) and 'qubit' in zi_exp_params:
                 execution_time *= len(leQubits)
-                qubit_kwarg = {'qubits': leQubits}
+                qubit_kwarg = {'qubits': [x.uid for x in leQubits]}
 
             if kwargs.get('print_estimated_execution_time',True):
                 print(f"Expected Runtime: {execution_time:.3f}s")

{sqdtoolz-0.9.0.dev1 → sqdtoolz-0.9.2.dev1}/sqdtoolz/Utilities/OpenQASM/ParserOpenQASM.py

@@ -266,8 +266,10 @@ class SQDQasmVisitor(openqasm3.visitor.QASMVisitor):
         self._commands.append({'type':SQDQasmCommandType.DELAY, 'targets':qargs, 'length':cur_delay})
 
     def visit_QuantumMeasurementStatement(self, node):
-        qargs = [self._eval_qarg(node.measure.qubit)]   #TODO: Expand to support registers expanding...
-        self._commands.append( {'type': SQDQasmCommandType.MEASURE, 'targets': qargs, 'store': self._eval_bits_arg(node.target)} )
+        qargs = self._eval_qarg(node.measure.qubit, allow_entire_regs=True)   #TODO: Expand to support registers expanding...
+        stores = self._eval_bits_arg(node.target)
+        assert len(qargs) == len(stores), f"The qubit register {node.measure.qubit.name} does not match the size of the classical bit register {node.target.name}."
+        self._commands.append( {'type': SQDQasmCommandType.MEASURE, 'targets': qargs, 'store': stores} )
 
     def visit_RangeDefinition(self, node):
         leStep = 1 if node.step==None else self._eval_arg(node.step)
@@ -798,10 +800,10 @@ class ParserOpenQASM:
                             qubit_sync_times[cur_phys_qubit_index] += gate_duration   #TODO: Must add 2QG time and pass this in - perhaps by a graph?
                             last_sync_command_indices[cur_phys_qubit_index] = len(final_commands)-1
                     elif cur_command['type'] == SQDQasmCommandType.MEASURE:
-                        for cur_phys_qubit_index in cur_targ_phys_indices:
+                        for ind_reg, cur_phys_qubit_index in enumerate(cur_targ_phys_indices):
                             cur_meas_id = f'm{meas_index}'
                             cur_meas_cmd = ('Measure', cur_meas_id)
-                            meas_store_ids[cur_command['store'][0]] = cur_meas_id
+                            meas_store_ids[cur_command['store'][ind_reg]] = cur_meas_id
                             meas_index += 1
                             #
                             cur_play_after_index = None if last_sync_command_indices[cur_phys_qubit_index] == -1 else last_sync_command_indices[cur_phys_qubit_index]

{sqdtoolz-0.9.0.dev1 → sqdtoolz-0.9.2.dev1}/sqdtoolz/Utilities/OpenQASM/ScheduleParametersJSONConfigZI.py

@@ -48,7 +48,7 @@ class ScheduleParametersJSONConfigZI(ScheduleParametersBase):
         for cur_cplr in self.config_data['Couplers']:
             qubit1 = cur_cplr['Linkage'][0]
             qubit2 = cur_cplr['Linkage'][1]
-            if self.config_data['Qubits'][qubit1_phys_index]['Name'] == qubit1 and self.config_data['Qubits'][qubit2_phys_index]['Name'] == qubit2:
+            if self.config_data['Qubits'][qubit1_phys_index]['Name'] == qubit1 and self.config_data['Qubits'][qubit2_phys_index]['Name'] == qubit2 or self.config_data['Qubits'][qubit1_phys_index]['Name'] == qubit2 and self.config_data['Qubits'][qubit2_phys_index]['Name'] == qubit1:
                 found = True
                 break
         assert found, f"There is no 2-qubit coupling between physical qubits {qubit1_phys_index} and {qubit2_phys_index}"

{sqdtoolz-0.9.0.dev1 → sqdtoolz-0.9.2.dev1}/sqdtoolz/Utilities/OpenQASM/includes/stdgates_transmon_fixed_coupler.inc

@@ -20,5 +20,6 @@ gate h a { z a; ry(pi/2) a; }
 // 2-Qubit native CZ
 gate cz a, b { ctrl @ z a, b; }
 
-// Derived 2-Qubit CX
+//Derived Gates
 gate cx a,b { h b; cz a,b; h b; }
+gate swap a,b {cx a,b; cx b,a; cx a,b;}

{sqdtoolz-0.9.0.dev1 → sqdtoolz-0.9.2.dev1}/sqdtoolz.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqdtoolz
-Version: 0.9.0.dev1
+Version: 0.9.2.dev1
 Summary: toolbox to control and run experiments
 Author-email: Prasanna Pakkiam <p.pakkiam@uq.edu.au>, Rohit Beriwal <r.beriwal@uq.edu.au>
 Project-URL: Homepage, https://github.com/sqdlab/sqdtoolz