QuLab 2.2.8__tar.gz → 2.3.0__tar.gz

{qulab-2.2.8 → qulab-2.3.0}/PKG-INFO

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

{qulab-2.2.8 → qulab-2.3.0}/QuLab.egg-info/PKG-INFO

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

{qulab-2.2.8 → qulab-2.3.0}/qulab/scan/optimize.py

@@ -37,6 +37,12 @@ class NgOptimizer():
                            self.config['method'])(self.instrum,
                                                   budget=self.config['budget'])
 
+    def suggest(self, *suggested):
+        suggested = [
+            space.transform(x) for x, space in zip(suggested, self.dimensions)
+        ]
+        self.opt.suggest(*suggested)
+
     def ask(self):
         tmp = self.opt.ask()
         return [
@@ -47,15 +53,16 @@ class NgOptimizer():
     def tell(self, suggested: Sequence, value: Any):
         self._all_x.append(suggested)
         self._all_y.append(value)
-        suggested = [
+        suggested = tuple([
             space.transform(x) for x, space in zip(suggested, self.dimensions)
-        ]
-        self.opt.suggest(*suggested)
-        x = self.opt.ask()
+        ])
+        # self.opt.suggest(*suggested)
+        # x = self.opt.ask()
+        x = self.instrum.spawn_child(new_value=(suggested, {}))
         self.opt.tell(x, value)
 
     def get_result(self, history: bool = False) -> OptimizeResult:
-        recommendation = self.opt.recommend()
+        recommendation = self.opt.provide_recommendation()
         ret = OptimizeResult({
             'x': [
                 space.inverse_transform(x)

{qulab-2.2.8 → qulab-2.3.0}/qulab/scan/scan.py

@@ -226,10 +226,11 @@ class Scan():
                  max_workers: int = 4,
                  max_promise: int = 100,
                  max_message: int = 1000,
+                 config: dict | None = None,
                  mixin=None):
         self.id = task_uuid()
         self.record = None
-        self.config = None
+        self.config = {} if config is None else copy.deepcopy(config)
         self.description = {
             'app': app,
             'tags': tags,
@@ -250,7 +251,7 @@ class Scan():
             'filters': {},
             'total': {},
             'database': database,
-            'hiden': ['self', r'^__.*', r'.*__$'],
+            'hiden': ['self', 'config', r'^__.*', r'.*__$'],
             'entry': {
                 'system': get_system_info(),
                 'env': {},
@@ -392,7 +393,10 @@ class Scan():
         if name in self.description['consts']:
             return self.description['consts'][name]
         else:
-            return Symbol(name)
+            try:
+                return self._query_config(name)
+            except:
+                return Symbol(name)
 
     def _add_search_space(self, name: str, level: int, space):
         if level not in self.description['loops']:
@@ -402,6 +406,8 @@ class Scan():
     def add_depends(self, name: str, depends: list[str]):
         if isinstance(depends, str):
             depends = [depends]
+        if 'self' in depends:
+            depends.append('config')
         if name not in self.description['dependents']:
             self.description['dependents'][name] = set()
         self.description['dependents'][name].update(depends)
@@ -448,6 +454,9 @@ class Scan():
                 pass
             self.description['consts'][name] = value
 
+        if '.' in name:
+            self.add_depends('config', [name])
+
         if ',' in name:
             for key in name.split(','):
                 if not key.startswith('*'):
@@ -472,6 +481,8 @@ class Scan():
         elif isinstance(space, OptimizeSpace):
             space.name = name
             space.optimizer.dimensions[name] = space.space
+            if space.suggestions:
+                space.optimizer.suggestions[name] = space.suggestions
             self._add_search_space(name, space.optimizer.level, space)
             self.add_depends(space.optimizer.name, [name])
         else:
@@ -486,6 +497,8 @@ class Scan():
                 self.add_depends(name, space.symbols())
         if setter:
             self.description['setters'][name] = setter
+        if '.' in name:
+            self.add_depends('config', [name])
 
     def trace(self,
               name: str,
@@ -535,6 +548,28 @@ class Scan():
             self.description['getters'][name] = getter
         return opt
 
+    def _synchronize_config(self):
+        for key, value in self.variables.items():
+            if '.' in key:
+                d = self.config
+                ks = key.split('.')
+                if not ks:
+                    continue
+                for k in ks[:-1]:
+                    if k in d:
+                        d = d[k]
+                    else:
+                        d[k] = {}
+                        d = d[k]
+                d[ks[-1]] = value
+        return self.config
+
+    def _query_config(self, key):
+        d = self.config
+        for k in key.split('.'):
+            d = d[k]
+        return d
+
     async def _update_progress(self):
         while True:
             task = await self._prm_queue.get()
@@ -549,17 +584,6 @@ class Scan():
 
     async def run(self):
         assymbly(self.description)
-        if self.config:
-            self.description['config'] = await create_config(
-                self.config, self.description['database'], self._sock)
-        if current_notebook() is None:
-            await create_notebook('untitle', self.description['database'],
-                                  self._sock)
-        cell_id = await save_input_cells(current_notebook(),
-                                         self.description['entry']['scripts'],
-                                         self.description['database'],
-                                         self._sock)
-        self.description['entry']['scripts'] = cell_id
         if isinstance(
                 self.description['database'],
                 str) and self.description['database'].startswith("tcp://"):
@@ -567,15 +591,28 @@ class Scan():
                                          connect=self.description['database'],
                                          socket=self._sock) as socket:
                 self._sock = socket
+                if self.config:
+                    self.description['config'] = await create_config(
+                        self.config, self.description['database'], self._sock)
+                if current_notebook() is None:
+                    await create_notebook('untitle',
+                                          self.description['database'],
+                                          self._sock)
+                cell_id = await save_input_cells(
+                    current_notebook(), self.description['entry']['scripts'],
+                    self.description['database'], self._sock)
+                self.description['entry']['scripts'] = cell_id
                 await self._run()
         else:
+            if self.config:
+                self.description['config'] = copy.deepcopy(self.config)
             await self._run()
 
     async def _run(self):
         send_msg_task = asyncio.create_task(self._send_msg())
         update_progress_task = asyncio.create_task(self._update_progress())
 
-        self._variables = {'self': self}
+        self._variables = {'self': self, 'config': self.config}
 
         consts = {}
         for k, v in self.description['consts'].items():
@@ -671,8 +708,10 @@ class Scan():
                 self.variables,
                 self.description['loops'].get(self.current_level, []),
                 self.description['order'].get(self.current_level, []),
-                self.description['functions'], self.description['optimizers'],
-                self.description['setters'], self.description['getters']):
+                self.description['functions']
+                | {'config': self._synchronize_config},
+                self.description['optimizers'], self.description['setters'],
+                self.description['getters']):
             self._current_level += 1
             if await self._filter(variables, self.current_level - 1):
                 yield variables

{qulab-2.2.8 → qulab-2.3.0}/qulab/scan/space.py

@@ -1,3 +1,4 @@
+import itertools
 from typing import Type
 
 import numpy as np
@@ -103,10 +104,14 @@ def geomspace(start, stop, num=50, endpoint=True):
 
 class OptimizeSpace():
 
-    def __init__(self, optimizer: 'Optimizer', space):
+    def __init__(self, optimizer: 'Optimizer', space, suggestions=None):
         self.optimizer = optimizer
         self.space = space
         self.name = None
+        if suggestions is not None and not isinstance(
+                suggestions, (list, tuple, np.ndarray)):
+            suggestions = [suggestions]
+        self.suggestions = suggestions
 
     def __len__(self):
         return self.optimizer.maxiter
@@ -130,17 +135,32 @@ class Optimizer():
         self.level = level
         self.kwds = kwds
         self.minimize = minimize
+        self.suggestions = {}
 
     def create(self):
-        return self.method(list(self.dimensions.values()), **self.kwds)
+        opt = self.method(list(self.dimensions.values()), **self.kwds)
+
+        def rvs(space):
+            while True:
+                yield space.rvs()[0]
+
+        if self.suggestions:
+            for suggestion in zip(*[
+                    self.suggestions.get(key, rvs(space))
+                    for key, space in self.dimensions.items()
+            ]):
+                opt.suggest(*suggestion)
+        return opt
 
     def Categorical(self,
                     categories,
                     prior=None,
                     transform=None,
-                    name=None) -> OptimizeSpace:
+                    name=None,
+                    suggestions=None) -> OptimizeSpace:
         return OptimizeSpace(self,
-                             Categorical(categories, prior, transform, name))
+                             Categorical(categories, prior, transform, name),
+                             suggestions)
 
     def Integer(self,
                 low,
@@ -149,9 +169,11 @@ class Optimizer():
                 base=10,
                 transform="normalize",
                 name=None,
-                dtype=np.int64) -> OptimizeSpace:
+                dtype=np.int64,
+                suggestions=None) -> OptimizeSpace:
         return OptimizeSpace(
-            self, Integer(low, high, prior, base, transform, name, dtype))
+            self, Integer(low, high, prior, base, transform, name, dtype),
+            suggestions)
 
     def Real(self,
              low,
@@ -160,9 +182,11 @@ class Optimizer():
              base=10,
              transform="normalize",
              name=None,
-             dtype=float) -> OptimizeSpace:
+             dtype=float,
+             suggestions=None) -> OptimizeSpace:
         return OptimizeSpace(
-            self, Real(low, high, prior, base, transform, name, dtype))
+            self, Real(low, high, prior, base, transform, name, dtype),
+            suggestions)
 
     def __getstate__(self) -> dict:
         state = self.__dict__.copy()

qulab-2.3.0/qulab/version.py

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

qulab-2.2.8/qulab/version.py

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