waveforms 1.6.0__tar.gz → 1.6.2__tar.gz

{waveforms-1.6.0/waveforms.egg-info → waveforms-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: waveforms
-Version: 1.6.0
+Version: 1.6.2
 Summary: Edit waveforms used in experiment
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

{waveforms-1.6.0 → waveforms-1.6.2}/waveforms/math/fit/spectrum.py

@@ -15,11 +15,11 @@ def get_2d_spectrum_background(data):
     Returns:
         bg (np.ndarray): background
     """
-    x = np.median(data, axis=0)
-    y = np.median(data, axis=1)
+    x = np.nanmedian(data, axis=0)
+    y = np.nanmedian(data, axis=1)
     x, y = np.meshgrid(x, y)
     bg = x + y
-    offset = np.median(data - bg)
+    offset = np.nanmedian(data - bg)
     return bg - offset
 
 

{waveforms-1.6.0 → waveforms-1.6.2}/waveforms/quantum/math.py

@@ -158,7 +158,7 @@ def v2Hermitian(V):
     X = V[:(N**2 - N) // 2]
     Y = V[(N**2 - N) // 2:(N**2 - N)]
     Z = V[(N**2 - N):]
-    H = np.diag(Z / 2).astype(np.complex)
+    H = np.diag(Z / 2).astype(complex)
 
     H[np.triu_indices(N, 1)] = X + 1j * Y
     H += dagger(H)

waveforms-1.6.2/waveforms/systemq_kernel/kernel/__init__.py

@@ -0,0 +1,14 @@
+from .bootstrap import bootstrap
+from .sched import sched as scheduler
+from .sched.sched import (after_task_finished, before_task_start,
+                          before_task_step, cancel, create_task, exec, get,
+                          get_config, get_executor, get_system_info,
+                          register_hook, session, set, submit,
+                          unregister_all_hooks, unregister_hook,
+                          update_parameters)
+from .sched.task import set_default_lib, update_tags
+
+bootstrap()
+
+executor = get_executor()
+cfg = get_config()

{waveforms-1.6.0 → waveforms-1.6.2}/waveforms/systemq_kernel/kernel/sched/sched.py

@@ -55,6 +55,43 @@ __system_info = {
     'packages': [],
     'repositories': {}
 }
+__system_hooks = {
+    'before_task_start': [],
+    'after_task_finished': [],
+    'before_task_step': [],
+}
+
+
+def register_hook(hook_name, func):
+    if func not in __system_hooks[hook_name]:
+        __system_hooks[hook_name].append(func)
+    return func
+
+
+def unregister_hook(hook_name, func):
+    if func in __system_hooks[hook_name]:
+        __system_hooks[hook_name].remove(func)
+    return func
+
+
+def unregister_all_hooks(hook_name):
+    if hook_name is None:
+        for k in __system_hooks.keys():
+            unregister_all_hooks(k)
+    elif hook_name in __system_hooks:
+        __system_hooks[hook_name].clear()
+
+
+def before_task_start(func):
+    return register_hook('before_task_start', func)
+
+
+def after_task_finished(func):
+    return register_hook('after_task_finished', func)
+
+
+def before_task_step(func):
+    return register_hook('before_task_step', func)
 
 
 def _stack():
@@ -93,7 +130,12 @@ def clean_side_effects(task: Task,
             pass
         else:
             cmds.append(WRITE(k, v))
-    return executor.feed(task.id, -2, cmds, priority=task.task_priority, name=task.name, next_feed_time=0)
+    return executor.feed(task.id,
+                         -2,
+                         cmds,
+                         priority=task.task_priority,
+                         name=task.name,
+                         next_feed_time=0)
 
 
 def submit_loop(task_queue: PriorityQueue, current_stack: list[Task],
@@ -163,7 +205,7 @@ def _feed_step(task, feed_step, executor):
                                 task.runtime.prog.steps[feed_step].cmds,
                                 extra,
                                 priority=task.task_priority,
-                                name = task.name,
+                                name=task.name,
                                 next_feed_time=30)
         if succeed == 0 and feed_step == 0:
             with task.runtime._status_lock:
@@ -252,8 +294,8 @@ def _save_data(task,
     return last_time, saved_step
 
 
-def _exec_hooks(task, step, executor):
-    for hook in task._hooks:
+def _exec_hooks(task, step, executor, hooks):
+    for hook in hooks:
         hook(task, step, executor)
     time.sleep(0.01)
 
@@ -283,7 +325,15 @@ def task_run_thread(task: Task, kill_event: threading.Event,
         circuit = task.circuits
     else:
         circuit = []
-    executor.create_task(task.id, {'priority':task.task_priority,'user':user,'name':task.name,'circuit':circuit})
+    executor.create_task(
+        task.id, {
+            'priority': task.task_priority,
+            'user': user,
+            'name': task.name,
+            'circuit': circuit
+        })
+    if task._init_hooks:
+        _exec_hooks(task, feed_step, executor, task._init_hooks)
 
     try:
         while True:
@@ -314,7 +364,7 @@ def task_run_thread(task: Task, kill_event: threading.Event,
 
             if feed_more:
                 if task._hooks:
-                    _exec_hooks(task, feed_step, executor)
+                    _exec_hooks(task, feed_step, executor, task._hooks)
                 _feed_step(task, feed_step, executor)
                 feed_step += 1
 
@@ -324,8 +374,10 @@ def task_run_thread(task: Task, kill_event: threading.Event,
             if (feed_finished and
                     task.runtime.finished_step >= task.runtime.compiled_step):
                 # executor.save(task.id, task.data_path)
-                executor.save(task.id, f'{task.data_path}/{task.record.id}', # save checkpoint once the Task is finished
-                              task.result()['index'])
+                executor.save(
+                    task.id,
+                    f'{task.data_path}/{task.record.id}',  # save checkpoint once the Task is finished
+                    task.result()['index'])
                 task.runtime.finished_time = time.time()
                 with task.runtime._status_lock:
                     task.runtime.status = 'finished'
@@ -340,6 +392,8 @@ def task_run_thread(task: Task, kill_event: threading.Event,
         log.exception(f"{task.name}({task.id}) is failed")
         executor.free(task.id)
     finally:
+        if task._final_hooks:
+            _exec_hooks(task, feed_step, executor, task._final_hooks)
         if not side_effect_cleared:
             clean_side_effects(task, executor, task.runtime.keep_last_status)
         _save_data(task)
@@ -446,7 +500,7 @@ def set(key: str, value: Any, cache: bool = False):
     if not cache:
         cmds.append(WRITE(key, value))
     if len(cmds) > 0:
-        succeed = __executor.feed(0, -1, cmds,next_feed_time=0)
+        succeed = __executor.feed(0, -1, cmds, next_feed_time=0)
         if succeed == 0:
             raise RuntimeError(
                 f'Failed to set {key} to {value}, executor busy.')
@@ -499,6 +553,15 @@ def create_task(app, args=(), kwds={}):
     task.runtime.id = generate_task_id()
     task.runtime.user = __system_user
     task.runtime.system_info = get_system_info()
+    for fun in __system_hooks['before_task_start']:
+        if fun not in task._init_hooks:
+            task._init_hooks.append(fun)
+    for fun in __system_hooks['before_task_step']:
+        if fun not in task._hooks:
+            task._hooks.append(fun)
+    for fun in __system_hooks['after_task_finished']:
+        if fun not in task._final_hooks:
+            task._final_hooks.append(fun)
     return task
 
 
@@ -552,7 +615,8 @@ def exec(circuit,
          cmds=[],
          no_record=False,
          parent=None,
-         dry_run: bool = False, **kw):
+         dry_run: bool = False,
+         **kw):
     """Execute a circuit.
 
     Parameters:
@@ -581,7 +645,7 @@ def exec(circuit,
                               arch=arch,
                               lib=lib,
                               cfg=cfg,
-                              cmds=cmds)|kw)
+                              cmds=cmds) | kw)
     if parent is not None:
         t.parent = parent.id
         t.runtime.prog.snapshot = parent.cfg.export()

{waveforms-1.6.0 → waveforms-1.6.2}/waveforms/systemq_kernel/kernel/sched/task.py

@@ -141,6 +141,8 @@ class Task(BaseTask):
         self.__cfg = None
         self.__runtime.arch = get_arch(arch)
         self._hooks: list[Callable[[Task, int, Executor], None]] = []
+        self._init_hooks: list[Callable[[Task, int, Executor], None]] = []
+        self._final_hooks: list[Callable[[Task, int, Executor], None]] = []
 
     @property
     def signal(self):

{waveforms-1.6.0 → waveforms-1.6.2}/waveforms/systemq_kernel/kernel/terminal/scan.py

@@ -225,6 +225,7 @@ class Scan(App):
              aggregation: None | dict[str, tuple[str, callable]] = None,
              find_dim: None | tuple[str, int | float | complex] = None,
              T=False,
+             figsize=None,
              **kwds):
         import matplotlib.pyplot as plt
         from waveforms.visualization import autoplot
@@ -261,7 +262,9 @@ class Scan(App):
             row += 1
 
         if fig is None:
-            fig, axis = plt.subplots(row, col, figsize=(5 * col, 4 * row))
+            if figsize is None:
+                figsize = (5 * col, 4 * row)
+            fig, axis = plt.subplots(row, col, figsize=figsize)
             #plt.tight_layout()
             axis = np.array([axis]).reshape(row, col)
 

{waveforms-1.6.0 → waveforms-1.6.2}/waveforms/systemq_kernel/lib/arch/baqis.py

@@ -245,7 +245,15 @@ def _process_classify(data, gate_params_list, signal, classify):
             result['population'].append(p1)
         result['population'] = np.asarray(result['population'])
         for i in range(4):
-           result[f'P{i}'] = populations[i]
+            result[f'P{i}'] = populations[i]
+        for i, gate_params in enumerate(gate_params_list):
+            M = gate_params['params'].get('M', np.eye(4))
+            q = np.linalg.inv(np.asarray(M)) @ populations[:M.shape[0], i]
+            for j, v in enumerate(q):
+                if f'Q{j}' in result:
+                    result[f'Q{j}'].append(v)
+                else:
+                    result[f'Q{j}'] = [v]
     elif signal & Signal.state:
         result['state'] = state
 

{waveforms-1.6.0 → waveforms-1.6.2}/waveforms/systemq_kernel/lib/gates/u3.py

@@ -1,10 +1,11 @@
 from pathlib import Path
 
 from numpy import mod, pi
+
 from waveforms.qlisp.base import MeasurementTask
 from waveforms.qlisp.library import Library
 from waveforms.qlisp.macro import add_VZ_rule
-from waveforms.waveform import (cos, coshPulse, cosPulse, gaussian, mixing,
+from waveforms.waveform import (cos, coshPulse, cosPulse, gaussian, mixing, pi,
                                 sin, square, zero)
 from waveforms.waveform_parser import wave_eval
 
@@ -26,7 +27,6 @@ def get_frequency_phase(ctx, qubit, phi, level1, level2):
     return freq, phi
 
 
-@lib.opaque('R')
 def R(ctx, qubits, phi=0, level1=0, level2=1):
     qubit, = qubits
 
@@ -68,9 +68,20 @@ def R(ctx, qubits, phi=0, level1=0, level2=1):
         yield ('!add', 'time', width + plateau + buffer), qubit
 
 
+@lib.opaque('R')
+def _R(ctx, qubits, phi=0, level1=0, level2=1):
+    yield from R(ctx, qubits, phi, level1, level2)
+
+
+@lib.opaque('R12')
+def _R12(ctx, qubits, phi=0, level1=0, level2=1):
+    yield from R(ctx, qubits, phi, level1, level2)
+
+
 @lib.opaque('P')
 def P(ctx, qubits, phi):
     import numpy as np
+
     from waveforms.qlisp.assembly import call_opaque
 
     phi += ctx.phases[qubits[0]]
@@ -382,3 +393,23 @@ def CZ(ctx, qubits):
 
     yield ('!add', 'phase', ctx.params['phi1']), qubits[0]
     yield ('!add', 'phase', ctx.params['phi2']), qubits[1]
+
+
+@lib.opaque('Reset')
+def Reset(ctx, qubits):
+    qubit, *_ = qubits
+
+    f12 = ctx.cfg.query(f'gate.R12.{qubit}.params.frequency')
+    duration = ctx.params.get('duration', 1e-6)
+    amp_ef = ctx.params.get('amp_ef', 1.0)
+    amp_f0_g1 = ctx.params.get('amp_f0_g1', 1.0)
+    freq_f0_g1 = ctx.params.get('freq_f0_g1', 1e9)
+
+    wav1 = amp_ef * square(duration) * cos(2 * pi * f12)
+    wav2 = amp_f0_g1 * square(duration) * cos(2 * pi * freq_f0_g1)
+
+    t = ctx.time[qubit]
+
+    yield ('!add', 'waveform', wav1 >> t), ('RF', qubit)
+    yield ('!add', 'waveform', wav2 >> t), ('Z', qubit)
+    yield ('!add', 'time', duration), qubit

{waveforms-1.6.0 → waveforms-1.6.2}/waveforms/systemq_kernel/storage/fs.py

@@ -1,7 +1,11 @@
+import gzip
 import hashlib
+import pickle
 import zlib
 from pathlib import Path
 
+import dill
+
 DATAPATH = Path.home() / 'data'
 CHUNKSIZE = 1024 * 1024 * 4  # 4 MB
 
@@ -16,10 +20,10 @@ def get_data_path() -> Path:
 
 
 def _save_object(data) -> tuple[str, str]:
-    import gzip
-    import pickle
-
-    data = pickle.dumps(data)
+    try:
+        data = pickle.dumps(data)
+    except:
+        data = dill.dumps(data)
     hashstr = hashlib.sha1(data).hexdigest()
     file = get_data_path(
     ) / 'objects' / hashstr[:2] / hashstr[2:4] / hashstr[4:]
@@ -30,11 +34,12 @@ def _save_object(data) -> tuple[str, str]:
 
 
 def _load_object(file: str) -> bytes:
-    import gzip
-    import pickle
-
     with gzip.open(get_data_path() / file, 'rb') as f:
-        data = pickle.load(f)
+        try:
+            data = pickle.load(f)
+        except:
+            f.seek(0)
+            data = dill.load(f)
     return data
 
 

{waveforms-1.6.0 → waveforms-1.6.2}/waveforms/version.py

@@ -1,2 +1,2 @@
 """Define version number here and read it from setup.py automatically"""
-__version__ = "1.6.0"
+__version__ = "1.6.2"

{waveforms-1.6.0 → waveforms-1.6.2}/waveforms/visualization/__main__.py

@@ -1,6 +1,8 @@
-import pickle
 import pathlib
+import pickle
+
 import click
+import dill
 import matplotlib.pyplot as plt
 import numpy as np
 
@@ -12,15 +14,30 @@ default_draw_methods = {
 
 
 def load_data(fname):
+    try:
+        from home.hkxu.tools import get_record_by_id
+        record_id = int(fname)
+        return get_record_by_id(record_id).data
+    except:
+        pass
     with open(fname, 'rb') as f:
-        data = pickle.load(f)
+        try:
+            data = pickle.load(f)
+        except:
+            f.seek(0)
+            data = dill.load(f)
     return data
 
 
-def draw(data):
-    script = data['meta']['plot_script']
-    global_namespace = {'plt': plt, 'np': np, 'result': data}
-    exec(script, global_namespace)
+def draw_common(data):
+    try:
+        script = data['meta']['plot_script']
+        assert script.strip()
+        global_namespace = {'plt': plt, 'np': np, 'result': data}
+        exec(script, global_namespace)
+    except:
+        from home.hkxu.tools import plot_record
+        plot_record(data['meta']['id'])
 
 
 def draw_error(data, text="No validate plot script found"):
@@ -39,7 +56,7 @@ def plot(fname):
         fname = pathlib.Path(fname)
         data = load_data(fname)
         try:
-            draw(data)
+            draw_common(data)
         except:
             default_draw_methods.get(fname.suffix, draw_error)(data)
     except FileNotFoundError:

{waveforms-1.6.0 → waveforms-1.6.2}/waveforms/waveform.py

@@ -687,6 +687,50 @@ class Waveform:
             ])
         return "$$\n{}\n$$".format(expr)
 
+    def _play(self, time_unit):
+        RATE = 48000
+        y = self.sample(sample_rate=RATE / time_unit)
+        play(y, RATE)
+
+    def play(self, time_unit=1):
+        import multiprocessing as mp
+        p = mp.Process(target=self._play, args=(time_unit, ), daemon=True)
+        p.start()
+
+
+def play(data, rate=48000):
+    import io
+    import pyaudio
+
+    CHUNK = 1024
+
+    max_amp = np.max(np.abs(data))
+
+    if max_amp > 1:
+        data /= max_amp
+
+    data = np.array(2**15 * 0.999 * data, dtype=np.int16)
+    buff = io.BytesIO(data.data)
+    p = pyaudio.PyAudio()
+
+    try:
+        stream = p.open(format=pyaudio.paInt16,
+                        channels=1,
+                        rate=rate,
+                        output=True)
+        try:
+            while True:
+                data = buff.read(CHUNK)
+                if data:
+                    stream.write(data)
+                else:
+                    break
+        finally:
+            stream.stop_stream()
+            stream.close()
+    finally:
+        p.terminate()
+
 
 _zero_waveform = Waveform()
 _one_waveform = Waveform(seq=(_one, ))

{waveforms-1.6.0 → waveforms-1.6.2/waveforms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: waveforms
-Version: 1.6.0
+Version: 1.6.2
 Summary: Edit waveforms used in experiment
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

waveforms-1.6.0/waveforms/systemq_kernel/kernel/__init__.py

@@ -1,11 +0,0 @@
-from .bootstrap import bootstrap
-from .sched import sched as scheduler
-from .sched.sched import (cancel, create_task, exec, get, get_config,
-                          get_executor, get_system_info, session, set, submit,
-                          update_parameters)
-from .sched.task import set_default_lib, update_tags
-
-bootstrap()
-
-executor = get_executor()
-cfg = get_config()