QuLab 2.6.1__tar.gz → 2.7.0__tar.gz

{qulab-2.6.1 → qulab-2.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: QuLab
-Version: 2.6.1
+Version: 2.7.0
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

{qulab-2.6.1 → qulab-2.7.0}/QuLab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: QuLab
-Version: 2.6.1
+Version: 2.7.0
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

{qulab-2.6.1 → qulab-2.7.0}/qulab/executor/cli.py

@@ -10,6 +10,7 @@ from loguru import logger
 from ..cli.config import get_config_value, log_options
 from .load import (WorkflowType, find_unreferenced_workflows, get_entries,
                    load_workflow, make_graph)
+from .schedule import CalibrationFailedError
 from .schedule import maintain as maintain_workflow
 from .schedule import run as run_workflow
 from .transform import set_config_api
@@ -135,16 +136,20 @@ def get(key, api):
               '-n',
               is_flag=True,
               help='Do not run dependents.')
-@click.option('--update', '-u', is_flag=True)
+@click.option('--retry', '-r', default=1, type=int, help='Retry times.')
+@click.option('--freeze', is_flag=True, help='Freeze the config table.')
 @log_options
 @command_option('run')
-def run(workflow, code, data, api, plot, no_dependents, update):
+def run(workflow, code, data, api, plot, no_dependents, retry, freeze):
     """
     Run a workflow.
     """
     logger.info(
-        f'[CMD]: run {workflow} --code {code} --data {data} --api {api}{" --plot" if plot else ""}{" --no-dependents" if no_dependents else ""}{" --update " if update else ""}'
-    )
+        f'[CMD]: run {workflow} --code {code} --data {data} --api {api}'
+        f'{" --plot" if plot else ""}'
+        f'{" --no-dependents" if no_dependents else ""}'
+        f' --retry {retry}'
+        f'{" --freeze " if freeze else ""}')
     if api is not None:
         api = importlib.import_module(api)
         set_config_api(api.query_config, api.update_config, api.export_config)
@@ -159,42 +164,56 @@ def run(workflow, code, data, api, plot, no_dependents, update):
     wf = load_workflow(workflow, code)
     check_toplogy(wf, code)
 
-    if no_dependents:
-        if hasattr(wf, 'entries'):
-            for entry in get_entries(wf, code):
-                run_workflow(entry, code, data, plot=plot, update=update)
-        else:
-            run_workflow(wf, code, data, plot=plot, update=update)
-    else:
-        if hasattr(wf, 'entries'):
-            for entry in get_entries(wf, code):
-                maintain_workflow(entry,
-                                  code,
-                                  data,
-                                  run=True,
-                                  plot=plot,
-                                  update=update)
-        else:
-            maintain_workflow(wf,
-                              code,
-                              data,
-                              run=True,
-                              plot=plot,
-                              update=update)
+    for i in range(retry):
+        try:
+            if no_dependents:
+                if hasattr(wf, 'entries'):
+                    for entry in get_entries(wf, code):
+                        run_workflow(entry,
+                                     code,
+                                     data,
+                                     plot=plot,
+                                     freeze=freeze)
+                else:
+                    run_workflow(wf, code, data, plot=plot, freeze=freeze)
+            else:
+                if hasattr(wf, 'entries'):
+                    for entry in get_entries(wf, code):
+                        maintain_workflow(entry,
+                                          code,
+                                          data,
+                                          run=True,
+                                          plot=plot,
+                                          freeze=freeze)
+                else:
+                    maintain_workflow(wf,
+                                      code,
+                                      data,
+                                      run=True,
+                                      plot=plot,
+                                      freeze=freeze)
+            break
+        except CalibrationFailedError as e:
+            if i == retry - 1:
+                raise e
+            logger.warning(f'Calibration failed, retrying ({i + 1}/{retry})')
+            continue
 
 
 @click.command()
 @click.argument('workflow')
+@click.option('--retry', '-r', default=1, type=int, help='Retry times.')
 @click.option('--plot', '-p', is_flag=True, help='Plot the result.')
 @log_options
 @command_option('maintain')
-def maintain(workflow, code, data, api, plot):
+def maintain(workflow, code, data, api, retry, plot):
     """
     Maintain a workflow.
     """
     logger.info(
-        f'[CMD]: maintain {workflow} --code {code} --data {data} --api {api}{" --plot" if plot else ""}'
-    )
+        f'[CMD]: maintain {workflow} --code {code} --data {data} --api {api}'
+        f' --retry {retry}'
+        f'{" --plot" if plot else ""}')
     if api is not None:
         api = importlib.import_module(api)
         set_config_api(api.query_config, api.update_config, api.export_config)
@@ -209,8 +228,25 @@ def maintain(workflow, code, data, api, plot):
     wf = load_workflow(workflow, code)
     check_toplogy(wf, code)
 
-    if hasattr(wf, 'entries'):
-        for entry in get_entries(wf, code):
-            maintain_workflow(entry, code, data, run=False, plot=plot)
-    else:
-        maintain_workflow(wf, code, data, run=False, plot=plot)
+    for i in range(retry):
+        try:
+            if hasattr(wf, 'entries'):
+                for entry in get_entries(wf, code):
+                    maintain_workflow(entry,
+                                      code,
+                                      data,
+                                      run=False,
+                                      plot=plot,
+                                      freeze=False)
+            else:
+                maintain_workflow(wf,
+                                  code,
+                                  data,
+                                  run=False,
+                                  plot=plot,
+                                  freeze=False)
+        except CalibrationFailedError as e:
+            if i == retry - 1:
+                raise e
+            logger.warning(f'Calibration failed, retrying ({i + 1}/{retry})')
+            continue

{qulab-2.6.1 → qulab-2.7.0}/qulab/executor/schedule.py

@@ -9,7 +9,7 @@ from loguru import logger
 from .load import WorkflowType, get_dependents
 from .storage import (Result, find_result, renew_result, revoke_result,
                       save_result)
-from .transform import current_config, update_parameters
+from .transform import current_config, obey_the_oracle, update_parameters
 
 
 class CalibrationFailedError(Exception):
@@ -100,6 +100,18 @@ def call_analyzer(node,
     else:
         result = node.analyze(result, history=history)
         veryfy_analyzed_result(result, node.__workflow_id__, "analyze")
+        if hasattr(node, 'oracle') and callable(node.oracle):
+            logger.debug(
+                f'"{node.__workflow_id__}" has oracle method, calling ...')
+            try:
+                result = node.oracle(result, history=history)
+            except Exception as e:
+                logger.exception(e)
+                result.oracle = {}
+            if not is_pickleable(result.oracle):
+                raise TypeError(
+                    f'"{node.__workflow_id__}" : "oracle" return not pickleable data'
+                )
         result.fully_calibrated = True
         if plot:
             call_plot(node, result)
@@ -276,6 +288,7 @@ def diagnose(workflow: WorkflowType, code_path: str | Path,
 
     result = calibrate(workflow, code_path, state_path, plot, session_id)
     if result.bad_data or not result.in_spec:
+        obey_the_oracle(result, state_path)
         raise CalibrationFailedError(
             f'"{workflow.__workflow_id__}": All dependents passed, but calibration failed!'
         )
@@ -290,7 +303,7 @@ def maintain(workflow: WorkflowType,
              session_id: str | None = None,
              run: bool = False,
              plot: bool = False,
-             update: bool = True):
+             freeze: bool = False):
     if session_id is None:
         session_id = uuid.uuid4().hex
     logger.debug(f'run "{workflow.__workflow_id__}"'
@@ -300,7 +313,13 @@ def maintain(workflow: WorkflowType,
         logger.debug(
             f'maintain "{n.__workflow_id__}" because it is depended by "{workflow.__workflow_id__}"'
         )
-        maintain(n, code_path, state_path, session_id, run=False, plot=plot)
+        maintain(n,
+                 code_path,
+                 state_path,
+                 session_id,
+                 run=False,
+                 plot=plot,
+                 freeze=freeze)
     else:
         logger.debug(
             f'"{workflow.__workflow_id__}": All dependents maintained')
@@ -331,10 +350,12 @@ def maintain(workflow: WorkflowType,
     logger.debug(f'recalibrate "{workflow.__workflow_id__}"')
     result = calibrate(workflow, code_path, state_path, plot, session_id)
     if result.bad_data or not result.in_spec:
+        if not freeze:
+            obey_the_oracle(result, state_path)
         raise CalibrationFailedError(
             f'"{workflow.__workflow_id__}": All dependents passed, but calibration failed!'
         )
-    if update:
+    if not freeze:
         update_parameters(result, state_path)
     return
 
@@ -344,7 +365,7 @@ def run(workflow: WorkflowType,
         code_path: str | Path,
         state_path: str | Path,
         plot: bool = False,
-        update: bool = True):
+        freeze: bool = False):
     session_id = uuid.uuid4().hex
     logger.debug(f'run "{workflow.__workflow_id__}" without dependences.')
     result = calibrate(workflow,
@@ -353,9 +374,11 @@ def run(workflow: WorkflowType,
                        plot,
                        session_id=session_id)
     if result.bad_data or not result.in_spec:
+        if not freeze:
+            obey_the_oracle(result, state_path)
         raise CalibrationFailedError(
             f'"{workflow.__workflow_id__}": All dependents passed, but calibration failed!'
         )
-    if update:
+    if not freeze:
         update_parameters(result, state_path)
     return

{qulab-2.6.1 → qulab-2.7.0}/qulab/executor/storage.py

@@ -23,6 +23,7 @@ class Result():
     checked_time: datetime = field(default_factory=datetime.now)
     ttl: timedelta = timedelta(days=3650)
     parameters: dict = field(default_factory=dict)
+    oracle: dict = field(default_factory=dict)
     other_infomation: dict = field(default_factory=dict)
     data: Any = field(default_factory=tuple)
     index: int = -1

{qulab-2.6.1 → qulab-2.7.0}/qulab/executor/transform.py

@@ -43,6 +43,13 @@ def _export_config() -> dict:
     return parameters
 
 
+def obey_the_oracle(result: Result, data_path):
+    global __current_config_id
+    update_config(result.oracle)
+    cfg = export_config()
+    __current_config_id = save_config(cfg, data_path)
+
+
 def update_parameters(result: Result, data_path):
     global __current_config_id
     update_config(result.parameters)

{qulab-2.6.1 → qulab-2.7.0}/qulab/executor/utils.py

@@ -133,6 +133,24 @@ def check_analyze(result: Result, history: Result | None = None) -> Result:
     result.state = random.choice(['Outdated', 'OK', 'Bad'])
 
     return result
+
+
+def oracle(result: Result, history: Result | None = None):
+    \"\"\"
+    谕示：指凭直觉或经验判断，改动某些配置，以期望下次校准成功。
+    
+    当校准失败时，根据 analyze 的结果，尝试改变某些配置再重新校准整个系统。
+    比如通常我们在死活测不到 rabi 或能谱时，会换一个 idle bias 再试试。这
+    里我们凭直觉设的那个 bias 值，就是一个谕示，可以通过 oracle 来设定。
+
+    该函数代入的参数 result 是 analyze 函数的返回值。
+    \"\"\"
+    result.oracle = {{}}
+
+    # result.oracle['Q0.bias'] = 0.1
+    # result.oracle['Q1.bias'] = -0.03
+
+    return result
 """
 
 

qulab-2.7.0/qulab/version.py

@@ -0,0 +1 @@
+__version__ = "2.7.0"

qulab-2.6.1/qulab/version.py

@@ -1 +0,0 @@
-__version__ = "2.6.1"