Merge pull request #726 from qiboteam/fix_targets

Restoring execution without specifying `targets` in runcard

src/qibocal/auto/runcard.py

@@ -57,14 +57,20 @@ class Runcard:
     actions: list[Action]
     """List of action to be executed."""
     targets: Optional[Targets] = None
-    """Qubits to be calibrated."""
+    """Qubits to be calibrated.
+       If `None` the protocols will be executed on all qubits
+       available in the platform."""
     backend: str = "qibolab"
     """Qibo backend."""
     platform: str = os.environ.get("QIBO_PLATFORM", "dummy")
     """Qibolab platform."""
     max_iterations: int = MAX_ITERATIONS
     """Maximum number of iterations."""
 
+    def __post_init__(self):
+        if self.targets is None and self.platform_obj is not None:
+            self.targets = list(self.platform_obj.qubits)
+
     @cached_property
     def backend_obj(self) -> Backend:
         """Allocate backend."""

src/qibocal/cli/autocalibration.py

@@ -33,9 +33,6 @@ def autocalibrate(runcard, folder, force, update):
     # generate output folder
     path = generate_output_folder(folder, force)
 
-    # allocate qubits
-    # qubits = create_qubits_dict(qubits=runcard.qubits, platform=platform)
-
     # generate meta
     meta = generate_meta(backend, platform, path)
     # dump platform

src/qibocal/cli/utils.py

@@ -8,7 +8,6 @@
 from pathlib import Path
 
 from qibocal.config import log, raise_error
-from qibocal.utils import allocate_qubits_pairs, allocate_single_qubits
 
 RUNCARD = "runcard.yml"
 UPDATED_PLATFORM = "new_platform"
@@ -22,16 +21,6 @@ def dump_report(meta, path):
     (path / META).write_text(json.dumps(meta, indent=4))
 
 
-def create_qubits_dict(qubits, platform):
-    if platform is not None:
-        if qubits is not None:
-            if any(isinstance(i, list) for i in qubits):
-                return allocate_qubits_pairs(platform, qubits)
-            return allocate_single_qubits(platform, qubits)
-        return allocate_single_qubits(platform, list(platform.qubits))
-    return qubits
-
-
 def generate_meta(backend, platform, path):
     """Methods that takes care of:
     - dumping original platform

tests/test_task_options.py

@@ -21,7 +21,7 @@
 QUBITS = list(PLATFORM.qubits)
 DUMMY_CARD = {
     "backend": "numpy",
-    "qubits": QUBITS,
+    "targets": QUBITS,
     "actions": [
         {
             "id": "standard rb",
@@ -49,7 +49,7 @@ def modify_card(card, targets=None, update=None):
 
 @pytest.mark.parametrize("platform", [None, PLATFORM])
 @pytest.mark.parametrize("local_targets", [None, [0, 1]])
-def test_qubits_argument(platform, local_targets, tmp_path):
+def test_targets_argument(platform, local_targets, tmp_path):
     """Test possible qubits combinations between global and local."""
     runcard = Runcard.load(modify_card(DUMMY_CARD, targets=local_targets))
     print(runcard)
@@ -66,10 +66,11 @@ def test_qubits_argument(platform, local_targets, tmp_path):
         assert completed.task.targets == local_targets
     else:
         assert completed.task.targets == list(QUBITS)
+        assert runcard.targets == list(QUBITS)
 
 
 UPDATE_CARD = {
-    "qubits": QUBITS,
+    "targets": QUBITS,
     "actions": [
         {
             "id": "resonator frequency",