Merge pull request #688 from qiboteam/rmstart

Remove `platform.start()`

pyproject.toml

@@ -17,7 +17,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = ">=3.9,<3.12"
-qibolab = "^0.1.4"
+qibolab = "^0.1.5"
 qibo = "^0.2.1"
 numpy = "^1.24.0"
 scipy = "^1.10.1"

src/qibocal/cli/acquisition.py

@@ -3,7 +3,7 @@
 from dataclasses import asdict
 
 import yaml
-from qibolab.serialize import dump_runcard
+from qibolab.serialize import dump_platform
 
 from ..auto.execute import Executor
 from ..auto.history import add_timings_to_meta
@@ -39,7 +39,8 @@ def acquire(runcard, folder, force):
     meta = generate_meta(backend, platform, path)
     # dump platform
     if backend.name == "qibolab":
-        dump_runcard(platform, path / PLATFORM)
+        (path / PLATFORM).mkdir(parents=True, exist_ok=True)
+        dump_platform(platform, path / PLATFORM)
 
     # dump action runcard
     (path / RUNCARD).write_text(yaml.safe_dump(asdict(runcard)))
@@ -51,8 +52,6 @@ def acquire(runcard, folder, force):
     # connect and initialize platform
     if platform is not None:
         platform.connect()
-        platform.setup()
-        platform.start()
 
     # run protocols
     list(executor.run(mode=ExecutionMode.acquire))
@@ -62,7 +61,6 @@ def acquire(runcard, folder, force):
 
     # stop and disconnect platform
     if platform is not None:
-        platform.stop()
         platform.disconnect()
 
     # dump updated meta

src/qibocal/cli/autocalibration.py

@@ -3,7 +3,7 @@
 from dataclasses import asdict
 
 import yaml
-from qibolab.serialize import dump_runcard
+from qibolab.serialize import dump_platform
 
 from ..auto.execute import Executor
 from ..auto.history import add_timings_to_meta
@@ -41,7 +41,8 @@ def autocalibrate(runcard, folder, force, update):
     meta = generate_meta(backend, platform, path)
     # dump platform
     if backend.name == "qibolab":
-        dump_runcard(platform, path / PLATFORM)
+        (path / PLATFORM).mkdir(parents=True, exist_ok=True)
+        dump_platform(platform, path / PLATFORM)
 
     # dump action runcard
     (path / RUNCARD).write_text(yaml.safe_dump(asdict(runcard)))
@@ -54,8 +55,6 @@ def autocalibrate(runcard, folder, force, update):
     # connect and initialize platform
     if platform is not None:
         platform.connect()
-        platform.setup()
-        platform.start()
 
     # run protocols
     for _ in executor.run(mode=ExecutionMode.autocalibration):
@@ -70,9 +69,9 @@ def autocalibrate(runcard, folder, force, update):
 
     # stop and disconnect platform
     if platform is not None:
-        platform.stop()
         platform.disconnect()
 
     # dump updated runcard
     if platform is not None:
-        dump_runcard(platform, path / UPDATED_PLATFORM)
+        (path / UPDATED_PLATFORM).mkdir(parents=True, exist_ok=True)
+        dump_platform(platform, path / UPDATED_PLATFORM)

src/qibocal/cli/utils.py

@@ -10,8 +10,8 @@
 from qibocal.utils import allocate_qubits_pairs, allocate_single_qubits
 
 RUNCARD = "runcard.yml"
-UPDATED_PLATFORM = "new_platform.yml"
-PLATFORM = "platform.yml"
+UPDATED_PLATFORM = "new_platform"
+PLATFORM = "platform"
 META = "meta.json"
 
 

src/qibocal/protocols/characterization/resonator_spectroscopy_attenuation.py

@@ -90,9 +90,9 @@ def _acquisition(
         amplitudes[qubit] = ro_pulses[qubit].amplitude
 
         if params.attenuation is not None:
-            platform.set_attenuation(qubit, params.attenuation)
+            qubits[qubit].readout.attenuation = params.attenuation
 
-        attenuations[qubit] = platform.get_attenuation(qubit)
+        attenuations[qubit] = qubits[qubit].readout.attenuation
 
         sequence.add(ro_pulses[qubit])
 

src/qibocal/protocols/characterization/signal_experiments/time_of_flight_readout.py

@@ -74,7 +74,7 @@ def _acquisition(
     )
 
     data = TimeOfFlightReadoutData(
-        windows_size=params.window_size, sampling_rate=platform.settings.sampling_rate
+        windows_size=params.window_size, sampling_rate=platform.sampling_rate
     )
 
     # retrieve and store the results for every qubit

src/qibocal/protocols/characterization/two_qubit_interaction/chevron.py

@@ -126,9 +126,7 @@ def _aquisition(
         # Patch to get the coupler until the routines use QubitPair
         if platform.couplers:
             sequence.add(
-                cz.coupler_pulses(
-                    platform.pairs[tuple(sorted(ordered_pair))].coupler.name
-                )
+                cz.coupler_pulses(platform.pairs[tuple(ordered_pair)].coupler.name)
             )
 
         if params.parking:

src/qibocal/update.py

@@ -113,17 +113,13 @@ def virtual_phases(phases: dict[QubitId, float], platform: Platform, pair: Qubit
 
 def CZ_duration(duration: int, platform: Platform, pair: QubitPairId):
     """Update CZ duration for specific pair."""
-    if pair not in platform.pairs:
-        pair = (pair[1], pair[0])
     for pulse in platform.pairs[pair].native_gates.CZ.pulses:
         if pulse.qubit.name == pair[1]:
             pulse.duration = int(duration)
 
 
 def CZ_amplitude(amp: float, platform: Platform, pair: QubitPairId):
     """Update CZ amplitude for specific pair."""
-    if pair not in platform.pairs:
-        pair = (pair[1], pair[0])
     for pulse in platform.pairs[pair].native_gates.CZ.pulses:
         if pulse.qubit.name == pair[1]:
             pulse.amplitude = float(amp)

src/qibocal/utils.py

@@ -15,7 +15,7 @@ def allocate_qubits_pairs(
     platform: Optional[Platform], qubit_pairs_ids: list[tuple[QubitId, QubitId]]
 ) -> dict[tuple[QubitId, QubitId], QubitPair]:
     """Construct the map from the chosen id pairs to the corresponding physical qubit pairs available on the platform."""
-    return {tuple(qq): platform.pairs[tuple(sorted(qq))] for qq in qubit_pairs_ids}
+    return {tuple(qq): platform.pairs[tuple(qq)] for qq in qubit_pairs_ids}
 
 
 def allocate_single_qubits_lists(

tests/runcards/protocols.yml

@@ -531,7 +531,7 @@ actions:
   - id: chevron id
     priority: 0
     operation: chevron
-    qubits: [[0, 2],[1,2],[3,2], [2,3]]
+    qubits: [[0, 2],[1,2]]
     parameters:
       amplitude_min: 0.1
       amplitude_max: 0.6

tests/test_update.py

@@ -100,14 +100,15 @@ def test_virtual_phases_update(pair):
 
 @pytest.mark.parametrize("pair", PAIRS)
 def test_CZ_params_update(pair):
-    update.CZ_amplitude(RANDOM_FLOAT, PLATFORM, pair)
-    update.CZ_duration(RANDOM_INT, PLATFORM, pair)
+    if hasattr(PLATFORM.pairs[pair].native_gates, "CZ"):
+        if PLATFORM.pairs[pair].native_gates.CZ is not None:
+            update.CZ_amplitude(RANDOM_FLOAT, PLATFORM, pair)
+            update.CZ_duration(RANDOM_INT, PLATFORM, pair)
 
-    if PLATFORM.pairs[pair].native_gates.CZ is not None:
-        for pulse in PLATFORM.pairs[pair].native_gates.CZ.pulses:
-            if pulse.qubit.name == pair[1]:
-                assert pulse.duration == RANDOM_INT
-                assert pulse.amplitude == RANDOM_FLOAT
+            for pulse in PLATFORM.pairs[pair].native_gates.CZ.pulses:
+                if pulse.qubit.name == pair[1]:
+                    assert pulse.duration == RANDOM_INT
+                    assert pulse.amplitude == RANDOM_FLOAT
 
 
 @pytest.mark.parametrize("qubit", QUBITS)