WIP: Hardware randomization

.gitattributes

@@ -1 +1,3 @@
 *.h5 filter=lfs diff=lfs merge=lfs -text
+*.aps2 filter=lfs diff=lfs merge=lfs -text
+*.aps1 filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -5,3 +5,5 @@
 *.h5
 *.py~
 *.py#
+*.egg-info
+QGL.egg-info/

.travis.yml

@@ -3,7 +3,10 @@
 
 language: python
 python:
-  - 3.5
+  - 3.6
+env:
+  - CONDA_TYPE=miniconda CONDA_VERS=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
+  - CONDA_TYPE=miniconda CONDA_VERS=https://repo.continuum.io/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh
 
 before_install:
   # install git lfs and fetch test data
@@ -22,22 +25,24 @@ install:
 
   # We do this conditionally because it saves us some downloading if the
   # version is the same.
-  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+  - echo "Using $CONDA_TYPE"
+  - wget $CONDA_VERS -O miniconda.sh
+  - bash miniconda.sh -h | sed '4q;d'
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"
-  - export BBN_MEAS_FILE="$PWD/tests/test_measure.yml"
-  - echo "Measure file at $BBN_MEAS_FILE"
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
 
   # Create conda environment with dependencies
-  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy bokeh h5py jupyter scipy networkx future
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy sqlalchemy jupyter scipy networkx
   - source activate test-environment
-  - conda install -c ecpy atom;
-  - pip install watchdog coveralls
+  - pip install coveralls
+  - pip install bqplot
+  - pip install git+https://github.com/BBN-Q/bbndb.git
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then  pip install pygsti; fi
 
 script:
   - coverage run -m unittest discover

QGL.egg-info/PKG-INFO

@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: QGL
+Version: 2.1
+Summary: UNKNOWN
+Home-page: https://github.com/BBN-Q/QGL
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN

QGL.egg-info/SOURCES.txt

@@ -0,0 +1,41 @@
+README.md
+QGL/BlockLabel.py
+QGL/ChannelLibraries.py
+QGL/Channels.py
+QGL/Cliffords.py
+QGL/Compiler.py
+QGL/ControlFlow.py
+QGL/GSTTools.py
+QGL/PatternUtils.py
+QGL/Plotting.py
+QGL/PulsePrimitives.py
+QGL/PulseSequencePlotter.py
+QGL/PulseSequencer.py
+QGL/PulseShapes.py
+QGL/Scheduler.py
+QGL/TdmInstructions.py
+QGL/Tomography.py
+QGL/__init__.py
+QGL/config.py
+QGL/config_location.py
+QGL/mm.py
+QGL.egg-info/PKG-INFO
+QGL.egg-info/SOURCES.txt
+QGL.egg-info/dependency_links.txt
+QGL.egg-info/requires.txt
+QGL.egg-info/top_level.txt
+QGL/BasicSequences/AllXY.py
+QGL/BasicSequences/BlankingSweeps.py
+QGL/BasicSequences/CR.py
+QGL/BasicSequences/Decoupling.py
+QGL/BasicSequences/Feedback.py
+QGL/BasicSequences/FlipFlop.py
+QGL/BasicSequences/RB.py
+QGL/BasicSequences/Rabi.py
+QGL/BasicSequences/SPAM.py
+QGL/BasicSequences/T1T2.py
+QGL/BasicSequences/__init__.py
+QGL/BasicSequences/helpers.py
+QGL/drivers/APS2Pattern.py
+QGL/drivers/APSPattern.py
+QGL/drivers/__init__.py

QGL.egg-info/dependency_links.txt

@@ -0,0 +1 @@
+

QGL.egg-info/requires.txt

@@ -0,0 +1,6 @@
+bbndb>=0.1
+numpy>=1.11.1
+scipy>=0.17.1
+networkx>=1.11
+bqplot>=0.11.5
+sqlalchemy>=1.2.17

QGL.egg-info/top_level.txt

@@ -0,0 +1 @@
+QGL

QGL/APS2CustomInstructions.py

@@ -0,0 +1,86 @@
+'''
+Copyright 2019 Raytheon BBN Technologies
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+# Instructions for the the prototype APS2-TDM hardware.
+
+from .TdmInstructions import CustomInstruction, WriteAddr, Invalidate, LoadCmpVram
+from .ControlFlow import LoadCmp, Call
+
+##custom APS OP_CODES
+#APS_CLIFFORD_SET_SEED:         Set 32 bit seed for random number generator
+#APS_CLIFFORD_SET_OFFSET:       Stores jump table starting offset
+#APS_CLIFFORD_SET_SPACING:      Stores jump table spacing (integer to shift left),
+#                               including interal address representation
+#APS_CLIFFORD_INVERSE_RESET:    Reset inverse tracker
+#APS_CLIFFORD_RAND:             Choose randomly from set of 24 waveforms,
+#                               returns starting address of jump table entry from RAM
+#APS_CLIFFORD_INVERSE:          Store waveform address of inverse waveform to be jumped to
+
+APS2_CUSTOM = {"APS_RAND": 0,
+                     "APS_CLIFFORD_RAND": 2,
+                     "APS_CLIFFORD_INVERSE": 6,
+                     "APS_CLIFFORD_INVERSE_RESET": 7,
+                     "APS_CLIFFORD_SET_SEED": 3,
+                     "APS_CLIFFORD_SET_OFFSET": 4,
+                     "APS_CLIFFORD_SET_SPACING": 5}
+
+APS2_CUSTOM_DECODE = {v: k for k, v in APS2_CUSTOM.items()}
+
+##Note that the expected call pattern for the randomizer is:
+
+#   APS_CLIFFORD_RAND / APS_CLIFFORD_INVERSE
+#   LOADCMP
+#   CALL
+
+def RandomCliffordSetOffset(addr, offset):
+    return [Invalidate(addr, 0, tdm=False),
+            WriteAddr(addr, offset, tdm=False),
+            LoadCmpVram(addr, 0xFFFFFFFF, tdm=False), #
+            CustomInstruction("APS_CLIFFORD_SET_OFFSET", addr, 0xA),
+            LoadCmpVram(0xA, 0xFFFFFFFF, tdm=False)]
+
+def RandomCliffordSetSpacing(addr, spacing):
+    return [Invalidate(addr, 0, tdm=False),
+            WriteAddr(addr, spacing, tdm=False),
+            LoadCmpVram(addr, 0xFFFFFFFF, tdm=False),
+            CustomInstruction("APS_CLIFFORD_SET_SPACING", addr, 0xA),
+            LoadCmpVram(0xA, 0xFFFFFFFF, tdm=False)]
+
+def RandomClifford(target, addr):
+    return [Invalidate(addr, 0, tdm=False),
+            CustomInstruction("APS_CLIFFORD_RAND", 0x0, addr),
+            LoadCmpVram(addr, 0xFFFFFFFF, tdm=False),
+            Call(target, indirect=True)]
+
+def RandomCliffordInverse(target, addr):
+    return [Invalidate(addr, 0, tdm=False),
+            CustomInstruction("APS_CLIFFORD_INVERSE", 0x0, addr),
+            LoadCmpVram(addr, 0xFFFFFFFF, tdm=False),
+            Call(target, indirect=True)]
+
+def RandomCliffordInverseReset(val=0x0, addr=0xD): #for now don't use addr
+    return [Invalidate(addr, 0, tdm=False),
+            WriteAddr(addr, val, tdm=False),
+            LoadCmpVram(addr, 0xFFFFFFFF, tdm=False),
+            CustomInstruction("APS_CLIFFORD_INVERSE_RESET", addr, 0xA),
+            LoadCmpVram(0xA, 0xFFFFFFFF, tdm=False)]
+
+def RandomCliffordSeed(seed):
+    return [Invalidate(0xB, 0, tdm=False),
+        WriteAddr(0xB, seed, tdm=False),
+        LoadCmpVram(0xB, 0xFFFFFFFF, tdm=False),
+        CustomInstruction("APS_CLIFFORD_SET_SEED", 0xB, 0xA),
+        LoadCmpVram(0xA, 0xFFFFFFFF, tdm=False)]

QGL/BasicSequences/Feedback.py

@@ -124,8 +124,8 @@ def BitFlip3(data_qs, ancilla_qs, theta=None, phi=None, nrounds=1, meas_delay=1e
         raise Exception("Wrong number of qubits")
     seqs =  [
     DecodeSetRounds(1,0,nrounds),
-    Invalidate(addr=10, mask=2*nrounds),
-    Invalidate(addr=11, mask=0x1)]
+    Invalidate(10, 2*nrounds),
+    Invalidate(11, 0x1)]
 
     # encode single-qubit state into 3 qubits
     if theta and phi:
@@ -153,7 +153,7 @@ def BitFlip3(data_qs, ancilla_qs, theta=None, phi=None, nrounds=1, meas_delay=1e
     if docals:
         seqs += create_cal_seqs(qubits,
         calRepeats)
-    metafile = compile_to_hardware(seqs, 'BitFlip/BitFlip')
+    metafile = compile_to_hardware(seqs, 'BitFlip/BitFlip', tdm_seq=True)
     return metafile
 
 def MajorityVoteN(qubits, nrounds, prep=[], meas_delay=1e-6, docals=False, calRepeats=2):
@@ -172,9 +172,9 @@ def MajorityVoteN(qubits, nrounds, prep=[], meas_delay=1e-6, docals=False, calRe
     metafile : metafile path
     """
     nqubits = len(qubits)
-    seqs = [MajorityMask(nrounds*nqubits),
-           Invalidate(addr=10, mask=nrounds*nqubits),
-           Invalidate(addr=11, mask=1)]
+    seqs = [MajorityMask(1, 0, nrounds*nqubits),
+           Invalidate(10, nrounds*nqubits),
+           Invalidate(11, 1)]
     if prep:
        seqs += [reduce(operator.mul, [X(q) for n,q in enumerate(qubits) if prep[n]])]
     for n in range(nrounds):
@@ -187,5 +187,4 @@ def MajorityVoteN(qubits, nrounds, prep=[], meas_delay=1e-6, docals=False, calRe
     if docals:
         seqs += create_cal_seqs(qubits,
         calRepeats)
-    metafile = compile_to_hardware(seqs, 'MajorityVote/MajorityVote')
-    return metafile
+    metafile = compile_to_hardware(seqs, 'MajorityVote/MajorityVote', tdm_seq=True)

QGL/BasicSequences/Rabi.py

@@ -108,6 +108,8 @@ def RabiAmp_NQubits(qubits,
 
     if docals:
         seqs += create_cal_seqs(qubits, calRepeats, measChans=measChans)
+    else:
+        calRepeats = 0
 
     axis_descriptor = [
         {