Merge branch 'master' of https://gitlab.cis.strath.ac.uk/kwb13215/quantera-2

# Conflicts:
#	NEWPROPOSAL/FULLPROP.tex

NEWPROPOSAL/FULLPROP.tex

@@ -1120,7 +1120,7 @@ the tasks are sequenced in order of technical difficulty so that
 experience gained on earlier tasks can be applied to the more
 difficult ones.  There are strong interactions between the tasks, and
 early outputs of each WP will be used in later outputs of other WPs.
-(Details about the tasks are found in \S~\ref{sec:work-packages}.)\TODOb{Chat updated except for Milestones.}
+(Details about the tasks are found in \S~\ref{sec:work-packages}.)
 
 \oldt{\begin{figure}[th]
   \centering
@@ -1414,7 +1414,7 @@ We develop practical logical and algorithmic techniques for transforming  ``abst
       topological and quantitative properties, with associated
       reasoning techniques.} 
   \WPdeliverable{M24}{\newt{Setting the state-of-the-art for all forms of circuit optimization}.}
-        \WPdeliverable{M24}{\newt{Optimization techniques for a variety of computational models}.}
+        \WPdeliverable{M30}{\newt{Optimization techniques for a variety of computational models}.}
  % \WPdeliverable{M24}{Routines for adding error-correction to \zx programs}
     \WPdeliverable{M36}{Routines for adding error-correction to ZX programs.}
   \end{WPdeliverables}
@@ -1439,25 +1439,29 @@ Perdrix, Valiron, Carette.}
   \WPleaderGREN
   \WPeffort{20}{9}{12}{2}{6}{0}
   \begin{WPaim}
-We import machine-dependent specifications to \zx terms, and use this to optimise algorithms further for specific hardware constraints. We focus on the silicon spin qubits developing in Grenoble, the ion traps developed in Oxford, and the superconducting devices accessible through CQC and partnership with IBM. This is the culmination of all previous work packages, and feeds back into them. The final result will be \bR\ldots.
-Also machine-dependent error correction?\e
+We import machine-dependent specifications to \zx terms, and use this to optimise algorithms further for specific hardware constraints. We focus on the silicon spin qubits developing in Grenoble, the ion traps developed in Oxford, and the superconducting devices accessible through CQC and partnership with IBM. This is the culmination of all previous work packages, and feeds back into them. The final result will be a full ready-to-run deep-\zx compiler chain incorporating physical layout, error correction support and algorithmic optimisation, compiled for a target system, and demonstrating provably post-classical resource use in a quantum computation. 
   \end{WPaim}
   \begin{WPtasks}
 \WPtask[\label{task:qdot-model}]{Grenoble silicon spin qubits (M13--M36  Responsible: \partnerref{partner:grenoble};
   Involved: \partnerref{partner:loria},\partnerref{partner:gdansk})}{
   We will model the silicon spin qubits being developed in Grenoble, and extract specific annotations for
   \zx that describe key elements of the architecture.  This will
-  include qubit layout on wafers, network connectivity, and timing
-  and fidelity of potential entanglement links.  A suitably annotated \zx term
+  include qubit layout on wafers, network connectivity, and timing/fidelity of potential entanglement links.  A suitably annotated \zx term
   will then be translated to an executable sequence of hardware
   instructions -- output language to be defined in collaboration with
   the team at LETI.
 }
-\WPtask[\label{task:NQIT-model}]{Oxford ion traps (M13--M30  Responsible: \partnerref{partner:gdansk};
-  Involved: \partnerref{partner:grenoble})}{% 
-  In collaboration with the Oxford ion trap group and the NQIT team, we will design an output module which generates code for a realistic model of
+\WPtask[\label{task:NQIT-model}]{Oxford ion traps (M13--M30  Responsible: \partnerref{partner:grenoble};
+  Involved: \partnerref{partner:oxford},\partnerref{partner:CQC})}{% 
+    In collaboration with the Oxford ion trap group and the NQIT team, we will design an output module which generates code for a realistic model of
   ion trap quantum computers, including qubit losses and leakage, gate
-  timings, and circuit layout. Output language to be defined in collaboration with hardware experts at Oxford.}
+  timings, and circuit layout. Output language to be defined in collaboration with hardware experts at Oxford.
+}
+  
+  \WPtask[\label{task:IBM-model}]{IBM superconducting devices (M18--M36  Responsible: \partnerref{partner:grenoble};
+  Involved: \partnerref{partner:oxford},\partnerref{partner:CQC},\partnerref{partner:gdansk})}{%
+      Using the IBM devices accessed through the collaboration with CQC, model the devices and extract annotations. Compare with similar annotations from Grenoble and Oxford devices to extract core common components. 
+}
   
   \WPtask[\label{task:runnable}]{Formatting for target systems 
     (M15--M30; Responsible: \partnerref{partner:loria}; Involved: \partnerref{partner:grenoble},\partnerref{partner:oxford},\partnerref{partner:gdansk})}{%
@@ -1467,9 +1471,13 @@ Also machine-dependent error correction?\e
     to a form which can be executed on that machine model.
 %\BREM{      Develop a specification system for the operations and constraints of a hardware system, in order to specify how to transform a ``logical'' \azx term to a procedure to realise that transformation on a specific machine.}
       }
+        \WPtask[\label{task:error}]{Error correction for target devices 
+    (M15--M30; Responsible: \partnerref{partner:grenoble}; Involved: \partnerref{partner:oxford},\partnerref{partner:CQC})}{%
+    Develop specific small-scale and optimised error-correction and/or mitigation techniques for ion trap and spin qubit devices. Using the annotations extracted for the devices, and protocols developed in task \ref{task:ECC}, minimise qubit overheads and match codes to the specific error models of the Oxford and Grenoble devices.
+      }
 %%
     \WPtask[\label{task:opt-machine}]{Model-guided optimisation 
-      (M21--M36; Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:loria},\partnerref{partner:oxford})}{%
+      (M21--M36; Responsible: \partnerref{partner:grenoble}; Involved: \partnerref{partner:loria},\partnerref{partner:oxford},\partnerref{partner:CQC},\partnerref{partner:gdansk})}{%
       Develop procedures to optimise \zx-terms subject to a machine
       model,  within the confines of
       an annotation system for a particular hardware platform
@@ -1479,20 +1487,15 @@ Also machine-dependent error correction?\e
     
   \end{WPtasks}
   \begin{WPdeliverables}
-  \WPdeliverable{M24}{Deliverable}
-  \WPdeliverable{M24}{Deliverable}
-  \WPdeliverable{M30}{General purpose layout engine}
-  \WPdeliverable{M36}{Optimising \dzxc, suitable for compiling to Grenoble and/or Oxford architecture}    
-  \WPdeliverable[\label{del:backendapiBIS}]{M36}{API for back-end
-    modules, including specification language for architectures.}
+  \WPdeliverable{M19}{Initial device-specific annotations for Grenoble and Oxford machines}
+  \WPdeliverable{M24}{Initial optimised error correction techniques for ion traps and spin qubits}
+  \WPdeliverable{M28}{Back-end module for Oxford ion traps}
+    \WPdeliverable{M30}{Back-end module for Grenoble spin qubits and IBM devices}
+  \WPdeliverable{M36}{Fully optimising \dzxc with compilation to Grenoble, Oxford, or IBM architecture}    
   \end{WPdeliverables}
 \end{WP}
-\TODOb{Should D4.5 be the same as D1.6? Does not correspond to a task
-  in WP4}
 
-\REM{\emph{Leader:} Kissinger.
-\emph{Others:} Abramsky, de Beaudrap, Duncan, Jeandel, Perdrix, 
-Staton, Carette.} 
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % WP admin and comms

NEWPROPOSAL/ganttchart.tex

@@ -39,7 +39,7 @@
   \ganttbar{\footnotesize \ref{task:axioms} Beyond qubits and stabilisers}{1}{14}\\
   \ganttbar{\footnotesize \ref{task:betterboxes} Control in \zx}{1}{18}\\
   \ganttbar{\footnotesize \ref{task:resources} Resources and axioms}{1}{36}\\
-  \ganttbar{\ref{task:resourcesagain} Computational resources}{12}{36}\\
+  \ganttbar{\footnotesize \ref{task:resourcesagain} Computational resources}{12}{36}\\
 %%%% WP 3 
   \ganttset{bar/.append style={fill=green!50}}
   \ganttbar{\footnotesize \ref{task:algorithms} Reduction strategies etc.}{1}{24}\\
@@ -51,7 +51,9 @@
   \ganttset{bar/.append style={fill=blue!50}}
   \ganttbar{\footnotesize \ref{task:qdot-model} Grenoble silicon spin qubits}{13}{36}\\
   \ganttbar{\footnotesize \ref{task:NQIT-model} Oxford ion traps}{13}{30}\\
+  \ganttbar{\footnotesize \ref{task:IBM-model} IBM superconducting devices}{18}{36}\\
   \ganttbar{\footnotesize \ref{task:runnable} Formatting for target systems}{15}{30}\\
+  \ganttbar{\footnotesize \ref{task:error} Error correction for target devices}{15}{30}\\
   \ganttbar{\footnotesize \ref{task:opt-machine} Model-guided optimisations}{21}{36}\\
 %%% WP 5 -- don't use
   % \ganttset{bar/.append style={fill=gray!50}}